Add more coverage for bidder removal fields

Author: marki1an

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

@@ -3,11 +3,13 @@ package org.prebid.server.functional.model.request.auction
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.model.Currency
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class AdjustmentRule {
 
     @JsonProperty('adjtype')

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

@@ -1,8 +1,10 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class AppExt {
 
     AppExtData data

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

@@ -1,8 +1,10 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class AppExtData {
 
     String language

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

@@ -2,11 +2,13 @@ package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.util.PBSUtils
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class BidAdjustment {
 
     Map<BidAdjustmentMediaType, BidAdjustmentRule> mediaType

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

@@ -4,11 +4,13 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.model.bidder.BidderName
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class BidAdjustmentFactors {
 
     @JsonAnySetter

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

@@ -1,9 +1,11 @@
 package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class BidAdjustmentRule {
 
     @JsonProperty('*')

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

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
 import groovy.transform.ToString
-import org.prebid.server.functional.model.ChannelType
 import org.prebid.server.functional.model.bidder.BidderName
 import org.prebid.server.functional.model.config.AlternateBidderCodes
 import org.prebid.server.functional.model.request.Channel
@@ -54,4 +53,5 @@ class Prebid {
     Map<String, String> keyValuePairs
     Boolean supportDeals
     String integration
+    Map<String, String> bidders
 }

src/test/groovy/org/prebid/server/functional/tests/BidAdjustmentSpec.groovy

@@ -1,6 +1,5 @@
 package org.prebid.server.functional.tests
 
-
 import org.prebid.server.functional.model.bidder.Generic
 import org.prebid.server.functional.model.config.AccountAuctionConfig
 import org.prebid.server.functional.model.config.AccountConfig
@@ -53,6 +52,7 @@ import static org.prebid.server.functional.model.request.auction.VideoPlcmtSubty
 import static org.prebid.server.functional.model.response.auction.ErrorType.PREBID
 import static org.prebid.server.functional.testcontainers.Dependencies.getNetworkServiceContainer
 import static org.prebid.server.functional.util.PBSUtils.getRandomDecimal
+import static org.prebid.server.functional.util.PBSUtils.roundDecimal
 
 class BidAdjustmentSpec extends BaseSpec {
 
@@ -106,7 +106,7 @@ class BidAdjustmentSpec extends BaseSpec {
 
     def "PBS should prefer bid price adjustment based on media type when request has per-media-type bid adjustment factors"() {
         given: "Default bid request with bid adjustment"
-        def bidAdjustment = randomDecimal
+        def bidAdjustment = roundDecimal(getRandomDecimal(), 0)
         def mediaTypeBidAdjustment = bidAdjustmentFactor
         def bidRequest = BidRequest.getDefaultBidRequest(SITE).tap {
             ext.prebid.bidAdjustmentFactors = new BidAdjustmentFactors().tap {
@@ -126,6 +126,10 @@ class BidAdjustmentSpec extends BaseSpec {
         assert response?.seatbid?.first?.bid?.first?.price == bidResponse.seatbid.first.bid.first.price *
                 mediaTypeBidAdjustment
 
+        and: "Bidder request should contain bid bid adjustment factors"
+        def bidderRequest = bidder.getBidderRequest(bidRequest.id)
+        assert bidderRequest.ext.prebid.bidAdjustmentFactors == bidRequest.ext.prebid.bidAdjustmentFactors
+
         where:
         bidAdjustmentFactor << [0.9, 1.1]
     }
@@ -239,6 +243,9 @@ class BidAdjustmentSpec extends BaseSpec {
         assert bidderRequest.imp.bidFloorCur == [currency]
         assert bidderRequest.imp.bidFloor == [impPrice]
 
+        and: "Bidder request should contain bid adjustments"
+        assert bidderRequest.ext.prebid.bidAdjustments == bidRequest.ext.prebid.bidAdjustments
+
         where:
         adjustmentType | ruleValue                                                       | mediaType        | bidRequest
         MULTIPLIER     | getRandomDecimal(MIN_ADJUST_VALUE, MAX_MULTIPLIER_ADJUST_VALUE) | BANNER           | BidRequest.defaultBidRequest