Test: Multiple biddercode support

src/test/groovy/org/prebid/server/functional/model/bidder/BidderName.groovy

@@ -11,6 +11,7 @@ enum BidderName {
     BOGUS("bogus"),
     ALIAS("alias"),
     ALIAS_CAMEL_CASE("AlIaS"),
+    ALIAS_UPPER_CASE("ALIAS"),
     GENERIC_CAMEL_CASE("GeNerIc"),
     GENERIC("generic"),
     GENER_X("gener_x"),
@@ -25,7 +26,10 @@ enum BidderName {
     ADKERNEL("adkernel"),
     IX("ix"),
     GRID("grid"),
-    MEDIANET("medianet")
+    MEDIANET("medianet"),
+    AMX("amx"),
+    AMX_CAMEL_CASE("AmX"),
+    AMX_UPPER_CASE("AMX"),
 
     @JsonValue
     final String value

src/test/groovy/org/prebid/server/functional/model/bidder/GeneralBidderAdapter.groovy

@@ -1,8 +1,14 @@
 package org.prebid.server.functional.model.bidder
 
+import com.fasterxml.jackson.annotation.JsonProperty
+
 class GeneralBidderAdapter extends Generic {
 
     String siteId
     List<Integer> size
     String sid
+    @JsonProperty("ds")
+    String demandSource
+    @JsonProperty("bc")
+    BidderName bidderCode
 }

src/test/groovy/org/prebid/server/functional/model/config/AccountConfig.groovy

@@ -23,6 +23,9 @@ class AccountConfig {
     AccountSetting settings
     @JsonProperty("cookie_sync")
     AccountCookieSyncConfig cookieSyncSnakeCase
+    AlternateBidderCodes alternateBidderCodes
+    @JsonProperty("alternate_bidder_codes")
+    AlternateBidderCodes alternateBidderCodesSnakeCase
 
     static getDefaultAccountConfig() {
         new AccountConfig(status: AccountStatus.ACTIVE)

src/test/groovy/org/prebid/server/functional/model/config/AlternateBidderCodes.groovy

@@ -0,0 +1,16 @@
+package org.prebid.server.functional.model.config
+
+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
+
+@EqualsAndHashCode
+@ToString(includeNames = true, ignoreNulls = true)
+@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
+class AlternateBidderCodes {
+
+    Boolean enabled
+    Map<BidderName, BidderConfig> bidders
+}

src/test/groovy/org/prebid/server/functional/model/config/BidderConfig.groovy

@@ -0,0 +1,21 @@
+package org.prebid.server.functional.model.config
+
+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.bidder.BidderName
+
+@EqualsAndHashCode
+@ToString(includeNames = true, ignoreNulls = true)
+@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
+class BidderConfig {
+
+    Boolean enabled
+    List<BidderName> allowedBidderCodes
+    @JsonProperty("allowedbiddercodes")
+    List<BidderName> allowedBidderCodesLowerCase
+    @JsonProperty("allowed_bidder_codes")
+    List<BidderName> allowedBidderCodesSnakeCase
+}

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

@@ -0,0 +1,17 @@
+package org.prebid.server.functional.model.request.auction
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import org.prebid.server.functional.model.bidder.BidderAdapter
+import org.prebid.server.functional.model.bidder.BidderName
+
+class Amx implements BidderAdapter {
+
+    @JsonProperty("ct")
+    Integer creativeType
+    @JsonProperty("startdelay")
+    Integer startDelay
+    @JsonProperty("ds")
+    String demandSource
+    @JsonProperty("bc")
+    BidderName bidderCode
+}

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

@@ -12,6 +12,8 @@ import org.prebid.server.functional.model.bidder.Rubicon
 class Bidder {
 
     Generic alias
+    @JsonProperty("ALIAS")
+    Generic aliasUpperCase
     Generic generic
     @JsonProperty("gener_x")
     Generic generX
@@ -26,6 +28,9 @@ class Bidder {
     Openx openxAlias
     Adrino adrino
     Generic nativo
+    Amx amx
+    @JsonProperty("AMX")
+    Amx amxUpperCase
 
     static Bidder getDefaultBidder() {
         new Bidder().tap {

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

@@ -1,10 +1,12 @@
 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.ToString
 import org.prebid.server.functional.model.ChannelType
 import org.prebid.server.functional.model.bidder.BidderName
+import org.prebid.server.functional.model.config.AlternateBidderCodes
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
@@ -41,6 +43,8 @@ class Prebid {
     PrebidAnalytics analytics
     StoredAuctionResponse storedAuctionResponse
     PaaFormat paaFormat
+    @JsonProperty("alternatebiddercodes")
+    AlternateBidderCodes alternateBidderCodes
 
     static class Channel {
 

src/test/groovy/org/prebid/server/functional/model/response/auction/BidExt.groovy

@@ -1,7 +1,9 @@
 package org.prebid.server.functional.model.response.auction
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import groovy.transform.ToString
 import org.prebid.server.functional.model.Currency
+import org.prebid.server.functional.model.bidder.BidderName
 
 @ToString(includeNames = true, ignoreNulls = true)
 class BidExt {
@@ -10,4 +12,12 @@ class BidExt {
     BigDecimal origbidcpm
     Currency origbidcur
     DsaResponse dsa
+    @JsonProperty("ct")
+    Integer creativeType
+    @JsonProperty("startdelay")
+    Integer startDelay
+    @JsonProperty("ds")
+    String demandSource
+    @JsonProperty("bc")
+    BidderName bidderCode
 }

src/test/groovy/org/prebid/server/functional/model/response/auction/ErrorType.groovy

@@ -14,7 +14,9 @@ enum ErrorType {
     ALIAS("alias"),
     TARGETING("targeting"),
     IX("ix"),
-    OPENX("openx")
+    OPENX("openx"),
+    AMX("amx"),
+    AMX_UPPER_CASE("AMX"),
 
     @JsonValue
     final String value

src/test/groovy/org/prebid/server/functional/model/response/auction/Meta.groovy

@@ -1,12 +1,15 @@
 package org.prebid.server.functional.model.response.auction
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import groovy.transform.ToString
+import org.prebid.server.functional.model.bidder.BidderName
 import org.prebid.server.functional.model.request.auction.RendererData
 
 @ToString(includeNames = true, ignoreNulls = true)
 class Meta {
 
-    String adapterCode
+    @JsonProperty("adaptercode")
+    BidderName adapterCode
     List<String> advertiserDomains
     Integer advertiserId
     String advertiserName

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

@@ -110,7 +110,7 @@ class AliasSpec extends BaseSpec {
         then: "Request should fail with error"
         def exception = thrown(PrebidServerException)
         assert exception.responseBody.contains("Invalid request format: request.ext.prebid.aliasgvlids. " +
-                "vendorId ${validId} refers to unknown bidder alias: ${bidderName}")
+                "vendorId ${validId} refers to unknown bidder alias: ${bidderName.toLowerCase()}")
     }
 
     def "PBS should return an error when GVL ID alias value is lower that one"() {
@@ -126,7 +126,7 @@ class AliasSpec extends BaseSpec {
         then: "Request should fail with error"
         def exception = thrown(PrebidServerException)
         assert exception.responseBody.contains("Invalid request format: request.ext.prebid.aliasgvlids. " +
-                "Invalid vendorId ${invalidId} for alias: ${bidderName}. Choose a different vendorId, or remove this entry.")
+                "Invalid vendorId ${invalidId} for alias: ${bidderName.toLowerCase()}. Choose a different vendorId, or remove this entry.")
 
         where:
         invalidId << [PBSUtils.randomNegativeNumber, 0]
@@ -145,7 +145,7 @@ class AliasSpec extends BaseSpec {
         then: "Request should fail with an error"
         def exception = thrown(PrebidServerException)
         assert exception.statusCode == BAD_REQUEST.code()
-        assert exception.responseBody == "Invalid request format: request.ext.prebid.aliases.$randomString " +
+        assert exception.responseBody == "Invalid request format: request.ext.prebid.aliases.${randomString.toLowerCase()} " +
                 "refers to unknown bidder: $BOGUS.value"
     }