Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: prebid/prebid-server-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ad3b09c3dcf3c791858c912cd9b176ba2e98a30
Choose a base ref
..
head repository: prebid/prebid-server-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 26f38ea9d4f5b865d4583a555483c160197cfc71
Choose a head ref
8 changes: 4 additions & 4 deletions src/test/groovy/org/prebid/server/functional/model/request/auction/UserExtData.groovy
View file
Original file line number Diff line number Diff line change
@@ -7,15 +7,15 @@ import org.prebid.server.functional.util.PBSUtils
class UserExtData {

List<String> keywords
String buyeruid
List<String> buyeruids
String buyerUid
List<String> buyerUids
Geo geo

static UserExtData getFPDUserExtData() {
new UserExtData().tap {
keywords = [PBSUtils.randomString]
buyeruid = PBSUtils.randomString
buyeruids = [PBSUtils.randomString]
buyerUid = PBSUtils.randomString
buyerUids = [PBSUtils.randomString]
}
}
}
16 changes: 8 additions & 8 deletions src/test/groovy/org/prebid/server/functional/tests/AmpFpdSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -74,8 +74,8 @@ class AmpFpdSpec extends BaseSpec {
ampStoredRequest.user.geo.zip == user.geo.zip
ampStoredRequest.user.geo.country == user.geo.country
ampStoredRequest.user.ext.data.keywords == user.ext.data.keywords
ampStoredRequest.user.ext.data.buyeruid == user.ext.data.buyeruid
ampStoredRequest.user.ext.data.buyeruids == user.ext.data.buyeruids
ampStoredRequest.user.ext.data.buyerUid == user.ext.data.buyerUid
ampStoredRequest.user.ext.data.buyerUids == user.ext.data.buyerUids
}

and: "Bidder request shouldn't contain imp[0].ext.rp"
@@ -195,8 +195,8 @@ class AmpFpdSpec extends BaseSpec {
ortb2.user.gender == user.gender
ortb2.user.keywords == user.keywords
ortb2.user.ext.data.keywords == user.ext.data.keywords
ortb2.user.ext.data.buyeruid == user.ext.data.buyeruid
ortb2.user.ext.data.buyeruids == user.ext.data.buyeruids
ortb2.user.ext.data.buyerUid == user.ext.data.buyerUid
ortb2.user.ext.data.buyerUids == user.ext.data.buyerUids
}

and: "Bidder request shouldn't contain imp[0].ext.rp"
@@ -289,8 +289,8 @@ class AmpFpdSpec extends BaseSpec {
ampStoredRequest.user.geo.zip == user.geo.zip
ampStoredRequest.user.geo.country == user.geo.country
ampStoredRequest.user.ext.data.keywords == user.ext.data.keywords
ampStoredRequest.user.ext.data.buyeruid == user.ext.data.buyeruid
ampStoredRequest.user.ext.data.buyeruids == user.ext.data.buyeruids
ampStoredRequest.user.ext.data.buyerUid == user.ext.data.buyerUid
ampStoredRequest.user.ext.data.buyerUids == user.ext.data.buyerUids
}
}

@@ -367,8 +367,8 @@ class AmpFpdSpec extends BaseSpec {
ortb2.user.gender == user.gender
ortb2.user.keywords == user.keywords
ortb2.user.ext.data.keywords == user.ext.data.keywords
ortb2.user.ext.data.buyeruid == user.ext.data.buyeruid
ortb2.user.ext.data.buyeruids == user.ext.data.buyeruids
ortb2.user.ext.data.buyerUid == user.ext.data.buyerUid
ortb2.user.ext.data.buyerUids == user.ext.data.buyerUids
}

and: "Bidder request shouldn't contain imp[0].ext.rp"
4 changes: 2 additions & 2 deletions src/test/groovy/org/prebid/server/functional/tests/BidderInsensitiveCaseSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -109,8 +109,8 @@ class BidderInsensitiveCaseSpec extends BaseSpec {
ortb2.user.gender == user.gender
ortb2.user.keywords == user.keywords
ortb2.user.ext.data.keywords == user.ext.data.keywords
ortb2.user.ext.data.buyeruid == user.ext.data.buyeruid
ortb2.user.ext.data.buyeruids == user.ext.data.buyeruids
ortb2.user.ext.data.buyerUid == user.ext.data.buyerUid
ortb2.user.ext.data.buyerUids == user.ext.data.buyerUids
}

