Skip to content

Commit 623fee2

Browse files
osulzhenkoosulzhenko
committed
Fix conflicts
1 parent d5f656b commit 623fee2

14 files changed

+68
-244
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.prebid.server.functional.util.HttpUtil
1616
import org.prebid.server.functional.util.PBSUtils
1717
import org.prebid.server.functional.util.privacy.CcpaConsent
1818
import org.prebid.server.functional.util.privacy.TcfConsent
19+
import org.prebid.server.functional.util.privacy.gpp.v1.UsNatV1Consent
1920
import org.prebid.server.functional.util.privacy.gpp.v2.TcfEuV2Consent
2021
import org.prebid.server.functional.util.privacy.gpp.v1.UspV1Consent
2122

@@ -327,7 +328,7 @@ class GppCookieSyncSpec extends BaseSpec {
327328
given: "Default CookieSyncRequest with gpp and gppSid"
328329
def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap {
329330
it.gppSid = TCF_EU_V2.intValue
330-
it.gpp = new UsV1Consent.Builder().build()
331+
it.gpp = new UsNatV1Consent.Builder().build()
331332
it.gppSid = gppSid
332333
}
333334

@@ -358,7 +359,7 @@ class GppCookieSyncSpec extends BaseSpec {
358359
def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap {
359360
it.gppSid = TCF_EU_V2.intValue
360361
it.bidders = [ALIAS]
361-
it.gpp = new UsV1Consent.Builder().build()
362+
it.gpp = new UsNatV1Consent.Builder().build()
362363
it.gppSid = gppSid
363364
}
364365

@@ -478,7 +479,7 @@ class GppCookieSyncSpec extends BaseSpec {
478479

479480
def "PBS shouldn't emit error message when request doesn't contain matched gpp config and specific global skip gpp config for adapter"() {
480481
given: "Default CookieSyncRequest with gpp and gppSid"
481-
def gpp = new UsV1Consent.Builder().build()
482+
def gpp = new UsNatV1Consent.Builder().build()
482483
def gppSid = "${PBSUtils.getRandomEnum(GppSectionId.class, [FIRST_GPP_SECTION, SECOND_GPP_SECTION]).value}"
483484
def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap {
484485
it.gppSid = TCF_EU_V2.intValue

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,7 +2264,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
22642264
def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap {
22652265
it.gppSid = US_NAT_V1.value
22662266
it.account = accountId
2267-
it.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
2267+
it.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
22682268
}
22692269

22702270
and: "Activities set for cookie sync with allowing privacy regulation"
@@ -2297,7 +2297,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
22972297
def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap {
22982298
it.gppSid = US_NAT_V1.value
22992299
it.account = accountId
2300-
it.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
2300+
it.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
23012301
}
23022302

23032303
and: "Activities set for cookie sync with allowing privacy regulation"
@@ -2349,7 +2349,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {
23492349
def cookieSyncRequest = CookieSyncRequest.defaultCookieSyncRequest.tap {
23502350
it.gppSid = US_NAT_V1.value
23512351
it.account = accountId
2352-
it.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
2352+
it.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
23532353
}
23542354

23552355
and: "Activities set for cookie sync with allowing privacy regulation"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2615,7 +2615,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
26152615
def accountId = PBSUtils.randomNumber as String
26162616
def bidRequest = getBidRequestWithPersonalData(accountId).tap {
26172617
regs.gppSid = [US_NAT_V1.intValue]
2618-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
2618+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
26192619
}
26202620

26212621
and: "Activities set for transmitEIDS with rejecting privacy regulation"
@@ -2646,7 +2646,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
26462646
def accountId = PBSUtils.randomNumber as String
26472647
def bidRequest = getBidRequestWithPersonalData(accountId).tap {
26482648
regs.gppSid = [US_NAT_V1.intValue]
2649-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
2649+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
26502650
}
26512651

26522652
and: "Activities set for transmitEIDS with rejecting privacy regulation"
@@ -2695,7 +2695,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {
26952695
def accountId = PBSUtils.randomNumber as String
26962696
def bidRequest = getBidRequestWithPersonalData(accountId).tap {
26972697
regs.gppSid = [US_NAT_V1.intValue]
2698-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
2698+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
26992699
}
27002700

27012701
and: "Activities set for transmitEIDS with rejecting privacy regulation"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3088,7 +3088,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {
30883088
def bidRequest = bidRequestWithGeo.tap {
30893089
it.setAccountId(accountId)
30903090
regs.gppSid = [US_NAT_V1.intValue]
3091-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
3091+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
30923092
}
30933093

30943094
and: "Activities set for transmitPreciseGeo with rejecting privacy regulation"
@@ -3144,7 +3144,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {
31443144
def bidRequest = bidRequestWithGeo.tap {
31453145
it.setAccountId(accountId)
31463146
regs.gppSid = [US_NAT_V1.intValue]
3147-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
3147+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
31483148
}
31493149

31503150
and: "Activities set for transmitPreciseGeo with rejecting privacy regulation"
@@ -3218,7 +3218,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {
32183218
def bidRequest = bidRequestWithGeo.tap {
32193219
it.setAccountId(accountId)
32203220
regs.gppSid = [US_NAT_V1.intValue]
3221-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
3221+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
32223222
}
32233223

32243224
and: "Activities set for transmitPreciseGeo with rejecting privacy regulation"

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import org.prebid.server.functional.model.privacy.gpp.UsCaliforniaV1SensitiveDat
4343
import org.prebid.server.functional.model.privacy.gpp.UsNationalV1SensitiveData
4444
import org.prebid.server.functional.model.privacy.gpp.UsUtahV1SensitiveData
4545
import org.prebid.server.functional.util.privacy.gpp.v2.UsNatV2Consent
46-
import spock.lang.PendingFeature
4746

4847
import java.time.Instant
4948

@@ -1175,7 +1174,6 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
11751174
]
11761175
}
11771176

1178-
@PendingFeature
11791177
def "PBS auction call when privacy module contain some part of disallow logic US nat v2 validation should remove UFPD fields in request"() {
11801178
given: "Default Generic BidRequests with UFPD fields and account id"
11811179
def accountId = PBSUtils.randomNumber as String
@@ -3634,7 +3632,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
36343632
def accountId = PBSUtils.randomNumber as String
36353633
def bidRequest = getBidRequestWithPersonalData(accountId).tap {
36363634
regs.gppSid = [US_NAT_V1.intValue]
3637-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
3635+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
36383636
}
36393637

36403638
and: "Activities set for transmitUfpd with rejecting privacy regulation"
@@ -3682,7 +3680,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
36823680
def accountId = PBSUtils.randomNumber as String
36833681
def bidRequest = getBidRequestWithPersonalData(accountId).tap {
36843682
regs.gppSid = [US_NAT_V1.intValue]
3685-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
3683+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
36863684
}
36873685

36883686
and: "Activities set for transmitUfpd with rejecting privacy regulation"
@@ -3748,7 +3746,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
37483746
def accountId = PBSUtils.randomNumber as String
37493747
def bidRequest = getBidRequestWithPersonalData(accountId).tap {
37503748
regs.gppSid = [US_NAT_V1.intValue]
3751-
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(2).build()
3749+
regs.gpp = new UsNatV1Consent.Builder().setPersonalDataConsents(DataActivity.CONSENT).build()
37523750
}
37533751

37543752
and: "Activities set for transmitUfpd with rejecting privacy regulation"

‎src/test/groovy/org/prebid/server/functional/util/privacy/gpp/GppConsent.groovy‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ abstract class GppConsent implements ConsentString {
6464

6565
TCF_EU_V2(TcfEuV2.NAME, TcfEuV2.VERSION), //2
6666
USP_V1(UspV1.NAME, UspV1.VERSION), //6
67-
US_NAT_V1(UsNat.NAME, UsNat.VERSION), //7
68-
US_NAT_V2(UsNatV1.NAME, 2), //7
69-
US_CA_V1(UsCa.NAME, UsCa.VERSION), //8
70-
US_VA_V1(UsVa.NAME, UsVa.VERSION), //9
71-
US_CO_V1(UsCo.NAME, UsCo.VERSION), //10
72-
US_UT_V1(UsUt.NAME, UsUt.VERSION), //11
73-
US_CT_V1(UsCt.NAME, UsCt.VERSION), //12
67+
US_NAT_V1(UsNat.NAME, UsNat.VERSION), //7
68+
US_NAT_V2(UsNat.NAME, 2), //7
69+
US_CA_V1(UsCa.NAME, UsCa.VERSION), //8
70+
US_VA_V1(UsVa.NAME, UsVa.VERSION), //9
71+
US_CO_V1(UsCo.NAME, UsCo.VERSION), //10
72+
US_UT_V1(UsUt.NAME, UsUt.VERSION), //11
73+
US_CT_V1(UsCt.NAME, UsCt.VERSION), //12
7474

7575
final String name
7676
final int version

‎src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsUtV1Consent.groovy‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎src/test/groovy/org/prebid/server/functional/util/privacy/gpp/UsVaV1Consent.groovy‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎src/test/groovy/org/prebid/server/functional/util/privacy/gpp/v1/UsCaV1Consent.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class UsCaV1Consent extends GppConsent {
5353
this
5454
}
5555

56-
Builder setSensitiveDataProcessing(UsCaliforniaSensitiveData sensitiveDataProcessing) {
56+
Builder setSensitiveDataProcessing(UsCaliforniaV1SensitiveData sensitiveDataProcessing) {
5757
fieldValue(UsCaField.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList)
5858
this
5959
}

‎src/test/groovy/org/prebid/server/functional/util/privacy/gpp/v1/UsCoV1Consent.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class UsCoV1Consent extends GppConsent {
5252
this
5353
}
5454

55-
Builder setSensitiveDataProcessing(UsColoradoSensitiveData sensitiveDataProcessing) {
55+
Builder setSensitiveDataProcessing(UsColoradoV1SensitiveData sensitiveDataProcessing) {
5656
fieldValue(UsCoField.SENSITIVE_DATA_PROCESSING, sensitiveDataProcessing.contentList)
5757
this
5858
}

0 commit comments

Comments
 (0)