Skip to content

Test: Rename ModelGroup #3949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CTMBNara merged 5 commits into from
May 16, 2025
Merged

Test: Rename ModelGroup #3949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2a3d47
Rename modelGroups field
marki1an May 5, 2025
430af97
Merge remote-tracking branch 'refs/remotes/origin/master' into test/h…
marki1an May 5, 2025
879dada
Resolve conflict
marki1an May 5, 2025
c4e9b6f
Merge remote-tracking branch 'refs/remotes/origin/master' into test/h…
marki1an May 5, 2025
dd2e1f0
Merge remote-tracking branch 'origin/test/housekeeping-update-naming-…
marki1an May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ional/model/pricefloors/ModelGroup.groovy → .../model/pricefloors/FloorModelGroup.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.prebid.server.functional.util.PBSUtils

@EqualsAndHashCode
@ToString(includeNames = true, ignoreNulls = true)
class ModelGroup {
class FloorModelGroup {

Currency currency
Integer skipRate
Expand All @@ -21,8 +21,8 @@ class ModelGroup {
BigDecimal defaultFloor
List<BidderName> noFloorSignalBidders

static ModelGroup getModelGroup() {
new ModelGroup(
static FloorModelGroup getModelGroup() {
new FloorModelGroup(
currency: Currency.USD,
schema: PriceFloorSchema.priceFloorSchema,
values: [(new Rule(mediaType: MediaType.MULTIPLE, country: Country.MULTIPLE)
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/org/prebid/server/functional/model/pricefloors/PriceFloorData.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ class PriceFloorData implements ResponseModel {
Integer useFetchDataRate
String floorsSchemaVersion
Integer modelTimestamp
List<ModelGroup> modelGroups
List<FloorModelGroup> modelGroups
List<BidderName> noFloorSignalBidders

static PriceFloorData getPriceFloorData() {
new PriceFloorData(floorProvider: PBSUtils.randomString,
currency: USD,
floorsSchemaVersion: 2,
modelGroups: [ModelGroup.modelGroup])
modelGroups: [FloorModelGroup.modelGroup])
}
}
22 changes: 11 additions & 11 deletions ...test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.prebid.server.functional.tests.pricefloors

import org.prebid.server.functional.model.config.PriceFloorsFetch
import org.prebid.server.functional.model.db.StoredRequest
import org.prebid.server.functional.model.pricefloors.ModelGroup
import org.prebid.server.functional.model.pricefloors.FloorModelGroup
import org.prebid.server.functional.model.pricefloors.PriceFloorData
import org.prebid.server.functional.model.pricefloors.Rule
import org.prebid.server.functional.model.request.amp.AmpRequest
Expand Down Expand Up @@ -1352,7 +1352,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
def floorValue = PBSUtils.randomFloorValue
def bidRequest = bidRequestWithFloors.tap {
imp[0].bidFloor = floorValue
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
ext.prebid.floors.data.modelGroups.first().modelWeight = invalidModelWeight
ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2]
Expand Down Expand Up @@ -1389,7 +1389,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
def floorValue = PBSUtils.randomFloorValue
def ampStoredRequest = storedRequestWithFloors.tap {
imp[0].bidFloor = floorValue
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
ext.prebid.floors.data.modelGroups.first().modelWeight = invalidModelWeight
ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2]
Expand Down Expand Up @@ -1426,7 +1426,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
def floorValue = PBSUtils.randomFloorValue
def bidRequest = bidRequestWithFloors.tap {
imp[0].bidFloor = floorValue
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
ext.prebid.floors.data.modelGroups[0].skipRate = 0
ext.prebid.floors.data.skipRate = 0
Expand Down Expand Up @@ -1466,7 +1466,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
def floorValue = PBSUtils.randomFloorValue
def bidRequest = bidRequestWithFloors.tap {
imp[0].bidFloor = floorValue
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
ext.prebid.floors.data.modelGroups[0].skipRate = 0
ext.prebid.floors.data.skipRate = invalidSkipRate
Expand Down Expand Up @@ -1506,7 +1506,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
def floorValue = PBSUtils.randomFloorValue
def bidRequest = bidRequestWithFloors.tap {
imp[0].bidFloor = floorValue
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
ext.prebid.floors.data.modelGroups[0].skipRate = invalidSkipRate
ext.prebid.floors.data.skipRate = 0
Expand Down Expand Up @@ -1547,7 +1547,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
def invalidDefaultFloorValue = DEFAULT_FLOOR_VALUE_MIN - 1
def bidRequest = bidRequestWithFloors.tap {
imp[0].bidFloor = floorValue
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
ext.prebid.floors.data.modelGroups[0].defaultFloor = invalidDefaultFloorValue
ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2]
Expand Down Expand Up @@ -1642,7 +1642,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
and: "Set Floors Provider response"
def floorValue = PBSUtils.randomFloorValue
def floorsResponse = PriceFloorData.priceFloorData.tap {
modelGroups << ModelGroup.modelGroup
modelGroups << FloorModelGroup.modelGroup
modelGroups.first().values = [(rule): floorValue + 0.1]
modelGroups.first().modelWeight = invalidModelWeight
modelGroups.last().values = [(rule): floorValue]
Expand Down Expand Up @@ -1700,7 +1700,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
and: "Set Floors Provider response"
def floorValue = PBSUtils.randomFloorValue
def floorsResponse = PriceFloorData.priceFloorData.tap {
modelGroups << ModelGroup.modelGroup
modelGroups << FloorModelGroup.modelGroup
modelGroups.first().values = [(rule): floorValue + 0.1]
modelGroups[0].skipRate = 0
skipRate = invalidSkipRate
Expand Down Expand Up @@ -1759,7 +1759,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
and: "Set Floors Provider response"
def floorValue = PBSUtils.randomFloorValue
def floorsResponse = PriceFloorData.priceFloorData.tap {
modelGroups << ModelGroup.modelGroup
modelGroups << FloorModelGroup.modelGroup
modelGroups.first().values = [(rule): floorValue + 0.1]
modelGroups[0].skipRate = invalidSkipRate
skipRate = 0
Expand Down Expand Up @@ -1819,7 +1819,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
def floorValue = PBSUtils.randomFloorValue
def invalidDefaultFloor = DEFAULT_FLOOR_VALUE_MIN - 1
def floorsResponse = PriceFloorData.priceFloorData.tap {
modelGroups << ModelGroup.modelGroup
modelGroups << FloorModelGroup.modelGroup
modelGroups.first().values = [(rule): floorValue + 0.1]
modelGroups[0].defaultFloor = invalidDefaultFloor
modelGroups.last().values = [(rule): floorValue]
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsRulesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.prebid.server.functional.model.config.BidderConfig
import org.prebid.server.functional.model.db.StoredImp
import org.prebid.server.functional.model.pricefloors.Country
import org.prebid.server.functional.model.pricefloors.MediaType
import org.prebid.server.functional.model.pricefloors.ModelGroup
import org.prebid.server.functional.model.pricefloors.FloorModelGroup
import org.prebid.server.functional.model.pricefloors.PriceFloorData
import org.prebid.server.functional.model.pricefloors.PriceFloorSchema
import org.prebid.server.functional.model.pricefloors.Rule
Expand Down Expand Up @@ -191,7 +191,7 @@ class PriceFloorsRulesSpec extends PriceFloorsBaseSpec {
and: "Set Floors Provider response"
def floorValue = PBSUtils.randomFloorValue
def floorsResponse = PriceFloorData.priceFloorData.tap {
modelGroups << ModelGroup.modelGroup
modelGroups << FloorModelGroup.modelGroup
modelGroups[0].schema = new PriceFloorSchema(fields: [BOGUS])
modelGroups[0].values = [(new Rule(domain: domain).rule): floorValue + 0.1]
modelGroups[1].schema = new PriceFloorSchema(fields: [DOMAIN])
Expand Down
4 changes: 2 additions & 2 deletions ...est/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.prebid.server.functional.tests.pricefloors

import org.prebid.server.functional.model.db.StoredRequest
import org.prebid.server.functional.model.pricefloors.Country
import org.prebid.server.functional.model.pricefloors.ModelGroup
import org.prebid.server.functional.model.pricefloors.FloorModelGroup
import org.prebid.server.functional.model.pricefloors.PriceFloorData
import org.prebid.server.functional.model.pricefloors.PriceFloorSchema
import org.prebid.server.functional.model.pricefloors.Rule
Expand Down Expand Up @@ -473,7 +473,7 @@ class PriceFloorsSignalingSpec extends PriceFloorsBaseSpec {
and: "Set Floors Provider response"
def floorValue = PBSUtils.randomFloorValue
def floorsResponse = PriceFloorData.priceFloorData.tap {
modelGroups << ModelGroup.modelGroup
modelGroups << FloorModelGroup.modelGroup
modelGroups.first().values = [(rule): floorValue + 0.1]
modelGroups.last().schema = new PriceFloorSchema(fields: [SITE_DOMAIN])
modelGroups.last().values = [(new Rule(siteDomain: domain).rule): floorValue]
Expand Down
Loading