and: "Bidder request shouldn't contain imp[0].ext.rp"
4 changes: 2 additions & 2 deletions src/test/groovy/org/prebid/server/functional/tests/privacy/CoppaSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -192,7 +192,7 @@ class CoppaSpec extends PrivacyBaseSpec {
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo.lat == bidRequest.user.geo.lat
bidderRequest.user.geo.lon == bidRequest.user.geo.lon
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Metrics processed across activities shouldn't be updated"
@@ -396,7 +396,7 @@ class CoppaSpec extends PrivacyBaseSpec {
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo.lat == ampStoredRequest.user.geo.lat
bidderRequest.user.geo.lon == ampStoredRequest.user.geo.lon
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Metrics processed across activities shouldn't be updated"
2 changes: 1 addition & 1 deletion src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAmpSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -647,7 +647,7 @@ class GdprAmpSpec extends PrivacyBaseSpec {
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo.lat == ampStoredRequest.user.geo.lat
bidderRequest.user.geo.lon == ampStoredRequest.user.geo.lon
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Metrics processed across activities shouldn't be updated"
2 changes: 1 addition & 1 deletion src/test/groovy/org/prebid/server/functional/tests/privacy/GdprAuctionSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -768,7 +768,7 @@ class GdprAuctionSpec extends PrivacyBaseSpec {
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo.lat == bidRequest.user.geo.lat
bidderRequest.user.geo.lon == bidRequest.user.geo.lon
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Metrics processed across activities shouldn't be updated"
36 changes: 18 additions & 18 deletions ...st/groovy/org/prebid/server/functional/tests/privacy/GppTransmitUfpdActivitiesSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -302,7 +302,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -397,7 +397,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -519,7 +519,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -649,7 +649,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -767,7 +767,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo.zip == bidRequest.user.geo.zip
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -1213,7 +1213,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -1269,7 +1269,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -1324,7 +1324,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -1410,7 +1410,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == bidRequest.user.gender
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo == bidRequest.user.geo
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -1700,7 +1700,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == ampStoredRequest.user.gender
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo == ampStoredRequest.user.geo
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -1903,7 +1903,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == ampStoredRequest.user.gender
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo == ampStoredRequest.user.geo
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -2075,7 +2075,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == ampStoredRequest.user.gender
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo == ampStoredRequest.user.geo
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -2505,7 +2505,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == ampStoredRequest.user.gender
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo == ampStoredRequest.user.geo
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -2569,7 +2569,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == ampStoredRequest.user.gender
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo == ampStoredRequest.user.geo
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -2633,7 +2633,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == ampStoredRequest.user.gender
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo == ampStoredRequest.user.geo
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -2737,7 +2737,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
bidderRequest.user.gender == ampStoredRequest.user.gender
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo == ampStoredRequest.user.geo
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Generic bidder request should have data in EIDS fields"
@@ -3088,7 +3088,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {
it.user.yob = PBSUtils.randomNumber
it.user.gender = PBSUtils.randomString
it.user.geo = Geo.FPDGeo
it.user.ext = new UserExt(data: new UserExtData(buyeruid: PBSUtils.randomString))
it.user.ext = new UserExt(data: new UserExtData(buyerUid: PBSUtils.randomString))
it.regs.ext ?= new RegsExt()
}
}
4 changes: 2 additions & 2 deletions src/test/groovy/org/prebid/server/functional/tests/privacy/LmtSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -517,7 +517,7 @@ class LmtSpec extends PrivacyBaseSpec {
bidderRequest.user.data == bidRequest.user.data
bidderRequest.user.geo.lat == bidRequest.user.geo.lat
bidderRequest.user.geo.lon == bidRequest.user.geo.lon
bidderRequest.user.ext.data.buyeruid == bidRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == bidRequest.user.ext.data.buyerUid
}

and: "Metrics processed across activities shouldn't be updated"
@@ -656,7 +656,7 @@ class LmtSpec extends PrivacyBaseSpec {
bidderRequest.user.data == ampStoredRequest.user.data
bidderRequest.user.geo.lat == ampStoredRequest.user.geo.lat
bidderRequest.user.geo.lon == ampStoredRequest.user.geo.lon
bidderRequest.user.ext.data.buyeruid == ampStoredRequest.user.ext.data.buyeruid
bidderRequest.user.ext.data.buyerUid == ampStoredRequest.user.ext.data.buyerUid
}

and: "Metrics processed across activities shouldn't be updated"
2 changes: 1 addition & 1 deletion src/test/groovy/org/prebid/server/functional/tests/privacy/PrivacyBaseSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -172,7 +172,7 @@ abstract class PrivacyBaseSpec extends BaseSpec {
yob = PBSUtils.randomNumber
gender = PBSUtils.randomString
geo = Geo.FPDGeo
ext = new UserExt(data: new UserExtData(buyeruid: PBSUtils.randomString))
ext = new UserExt(data: new UserExtData(buyerUid: PBSUtils.randomString))
}
}
}