Skip to content

Commit 317621b

Browse files
Net-burstNet-burst
authored
Tests: Move privacy-related fields from extensions to their root objects (#2958)
1 parent 8102f04 commit 317621b

18 files changed

+90
-80
lines changed

‎src/test/groovy/org/prebid/server/functional/model/request/auction/Regs.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Regs {
1717

1818
static Regs getDefaultRegs() {
1919
new Regs().tap {
20-
ext = new RegsExt(gdpr: 0)
20+
gdpr = 0
2121
}
2222
}
2323
}

‎src/test/groovy/org/prebid/server/functional/model/request/auction/RegsExt.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import groovy.transform.ToString
88
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)
99
class RegsExt {
1010

11+
@Deprecated(since = "enabling support of ortb 2.6")
1112
Integer gdpr
13+
@Deprecated(since = "enabling support of ortb 2.6")
1214
String usPrivacy
1315
String gpc
1416
Dsa dsa

‎src/test/groovy/org/prebid/server/functional/tests/AmpSpec.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class AmpSpec extends BaseSpec {
107107

108108
and: "Default stored request with specified: gdpr, debug"
109109
def ampStoredRequest = BidRequest.defaultStoredRequest
110-
ampStoredRequest.regs.ext.gdpr = 1
110+
ampStoredRequest.regs.gdpr = 1
111111

112112
and: "Stored request in DB"
113113
def storedRequest = StoredRequest.getStoredRequest(ampRequest, ampStoredRequest)
@@ -178,6 +178,6 @@ class AmpSpec extends BaseSpec {
178178
assert !bidderRequest.imp[0]?.tagId
179179
assert bidderRequest.imp[0]?.banner?.format[0]?.height == ampStoredRequest.imp[0].banner.format[0].height
180180
assert bidderRequest.imp[0]?.banner?.format[0]?.weight == ampStoredRequest.imp[0].banner.format[0].weight
181-
assert bidderRequest.regs?.gdpr == ampStoredRequest.regs.ext.gdpr
181+
assert bidderRequest.regs?.gdpr == ampStoredRequest.regs.gdpr
182182
}
183183
}

‎src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class BidderParamsSpec extends BaseSpec {
159159
and: "Default basic generic BidRequest"
160160
def bidRequest = BidRequest.defaultBidRequest
161161
def validCcpa = new CcpaConsent(explicitNotice: ENFORCED, optOutSale: ENFORCED)
162-
bidRequest.regs.ext = new RegsExt(usPrivacy: validCcpa)
162+
bidRequest.regs.usPrivacy = validCcpa
163163
def lat = PBSUtils.getRandomDecimal(0, 90)
164164
def lon = PBSUtils.getRandomDecimal(0, 90)
165165
bidRequest.device = new Device(geo: new Geo(lat: lat, lon: lon))
@@ -186,7 +186,7 @@ class BidderParamsSpec extends BaseSpec {
186186
and: "Default basic generic BidRequest"
187187
def bidRequest = BidRequest.defaultBidRequest
188188
def validCcpa = new CcpaConsent(explicitNotice: ENFORCED, optOutSale: ENFORCED)
189-
bidRequest.regs.ext = new RegsExt(usPrivacy: validCcpa)
189+
bidRequest.regs.usPrivacy = validCcpa
190190
def lat = PBSUtils.getRandomDecimal(0, 90) as float
191191
def lon = PBSUtils.getRandomDecimal(0, 90) as float
192192
bidRequest.device = new Device(geo: new Geo(lat: lat, lon: lon))

‎src/test/groovy/org/prebid/server/functional/tests/HttpSettingsSpec.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class HttpSettingsSpec extends BaseSpec {
3232
def "PBS should take account information from http data source on auction request"() {
3333
given: "Get basic BidRequest with generic bidder and set gdpr = 1"
3434
def bidRequest = BidRequest.defaultBidRequest
35-
bidRequest.regs.ext.gdpr = 1
35+
bidRequest.regs.gdpr = 1
3636

3737
and: "Prepare default account response with gdpr = 0"
3838
def httpSettingsResponse = HttpAccountsResponse.getDefaultHttpAccountsResponse(bidRequest?.site?.publisher?.id)
@@ -61,7 +61,7 @@ class HttpSettingsSpec extends BaseSpec {
6161
and: "Get basic stored request and set gdpr = 1"
6262
def ampStoredRequest = BidRequest.defaultBidRequest
6363
ampStoredRequest.site.publisher.id = ampRequest.account
64-
ampStoredRequest.regs.ext.gdpr = 1
64+
ampStoredRequest.regs.gdpr = 1
6565

6666
and: "Save storedRequest into DB"
6767
def storedRequest = StoredRequest.getStoredRequest(ampRequest, ampStoredRequest)

‎src/test/groovy/org/prebid/server/functional/tests/OrtbConverterSpec.groovy

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import org.prebid.server.functional.model.request.auction.RefSettings
1717
import org.prebid.server.functional.model.request.auction.RefType
1818
import org.prebid.server.functional.model.request.auction.Refresh
1919
import org.prebid.server.functional.model.request.auction.Regs
20+
import org.prebid.server.functional.model.request.auction.RegsExt
2021
import org.prebid.server.functional.model.request.auction.Source
2122
import org.prebid.server.functional.model.request.auction.SourceType
2223
import org.prebid.server.functional.model.request.auction.User
@@ -46,10 +47,7 @@ class OrtbConverterSpec extends BaseSpec {
4647
def usPrivacyRandomString = PBSUtils.randomString
4748
def gdpr = 0
4849
def bidRequest = BidRequest.defaultBidRequest.tap {
49-
regs = Regs.defaultRegs.tap {
50-
it.usPrivacy = usPrivacyRandomString
51-
it.gdpr = gdpr
52-
}
50+
regs = new Regs(usPrivacy: usPrivacyRandomString, gdpr: gdpr)
5351
}
5452

5553
when: "Requesting PBS auction with ortb 2.6"
@@ -1140,7 +1138,7 @@ class OrtbConverterSpec extends BaseSpec {
11401138
def randomGpc = PBSUtils.randomNumber as String
11411139
def bidRequest = BidRequest.defaultBidRequest.tap {
11421140
regs = Regs.defaultRegs.tap {
1143-
ext.gpc = randomGpc
1141+
ext = new RegsExt(gpc: randomGpc)
11441142
}
11451143
}
11461144

@@ -1156,7 +1154,7 @@ class OrtbConverterSpec extends BaseSpec {
11561154
def randomGpc = PBSUtils.randomNumber as String
11571155
def bidRequest = BidRequest.defaultBidRequest.tap {
11581156
regs = Regs.defaultRegs.tap {
1159-
ext.gpc = randomGpc
1157+
ext = new RegsExt(gpc: randomGpc)
11601158
}
11611159
}
11621160

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.prebid.server.functional.model.request.auction.BidRequest
99
import org.prebid.server.functional.model.request.auction.Condition
1010
import org.prebid.server.functional.model.request.auction.Device
1111
import org.prebid.server.functional.model.request.auction.Geo
12+
import org.prebid.server.functional.model.request.auction.RegsExt
1213
import org.prebid.server.functional.model.response.auction.ActivityInfrastructure
1314
import org.prebid.server.functional.model.response.auction.ActivityInvocationPayload
1415
import org.prebid.server.functional.model.response.auction.And
@@ -192,7 +193,7 @@ class ActivityTraceLogSpec extends PrivacyBaseSpec {
192193
def bidRequest = BidRequest.defaultBidRequest.tap {
193194
ext.prebid.trace = VERBOSE
194195
device = new Device(geo: new Geo(country: USA, region: ALABAMA.abbreviation))
195-
regs.ext.gpc = PBSUtils.randomString
196+
regs.ext = new RegsExt(gpc: PBSUtils.randomString)
196197
regs.gppSid = [US_CA_V1.intValue]
197198
setAccountId(accountId)
198199
}
@@ -298,7 +299,7 @@ class ActivityTraceLogSpec extends PrivacyBaseSpec {
298299
def bidRequest = BidRequest.defaultBidRequest.tap {
299300
ext.prebid.trace = VERBOSE
300301
device = new Device(geo: new Geo(country: USA, region: ALABAMA.abbreviation))
301-
regs.ext.gpc = PBSUtils.randomString
302+
regs.ext = new RegsExt(gpc: PBSUtils.randomString)
302303
regs.gppSid = [US_CA_V1.intValue]
303304
regs.gpp = new UsNatV1Consent.Builder().setGpc(true).build()
304305
setAccountId(accountId)

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import org.prebid.server.functional.model.request.amp.AmpRequest
66
import org.prebid.server.functional.model.request.auction.BidRequest
77
import org.prebid.server.functional.model.request.auction.Dsa
88
import org.prebid.server.functional.model.request.auction.Dsa as RequestDsa
9+
import org.prebid.server.functional.model.request.auction.RegsExt
910
import org.prebid.server.functional.model.response.auction.BidExt
1011
import org.prebid.server.functional.model.response.auction.BidResponse
1112
import org.prebid.server.functional.model.response.auction.DsaResponse
@@ -34,7 +35,7 @@ class DsaSpec extends PrivacyBaseSpec {
3435

3536
and: "Default stored request with DSA"
3637
def ampStoredRequest = BidRequest.defaultBidRequest.tap {
37-
regs.ext.dsa = dsa
38+
regs.ext = new RegsExt(dsa: dsa)
3839
setAccountId(ampRequest.account)
3940
}
4041

@@ -63,7 +64,7 @@ class DsaSpec extends PrivacyBaseSpec {
6364

6465
and: "Default stored request with DSA"
6566
def ampStoredRequest = BidRequest.defaultBidRequest.tap {
66-
regs.ext.dsa = dsa
67+
regs.ext = new RegsExt(dsa: dsa)
6768
setAccountId(ampRequest.account)
6869
}
6970

@@ -106,7 +107,7 @@ class DsaSpec extends PrivacyBaseSpec {
106107

107108
and: "Default stored request with DSA"
108109
def ampStoredRequest = BidRequest.defaultBidRequest.tap {
109-
regs.ext.dsa = dsa
110+
regs.ext = new RegsExt(dsa: dsa)
110111
setAccountId(ampRequest.account)
111112
}
112113

@@ -143,7 +144,7 @@ class DsaSpec extends PrivacyBaseSpec {
143144

144145
and: "Default stored bid request with DSA"
145146
def ampStoredRequest = BidRequest.defaultBidRequest.tap {
146-
regs.ext.dsa = dsa
147+
regs.ext = new RegsExt(dsa: dsa)
147148
setAccountId(ampRequest.account)
148149
}
149150

@@ -177,7 +178,7 @@ class DsaSpec extends PrivacyBaseSpec {
177178
def "Auction request should always forward DSA to bidders"() {
178179
given: "Default bid request with DSA"
179180
def bidRequest = BidRequest.defaultBidRequest.tap {
180-
regs.ext.dsa = dsa
181+
regs.ext = new RegsExt(dsa: dsa)
181182
}
182183

183184
when: "PBS processes auction request"
@@ -198,7 +199,7 @@ class DsaSpec extends PrivacyBaseSpec {
198199
def "Auction request should always accept bids with DSA"() {
199200
given: "Default bid request with DSA"
200201
def bidRequest = BidRequest.defaultBidRequest.tap {
201-
regs.ext.dsa = dsa
202+
regs.ext = new RegsExt(dsa: dsa)
202203
}
203204

204205
and: "Default bidder response with DSA"
@@ -235,7 +236,7 @@ class DsaSpec extends PrivacyBaseSpec {
235236
def "Auction request should accept bids without DSA when dsarequired is #dsaRequired"() {
236237
given: "Default bid request with DSA"
237238
def bidRequest = BidRequest.defaultBidRequest.tap {
238-
regs.ext.dsa = RequestDsa.getDefaultDsa(dsaRequired)
239+
regs.ext = new RegsExt(dsa: RequestDsa.getDefaultDsa(dsaRequired))
239240
}
240241

241242
and: "Default bidder response with DSA"
@@ -263,7 +264,7 @@ class DsaSpec extends PrivacyBaseSpec {
263264
def "Auction request should reject bids without DSA when dsarequired is #dsaRequired"() {
264265
given: "Default bid request with DSA"
265266
def bidRequest = BidRequest.defaultBidRequest.tap {
266-
regs.ext.dsa = RequestDsa.getDefaultDsa(dsaRequired)
267+
regs.ext = new RegsExt(dsa: RequestDsa.getDefaultDsa(dsaRequired))
267268
}
268269

269270
and: "Default bidder response without DSA"
@@ -293,7 +294,7 @@ class DsaSpec extends PrivacyBaseSpec {
293294
given: "Default bid request with DSA"
294295
def bidRequest = BidRequest.defaultBidRequest.tap {
295296
ext.prebid.returnAllBidStatus = true
296-
regs.ext.dsa = RequestDsa.getDefaultDsa(dsaRequired)
297+
regs.ext = new RegsExt(dsa: RequestDsa.getDefaultDsa(dsaRequired))
297298
}
298299

299300
and: "Default bidder response without DSA"
@@ -332,7 +333,7 @@ class DsaSpec extends PrivacyBaseSpec {
332333
def accountId = PBSUtils.randomNumber.toString()
333334
def bidRequest = BidRequest.defaultBidRequest.tap {
334335
setAccountId(accountId)
335-
regs.ext.dsa = null
336+
regs.ext = new RegsExt(dsa: null)
336337
}
337338

338339
and: "Account with default DSA config"
@@ -352,7 +353,7 @@ class DsaSpec extends PrivacyBaseSpec {
352353
def accountId = PBSUtils.randomNumber.toString()
353354
def bidRequest = BidRequest.defaultBidRequest.tap {
354355
setAccountId(accountId)
355-
regs.ext.dsa = requestDsa
356+
regs.ext = new RegsExt(dsa: requestDsa)
356357
}
357358

358359
and: "Account with default DSA config"
@@ -378,7 +379,7 @@ class DsaSpec extends PrivacyBaseSpec {
378379
def accountId = PBSUtils.randomNumber.toString()
379380
def bidRequest = BidRequest.defaultBidRequest.tap {
380381
setAccountId(accountId)
381-
regs.ext.dsa = null
382+
regs.ext = new RegsExt(dsa: null)
382383
}
383384

384385
and: "Account without default DSA config"
@@ -397,8 +398,8 @@ class DsaSpec extends PrivacyBaseSpec {
397398
def accountId = PBSUtils.randomNumber.toString()
398399
def bidRequest = BidRequest.defaultBidRequest.tap {
399400
setAccountId(accountId)
400-
regs.ext.dsa = null
401-
regs.ext.gdpr = 0
401+
regs.ext = new RegsExt(dsa: null)
402+
regs.gdpr = 0
402403
}
403404

404405
and: "Account with default DSA config"
@@ -424,7 +425,7 @@ class DsaSpec extends PrivacyBaseSpec {
424425
def accountId = PBSUtils.randomNumber.toString()
425426
def bidRequest = getGdprBidRequest(consentString).tap {
426427
setAccountId(accountId)
427-
regs.ext.dsa = null
428+
regs.ext = new RegsExt(dsa: null)
428429
}
429430

430431
and: "Account with default DSA config"
@@ -448,8 +449,8 @@ class DsaSpec extends PrivacyBaseSpec {
448449
def accountId = PBSUtils.randomNumber.toString()
449450
def bidRequest = BidRequest.defaultBidRequest.tap {
450451
setAccountId(accountId)
451-
regs.ext.dsa = null
452-
regs.ext.gdpr = 0
452+
regs.ext = new RegsExt(dsa: null)
453+
regs.gdpr = 0
453454
}
454455

455456
and: "Account with default DSA config"
@@ -471,9 +472,9 @@ class DsaSpec extends PrivacyBaseSpec {
471472
given: "Default bid request with DSA pubRender"
472473
def bidRequest = BidRequest.defaultBidRequest.tap {
473474
ext.prebid.returnAllBidStatus = true
474-
regs.ext.dsa = RequestDsa.getDefaultDsa(REQUIRED).tap {
475+
regs.ext = new RegsExt(dsa: RequestDsa.getDefaultDsa(REQUIRED).tap {
475476
it.pubRender = pubRender
476-
}
477+
})
477478
}
478479

479480
and: "Default bidder response with incorrect DSA adRender"
@@ -513,7 +514,7 @@ class DsaSpec extends PrivacyBaseSpec {
513514
given: "Default bid request with DSA pubRender"
514515
def bidRequest = BidRequest.defaultBidRequest.tap {
515516
ext.prebid.returnAllBidStatus = true
516-
regs.ext.dsa = RequestDsa.getDefaultDsa(REQUIRED)
517+
regs.ext = new RegsExt(dsa: RequestDsa.getDefaultDsa(REQUIRED))
517518
}
518519

519520
and: "Default bidder response with incorrect DSA"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ class GdprAuctionSpec extends PrivacyBaseSpec {
505505
given: "Default Generic bid requests with personal data"
506506
def tcfConsent = new TcfConsent.Builder().build()
507507
def bidRequest = bidRequestWithPersonalData.tap {
508-
regs.ext = new RegsExt(gdpr: 1)
508+
regs.gdpr = 1
509509
user.ext.consent = tcfConsent
510510
}
511511

@@ -535,7 +535,7 @@ class GdprAuctionSpec extends PrivacyBaseSpec {
535535
given: "Default Generic BidRequests with personal data"
536536
def tcfConsent = new TcfConsent.Builder().build()
537537
def bidRequest = bidRequestWithPersonalData.tap {
538-
regs.ext = new RegsExt(gdpr: 1)
538+
regs.gdpr = 1
539539
user.ext.consent = tcfConsent
540540
ext.prebid.trace = VERBOSE
541541
}
@@ -613,7 +613,7 @@ class GdprAuctionSpec extends PrivacyBaseSpec {
613613
given: "Default Generic BidRequests with personal data"
614614
def tcfConsent = new TcfConsent.Builder().build()
615615
def bidRequest = bidRequestWithPersonalData.tap {
616-
regs.ext = new RegsExt(gdpr: 1)
616+
regs.gdpr = 1
617617
user.ext.consent = tcfConsent
618618
ext.prebid.trace = BASIC
619619
}
@@ -693,7 +693,7 @@ class GdprAuctionSpec extends PrivacyBaseSpec {
693693
given: "Default Generic BidRequests with privacy data"
694694
def tcfConsent = new TcfConsent.Builder().setSpecialFeatureOptIns(DEVICE_ACCESS).build()
695695
def bidRequest = bidRequestWithPersonalData.tap {
696-
regs.ext = new RegsExt(gdpr: 1)
696+
regs.gdpr = 1
697697
user.ext.consent = tcfConsent
698698
}
699699

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.prebid.server.functional.model.request.amp.AmpRequest
55
import org.prebid.server.functional.model.request.amp.ConsentType
66
import org.prebid.server.functional.model.request.auction.BidRequest
77
import org.prebid.server.functional.model.request.auction.Regs
8+
import org.prebid.server.functional.model.request.auction.RegsExt
89
import org.prebid.server.functional.util.PBSUtils
910
import org.prebid.server.functional.util.privacy.gpp.TcfEuV2Consent
1011
import org.prebid.server.functional.util.privacy.gpp.UsV1Consent
@@ -188,7 +189,7 @@ class GppAmpSpec extends PrivacyBaseSpec {
188189

189190
and: "Save storedRequest into DB"
190191
def ampStoredRequest = BidRequest.defaultStoredRequest.tap {
191-
regs.ext.gpc = null
192+
regs.ext = new RegsExt(gpc: null)
192193
}
193194
def storedRequest = StoredRequest.getStoredRequest(ampRequest, ampStoredRequest)
194195
storedRequestDao.save(storedRequest)
@@ -212,7 +213,7 @@ class GppAmpSpec extends PrivacyBaseSpec {
212213

213214
and: "Save storedRequest into DB"
214215
def ampStoredRequest = BidRequest.defaultStoredRequest.tap {
215-
regs.ext.gpc = null
216+
regs.ext = new RegsExt(gpc: null)
216217
}
217218
def storedRequest = StoredRequest.getStoredRequest(ampRequest, ampStoredRequest)
218219
storedRequestDao.save(storedRequest)
@@ -222,6 +223,6 @@ class GppAmpSpec extends PrivacyBaseSpec {
222223

223224
then: "Bidder request shouldn't contain gpc value from header"
224225
def bidderRequest = bidder.getBidderRequest(ampStoredRequest.id)
225-
assert !bidderRequest.regs.ext
226+
assert !bidderRequest?.regs?.ext?.gpc
226227
}
227228
}

0 commit comments

Comments
 (0)