Skip to content

Commit a779d4f

Browse files
osulzhenkoosulzhenko
authored
Tests: fix alert.general metric conflict (#3943)
1 parent 1a55dc4 commit a779d4f

6 files changed

Lines changed: 20 additions & 26 deletions

File tree

‎src/test/groovy/org/prebid/server/functional/model/privacy/Metric.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import org.prebid.server.functional.model.request.setuid.SetuidRequest
77

88
enum Metric {
99

10-
ALERT_GENERAL("alerts.general"),
1110
PROCESSED_ACTIVITY_RULES_COUNT("requests.activity.processedrules.count"),
1211
ACCOUNT_PROCESSED_RULES_COUNT("requests.activity.processedrules.count"),
1312
TEMPLATE_ADAPTER_DISALLOWED_COUNT("adapter.{bidderName}.activity.{activityType}.disallowed.count"),

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import static org.prebid.server.functional.model.pricefloors.Country.USA
6060
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
6161
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
6262
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
63-
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
6463
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6564
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6665
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -694,7 +693,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {
694693

695694
and: "Metrics for disallowed activities should be updated"
696695
def metrics = activityPbsService.sendCollectedMetricsRequest()
697-
assert metrics[ALERT_GENERAL.getValue()] == 1
696+
assert metrics[ALERT_GENERAL] == 1
698697

699698
where:
700699
gppAccountsConfig << [[new AccountGppConfig(code: IAB_US_GENERAL, config: new GppModuleConfig(skipSids: [US_NAT_V1]), enabled: false),
@@ -868,7 +867,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {
868867

869868
and: "Metrics for disallowed activities should be updated"
870869
def metrics = activityPbsService.sendCollectedMetricsRequest()
871-
assert metrics[ALERT_GENERAL.getValue()] == 1
870+
assert metrics[ALERT_GENERAL] == 1
872871
}
873872

874873
def "PBS auction call when custom privacy regulation with normalizing should ignore call to bidder"() {
@@ -1425,7 +1424,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {
14251424

14261425
and: "Metrics for disallowed activities should be updated"
14271426
def metrics = activityPbsService.sendCollectedMetricsRequest()
1428-
assert metrics[ALERT_GENERAL.getValue()] == 1
1427+
assert metrics[ALERT_GENERAL] == 1
14291428
}
14301429

14311430
def "PBS amp call when privacy module contain invalid property should respond with an error"() {
@@ -1624,7 +1623,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {
16241623

16251624
and: "Metrics for disallowed activities should be updated"
16261625
def metrics = activityPbsService.sendCollectedMetricsRequest()
1627-
assert metrics[ALERT_GENERAL.getValue()] == 1
1626+
assert metrics[ALERT_GENERAL] == 1
16281627
}
16291628

16301629
def "PBS amp call when custom privacy regulation with normalizing should ignore call to bidder"() {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import static org.prebid.server.functional.model.config.UsNationalPrivacySection
5959
import static org.prebid.server.functional.model.pricefloors.Country.CAN
6060
import static org.prebid.server.functional.model.pricefloors.Country.USA
6161
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
62-
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
6362
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6463
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6564
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -657,7 +656,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
657656

658657
and: "Metrics for disallowed activities should be updated"
659658
def metrics = activityPbsService.sendCollectedMetricsRequest()
660-
assert metrics[ALERT_GENERAL.getValue()] == 1
659+
assert metrics[ALERT_GENERAL] == 1
661660
}
662661

663662
def "PBS cookie sync call when privacy module contain invalid code should include proper responded with bidders URLs"() {
@@ -817,7 +816,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
817816

818817
and: "Metrics for disallowed activities should be updated"
819818
def metrics = activityPbsService.sendCollectedMetricsRequest()
820-
assert metrics[ALERT_GENERAL.getValue()] == 1
819+
assert metrics[ALERT_GENERAL] == 1
821820
}
822821

823822
def "PBS cookie sync when custom privacy regulation with normalizing should exclude bidders URLs"() {
@@ -1550,7 +1549,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
15501549

15511550
and: "Metrics for disallowed activities should be updated"
15521551
def metrics = activityPbsService.sendCollectedMetricsRequest()
1553-
assert metrics[ALERT_GENERAL.getValue()] == 1
1552+
assert metrics[ALERT_GENERAL] == 1
15541553
}
15551554

15561555
def "PBS setuid request call when privacy module contain invalid code should respond with valid bidders UIDs cookies"() {
@@ -1725,7 +1724,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
17251724

17261725
and: "Metrics for disallowed activities should be updated"
17271726
def metrics = activityPbsService.sendCollectedMetricsRequest()
1728-
assert metrics[ALERT_GENERAL.getValue()] == 1
1727+
assert metrics[ALERT_GENERAL] == 1
17291728
}
17301729

17311730
def "PBS setuid call when custom privacy regulation with normalizing should reject bidders with status code invalidStatusCode"() {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import static org.prebid.server.functional.model.pricefloors.Country.USA
5959
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
6060
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
6161
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
62-
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
6362
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6463
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6564
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -1023,7 +1022,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
10231022

10241023
and: "Metrics for disallowed activities should be updated"
10251024
def metrics = activityPbsService.sendCollectedMetricsRequest()
1026-
assert metrics[ALERT_GENERAL.getValue()] == 1
1025+
assert metrics[ALERT_GENERAL] == 1
10271026
}
10281027

10291028
def "PBS auction call when privacy module contain invalid property should respond with an error"() {
@@ -1185,7 +1184,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
11851184

11861185
and: "Metrics for disallowed activities should be updated"
11871186
def metrics = activityPbsService.sendCollectedMetricsRequest()
1188-
assert metrics[ALERT_GENERAL.getValue()] == 1
1187+
assert metrics[ALERT_GENERAL] == 1
11891188
}
11901189

11911190
def "PBS auction call when custom privacy regulation with normalizing that match custom config should have empty EIDS fields"() {
@@ -2097,7 +2096,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
20972096

20982097
and: "Metrics for disallowed activities should be updated"
20992098
def metrics = activityPbsService.sendCollectedMetricsRequest()
2100-
assert metrics[ALERT_GENERAL.getValue()] == 1
2099+
assert metrics[ALERT_GENERAL] == 1
21012100
}
21022101

21032102
def "PBS amp call when privacy module contain invalid property should respond with an error"() {
@@ -2295,7 +2294,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
22952294

22962295
and: "Metrics for disallowed activities should be updated"
22972296
def metrics = activityPbsService.sendCollectedMetricsRequest()
2298-
assert metrics[ALERT_GENERAL.getValue()] == 1
2297+
assert metrics[ALERT_GENERAL] == 1
22992298
}
23002299

23012300
def "PBS amp call when custom privacy regulation with normalizing should change request consent and call to bidder"() {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import static org.prebid.server.functional.model.pricefloors.Country.USA
5858
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
5959
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
6060
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
61-
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
6261
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6362
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6463
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -1359,7 +1358,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {
13591358

13601359
and: "Metrics for disallowed activities should be updated"
13611360
def metrics = activityPbsService.sendCollectedMetricsRequest()
1362-
assert metrics[ALERT_GENERAL.getValue()] == 1
1361+
assert metrics[ALERT_GENERAL] == 1
13631362
}
13641363

13651364
def "PBS auction call when privacy module contain invalid code should respond with an error"() {
@@ -1573,7 +1572,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {
15731572

15741573
and: "Metrics for disallowed activities should be updated"
15751574
def metrics = activityPbsService.sendCollectedMetricsRequest()
1576-
assert metrics[ALERT_GENERAL.getValue()] == 1
1575+
assert metrics[ALERT_GENERAL] == 1
15771576
}
15781577

15791578
def "PBS auction call when custom privacy regulation with normalizing should change request consent and call to bidder"() {
@@ -2613,7 +2612,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {
26132612

26142613
and: "Metrics for disallowed activities should be updated"
26152614
def metrics = activityPbsService.sendCollectedMetricsRequest()
2616-
assert metrics[ALERT_GENERAL.getValue()] == 1
2615+
assert metrics[ALERT_GENERAL] == 1
26172616
}
26182617

26192618
def "PBS amp call when privacy module contain invalid code should respond with an error"() {
@@ -2863,7 +2862,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {
28632862

28642863
and: "Metrics for disallowed activities should be updated"
28652864
def metrics = activityPbsService.sendCollectedMetricsRequest()
2866-
assert metrics[ALERT_GENERAL.getValue()] == 1
2865+
assert metrics[ALERT_GENERAL] == 1
28672866
}
28682867

28692868
def "PBS amp call when custom privacy regulation with normalizing should change request consent and call to bidder"() {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ import static org.prebid.server.functional.model.pricefloors.Country.USA
6363
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
6464
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
6565
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
66-
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
6766
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6867
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6968
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -1378,7 +1377,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
13781377

13791378
and: "Metrics for disallowed activities should be updated"
13801379
def metrics = activityPbsService.sendCollectedMetricsRequest()
1381-
assert metrics[ALERT_GENERAL.getValue()] == 1
1380+
assert metrics[ALERT_GENERAL] == 1
13821381
}
13831382

13841383
def "PBS auction call when privacy module contain invalid property should respond with an error"() {
@@ -1573,7 +1572,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
15731572

15741573
and: "Metrics for disallowed activities should be updated"
15751574
def metrics = activityPbsService.sendCollectedMetricsRequest()
1576-
assert metrics[ALERT_GENERAL.getValue()] == 1
1575+
assert metrics[ALERT_GENERAL] == 1
15771576
}
15781577

15791578
def "PBS auction call when custom privacy regulation with normalizing that match custom config should have empty UFPD fields"() {
@@ -2748,7 +2747,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
27482747

27492748
and: "Metrics for disallowed activities should be updated"
27502749
def metrics = activityPbsService.sendCollectedMetricsRequest()
2751-
assert metrics[ALERT_GENERAL.getValue()] == 1
2750+
assert metrics[ALERT_GENERAL] == 1
27522751
}
27532752

27542753
def "PBS amp call when privacy module contain invalid property should respond with an error"() {
@@ -2979,7 +2978,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
29792978

29802979
and: "Metrics for disallowed activities should be updated"
29812980
def metrics = activityPbsService.sendCollectedMetricsRequest()
2982-
assert metrics[ALERT_GENERAL.getValue()] == 1
2981+
assert metrics[ALERT_GENERAL] == 1
29832982
}
29842983

29852984
def "PBS amp call when custom privacy regulation with normalizing should change request consent and call to bidder"() {

0 commit comments

Comments
 (0)