Update functional tests

marki1an · marki1an · commit 0c04b53ad053 · 2025-03-08T21:36:55.000+02:00
diff --git a/src/test/groovy/org/prebid/server/functional/model/bidder/BidderName.groovy b/src/test/groovy/org/prebid/server/functional/model/bidder/BidderName.groovy
@@ -25,7 +25,9 @@ enum BidderName {
     ADKERNEL("adkernel"),
     IX("ix"),
     GRID("grid"),
-    MEDIANET("medianet")
+    MEDIANET("medianet"),
+    AMX("amx"),
+    AMX_CAMEL_CASE("AmX"),
 
     @JsonValue
     final String value
diff --git a/src/test/groovy/org/prebid/server/functional/model/bidder/GeneralBidderAdapter.groovy b/src/test/groovy/org/prebid/server/functional/model/bidder/GeneralBidderAdapter.groovy
@@ -5,4 +5,6 @@ class GeneralBidderAdapter extends Generic {
     String siteId
     List<Integer> size
     String sid
+    String ds
+    String bc
 }
diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/AccountConfig.groovy
@@ -23,7 +23,6 @@ class AccountConfig {
     AccountSetting settings
     @JsonProperty("cookie_sync")
     AccountCookieSyncConfig cookieSyncSnakeCase
-    // Can be in other places
     AlternateBidderCodes alternateBidderCodes
 
     static getDefaultAccountConfig() {
diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Amx.groovy b/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
+}
diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Bidder.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Bidder.groovy
@@ -26,6 +26,7 @@ class Bidder {
     Openx openxAlias
     Adrino adrino
     Generic nativo
+    Amx amx
 
     static Bidder getDefaultBidder() {
         new Bidder().tap {
diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Prebid.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Prebid.groovy
@@ -1,5 +1,6 @@
 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
@@ -30,7 +31,7 @@ class Prebid {
     List<MultiBid> multibid
     Pbs pbs
     Server server
-    Map<BidderName, Map<String, Integer>> bidderParams
+    Map bidderParams
     ExtPrebidFloors floors
     Map passThrough
     Events events
@@ -41,6 +42,7 @@ class Prebid {
     PrebidModulesConfig modules
     PrebidAnalytics analytics
     StoredAuctionResponse storedAuctionResponse
+    @JsonProperty("alternatebidderscodes")
     AlternateBidderCodes alternateBidderCodes
     PaaFormat paaFormat
 
diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/BidExt.groovy b/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
 }
diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/ErrorType.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/ErrorType.groovy
@@ -14,7 +14,8 @@ enum ErrorType {
     ALIAS("alias"),
     TARGETING("targeting"),
     IX("ix"),
-    OPENX("openx")
+    OPENX("openx"),
+    AMX("amx"),
 
     @JsonValue
     final String value
diff --git a/src/test/groovy/org/prebid/server/functional/model/response/auction/Meta.groovy b/src/test/groovy/org/prebid/server/functional/model/response/auction/Meta.groovy
@@ -2,13 +2,14 @@ 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 {
 
     @JsonProperty("adaptercode")
-    String adapterCode
+    BidderName adapterCode
     List<String> advertiserDomains
     Integer advertiserId
     String advertiserName
diff --git a/src/test/groovy/org/prebid/server/functional/tests/AlternateBidderCodeSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/AlternateBidderCodeSpec.groovy
diff --git a/src/test/groovy/org/prebid/server/functional/tests/BidAdjustmentSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/BidAdjustmentSpec.groovy
@@ -3,17 +3,21 @@ package org.prebid.server.functional.tests
 import org.prebid.server.functional.model.Currency
 import org.prebid.server.functional.model.config.AccountAuctionConfig
 import org.prebid.server.functional.model.config.AccountConfig
+import org.prebid.server.functional.model.config.AlternateBidderCodes
+import org.prebid.server.functional.model.config.BidderConfig
 import org.prebid.server.functional.model.db.Account
 import org.prebid.server.functional.model.mock.services.currencyconversion.CurrencyConversionRatesResponse
 import org.prebid.server.functional.model.request.auction.AdjustmentRule
 import org.prebid.server.functional.model.request.auction.AdjustmentType
+import org.prebid.server.functional.model.request.auction.Amx
 import org.prebid.server.functional.model.request.auction.BidAdjustment
 import org.prebid.server.functional.model.request.auction.BidAdjustmentFactors
 import org.prebid.server.functional.model.request.auction.BidAdjustmentRule
 import org.prebid.server.functional.model.request.auction.BidRequest
 import org.prebid.server.functional.model.request.auction.Imp
 import org.prebid.server.functional.model.request.auction.VideoPlacementSubtypes
 import org.prebid.server.functional.model.request.auction.VideoPlcmtSubtype
+import org.prebid.server.functional.model.response.auction.BidExt
 import org.prebid.server.functional.model.response.auction.BidResponse
 import org.prebid.server.functional.service.PrebidServerException
 import org.prebid.server.functional.service.PrebidServerService
@@ -27,6 +31,7 @@ import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST
 import static org.prebid.server.functional.model.Currency.EUR
 import static org.prebid.server.functional.model.Currency.GBP
 import static org.prebid.server.functional.model.Currency.USD
+import static org.prebid.server.functional.model.bidder.BidderName.AMX
 import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS
 import static org.prebid.server.functional.model.bidder.BidderName.GENERIC
 import static org.prebid.server.functional.model.bidder.BidderName.RUBICON
@@ -68,7 +73,9 @@ class BidAdjustmentSpec extends BaseSpec {
     private static final CurrencyConversion currencyConversion = new CurrencyConversion(networkServiceContainer).tap {
         setCurrencyConversionRatesResponse(CurrencyConversionRatesResponse.getDefaultCurrencyConversionRatesResponse(DEFAULT_CURRENCY_RATES))
     }
-    private static final PrebidServerService pbsService = pbsServiceFactory.getService(externalCurrencyConverterConfig)
+    private static final Map AMX_CONFIG = ["adapters.amx.enabled" : "true",
+                                           "adapters.amx.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
+    private static final PrebidServerService pbsService = pbsServiceFactory.getService(externalCurrencyConverterConfig + AMX_CONFIG)
 
     def "PBS should adjust bid price for matching bidder when request has per-bidder bid adjustment factors"() {
         given: "Default bid request with bid adjustment"
@@ -1074,6 +1081,73 @@ class BidAdjustmentSpec extends BaseSpec {
         adjustmentType << [CPM, STATIC]
     }
 
+    def "PBS should adjust bid price for matching bidder and alternate bidder code when request has per-bidder bid adjustment factors"() {
+        given: "Default bid request with bid adjustment and amx bidder"
+        def bidRequest = BidRequest.getDefaultBidRequest(SITE).tap {
+            imp[0].ext.prebid.bidder.generic = null
+            imp[0].ext.prebid.bidder.amx = new Amx()
+            it.ext.prebid.tap {
+                alternateBidderCodes = new AlternateBidderCodes().tap {
+                    enabled = true
+                    bidders = [(AMX): new BidderConfig(enabled: true, allowedBidderCodes: [GENERIC])]
+                }
+                bidAdjustmentFactors = new BidAdjustmentFactors(adjustments: [(GENERIC): bidAdjustmentFactor])
+            }
+        }
+
+        and: "Bid response with bidder code"
+        def bidResponse = BidResponse.getDefaultBidResponse(bidRequest, AMX).tap {
+            it.seatbid[0].bid[0].ext = new BidExt(bidderCode: GENERIC)
+        }
+        bidder.setResponse(bidRequest.id, bidResponse)
+
+        when: "PBS processes auction request"
+        def response = pbsService.sendAuctionRequest(bidRequest)
+
+        then: "Final bid price should be adjusted"
+        assert response?.seatbid?.first?.bid?.first?.price == bidResponse.seatbid.first.bid.first.price *
+                bidAdjustmentFactor
+
+        where:
+        bidAdjustmentFactor << [0.9, 1.1]
+    }
+
+    def "PBS should prefer bid price adjustment based on media type and alternate bidder code when request has per-media-type bid adjustment factors"() {
+        given: "Default bid request with bid adjustment"
+        def bidAdjustment = randomDecimal
+        def mediaTypeBidAdjustment = bidAdjustmentFactor
+        def bidRequest = BidRequest.getDefaultBidRequest(SITE).tap {
+            imp[0].ext.prebid.bidder.generic = null
+            imp[0].ext.prebid.bidder.amx = new Amx()
+            ext.prebid.tap {
+                bidAdjustmentFactors = new BidAdjustmentFactors().tap {
+                    adjustments = [(GENERIC): bidAdjustment]
+                    mediaTypes = [(BANNER): [(GENERIC): mediaTypeBidAdjustment]]
+                }
+                alternateBidderCodes = new AlternateBidderCodes().tap {
+                    enabled = true
+                    bidders = [(AMX): new BidderConfig(enabled: true, allowedBidderCodes: [GENERIC])]
+                }
+            }
+        }
+
+        and: "Bid response with bidder code"
+        def bidResponse = BidResponse.getDefaultBidResponse(bidRequest, AMX).tap {
+            it.seatbid[0].bid[0].ext = new BidExt(bidderCode: GENERIC)
+        }
+        bidder.setResponse(bidRequest.id, bidResponse)
+
+        when: "PBS processes auction request"
+        def response = pbsService.sendAuctionRequest(bidRequest)
+
+        then: "Final bid price should be adjusted"
+        assert response?.seatbid?.first?.bid?.first?.price == bidResponse.seatbid.first.bid.first.price *
+                mediaTypeBidAdjustment
+
+        where:
+        bidAdjustmentFactor << [0.9, 1.1]
+    }
+
     private static Map<String, String> getExternalCurrencyConverterConfig() {
         ["auction.ad-server-currency"                          : DEFAULT_CURRENCY as String,
          "currency-converter.external-rates.enabled"           : "true",
diff --git a/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy
@@ -34,6 +34,7 @@ import static org.prebid.server.functional.model.Currency.CHF
 import static org.prebid.server.functional.model.Currency.EUR
 import static org.prebid.server.functional.model.Currency.JPY
 import static org.prebid.server.functional.model.Currency.USD
+import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS
 import static org.prebid.server.functional.model.bidder.BidderName.OPENX
 import static org.prebid.server.functional.model.bidder.CompressionType.GZIP
 import static org.prebid.server.functional.model.bidder.CompressionType.NONE
@@ -1379,7 +1380,7 @@ class BidderParamsSpec extends BaseSpec {
         def response = defaultPbsService.sendAuctionRequest(bidRequest)
 
         then: "Response should contain adapter code"
-        assert response.seatbid.bid.ext.prebid.meta.adapterCode.flatten() == [BidderName.GENERIC]
+        assert response.seatbid.bid.ext.prebid.meta.adapterCode.flatten() == [BidderName.GENERIC.value]
 
         and: "Bidder request should be valid"
         assert bidder.getBidderRequest(bidRequest.id)
@@ -1399,7 +1400,7 @@ class BidderParamsSpec extends BaseSpec {
         def response = defaultPbsService.sendAuctionRequest(bidRequest)
 
         then: "Response should contain adapter code"
-        assert response.seatbid.bid.ext.prebid.meta.adapterCode.flatten() == [BidderName.ALIAS]
+        assert response.seatbid.bid.ext.prebid.meta.adapterCode.flatten() == [BidderName.ALIAS.value]
 
         and: "Bidder request should be valid"
         assert bidder.getBidderRequests(bidRequest.id)

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,6 @@ class GeneralBidderAdapter extends Generic {`
`5`	`5`	`String siteId`
`6`	`6`	`List<Integer> size`
`7`	`7`	`String sid`
	`8`	`+ String ds`
	`9`	`+ String bc`
`8`	`10`	`}`