Update: Add coverage for bidder removal fields

Author: marki1an

src/test/groovy/org/prebid/server/functional/model/request/Channel.groovy

@@ -0,0 +1,11 @@
+package org.prebid.server.functional.model.request
+
+import groovy.transform.ToString
+import org.prebid.server.functional.model.ChannelType
+
+@ToString(includeNames = true, ignoreNulls = true)
+class Channel {
+
+    ChannelType name
+    String version
+}

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

@@ -2,10 +2,12 @@ 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
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)
+@EqualsAndHashCode
 class ConsentedProvidersSettings {
 
     String consentedProviders

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

@@ -1,13 +1,16 @@
 package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.annotation.JsonValue
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString
+@EqualsAndHashCode
 class DeviceExt {
 
     Atts atts
     String cdep
+    DevicePrebid prebid
 
     enum Atts {
 

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

@@ -0,0 +1,11 @@
+package org.prebid.server.functional.model.request.auction
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+@EqualsAndHashCode
+@ToString(includeNames = true, ignoreNulls = true)
+class DevicePrebid {
+
+    Interstitial interstitial
+}

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

@@ -2,8 +2,10 @@ 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
 
+@EqualsAndHashCode
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
 class ImpExtContextDataAdServer {

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

@@ -0,0 +1,15 @@
+package org.prebid.server.functional.model.request.auction
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+@EqualsAndHashCode
+@ToString(includeNames = true, ignoreNulls = true)
+class Interstitial {
+
+    @JsonProperty("minwidthperc")
+    Integer minWidthPercentage
+    @JsonProperty("minheightperc")
+    Integer minHeightPercentage
+}

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

@@ -7,6 +7,7 @@ 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
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
@@ -26,6 +27,8 @@ class Prebid {
     ExtRequestPrebidData data
     List<ExtPrebidBidderConfig> bidderConfig
     List<PrebidSchain> schains
+    List<String> noSale
+    Long auctionTimestamp
     Amp amp
     Channel channel
     List<MultiBid> multibid
@@ -49,10 +52,5 @@ class Prebid {
     List<String> profileNames
     @JsonProperty("kvps")
     Map<String, String> keyValuePairs
-
-    static class Channel {
-
-        ChannelType name
-        String version
-    }
+    Boolean supportDeals
 }

src/test/groovy/org/prebid/server/functional/model/request/auction/PrebidCurrency.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.model.Currency
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class PrebidCurrency {
 
     Map<Currency, Map<Currency, BigDecimal>> rates

src/test/groovy/org/prebid/server/functional/model/request/auction/UserTime.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 UserTime {
 
     Integer userdow

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

@@ -233,9 +233,6 @@ class AmpFpdSpec extends BaseSpec {
         def bidderRequest = bidder.getBidderRequest(ampStoredRequest.id)
         assert ampStoredRequest.ext.prebid.bidderConfig[0].config.ortb2.site.domain == bidderRequest.site.domain
         assert ampStoredRequest.ext.prebid.bidderConfig[0].config.ortb2.user.keywords == bidderRequest.user.keywords
-
-        and: "Bidder request shouldn't contain bidder config"
-        assert !bidderRequest.ext.prebid.bidderConfig
     }
 
     def "PBS should populate FPD from root when bidder was defined in prebid data"() {