Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@bsardo
bsardo committed Jul 18, 2023
1 parent f9c6a5c commit aefc979
Show file tree
Hide file tree
Showing 26 changed files with 952 additions and 419 deletions.
8 changes: 4 additions & 4 deletions account/account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func TestGetAccount(t *testing.T) {
func TestSetDerivedConfig(t *testing.T) {
tests := []struct {
description string
purpose1VendorExceptions []openrtb_ext.BidderName
purpose1VendorExceptions []string
feature1VendorExceptions []openrtb_ext.BidderName
basicEnforcementVendors []string
enforceAlgo string
Expand All @@ -148,11 +148,11 @@ func TestSetDerivedConfig(t *testing.T) {
},
{
description: "One purpose 1 vendor exception",
purpose1VendorExceptions: []openrtb_ext.BidderName{"appnexus"},
purpose1VendorExceptions: []string{"appnexus"},
},
{
description: "Multiple purpose 1 vendor exceptions",
purpose1VendorExceptions: []openrtb_ext.BidderName{"appnexus", "rubicon"},
purpose1VendorExceptions: []string{"appnexus", "rubicon"},
},
{
description: "Nil feature 1 vendor exceptions",
Expand Down Expand Up @@ -206,7 +206,7 @@ func TestSetDerivedConfig(t *testing.T) {

setDerivedConfig(&account)

purpose1ExceptionMapKeys := make([]openrtb_ext.BidderName, 0)
purpose1ExceptionMapKeys := make([]string, 0)
for k := range account.GDPR.Purpose1.VendorExceptionMap {
purpose1ExceptionMapKeys = append(purpose1ExceptionMapKeys, k)
}
Expand Down
2 changes: 1 addition & 1 deletion analytics/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ func NewPBSAnalytics(analytics *config.Analytics) EnabledAnalytics {
}
}
return modules
}
}
158 changes: 80 additions & 78 deletions analytics/config/config_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,94 +1,94 @@
package config

import (
"net/http"
// "net/http"
"os"
"testing"

"github.com/prebid/openrtb/v19/openrtb2"
// "github.com/prebid/openrtb/v19/openrtb2"
"github.com/stretchr/testify/assert"

"github.com/prebid/prebid-server/analytics"
// "github.com/prebid/prebid-server/analytics"
"github.com/prebid/prebid-server/analytics/filesystem"
"github.com/prebid/prebid-server/analytics/pubstack"
"github.com/prebid/prebid-server/config"
)

const TEST_DIR string = "testFiles"

func TestSampleModule(t *testing.T) {
var count int
am := initAnalytics(&count)
am.LogAuctionObject(&analytics.AuctionObject{
Status: http.StatusOK,
Errors: nil,
Response: &openrtb2.BidResponse{},
})
if count != 1 {
t.Errorf("PBSAnalyticsModule failed at LogAuctionObject")
}
// func TestSampleModule(t *testing.T) {
// var count int
// am := initAnalytics(&count)
// am.LogAuctionObject(&analytics.AuctionObject{
// Status: http.StatusOK,
// Errors: nil,
// Response: &openrtb2.BidResponse{},
// })
// if count != 1 {
// t.Errorf("PBSAnalyticsModule failed at LogAuctionObject")
// }

am.LogSetUIDObject(&analytics.SetUIDObject{
Status: http.StatusOK,
Bidder: "bidders string",
UID: "uid",
Errors: nil,
Success: true,
})
if count != 2 {
t.Errorf("PBSAnalyticsModule failed at LogSetUIDObject")
}
// am.LogSetUIDObject(&analytics.SetUIDObject{
// Status: http.StatusOK,
// Bidder: "bidders string",
// UID: "uid",
// Errors: nil,
// Success: true,
// })
// if count != 2 {
// t.Errorf("PBSAnalyticsModule failed at LogSetUIDObject")
// }

am.LogCookieSyncObject(&analytics.CookieSyncObject{})
if count != 3 {
t.Errorf("PBSAnalyticsModule failed at LogCookieSyncObject")
}
// am.LogCookieSyncObject(&analytics.CookieSyncObject{})
// if count != 3 {
// t.Errorf("PBSAnalyticsModule failed at LogCookieSyncObject")
// }

am.LogAmpObject(&analytics.AmpObject{})
if count != 4 {
t.Errorf("PBSAnalyticsModule failed at LogAmpObject")
}
// am.LogAmpObject(&analytics.AmpObject{})
// if count != 4 {
// t.Errorf("PBSAnalyticsModule failed at LogAmpObject")
// }

am.LogVideoObject(&analytics.VideoObject{})
if count != 5 {
t.Errorf("PBSAnalyticsModule failed at LogVideoObject")
}
// am.LogVideoObject(&analytics.VideoObject{})
// if count != 5 {
// t.Errorf("PBSAnalyticsModule failed at LogVideoObject")
// }

am.LogNotificationEventObject(&analytics.NotificationEvent{})
if count != 6 {
t.Errorf("PBSAnalyticsModule failed at LogNotificationEventObject")
}
}
// am.LogNotificationEventObject(&analytics.NotificationEvent{})
// if count != 6 {
// t.Errorf("PBSAnalyticsModule failed at LogNotificationEventObject")
// }
// }

type sampleModule struct {
count *int
}
// type sampleModule struct {
// count *int
// }

func (m *sampleModule) GetName() string { return "" }
// func (m *sampleModule) GetName() string { return "" }

func (m *sampleModule) GetVendorID() uint16 { return 0 }
// func (m *sampleModule) GetVendorID() uint16 { return 0 }

func (m *sampleModule) LogAuctionObject(ao *analytics.AuctionObject) { *m.count++ }
// func (m *sampleModule) LogAuctionObject(ao *analytics.AuctionObject) { *m.count++ }

func (m *sampleModule) LogVideoObject(vo *analytics.VideoObject) { *m.count++ }
// func (m *sampleModule) LogVideoObject(vo *analytics.VideoObject) { *m.count++ }

func (m *sampleModule) LogCookieSyncObject(cso *analytics.CookieSyncObject) { *m.count++ }
// func (m *sampleModule) LogCookieSyncObject(cso *analytics.CookieSyncObject) { *m.count++ }

func (m *sampleModule) LogSetUIDObject(so *analytics.SetUIDObject) { *m.count++ }
// func (m *sampleModule) LogSetUIDObject(so *analytics.SetUIDObject) { *m.count++ }

func (m *sampleModule) LogAmpObject(ao *analytics.AmpObject) { *m.count++ }
// func (m *sampleModule) LogAmpObject(ao *analytics.AmpObject) { *m.count++ }

func (m *sampleModule) LogNotificationEventObject(ne *analytics.NotificationEvent) { *m.count++ }
// func (m *sampleModule) LogNotificationEventObject(ne *analytics.NotificationEvent) { *m.count++ }

func initAnalytics(count *int) analytics.PBSAnalyticsModule {
modules := make(enabledAnalytics, 0)
modules = append(modules, &sampleModule{count})
return &modules
}
// func initAnalytics(count *int) analytics.PBSAnalyticsModule {
// modules := make(EnabledAnalytics, 0)
// modules = append(modules, &sampleModule{count})
// return &modules
// }

func TestNewPBSAnalytics(t *testing.T) {
pbsAnalytics := NewPBSAnalytics(&config.Analytics{})
instance := pbsAnalytics.(enabledAnalytics)

assert.Equal(t, len(instance), 0)
assert.Len(t, pbsAnalytics, 0)
}

func TestNewPBSAnalytics_FileLogger(t *testing.T) {
Expand All @@ -98,20 +98,23 @@ func TestNewPBSAnalytics_FileLogger(t *testing.T) {
}
}
defer os.RemoveAll(TEST_DIR)
mod := NewPBSAnalytics(&config.Analytics{File: config.FileLogs{Filename: TEST_DIR + "/test"}})
switch modType := mod.(type) {
case enabledAnalytics:
if len(enabledAnalytics(modType)) != 1 {
t.Fatalf("Failed to add analytics module")
}
default:
t.Fatalf("Failed to initialize analytics module")
}
// mod := NewPBSAnalytics(&config.Analytics{File: config.FileLogs{Filename: TEST_DIR + "/test"}})
// switch modType := mod.(type) {
// case enabledAnalytics:
// if len(enabledAnalytics(modType)) != 1 {
// t.Fatalf("Failed to add analytics module")
// }
// default:
// t.Fatalf("Failed to initialize analytics module")
// }

enabledAnalytics := NewPBSAnalytics(&config.Analytics{File: config.FileLogs{Filename: TEST_DIR + "/test"}})
// instance := pbsAnalytics.(enabledAnalytics)
// assert.Equal(t, len(instance), 1)
assert.Len(t, enabledAnalytics, 1)
_, ok := enabledAnalytics[0].(*filesystem.FileLogger)
assert.Equal(t, true, ok)

pbsAnalytics := NewPBSAnalytics(&config.Analytics{File: config.FileLogs{Filename: TEST_DIR + "/test"}})
instance := pbsAnalytics.(enabledAnalytics)

assert.Equal(t, len(instance), 1)
}

func TestNewPBSAnalytics_Pubstack(t *testing.T) {
Expand All @@ -129,15 +132,14 @@ func TestNewPBSAnalytics_Pubstack(t *testing.T) {
ConfRefresh: "2h",
},
})
instanceWithoutError := pbsAnalyticsWithoutError.(enabledAnalytics)

