Skip to content

Commit fcf4f37

Browse files
osulzhenkoosulzhenko
committed
fix merge conflicts for functional tests
1 parent 5b3c4fc commit fcf4f37

3 files changed

Lines changed: 19 additions & 23 deletions

File tree

‎src/test/groovy/org/prebid/server/functional/tests/privacy/GppSyncUserActivitiesSpec.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ import static org.prebid.server.functional.model.config.UsNationalPrivacySection
5757
import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SHARING_NOTICE
5858
import static org.prebid.server.functional.model.pricefloors.Country.CAN
5959
import static org.prebid.server.functional.model.pricefloors.Country.USA
60-
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
6160
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
61+
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
6262
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6363
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
6464
import static org.prebid.server.functional.model.request.GppSectionId.US_CA_V1
@@ -519,7 +519,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
519519
and: "Metrics processed across activities should be updated"
520520
def metrics = activityPbsService.sendCollectedMetricsRequest()
521521
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(cookieSyncRequest, SYNC_USER)] == 1
522-
assert metrics[ALERT_GENERAL.value] == 1
522+
assert metrics[ALERT_GENERAL] == 1
523523

524524
and: "Response shouldn't contain warnings"
525525
assert !response.warnings
@@ -685,7 +685,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
685685
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(cookieSyncRequest, SYNC_USER)] == 1
686686

687687
and: "General alert metric shouldn't be updated"
688-
!metrics[ALERT_GENERAL.getValue()]
688+
!metrics[ALERT_GENERAL]
689689

690690
where:
691691
regsGpp << [null, "", new UsNatV1Consent.Builder().build(), new UsNatV1Consent.Builder().setGpc(false).build()]
@@ -1473,7 +1473,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
14731473
and: "Metrics processed across activities should be updated"
14741474
def metrics = activityPbsService.sendCollectedMetricsRequest()
14751475
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(setuidRequest, SYNC_USER)] == 1
1476-
assert metrics[ALERT_GENERAL.value] == 1
1476+
assert metrics[ALERT_GENERAL] == 1
14771477

14781478
and: "Logs should contain error"
14791479
def logs = activityPbsService.getLogsByTime(startTime)
@@ -1645,7 +1645,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
16451645
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(setuidRequest, SYNC_USER)] == 1
16461646

16471647
and: "General alert metric shouldn't be updated"
1648-
!metrics[ALERT_GENERAL.getValue()]
1648+
!metrics[ALERT_GENERAL]
16491649

16501650
where:
16511651
regsGpp << [null, "", new UsNatV1Consent.Builder().build(), new UsNatV1Consent.Builder().setGpc(false).build()]

‎src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitEidsActivitiesSpec.groovy‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ import static org.prebid.server.functional.model.config.UsNationalPrivacySection
5555
import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SHARING_NOTICE
5656
import static org.prebid.server.functional.model.pricefloors.Country.CAN
5757
import static org.prebid.server.functional.model.pricefloors.Country.USA
58-
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
5958
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
60-
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
6159
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
60+
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
61+
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
6262
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6363
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
6464
import static org.prebid.server.functional.model.request.GppSectionId.US_CA_V1
@@ -75,6 +75,7 @@ import static org.prebid.server.functional.model.request.auction.PrivacyModule.I
7575
import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_CUSTOM_LOGIC
7676
import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_GENERAL
7777
import static org.prebid.server.functional.model.request.auction.TraceLevel.VERBOSE
78+
import static org.prebid.server.functional.model.response.auction.ErrorType.PREBID
7879
import static org.prebid.server.functional.util.privacy.model.State.ALABAMA
7980
import static org.prebid.server.functional.util.privacy.model.State.ONTARIO
8081

@@ -885,7 +886,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
885886
def metrics = activityPbsService.sendCollectedMetricsRequest()
886887
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(bidRequest, TRANSMIT_EIDS)] == 1
887888
assert metrics[ACCOUNT_PROCESSED_RULES_COUNT.getValue(bidRequest, TRANSMIT_EIDS)] == 1
888-
assert metrics[ALERT_GENERAL.value] == 1
889+
assert metrics[ALERT_GENERAL] == 1
889890

890891
and: "Logs should contain error"
891892
def logs = activityPbsService.getLogsByTime(startTime)
@@ -1058,7 +1059,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
10581059
assert metrics[ACCOUNT_PROCESSED_RULES_COUNT.getValue(bidRequest, TRANSMIT_EIDS)] == 1
10591060

10601061
and: "General alert metric shouldn't be updated"
1061-
!metrics[ALERT_GENERAL.getValue()]
1062+
!metrics[ALERT_GENERAL]
10621063

10631064
where:
10641065
regsGpp << [null, "", new UsNatV1Consent.Builder().build(), new UsNatV1Consent.Builder().setGpc(false).build()]
@@ -2003,7 +2004,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
20032004
and: "Metrics processed across activities should be updated"
20042005
def metrics = activityPbsService.sendCollectedMetricsRequest()
20052006
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(ampStoredRequest, TRANSMIT_EIDS)] == 1
2006-
assert metrics[ALERT_GENERAL.value] == 1
2007+
assert metrics[ALERT_GENERAL] == 1
20072008

