Unit tests clean up

prebid · Dec 11, 2023 · fb6be8a · fb6be8a
1 parent 921a52d
commit fb6be8a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/hooks/hookexecution/execution_test.go b/hooks/hookexecution/execution_test.go
@@ -52,11 +52,11 @@ func TestHandleModuleActivitiesBidderRequestPayload(t *testing.T) {
 	}
 	for _, test := range testCases {
 		t.Run(test.description, func(t *testing.T) {
+			//check input payload didn't change
+			origInPayloadData := test.inPayloadData
 			activityControl := privacy.NewActivityControl(test.privacyConfig)
 			newPayload := handleModuleActivities(test.hookCode, activityControl, test.inPayloadData)
 			assert.Equal(t, test.expectedPayloadData.Request.BidRequest, newPayload.Request.BidRequest)
-			//check input payload didn't change
-			origInPayloadData := test.inPayloadData
 			assert.Equal(t, origInPayloadData, test.inPayloadData)
 		})
 	}
@@ -104,11 +104,11 @@ func TestHandleModuleActivitiesProcessedAuctionRequestPayload(t *testing.T) {
 	}
 	for _, test := range testCases {
 		t.Run(test.description, func(t *testing.T) {
+			//check input payload didn't change
+			origInPayloadData := test.inPayloadData
 			activityControl := privacy.NewActivityControl(test.privacyConfig)
 			newPayload := handleModuleActivities(test.hookCode, activityControl, test.inPayloadData)
 			assert.Equal(t, test.expectedPayloadData.Request.BidRequest, newPayload.Request.BidRequest)
-			//check input payload didn't change
-			origInPayloadData := test.inPayloadData
 			assert.Equal(t, origInPayloadData, test.inPayloadData)
 		})
 	}
@@ -140,11 +140,11 @@ func TestHandleModuleActivitiesNoBidderRequestPayload(t *testing.T) {
 	}
 	for _, test := range testCases {
 		t.Run(test.description, func(t *testing.T) {
+			//check input payload didn't change
+			origInPayloadData := test.inPayloadData
 			activityControl := privacy.NewActivityControl(test.privacyConfig)
 			newPayload := handleModuleActivities(test.hookCode, activityControl, test.inPayloadData)
 			assert.Equal(t, test.expectedPayloadData, newPayload)
-			//check input payload didn't change
-			origInPayloadData := test.inPayloadData
 			assert.Equal(t, origInPayloadData, test.inPayloadData)
 		})
 	}

diff --git a/hooks/hookexecution/executor_test.go b/hooks/hookexecution/executor_test.go
@@ -431,7 +431,6 @@ func TestExecuteRawAuctionStage(t *testing.T) {
 		expectedReject         *RejectError
 		expectedModuleContexts *moduleContexts
 		expectedStageOutcomes  []StageOutcome
-		privacyConfig          *config.AccountPrivacy
 	}{
 		{
 			description:            "Payload not changed if hook execution plan empty",
@@ -677,11 +676,11 @@ func TestExecuteRawAuctionStage(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(test.description, func(t *testing.T) {
 			exec := NewHookExecutor(test.givenPlanBuilder, EndpointAuction, &metricsConfig.NilMetricsEngine{})
-			exec.SetAccount(test.givenAccount)
 
-			ac := privacy.NewActivityControl(test.privacyConfig)
+			privacyConfig := getTransmitUFPDActivityConfig("foo", false)
+			ac := privacy.NewActivityControl(privacyConfig)
 			exec.SetActivityControl(ac)
-
+			exec.SetAccount(test.givenAccount)
 			newBody, reject := exec.ExecuteRawAuctionStage([]byte(test.givenBody))
 
 			assert.Equal(t, test.expectedReject, reject, "Unexpected stage reject.")
@@ -902,6 +901,10 @@ func TestExecuteProcessedAuctionStage(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(test.description, func(ti *testing.T) {
 			exec := NewHookExecutor(test.givenPlanBuilder, EndpointAuction, &metricsConfig.NilMetricsEngine{})
+
+			privacyConfig := getTransmitUFPDActivityConfig("foo", false)
+			ac := privacy.NewActivityControl(privacyConfig)
+			exec.SetActivityControl(ac)
 			exec.SetAccount(test.givenAccount)
 
 			err := exec.ExecuteProcessedAuctionStage(&test.givenRequest)
@@ -1423,6 +1426,10 @@ func TestExecuteRawBidderResponseStage(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(test.description, func(ti *testing.T) {
 			exec := NewHookExecutor(test.givenPlanBuilder, EndpointAuction, &metricsConfig.NilMetricsEngine{})
+
+			privacyConfig := getTransmitUFPDActivityConfig("foo", false)
+			ac := privacy.NewActivityControl(privacyConfig)
+			exec.SetActivityControl(ac)
 			exec.SetAccount(test.givenAccount)
 
 			reject := exec.ExecuteRawBidderResponseStage(&test.givenBidderResponse, "the-bidder")
@@ -1702,6 +1709,10 @@ func TestExecuteAllProcessedBidResponsesStage(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(test.description, func(t *testing.T) {
 			exec := NewHookExecutor(test.givenPlanBuilder, EndpointAuction, &metricsConfig.NilMetricsEngine{})
+
+			privacyConfig := getTransmitUFPDActivityConfig("foo", false)
+			ac := privacy.NewActivityControl(privacyConfig)
+			exec.SetActivityControl(ac)
 			exec.SetAccount(test.givenAccount)
 
 			exec.ExecuteAllProcessedBidResponsesStage(test.givenBiddersResponse)
@@ -1951,6 +1962,10 @@ func TestExecuteAuctionResponseStage(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(test.description, func(t *testing.T) {
 			exec := NewHookExecutor(test.givenPlanBuilder, EndpointAuction, &metricsConfig.NilMetricsEngine{})
+
+			privacyConfig := getTransmitUFPDActivityConfig("foo", false)
+			ac := privacy.NewActivityControl(privacyConfig)
+			exec.SetActivityControl(ac)
 			exec.SetAccount(test.givenAccount)
 
 			exec.ExecuteAuctionResponseStage(test.givenResponse)