assert.Equal(t, len(instanceWithoutError), 1)
assert.Len(t, pbsAnalyticsWithoutError, 1)
_, ok := pbsAnalyticsWithoutError[0].(*pubstack.PubstackModule)
assert.Equal(t, true, ok)

pbsAnalyticsWithError := NewPBSAnalytics(&config.Analytics{
Pubstack: config.Pubstack{
Enabled: true,
},
})
instanceWithError := pbsAnalyticsWithError.(enabledAnalytics)
assert.Equal(t, len(instanceWithError), 0)
assert.Len(t, pbsAnalyticsWithError, 0)
}
14 changes: 7 additions & 7 deletions analytics/config/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (eml *EnabledModuleLogger) LogAuctionObject(ao *analytics.AuctionObject) {
allow, err := eml.privacyPolicy.Allow(eml.ctx, module.GetName(), module.GetVendorID())
if allow && err == nil {
module.LogAuctionObject(ao)
}
}
}
}

Expand All @@ -51,7 +51,7 @@ func (eml *EnabledModuleLogger) LogVideoObject(vo *analytics.VideoObject) {
allow, err := eml.privacyPolicy.Allow(eml.ctx, module.GetName(), module.GetVendorID())
if allow && err == nil {
module.LogVideoObject(vo)
}
}
}
}