20082009
and: "Response should not contain any warnings"
20092010
assert !response.ext.warnings
@@ -2216,7 +2217,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
22162217
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(ampStoredRequest, TRANSMIT_EIDS)] == 1
22172218

22182219
and: "General alert metric shouldn't be updated"
2219-
!metrics[ALERT_GENERAL.getValue()]
2220+
!metrics[ALERT_GENERAL]
22202221

22212222
where:
22222223
regsGpp << [null, ""]

‎src/test/groovy/org/prebid/server/functional/tests/privacy/GppTransmitUfpdActivitiesSpec.groovy‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,10 @@ import org.prebid.server.functional.model.request.amp.AmpRequest
1515
import org.prebid.server.functional.model.request.auction.Activity
1616
import org.prebid.server.functional.model.request.auction.ActivityRule
1717
import org.prebid.server.functional.model.request.auction.AllowActivities
18-
import org.prebid.server.functional.model.request.auction.BidRequest
1918
import org.prebid.server.functional.model.request.auction.Condition
20-
import org.prebid.server.functional.model.request.auction.Data
2119
import org.prebid.server.functional.model.request.auction.Device
22-
import org.prebid.server.functional.model.request.auction.Eid
2320
import org.prebid.server.functional.model.request.auction.Geo
2421
import org.prebid.server.functional.model.request.auction.RegsExt
25-
import org.prebid.server.functional.model.request.auction.User
26-
import org.prebid.server.functional.model.request.auction.UserExt
27-
import org.prebid.server.functional.model.request.auction.UserExtData
2822
import org.prebid.server.functional.service.PrebidServerException
2923
import org.prebid.server.functional.util.PBSUtils
3024
import org.prebid.server.functional.util.privacy.gpp.UsCaV1Consent
@@ -65,10 +59,10 @@ import static org.prebid.server.functional.model.config.UsNationalPrivacySection
6559
import static org.prebid.server.functional.model.config.UsNationalPrivacySection.SHARING_NOTICE
6660
import static org.prebid.server.functional.model.pricefloors.Country.CAN
6761
import static org.prebid.server.functional.model.pricefloors.Country.USA
68-
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
6962
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
70-
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
7163
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
64+
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
65+
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
7266
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
7367
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
7468
import static org.prebid.server.functional.model.request.GppSectionId.US_CA_V1
@@ -85,6 +79,7 @@ import static org.prebid.server.functional.model.request.auction.PrivacyModule.I
8579
import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_CUSTOM_LOGIC
8680
import static org.prebid.server.functional.model.request.auction.PrivacyModule.IAB_US_GENERAL
8781
import static org.prebid.server.functional.model.request.auction.TraceLevel.VERBOSE
82+
import static org.prebid.server.functional.model.response.auction.ErrorType.PREBID
8883
import static org.prebid.server.functional.util.privacy.model.State.ALABAMA
8984
import static org.prebid.server.functional.util.privacy.model.State.ONTARIO
9085

@@ -1176,7 +1171,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
11761171
def metrics = activityPbsService.sendCollectedMetricsRequest()
11771172
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(bidRequest, TRANSMIT_UFPD)] == 1
11781173
assert metrics[ACCOUNT_PROCESSED_RULES_COUNT.getValue(bidRequest, TRANSMIT_UFPD)] == 1
1179-
assert metrics[ALERT_GENERAL.value] == 1
1174+
assert metrics[ALERT_GENERAL] == 1
11801175

11811176
and: "Logs should contain error"
11821177
def logs = activityPbsService.getLogsByTime(startTime)
@@ -1423,7 +1418,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
14231418
assert metrics[ACCOUNT_PROCESSED_RULES_COUNT.getValue(bidRequest, TRANSMIT_UFPD)] == 1
14241419

14251420
and: "General alert metric shouldn't be updated"
1426-
!metrics[ALERT_GENERAL.getValue()]
1421+
!metrics[ALERT_GENERAL]
14271422

14281423
where:
14291424
regsGpp << [null, "", new UsNatV1Consent.Builder().build(), new UsNatV1Consent.Builder().setGpc(false).build()]
@@ -2637,7 +2632,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
26372632
and: "Metrics processed across activities should be updated"
26382633
def metrics = activityPbsService.sendCollectedMetricsRequest()
26392634
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(ampStoredRequest, TRANSMIT_UFPD)] == 1
2640-
assert metrics[ALERT_GENERAL.value] == 1
2635+
assert metrics[ALERT_GENERAL] == 1
26412636

26422637
and: "Response should not contain any warnings"
26432638
assert !response.ext.warnings
@@ -2922,7 +2917,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
29222917
assert metrics[PROCESSED_ACTIVITY_RULES_COUNT.getValue(ampStoredRequest, TRANSMIT_UFPD)] == 1
29232918

29242919
and: "General alert metric shouldn't be updated"
2925-
!metrics[ALERT_GENERAL.getValue()]
2920+
!metrics[ALERT_GENERAL]
29262921

29272922
where:
29282923
regsGpp << [null, ""]

0 commit comments

Comments
 (0)