Skip to content

Commit 2d7be04

Browse files
marki1anosulzhenko
marki1an
authored and
osulzhenko
committed
Test: Rename ModelGroup (#3949)
1 parent 33daa4f commit 2d7be04

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

src/test/groovy/org/prebid/server/functional/model/pricefloors/ModelGroup.groovy renamed to src/test/groovy/org/prebid/server/functional/model/pricefloors/FloorModelGroup.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.prebid.server.functional.util.PBSUtils
99

1010
@EqualsAndHashCode
1111
@ToString(includeNames = true, ignoreNulls = true)
12-
class ModelGroup {
12+
class FloorModelGroup {
1313

1414
Currency currency
1515
Integer skipRate
@@ -21,8 +21,8 @@ class ModelGroup {
2121
BigDecimal defaultFloor
2222
List<BidderName> noFloorSignalBidders
2323

24-
static ModelGroup getModelGroup() {
25-
new ModelGroup(
24+
static FloorModelGroup getModelGroup() {
25+
new FloorModelGroup(
2626
currency: Currency.USD,
2727
schema: PriceFloorSchema.priceFloorSchema,
2828
values: [(new Rule(mediaType: MediaType.MULTIPLE, country: Country.MULTIPLE)

‎src/test/groovy/org/prebid/server/functional/model/pricefloors/PriceFloorData.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ class PriceFloorData implements ResponseModel {
1919
Integer useFetchDataRate
2020
String floorsSchemaVersion
2121
Integer modelTimestamp
22-
List<ModelGroup> modelGroups
22+
List<FloorModelGroup> modelGroups
2323
List<BidderName> noFloorSignalBidders
2424

2525
static PriceFloorData getPriceFloorData() {
2626
new PriceFloorData(floorProvider: PBSUtils.randomString,
2727
currency: USD,
2828
floorsSchemaVersion: 2,
29-
modelGroups: [ModelGroup.modelGroup])
29+
modelGroups: [FloorModelGroup.modelGroup])
3030
}
3131
}

‎src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.prebid.server.functional.tests.pricefloors
22

33
import org.prebid.server.functional.model.config.PriceFloorsFetch
44
import org.prebid.server.functional.model.db.StoredRequest
5-
import org.prebid.server.functional.model.pricefloors.ModelGroup
5+
import org.prebid.server.functional.model.pricefloors.FloorModelGroup
66
import org.prebid.server.functional.model.pricefloors.PriceFloorData
77
import org.prebid.server.functional.model.pricefloors.Rule
88
import org.prebid.server.functional.model.request.amp.AmpRequest
@@ -1352,7 +1352,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
13521352
def floorValue = PBSUtils.randomFloorValue
13531353
def bidRequest = bidRequestWithFloors.tap {
13541354
imp[0].bidFloor = floorValue
1355-
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
1355+
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
13561356
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
13571357
ext.prebid.floors.data.modelGroups.first().modelWeight = invalidModelWeight
13581358
ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2]
@@ -1389,7 +1389,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
13891389
def floorValue = PBSUtils.randomFloorValue
13901390
def ampStoredRequest = storedRequestWithFloors.tap {
13911391
imp[0].bidFloor = floorValue
1392-
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
1392+
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
13931393
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
13941394
ext.prebid.floors.data.modelGroups.first().modelWeight = invalidModelWeight
13951395
ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2]
@@ -1426,7 +1426,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
14261426
def floorValue = PBSUtils.randomFloorValue
14271427
def bidRequest = bidRequestWithFloors.tap {
14281428
imp[0].bidFloor = floorValue
1429-
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
1429+
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
14301430
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
14311431
ext.prebid.floors.data.modelGroups[0].skipRate = 0
14321432
ext.prebid.floors.data.skipRate = 0
@@ -1466,7 +1466,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
14661466
def floorValue = PBSUtils.randomFloorValue
14671467
def bidRequest = bidRequestWithFloors.tap {
14681468
imp[0].bidFloor = floorValue
1469-
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
1469+
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
14701470
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
14711471
ext.prebid.floors.data.modelGroups[0].skipRate = 0
14721472
ext.prebid.floors.data.skipRate = invalidSkipRate
@@ -1506,7 +1506,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
15061506
def floorValue = PBSUtils.randomFloorValue
15071507
def bidRequest = bidRequestWithFloors.tap {
15081508
imp[0].bidFloor = floorValue
1509-
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
1509+
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
15101510
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
15111511
ext.prebid.floors.data.modelGroups[0].skipRate = invalidSkipRate
15121512
ext.prebid.floors.data.skipRate = 0
@@ -1547,7 +1547,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
15471547
def invalidDefaultFloorValue = DEFAULT_FLOOR_VALUE_MIN - 1
15481548
def bidRequest = bidRequestWithFloors.tap {
15491549
imp[0].bidFloor = floorValue
1550-
ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup
1550+
ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup
15511551
ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1]
15521552
ext.prebid.floors.data.modelGroups[0].defaultFloor = invalidDefaultFloorValue
15531553
ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2]
@@ -1642,7 +1642,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
16421642
and: "Set Floors Provider response"
16431643
def floorValue = PBSUtils.randomFloorValue
16441644
def floorsResponse = PriceFloorData.priceFloorData.tap {
1645-
modelGroups << ModelGroup.modelGroup
1645+
modelGroups << FloorModelGroup.modelGroup
16461646
modelGroups.first().values = [(rule): floorValue + 0.1]
16471647
modelGroups.first().modelWeight = invalidModelWeight
16481648
modelGroups.last().values = [(rule): floorValue]
@@ -1700,7 +1700,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
17001700
and: "Set Floors Provider response"
17011701
def floorValue = PBSUtils.randomFloorValue
17021702
def floorsResponse = PriceFloorData.priceFloorData.tap {
1703-
modelGroups << ModelGroup.modelGroup
1703+
modelGroups << FloorModelGroup.modelGroup
17041704
modelGroups.first().values = [(rule): floorValue + 0.1]
17051705
modelGroups[0].skipRate = 0
17061706
skipRate = invalidSkipRate
@@ -1759,7 +1759,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
17591759
and: "Set Floors Provider response"
17601760
def floorValue = PBSUtils.randomFloorValue
17611761
def floorsResponse = PriceFloorData.priceFloorData.tap {
1762-
modelGroups << ModelGroup.modelGroup
1762+
modelGroups << FloorModelGroup.modelGroup
17631763
modelGroups.first().values = [(rule): floorValue + 0.1]
17641764
modelGroups[0].skipRate = invalidSkipRate
17651765
skipRate = 0
@@ -1819,7 +1819,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec {
18191819
def floorValue = PBSUtils.randomFloorValue
18201820
def invalidDefaultFloor = DEFAULT_FLOOR_VALUE_MIN - 1
18211821
def floorsResponse = PriceFloorData.priceFloorData.tap {
1822-
modelGroups << ModelGroup.modelGroup
1822+
modelGroups << FloorModelGroup.modelGroup
18231823
modelGroups.first().values = [(rule): floorValue + 0.1]
18241824
modelGroups[0].defaultFloor = invalidDefaultFloor
18251825
modelGroups.last().values = [(rule): floorValue]

‎src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsRulesSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.prebid.server.functional.model.config.BidderConfig
99
import org.prebid.server.functional.model.db.StoredImp
1010
import org.prebid.server.functional.model.pricefloors.Country
1111
import org.prebid.server.functional.model.pricefloors.MediaType
12-
import org.prebid.server.functional.model.pricefloors.ModelGroup
12+
import org.prebid.server.functional.model.pricefloors.FloorModelGroup
1313
import org.prebid.server.functional.model.pricefloors.PriceFloorData
1414
import org.prebid.server.functional.model.pricefloors.PriceFloorSchema
1515
import org.prebid.server.functional.model.pricefloors.Rule
@@ -191,7 +191,7 @@ class PriceFloorsRulesSpec extends PriceFloorsBaseSpec {
191191
and: "Set Floors Provider response"
192192
def floorValue = PBSUtils.randomFloorValue
193193
def floorsResponse = PriceFloorData.priceFloorData.tap {
194-
modelGroups << ModelGroup.modelGroup
194+
modelGroups << FloorModelGroup.modelGroup
195195
modelGroups[0].schema = new PriceFloorSchema(fields: [BOGUS])
196196
modelGroups[0].values = [(new Rule(domain: domain).rule): floorValue + 0.1]
197197
modelGroups[1].schema = new PriceFloorSchema(fields: [DOMAIN])

‎src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.prebid.server.functional.tests.pricefloors
22

33
import org.prebid.server.functional.model.db.StoredRequest
44
import org.prebid.server.functional.model.pricefloors.Country
5-
import org.prebid.server.functional.model.pricefloors.ModelGroup
5+
import org.prebid.server.functional.model.pricefloors.FloorModelGroup
66
import org.prebid.server.functional.model.pricefloors.PriceFloorData
77
import org.prebid.server.functional.model.pricefloors.PriceFloorSchema
88
import org.prebid.server.functional.model.pricefloors.Rule
@@ -473,7 +473,7 @@ class PriceFloorsSignalingSpec extends PriceFloorsBaseSpec {
473473
and: "Set Floors Provider response"
474474
def floorValue = PBSUtils.randomFloorValue
475475
def floorsResponse = PriceFloorData.priceFloorData.tap {
476-
modelGroups << ModelGroup.modelGroup
476+
modelGroups << FloorModelGroup.modelGroup
477477
modelGroups.first().values = [(rule): floorValue + 0.1]
478478
modelGroups.last().schema = new PriceFloorSchema(fields: [SITE_DOMAIN])
479479
modelGroups.last().values = [(new Rule(siteDomain: domain).rule): floorValue]

0 commit comments

Comments
 (0)