Expand All @@ -62,7 +62,7 @@ func (eml *EnabledModuleLogger) LogCookieSyncObject(cso *analytics.CookieSyncObj
allow, err := eml.privacyPolicy.Allow(eml.ctx, module.GetName(), module.GetVendorID())
if allow && err == nil {
module.LogCookieSyncObject(cso)
}
}
}
}

Expand All @@ -73,7 +73,7 @@ func (eml *EnabledModuleLogger) LogSetUIDObject(so *analytics.SetUIDObject) {
allow, err := eml.privacyPolicy.Allow(eml.ctx, module.GetName(), module.GetVendorID())
if allow && err == nil {
module.LogSetUIDObject(so)
}
}
}
}

Expand All @@ -84,7 +84,7 @@ func (eml *EnabledModuleLogger) LogAmpObject(ao *analytics.AmpObject) {
allow, err := eml.privacyPolicy.Allow(eml.ctx, module.GetName(), module.GetVendorID())
if allow && err == nil {
module.LogAmpObject(ao)
}
}
}
}

Expand All @@ -96,6 +96,6 @@ func (eml *EnabledModuleLogger) LogNotificationEventObject(ne *analytics.Notific
allow, err := eml.privacyPolicy.Allow(eml.ctx, module.GetName(), module.GetVendorID())
if allow && err == nil {
module.LogNotificationEventObject(ne)
}
}
}
}
}
Loading

0 comments on commit aefc979

Please sign in to comment.