Skip to content

Commit 61352f9

Browse files
CTMBNaraCTMBNara
authored
Revert "Tests: fix alert.general metric conflict (#3943)"
This reverts commit a779d4f.
1 parent a779d4f commit 61352f9

6 files changed

Lines changed: 26 additions & 20 deletions

File tree

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

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

88
enum Metric {
99

10+
ALERT_GENERAL("alerts.general"),
1011
PROCESSED_ACTIVITY_RULES_COUNT("requests.activity.processedrules.count"),
1112
ACCOUNT_PROCESSED_RULES_COUNT("requests.activity.processedrules.count"),
1213
TEMPLATE_ADAPTER_DISALLOWED_COUNT("adapter.{bidderName}.activity.{activityType}.disallowed.count"),

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ 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
6364
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6465
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6566
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -693,7 +694,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {
693694

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

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

868869
and: "Metrics for disallowed activities should be updated"
869870
def metrics = activityPbsService.sendCollectedMetricsRequest()
870-
assert metrics[ALERT_GENERAL] == 1
871+
assert metrics[ALERT_GENERAL.getValue()] == 1
871872
}
872873

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

14251426
and: "Metrics for disallowed activities should be updated"
14261427
def metrics = activityPbsService.sendCollectedMetricsRequest()
1427-
assert metrics[ALERT_GENERAL] == 1
1428+
assert metrics[ALERT_GENERAL.getValue()] == 1
14281429
}
14291430

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

16241625
and: "Metrics for disallowed activities should be updated"
16251626
def metrics = activityPbsService.sendCollectedMetricsRequest()
1626-
assert metrics[ALERT_GENERAL] == 1
1627+
assert metrics[ALERT_GENERAL.getValue()] == 1
16271628
}
16281629

16291630
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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ 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
6263
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6364
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6465
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -656,7 +657,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
656657

657658
and: "Metrics for disallowed activities should be updated"
658659
def metrics = activityPbsService.sendCollectedMetricsRequest()
659-
assert metrics[ALERT_GENERAL] == 1
660+
assert metrics[ALERT_GENERAL.getValue()] == 1
660661
}
661662

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

817818
and: "Metrics for disallowed activities should be updated"
818819
def metrics = activityPbsService.sendCollectedMetricsRequest()
819-
assert metrics[ALERT_GENERAL] == 1
820+
assert metrics[ALERT_GENERAL.getValue()] == 1
820821
}
821822

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

15501551
and: "Metrics for disallowed activities should be updated"
15511552
def metrics = activityPbsService.sendCollectedMetricsRequest()
1552-
assert metrics[ALERT_GENERAL] == 1
1553+
assert metrics[ALERT_GENERAL.getValue()] == 1
15531554
}
15541555

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

17251726
and: "Metrics for disallowed activities should be updated"
17261727
def metrics = activityPbsService.sendCollectedMetricsRequest()
1727-
assert metrics[ALERT_GENERAL] == 1
1728+
assert metrics[ALERT_GENERAL.getValue()] == 1
17281729
}
17291730

17301731
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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ 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
6263
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6364
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6465
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -1022,7 +1023,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
10221023

10231024
and: "Metrics for disallowed activities should be updated"
10241025
def metrics = activityPbsService.sendCollectedMetricsRequest()
1025-
assert metrics[ALERT_GENERAL] == 1
1026+
assert metrics[ALERT_GENERAL.getValue()] == 1
10261027
}
10271028

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

11851186
and: "Metrics for disallowed activities should be updated"
11861187
def metrics = activityPbsService.sendCollectedMetricsRequest()
1187-
assert metrics[ALERT_GENERAL] == 1
1188+
assert metrics[ALERT_GENERAL.getValue()] == 1
11881189
}
11891190

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

20972098
and: "Metrics for disallowed activities should be updated"
20982099
def metrics = activityPbsService.sendCollectedMetricsRequest()
2099-
assert metrics[ALERT_GENERAL] == 1
2100+
assert metrics[ALERT_GENERAL.getValue()] == 1
21002101
}
21012102

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

22952296
and: "Metrics for disallowed activities should be updated"
22962297
def metrics = activityPbsService.sendCollectedMetricsRequest()
2297-
assert metrics[ALERT_GENERAL] == 1
2298+
assert metrics[ALERT_GENERAL.getValue()] == 1
22982299
}
22992300

23002301
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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ 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
6162
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6263
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6364
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -1358,7 +1359,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {
13581359

13591360
and: "Metrics for disallowed activities should be updated"
13601361
def metrics = activityPbsService.sendCollectedMetricsRequest()
1361-
assert metrics[ALERT_GENERAL] == 1
1362+
assert metrics[ALERT_GENERAL.getValue()] == 1
13621363
}
13631364

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

15731574
and: "Metrics for disallowed activities should be updated"
15741575
def metrics = activityPbsService.sendCollectedMetricsRequest()
1575-
assert metrics[ALERT_GENERAL] == 1
1576+
assert metrics[ALERT_GENERAL.getValue()] == 1
15761577
}
15771578

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

26132614
and: "Metrics for disallowed activities should be updated"
26142615
def metrics = activityPbsService.sendCollectedMetricsRequest()
2615-
assert metrics[ALERT_GENERAL] == 1
2616+
assert metrics[ALERT_GENERAL.getValue()] == 1
26162617
}
26172618

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

28632864
and: "Metrics for disallowed activities should be updated"
28642865
def metrics = activityPbsService.sendCollectedMetricsRequest()
2865-
assert metrics[ALERT_GENERAL] == 1
2866+
assert metrics[ALERT_GENERAL.getValue()] == 1
28662867
}
28672868

28682869
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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ 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
6667
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
6768
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
6869
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
@@ -1377,7 +1378,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
13771378

13781379
and: "Metrics for disallowed activities should be updated"
13791380
def metrics = activityPbsService.sendCollectedMetricsRequest()
1380-
assert metrics[ALERT_GENERAL] == 1
1381+
assert metrics[ALERT_GENERAL.getValue()] == 1
13811382
}
13821383

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

15731574
and: "Metrics for disallowed activities should be updated"
15741575
def metrics = activityPbsService.sendCollectedMetricsRequest()
1575-
assert metrics[ALERT_GENERAL] == 1
1576+
assert metrics[ALERT_GENERAL.getValue()] == 1
15761577
}
15771578

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

27482749
and: "Metrics for disallowed activities should be updated"
27492750
def metrics = activityPbsService.sendCollectedMetricsRequest()
2750-
assert metrics[ALERT_GENERAL] == 1
2751+
assert metrics[ALERT_GENERAL.getValue()] == 1
27512752
}
27522753

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

29792980
and: "Metrics for disallowed activities should be updated"
29802981
def metrics = activityPbsService.sendCollectedMetricsRequest()
2981-
assert metrics[ALERT_GENERAL] == 1
2982+
assert metrics[ALERT_GENERAL.getValue()] == 1
29822983
}
29832984

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

0 commit comments

Comments
 (0)