From cfbbdeae1ec526898c4f3593421118f597ce2d00 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Wed, 15 Jan 2025 15:22:11 +0100 Subject: [PATCH 1/8] Fix #3608 Smartadserver config: added audio support, endpoint compressions, alias --- src/main/resources/bidder-config/smartadserver.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/bidder-config/smartadserver.yaml b/src/main/resources/bidder-config/smartadserver.yaml index a4ff6fff510..3e1e75bc5d5 100644 --- a/src/main/resources/bidder-config/smartadserver.yaml +++ b/src/main/resources/bidder-config/smartadserver.yaml @@ -1,16 +1,21 @@ adapters: smartadserver: endpoint: https://ssb-global.smartadserver.com + endpoint-compression: gzip + aliases: + equativ: ~ meta-info: maintainer-email: supply-partner-integration@equativ.com app-media-types: - banner - video - native + - audio site-media-types: - banner - video - native + - audio supported-vendors: vendor-id: 45 usersync: From 1c1cc32a550c2aa072014fe5b76203ed38ea922b Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Wed, 15 Jan 2025 15:26:51 +0100 Subject: [PATCH 2/8] Fix #3608 Smartadserver: parse BidType from mType in the bid response --- .../smartadserver/SmartadserverBidder.java | 24 +++--- .../SmartadserverBidderTest.java | 81 ++++++++++++------- .../test-auction-smartadserver-response.json | 3 +- .../test-smartadserver-bid-response.json | 3 +- 4 files changed, 71 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java b/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java index 2622aae49cf..a9ee72df740 100644 --- a/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java +++ b/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java @@ -112,13 +112,13 @@ private static Publisher modifyPublisher(Publisher publisher, Integer networkId) public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { try { final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - return extractBids(httpCall.getRequest().getPayload(), bidResponse); + return extractBids(bidResponse); } catch (DecodeException | PreBidException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } } - private Result> extractBids(BidRequest bidRequest, BidResponse bidResponse) { + private Result> extractBids(BidResponse bidResponse) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Result.empty(); } @@ -128,19 +128,21 @@ private Result> extractBids(BidRequest bidRequest, BidResponse b .map(SeatBid::getBid) .filter(Objects::nonNull) .flatMap(Collection::stream) - .map(bid -> BidderBid.of(bid, getBidType(bid.getImpid(), bidRequest.getImp()), bidResponse.getCur())) + .map(bid -> BidderBid.of(bid, getBidTypeFromMarkupType(bid.getMtype()), bidResponse.getCur())) .toList(); return Result.of(bidderBids, errors); } - private static BidType getBidType(String impId, List imps) { - for (Imp imp : imps) { - if (imp.getId().equals(impId)) { - return imp.getVideo() != null - ? BidType.video - : (imp.getXNative() != null ? BidType.xNative : BidType.banner); - } + private static BidType getBidTypeFromMarkupType(Integer markupType) { + if (markupType == null) { + return BidType.banner; } - return BidType.banner; + return switch (markupType) { + case 1 -> BidType.banner; + case 2 -> BidType.video; + case 3 -> BidType.audio; + case 4 -> BidType.xNative; + default -> BidType.banner; + }; } } diff --git a/src/test/java/org/prebid/server/bidder/smartadserver/SmartadserverBidderTest.java b/src/test/java/org/prebid/server/bidder/smartadserver/SmartadserverBidderTest.java index 35b7470f758..d31213136fb 100644 --- a/src/test/java/org/prebid/server/bidder/smartadserver/SmartadserverBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/smartadserver/SmartadserverBidderTest.java @@ -4,7 +4,6 @@ import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; -import com.iab.openrtb.request.Native; import com.iab.openrtb.request.Publisher; import com.iab.openrtb.request.Site; import com.iab.openrtb.request.Video; @@ -27,8 +26,10 @@ import java.util.function.Function; import static java.util.Collections.singletonList; +import static java.util.function.UnaryOperator.identity; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.prebid.server.proto.openrtb.ext.response.BidType.audio; import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; import static org.prebid.server.proto.openrtb.ext.response.BidType.video; import static org.prebid.server.proto.openrtb.ext.response.BidType.xNative; @@ -66,7 +67,7 @@ public void makeHttpRequestsShouldReturnErrorIfImpExtCouldNotBeParsed() { public void makeHttpRequestsShouldCreateCorrectURL() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(singletonList(givenImp(Function.identity()))) + .imp(singletonList(givenImp(identity()))) .build(); // when @@ -83,7 +84,7 @@ public void makeHttpRequestsShouldCreateCorrectURL() { public void makeHttpRequestsShouldUpdateSiteObjectIfPresent() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(singletonList(givenImp(Function.identity()))) + .imp(singletonList(givenImp(identity()))) .site(Site.builder() .domain("www.foo.com") .publisher(Publisher.builder().domain("foo.com").build()) @@ -110,7 +111,7 @@ public void makeHttpRequestsShouldUpdateSiteObjectIfPresent() { public void makeHttpRequestsShouldCreateRequestForEveryValidImp() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(Arrays.asList(givenImp(Function.identity()), + .imp(Arrays.asList(givenImp(identity()), givenImp(impBuilder -> impBuilder.id("456")) )) .build(); @@ -196,14 +197,12 @@ public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws Jso } @Test - public void makeBidsShouldReturnBannerBidIfBannerIsPresent() throws JsonProcessingException { + public void makeBidsShouldReturnBannerBidIfMarkupTypeIsBanner() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").banner(Banner.builder().build()).build())) - .build(), + BidRequest.builder().build(), mapper.writeValueAsString( - givenBidResponse(bidBuilder -> bidBuilder.impid("123")))); + givenBidResponse(bidBuilder -> bidBuilder.mtype(1)))); // when final Result> result = target.makeBids(httpCall, null); @@ -211,18 +210,33 @@ public void makeBidsShouldReturnBannerBidIfBannerIsPresent() throws JsonProcessi // then assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) - .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), banner, "EUR")); + .containsOnly(BidderBid.of(Bid.builder().mtype(1).build(), banner, "EUR")); } @Test - public void makeBidsShouldReturnBannerBidByDefault() throws JsonProcessingException { + public void makeBidsShouldReturnAudioBidIfMarkupTypeIsAudio() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").banner(Banner.builder().build()).build())) - .build(), + BidRequest.builder().build(), mapper.writeValueAsString( - givenBidResponse(Function.identity()))); + givenBidResponse(bidBuilder -> bidBuilder.mtype(3)))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().mtype(3).build(), audio, "EUR")); + } + + @Test + public void makeBidsShouldReturnBannerBidIfMarkupTypeIsNull() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder().build(), + mapper.writeValueAsString( + givenBidResponse(identity()))); // when final Result> result = target.makeBids(httpCall, null); @@ -234,14 +248,29 @@ public void makeBidsShouldReturnBannerBidByDefault() throws JsonProcessingExcept } @Test - public void makeBidsShouldReturnVideoBidIfVideoIsPresent() throws JsonProcessingException { + public void makeBidsShouldReturnBannerBidIfMarkupTypeOutOfBounds() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder().build(), + mapper.writeValueAsString( + givenBidResponse(bidBuilder -> bidBuilder.mtype(5)))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().mtype(5).build(), banner, "EUR")); + } + + @Test + public void makeBidsShouldReturnVideoBidIfMarkupTypeIsVideo() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").video(Video.builder().build()).build())) - .build(), + BidRequest.builder().build(), mapper.writeValueAsString( - givenBidResponse(bidBuilder -> bidBuilder.impid("123")))); + givenBidResponse(bidBuilder -> bidBuilder.mtype(2)))); // when final Result> result = target.makeBids(httpCall, null); @@ -249,18 +278,16 @@ public void makeBidsShouldReturnVideoBidIfVideoIsPresent() throws JsonProcessing // then assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) - .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), video, "EUR")); + .containsOnly(BidderBid.of(Bid.builder().mtype(2).build(), video, "EUR")); } @Test - public void makeBidsShouldReturnNativeBidIfNativeIsPresent() throws JsonProcessingException { + public void makeBidsShouldReturnNativeBidIfMarkupTypeIsNative() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").xNative(Native.builder().build()).build())) - .build(), + BidRequest.builder().build(), mapper.writeValueAsString( - givenBidResponse(bidBuilder -> bidBuilder.impid("123")))); + givenBidResponse(bidBuilder -> bidBuilder.mtype(4)))); // when final Result> result = target.makeBids(httpCall, null); @@ -268,7 +295,7 @@ public void makeBidsShouldReturnNativeBidIfNativeIsPresent() throws JsonProcessi // then assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) - .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), xNative, "EUR")); + .containsOnly(BidderBid.of(Bid.builder().mtype(4).build(), xNative, "EUR")); } private static Imp givenImp(Function impCustomizer) { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-auction-smartadserver-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-auction-smartadserver-response.json index 7b143f69a40..a4cd96d82b2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-auction-smartadserver-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-auction-smartadserver-response.json @@ -22,7 +22,8 @@ "type": "banner" }, "origbidcpm": 0.5 - } + }, + "mtype": 1 } ], "seat": "smartadserver", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-smartadserver-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-smartadserver-bid-response.json index cee26a03931..09d1cc62eb9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-smartadserver-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-smartadserver-bid-response.json @@ -15,7 +15,8 @@ "cid": "cid", "crid": "crid", "h": 576, - "w": 1024 + "w": 1024, + "mtype": 1 } ] } From e8e5f126b26c6a45af04f9d8094be4e3202819ce Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Fri, 23 May 2025 10:54:36 +0200 Subject: [PATCH 3/8] Added an integration test for the alias (#3608) --- .../prebid/server/it/SmartadserverTest.java | 25 +++++++- .../test-auction-smartadserver-request.json | 30 ++++++++++ .../test-auction-smartadserver-response.json | 46 ++++++++++++++ .../alias/test-smartadserver-bid-request.json | 60 +++++++++++++++++++ .../test-smartadserver-bid-response.json | 24 ++++++++ 5 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-response.json diff --git a/src/test/java/org/prebid/server/it/SmartadserverTest.java b/src/test/java/org/prebid/server/it/SmartadserverTest.java index 88b5e57c9cf..62e953ac111 100644 --- a/src/test/java/org/prebid/server/it/SmartadserverTest.java +++ b/src/test/java/org/prebid/server/it/SmartadserverTest.java @@ -11,10 +11,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; +import static java.util.Arrays.asList; import static java.util.Collections.singletonList; public class SmartadserverTest extends IntegrationTest { + private static final String SMARTADSERVER = "smartadserver"; + private static final String EQUATIV_ALIAS = "equativ"; + @Test public void openrtb2AuctionShouldRespondWithBidsFromSmartadserver() throws IOException, JSONException { // given @@ -29,6 +33,25 @@ public void openrtb2AuctionShouldRespondWithBidsFromSmartadserver() throws IOExc // then assertJsonEquals("openrtb2/smartadserver/test-auction-smartadserver-response.json", response, - singletonList("smartadserver")); + singletonList(SMARTADSERVER)); + } + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromEquativ() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/smartadserver-exchange/api/bid")) + .withRequestBody( + equalToJson(jsonFrom("openrtb2/smartadserver/alias/test-smartadserver-bid-request.json"))) + .willReturn(aResponse() + .withBody(jsonFrom("openrtb2/smartadserver/alias/test-smartadserver-bid-response.json")))); + + // when + final Response response = responseFor( + "openrtb2/smartadserver/alias/test-auction-smartadserver-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/smartadserver/alias/test-auction-smartadserver-response.json", response, + asList(SMARTADSERVER, EQUATIV_ALIAS)); } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-request.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-request.json new file mode 100644 index 00000000000..bd93b91baf0 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-request.json @@ -0,0 +1,30 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "prebid": { + "bidder": { + "smartadserver": { + "siteId": 1, + "pageId": 2, + "formatId": 3, + "networkId": 73 + } + } + } + } + } + ], + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-response.json new file mode 100644 index 00000000000..bd97f80820d --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-response.json @@ -0,0 +1,46 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "exp": 300, + "price": 0.5, + "adm": "some-test-ad", + "adid": "adid", + "adomain": [ + "advertsite.com" + ], + "cid": "cid", + "crid": "crid", + "w": 1024, + "h": 576, + "ext": { + "prebid": { + "type": "banner", + "meta": { + "adaptercode": "smartadserver" + } + }, + "origbidcpm": 0.5 + }, + "mtype": 1 + } + ], + "seat": "smartadserver", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "smartadserver": "{{ smartadserver.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-request.json new file mode 100644 index 00000000000..05fec0b445d --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-request.json @@ -0,0 +1,60 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "secure": 1, + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "tid": "${json-unit.any-string}", + "bidder": { + "siteId": 1, + "pageId": 2, + "formatId": 3, + "networkId": 73 + } + } + } + ], + "source": { + "tid": "${json-unit.any-string}" + }, + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "id": "73", + "domain": "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": "${json-unit.any-number}", + "cur": [ + "USD" + ], + "regs": { + "ext": { + "gdpr": 0 + } + }, + "ext": { + "prebid": { + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "endpoint": "/openrtb2/auction" + } + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-response.json new file mode 100644 index 00000000000..09d1cc62eb9 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-response.json @@ -0,0 +1,24 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 0.500000, + "adid": "adid", + "adm": "some-test-ad", + "adomain": [ + "advertsite.com" + ], + "cid": "cid", + "crid": "crid", + "h": 576, + "w": 1024, + "mtype": 1 + } + ] + } + ] +} From e30e7ae7f35df6fcc732e61fd2c56bebbdc9494d Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Fri, 23 May 2025 10:54:53 +0200 Subject: [PATCH 4/8] Disable alias by default (#3608) --- src/main/resources/bidder-config/smartadserver.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/bidder-config/smartadserver.yaml b/src/main/resources/bidder-config/smartadserver.yaml index 3e1e75bc5d5..f1233b2e754 100644 --- a/src/main/resources/bidder-config/smartadserver.yaml +++ b/src/main/resources/bidder-config/smartadserver.yaml @@ -3,7 +3,8 @@ adapters: endpoint: https://ssb-global.smartadserver.com endpoint-compression: gzip aliases: - equativ: ~ + equativ: + enabled: false meta-info: maintainer-email: supply-partner-integration@equativ.com app-media-types: From f2ed4ca8283e6c92846640d8cd650e007b1cc0bf Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Fri, 23 May 2025 10:57:02 +0200 Subject: [PATCH 5/8] Simplified conditional statements in the adapter (#3608) --- .../server/bidder/smartadserver/SmartadserverBidder.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java b/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java index a9ee72df740..d6dd53b75d7 100644 --- a/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java +++ b/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java @@ -134,15 +134,12 @@ private Result> extractBids(BidResponse bidResponse) { } private static BidType getBidTypeFromMarkupType(Integer markupType) { - if (markupType == null) { - return BidType.banner; - } return switch (markupType) { case 1 -> BidType.banner; case 2 -> BidType.video; case 3 -> BidType.audio; case 4 -> BidType.xNative; - default -> BidType.banner; + case null, default -> BidType.banner; }; } } From 771ac4645c7e24eb29eb3aa7ab464bfe2b45e485 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Fri, 30 May 2025 10:15:11 +0200 Subject: [PATCH 6/8] Separated the integration test for an alias from Smartadserver's test (#3608) --- .../org/prebid/server/it/EquativTest.java | 37 +++++++++++++++++++ .../prebid/server/it/SmartadserverTest.java | 24 +----------- ...json => test-auction-equativ-request.json} | 0 ...son => test-auction-equativ-response.json} | 0 ...est.json => test-equativ-bid-request.json} | 0 ...se.json => test-equativ-bid-response.json} | 0 6 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 src/test/java/org/prebid/server/it/EquativTest.java rename src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/{test-auction-smartadserver-request.json => test-auction-equativ-request.json} (100%) rename src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/{test-auction-smartadserver-response.json => test-auction-equativ-response.json} (100%) rename src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/{test-smartadserver-bid-request.json => test-equativ-bid-request.json} (100%) rename src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/{test-smartadserver-bid-response.json => test-equativ-bid-response.json} (100%) diff --git a/src/test/java/org/prebid/server/it/EquativTest.java b/src/test/java/org/prebid/server/it/EquativTest.java new file mode 100644 index 00000000000..4f9fecd14de --- /dev/null +++ b/src/test/java/org/prebid/server/it/EquativTest.java @@ -0,0 +1,37 @@ +package org.prebid.server.it; + +import io.restassured.response.Response; +import org.json.JSONException; +import org.junit.jupiter.api.Test; +import org.prebid.server.model.Endpoint; + +import java.io.IOException; +import java.util.List; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; + +// Alias for Smartadserver +public class EquativTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromEquativ() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/smartadserver-exchange/api/bid")) + .withRequestBody( + equalToJson(jsonFrom("openrtb2/smartadserver/alias/test-equativ-bid-request.json"))) + .willReturn(aResponse() + .withBody(jsonFrom("openrtb2/smartadserver/alias/test-equativ-bid-response.json")))); + + // when + final Response response = responseFor( + "openrtb2/smartadserver/alias/test-auction-equativ-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/smartadserver/alias/test-auction-equativ-response.json", response, + List.of("smartadserver", "equativ")); + } +} diff --git a/src/test/java/org/prebid/server/it/SmartadserverTest.java b/src/test/java/org/prebid/server/it/SmartadserverTest.java index 62e953ac111..fdc8ebce220 100644 --- a/src/test/java/org/prebid/server/it/SmartadserverTest.java +++ b/src/test/java/org/prebid/server/it/SmartadserverTest.java @@ -11,14 +11,10 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static java.util.Arrays.asList; import static java.util.Collections.singletonList; public class SmartadserverTest extends IntegrationTest { - private static final String SMARTADSERVER = "smartadserver"; - private static final String EQUATIV_ALIAS = "equativ"; - @Test public void openrtb2AuctionShouldRespondWithBidsFromSmartadserver() throws IOException, JSONException { // given @@ -33,25 +29,7 @@ public void openrtb2AuctionShouldRespondWithBidsFromSmartadserver() throws IOExc // then assertJsonEquals("openrtb2/smartadserver/test-auction-smartadserver-response.json", response, - singletonList(SMARTADSERVER)); + singletonList("smartadserver")); } - @Test - public void openrtb2AuctionShouldRespondWithBidsFromEquativ() throws IOException, JSONException { - // given - WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/smartadserver-exchange/api/bid")) - .withRequestBody( - equalToJson(jsonFrom("openrtb2/smartadserver/alias/test-smartadserver-bid-request.json"))) - .willReturn(aResponse() - .withBody(jsonFrom("openrtb2/smartadserver/alias/test-smartadserver-bid-response.json")))); - - // when - final Response response = responseFor( - "openrtb2/smartadserver/alias/test-auction-smartadserver-request.json", - Endpoint.openrtb2_auction); - - // then - assertJsonEquals("openrtb2/smartadserver/alias/test-auction-smartadserver-response.json", response, - asList(SMARTADSERVER, EQUATIV_ALIAS)); - } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-request.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-request.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-request.json rename to src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-request.json diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-response.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-smartadserver-response.json rename to src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-response.json diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-equativ-bid-request.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-request.json rename to src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-equativ-bid-request.json diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-equativ-bid-response.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-smartadserver-bid-response.json rename to src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-equativ-bid-response.json From e1a132a8bd583b8221c88fd3e98f38da5239d274 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Wed, 25 Jun 2025 09:04:45 +0200 Subject: [PATCH 7/8] Codestyle-related post-review changes (#3608) --- src/test/java/org/prebid/server/it/EquativTest.java | 1 - src/test/java/org/prebid/server/it/SmartadserverTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/test/java/org/prebid/server/it/EquativTest.java b/src/test/java/org/prebid/server/it/EquativTest.java index 4f9fecd14de..46b079f426c 100644 --- a/src/test/java/org/prebid/server/it/EquativTest.java +++ b/src/test/java/org/prebid/server/it/EquativTest.java @@ -13,7 +13,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -// Alias for Smartadserver public class EquativTest extends IntegrationTest { @Test diff --git a/src/test/java/org/prebid/server/it/SmartadserverTest.java b/src/test/java/org/prebid/server/it/SmartadserverTest.java index fdc8ebce220..88b5e57c9cf 100644 --- a/src/test/java/org/prebid/server/it/SmartadserverTest.java +++ b/src/test/java/org/prebid/server/it/SmartadserverTest.java @@ -31,5 +31,4 @@ public void openrtb2AuctionShouldRespondWithBidsFromSmartadserver() throws IOExc assertJsonEquals("openrtb2/smartadserver/test-auction-smartadserver-response.json", response, singletonList("smartadserver")); } - } From 05e7465ffbe80db19082e1231611d088ce03a9f6 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Mon, 14 Jul 2025 09:12:55 +0200 Subject: [PATCH 8/8] Corrected Equativ integration test (#3608) --- src/test/java/org/prebid/server/it/EquativTest.java | 12 ++++++------ .../test-auction-equativ-request.json | 2 +- .../test-auction-equativ-response.json | 6 +++--- .../alias => equativ}/test-equativ-bid-request.json | 0 .../alias => equativ}/test-equativ-bid-response.json | 0 .../org/prebid/server/it/test-application.properties | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) rename src/test/resources/org/prebid/server/it/openrtb2/{smartadserver/alias => equativ}/test-auction-equativ-request.json (93%) rename src/test/resources/org/prebid/server/it/openrtb2/{smartadserver/alias => equativ}/test-auction-equativ-response.json (84%) rename src/test/resources/org/prebid/server/it/openrtb2/{smartadserver/alias => equativ}/test-equativ-bid-request.json (100%) rename src/test/resources/org/prebid/server/it/openrtb2/{smartadserver/alias => equativ}/test-equativ-bid-response.json (100%) diff --git a/src/test/java/org/prebid/server/it/EquativTest.java b/src/test/java/org/prebid/server/it/EquativTest.java index 46b079f426c..e3464330edd 100644 --- a/src/test/java/org/prebid/server/it/EquativTest.java +++ b/src/test/java/org/prebid/server/it/EquativTest.java @@ -6,12 +6,12 @@ import org.prebid.server.model.Endpoint; import java.io.IOException; -import java.util.List; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; +import static java.util.Collections.singletonList; public class EquativTest extends IntegrationTest { @@ -20,17 +20,17 @@ public void openrtb2AuctionShouldRespondWithBidsFromEquativ() throws IOException // given WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/smartadserver-exchange/api/bid")) .withRequestBody( - equalToJson(jsonFrom("openrtb2/smartadserver/alias/test-equativ-bid-request.json"))) + equalToJson(jsonFrom("openrtb2/equativ/test-equativ-bid-request.json"))) .willReturn(aResponse() - .withBody(jsonFrom("openrtb2/smartadserver/alias/test-equativ-bid-response.json")))); + .withBody(jsonFrom("openrtb2/equativ/test-equativ-bid-response.json")))); // when final Response response = responseFor( - "openrtb2/smartadserver/alias/test-auction-equativ-request.json", + "openrtb2/equativ/test-auction-equativ-request.json", Endpoint.openrtb2_auction); // then - assertJsonEquals("openrtb2/smartadserver/alias/test-auction-equativ-response.json", response, - List.of("smartadserver", "equativ")); + assertJsonEquals("openrtb2/equativ/test-auction-equativ-response.json", response, + singletonList("equativ")); } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-request.json b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-request.json similarity index 93% rename from src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-request.json rename to src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-request.json index bd93b91baf0..acd98861296 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-request.json @@ -10,7 +10,7 @@ "ext": { "prebid": { "bidder": { - "smartadserver": { + "equativ": { "siteId": 1, "pageId": 2, "formatId": 3, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-response.json b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-response.json similarity index 84% rename from src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-response.json rename to src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-response.json index bd97f80820d..04029bdb400 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-auction-equativ-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-response.json @@ -21,7 +21,7 @@ "prebid": { "type": "banner", "meta": { - "adaptercode": "smartadserver" + "adaptercode": "equativ" } }, "origbidcpm": 0.5 @@ -29,14 +29,14 @@ "mtype": 1 } ], - "seat": "smartadserver", + "seat": "equativ", "group": 0 } ], "cur": "USD", "ext": { "responsetimemillis": { - "smartadserver": "{{ smartadserver.response_time_ms }}" + "equativ": "{{ equativ.response_time_ms }}" }, "prebid": { "auctiontimestamp": 0 diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-equativ-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-request.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-equativ-bid-request.json rename to src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-request.json diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-equativ-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-response.json similarity index 100% rename from src/test/resources/org/prebid/server/it/openrtb2/smartadserver/alias/test-equativ-bid-response.json rename to src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-response.json diff --git a/src/test/resources/org/prebid/server/it/test-application.properties b/src/test/resources/org/prebid/server/it/test-application.properties index 450ae419cb5..cf752c65069 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -445,6 +445,7 @@ adapters.smaato.enabled=true adapters.smaato.endpoint=http://localhost:8090/smaato-exchange adapters.smartadserver.enabled=true adapters.smartadserver.endpoint=http://localhost:8090/smartadserver-exchange +adapters.smartadserver.aliases.equativ.enabled=true adapters.smartrtb.enabled=true adapters.smartrtb.endpoint=http://localhost:8090/smartrtb-exchange/ adapters.smartx.enabled=true