diff --git a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataServiceTest.java b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataServiceTest.java index 1a93b22a502..ff10c9bd69a 100644 --- a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataServiceTest.java +++ b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataServiceTest.java @@ -90,7 +90,7 @@ public void extractThrottlingMessagesFromBidRequestShouldReturnValidThrottlingMe assertThat(throttlingMessages).isNotEmpty(); assertThat(throttlingMessages) .extracting(ThrottlingMessage::getBidder) - .containsExactly("rubicon", "appnexus", "pubmatic"); + .containsExactly("magnite", "appnexus", "pubmatic"); throttlingMessages.forEach(message -> { assertThat(message.getAdUnitCode()).isEqualTo("adunitcodevalue"); @@ -128,7 +128,7 @@ public void extractThrottlingMessagesFromBidRequestShouldReturnValidThrottlingMe assertThat(throttlingMessages).isNotEmpty(); assertThat(throttlingMessages) .extracting(ThrottlingMessage::getBidder) - .containsExactly("rubicon", "appnexus", "pubmatic"); + .containsExactly("magnite", "appnexus", "pubmatic"); throttlingMessages.forEach(message -> { assertThat(message.getAdUnitCode()).isEqualTo("adunitcodevalue"); @@ -162,7 +162,7 @@ public void extractThrottlingMessagesFromBidRequestShouldHandleMissingIp() { assertThat(throttlingMessages).isNotEmpty(); assertThat(throttlingMessages) .extracting(ThrottlingMessage::getBidder) - .containsExactly("rubicon", "appnexus", "pubmatic"); + .containsExactly("magnite", "appnexus", "pubmatic"); throttlingMessages.forEach(message -> { assertThat(message.getAdUnitCode()).isEqualTo("adunitcodevalue"); diff --git a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationResultCreatorTest.java b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationResultCreatorTest.java index 1aa9e5022b4..50f2afd2b57 100644 --- a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationResultCreatorTest.java +++ b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationResultCreatorTest.java @@ -49,7 +49,7 @@ public void createGreenbidsInvocationResultWhenNotExploration() { assertThat(ortb2ImpExtResult).isNotNull(); assertThat(ortb2ImpExtResult.getGreenbids().getIsExploration()).isFalse(); assertThat(ortb2ImpExtResult.getGreenbids().getFingerprint()).isNotNull(); - assertThat(keptInAuction.get("rubicon")).isTrue(); + assertThat(keptInAuction.get("magnite")).isTrue(); assertThat(keptInAuction.get("appnexus")).isFalse(); assertThat(keptInAuction.get("pubmatic")).isFalse(); } @@ -78,7 +78,7 @@ public void createShouldReturnNoActionWhenExploration() { assertThat(ortb2ImpExtResult).isNotNull(); assertThat(ortb2ImpExtResult.getGreenbids().getIsExploration()).isTrue(); assertThat(ortb2ImpExtResult.getGreenbids().getFingerprint()).isNotNull(); - assertThat(keptInAuction.get("rubicon")).isFalse(); + assertThat(keptInAuction.get("magnite")).isFalse(); assertThat(keptInAuction.get("appnexus")).isFalse(); assertThat(keptInAuction.get("pubmatic")).isFalse(); } @@ -107,14 +107,14 @@ public void createShouldReturnRejectWhenAllImpsAreFilteredOutAndNoExploration() assertThat(ortb2ImpExtResult).isNotNull(); assertThat(ortb2ImpExtResult.getGreenbids().getIsExploration()).isFalse(); assertThat(ortb2ImpExtResult.getGreenbids().getFingerprint()).isNotNull(); - assertThat(keptInAuction.get("rubicon")).isFalse(); + assertThat(keptInAuction.get("magnite")).isFalse(); assertThat(keptInAuction.get("appnexus")).isFalse(); assertThat(keptInAuction.get("pubmatic")).isFalse(); } private Map> givenImpsBiddersFilterMap() { final Map biddersFitlerMap = Map.of( - "rubicon", true, + "magnite", true, "appnexus", false, "pubmatic", false); @@ -123,7 +123,7 @@ private Map> givenImpsBiddersFilterMap() { private Map> givenFilterMapWithAllFilteredImps() { final Map biddersFitlerMap = Map.of( - "rubicon", false, + "magnite", false, "appnexus", false, "pubmatic", false); diff --git a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsPayloadUpdaterTest.java b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsPayloadUpdaterTest.java index 261742146fa..dbc01798d26 100644 --- a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsPayloadUpdaterTest.java +++ b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsPayloadUpdaterTest.java @@ -11,7 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getAppnexusNode; import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getPubmaticNode; -import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getRubiconNode; +import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getMagniteNode; import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenBidRequest; import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenImpExt; @@ -22,18 +22,18 @@ public void updateShouldReturnUpdatedBidRequest() { // given final Imp givenImp = Imp.builder() .id("adunitcodevalue") - .ext(givenImpExt(getRubiconNode(), getAppnexusNode(), getPubmaticNode())) + .ext(givenImpExt(getMagniteNode(), getAppnexusNode(), getPubmaticNode())) .build(); // when final BidRequest result = GreenbidsPayloadUpdater.update( givenBidRequest(identity(), List.of(givenImp)), - Map.of("adunitcodevalue", Map.of("rubicon", true, "appnexus", false, "pubmatic", false))); + Map.of("adunitcodevalue", Map.of("magnite", true, "appnexus", false, "pubmatic", false))); // then final Imp expectedImp = Imp.builder() .id("adunitcodevalue") - .ext(givenImpExt(getRubiconNode(), null, null)) + .ext(givenImpExt(getMagniteNode(), null, null)) .build(); assertThat(result.getImp()).containsOnly(expectedImp); @@ -44,13 +44,13 @@ public void updateShouldRemoveImpFromUpdateBidRequestWhenAllBiddersFiltered() { // given final Imp givenImp = Imp.builder() .id("adunitcodevalue") - .ext(givenImpExt(getRubiconNode(), null, null)) + .ext(givenImpExt(getMagniteNode(), null, null)) .build(); // when final BidRequest result = GreenbidsPayloadUpdater.update( givenBidRequest(identity(), List.of(givenImp)), - Map.of("adunitcodevalue", Map.of("rubicon", false, "appnexus", false, "pubmatic", false))); + Map.of("adunitcodevalue", Map.of("magnite", false, "appnexus", false, "pubmatic", false))); // then assertThat(result.getImp()).isEmpty(); diff --git a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/OnnxModelRunnerTest.java b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/OnnxModelRunnerTest.java index 51c4b34ff91..628717cb325 100644 --- a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/OnnxModelRunnerTest.java +++ b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/OnnxModelRunnerTest.java @@ -29,7 +29,7 @@ public void setUp() throws OrtException, IOException { public void runModelShouldReturnProbabilitiesWhenValidThrottlingInferenceRow() throws OrtException { // given final String[][] throttlingInferenceRow = {{ - "Chrome 59", "rubicon", "adunitcodevalue", "US", "www.leparisien.fr", "PC", "10", "1"}}; + "Chrome 59", "magnite", "adunitcodevalue", "US", "www.leparisien.fr", "PC", "10", "1"}}; // when final OrtSession.Result actualResult = target.runModel(throttlingInferenceRow); diff --git a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/util/TestBidRequestProvider.java b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/util/TestBidRequestProvider.java index 9a33620c087..4a90a45d393 100644 --- a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/util/TestBidRequestProvider.java +++ b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/util/TestBidRequestProvider.java @@ -37,14 +37,14 @@ public static Site givenSite() { } public static ObjectNode givenImpExt() { - return givenImpExt(getRubiconNode(), getAppnexusNode(), getPubmaticNode()); + return givenImpExt(getMagniteNode(), getAppnexusNode(), getPubmaticNode()); } - public static ObjectNode givenImpExt(ObjectNode rubiconNode, ObjectNode appnexusNode, ObjectNode pubmaticNode) { + public static ObjectNode givenImpExt(ObjectNode magniteNode, ObjectNode appnexusNode, ObjectNode pubmaticNode) { final ObjectNode bidderNode = MAPPER.createObjectNode(); - if (rubiconNode != null) { - bidderNode.set("rubicon", rubiconNode); + if (magniteNode != null) { + bidderNode.set("magnite", magniteNode); } if (appnexusNode != null) { @@ -70,7 +70,7 @@ public static ObjectNode getAppnexusNode() { return MAPPER.createObjectNode().put("placementId", 123456); } - public static ObjectNode getRubiconNode() { + public static ObjectNode getMagniteNode() { return MAPPER.createObjectNode() .put("accountId", 1001) .put("siteId", 267318) diff --git a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java index 42e16253445..290bc0f0d98 100644 --- a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java +++ b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; import static org.prebid.server.auction.model.BidRejectionReason.REQUEST_BLOCKED_OPTIMIZED; import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.MAPPER; -import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getRubiconNode; +import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getMagniteNode; import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenBidRequest; import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenImpExt; @@ -84,7 +84,7 @@ public void callShouldReturnAnalyticTagsWithoutFilteringOutBiddersWhenExploratio final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(explorationRate); given(filterService.filterBidders(any(), any(), any())).willReturn(Map.of("adunitcodevalue", - Map.of("rubicon", false, "appnexus", false, "pubmatic", false))); + Map.of("magnite", false, "appnexus", false, "pubmatic", false))); // when final Future> future = target @@ -100,11 +100,11 @@ public void callShouldReturnAnalyticTagsWithoutFilteringOutBiddersWhenExploratio final ResultImpl actualResult = (ResultImpl) actualActivity.results().getFirst(); final AppliedTo acctualAppliedTo = actualResult.appliedTo(); - assertThat(acctualAppliedTo.bidders()).containsOnly("appnexus", "pubmatic", "rubicon"); + assertThat(acctualAppliedTo.bidders()).containsOnly("appnexus", "pubmatic", "magnite"); assertThat(acctualAppliedTo.impIds()).containsOnly("adunitcodevalue"); assertThat(actualResult.values().get("adunitcodevalue").get("greenbids").get("keptInAuction")) .isEqualTo(MAPPER.createObjectNode() - .put("rubicon", false) + .put("magnite", false) .put("appnexus", false) .put("pubmatic", false)); assertThat(actualResult.values().get("adunitcodevalue").get("greenbids").get("fingerprint").asText()) @@ -127,7 +127,7 @@ public void callShouldFilterBiddersBasedOnModelResultsWhenExplorationIsFalse() { final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(explorationRate); given(filterService.filterBidders(any(), any(), any())).willReturn(Map.of("adunitcodevalue", - Map.of("rubicon", true, "appnexus", false, "pubmatic", false))); + Map.of("magnite", true, "appnexus", false, "pubmatic", false))); // when final Future> future = target @@ -145,7 +145,7 @@ public void callShouldFilterBiddersBasedOnModelResultsWhenExplorationIsFalse() { final Imp expectedImp = Imp.builder() .id("adunitcodevalue") - .ext(givenImpExt(getRubiconNode(), null, null)) + .ext(givenImpExt(getMagniteNode(), null, null)) .build(); assertThat(resultBidRequest).isEqualTo(givenBidRequest(identity(), List.of(expectedImp))); @@ -157,7 +157,7 @@ public void callShouldFilterBiddersBasedOnModelResultsWhenExplorationIsFalse() { assertThat(acctualAppliedTo.impIds()).containsOnly("adunitcodevalue"); assertThat(actualResult.values().get("adunitcodevalue").get("greenbids").get("keptInAuction")) .isEqualTo(MAPPER.createObjectNode() - .put("rubicon", true) + .put("magnite", true) .put("appnexus", false) .put("pubmatic", false)); assertThat(actualResult.values().get("adunitcodevalue").get("greenbids").get("fingerprint").asText()) diff --git a/src/test/groovy/org/prebid/server/functional/tests/BidderFieldDisplayBehaviorSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/BidderFieldDisplayBehaviorSpec.groovy index 6acd01d09cd..57df9ae7c53 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/BidderFieldDisplayBehaviorSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/BidderFieldDisplayBehaviorSpec.groovy @@ -48,7 +48,7 @@ import static org.prebid.server.functional.model.Currency.USD import static org.prebid.server.functional.model.bidder.BidderName.ALIAS import static org.prebid.server.functional.model.bidder.BidderName.GENERIC import static org.prebid.server.functional.model.bidder.BidderName.OPENX -import static org.prebid.server.functional.model.bidder.BidderName.RUBICON +import static org.prebid.server.functional.model.bidder.BidderName.MAGNITE import static org.prebid.server.functional.model.mock.services.currencyconversion.CurrencyConversionRatesResponse.defaultConversionRates import static org.prebid.server.functional.model.request.auction.AdjustmentType.MULTIPLIER import static org.prebid.server.functional.model.request.auction.BidAdjustmentMediaType.BANNER @@ -342,7 +342,7 @@ class BidderFieldDisplayBehaviorSpec extends BaseSpec { ext.prebid.alternateBidderCodes = new AlternateBidderCodes().tap { it.enabled = true it.bidders = [(GENERIC): new CodesBidderConfig(enabled: true, allowedBidderCodes: [GENERIC]), - (RUBICON): new CodesBidderConfig(enabled: true, allowedBidderCodes: [RUBICON])] + (MAGNITE): new CodesBidderConfig(enabled: true, allowedBidderCodes: [MAGNITE])] } } @@ -497,11 +497,11 @@ class BidderFieldDisplayBehaviorSpec extends BaseSpec { given: "Default basic BidRequest with generic bidder with includeBidderKeys = false" def bidRequest = BidRequest.defaultBidRequest - and: "Set maxbids = 2 for generic and rubicon bidder" + and: "Set maxbids = 2 for generic and magnite bidder" def maxBids = 2 def genericMultiBid = new MultiBid(bidder: GENERIC, maxBids: maxBids, targetBidderCodePrefix: PBSUtils.randomString) - def rubiconMultiBid = new MultiBid(bidder: RUBICON, maxBids: maxBids, targetBidderCodePrefix: PBSUtils.randomString) - bidRequest.ext.prebid.multibid = [genericMultiBid, rubiconMultiBid] + def magniteMultiBid = new MultiBid(bidder: MAGNITE, maxBids: maxBids, targetBidderCodePrefix: PBSUtils.randomString) + bidRequest.ext.prebid.multibid = [genericMultiBid, magniteMultiBid] and: "Default basic bid" def bidResponse = BidResponse.getDefaultBidResponse(bidRequest) diff --git a/src/test/java/org/prebid/server/auction/BasicCategoryMappingServiceTest.java b/src/test/java/org/prebid/server/auction/BasicCategoryMappingServiceTest.java index 7be988f887a..9b68eb0560b 100644 --- a/src/test/java/org/prebid/server/auction/BasicCategoryMappingServiceTest.java +++ b/src/test/java/org/prebid/server/auction/BasicCategoryMappingServiceTest.java @@ -79,7 +79,7 @@ public void setUp() { public void applyCategoryMappingShouldReturnFilteredBidsWithCategory() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "9", singletonList("cat1")), BidType.video, 10), givenBidderBid(givenBid("2", null, "15", singletonList("cat2")), @@ -122,14 +122,14 @@ public void applyCategoryMappingShouldReturnFilteredBidsWithCategory() { .containsOnly("2", "3", "4"); assertThat(resultFuture.result().getErrors()).hasSize(1) - .containsOnly("Bid rejected [bidder: rubicon, bid ID: 1] with a reason: Bid was deduplicated"); + .containsOnly("Bid rejected [bidder: magnite, bid ID: 1] with a reason: Bid was deduplicated"); } @Test public void applyCategoryMappingShouldTolerateBidsWithSameIdWithingDifferentBidders() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBid", givenBidderBid(givenBid("1", null, "5", singletonList("cat2")), BidType.video, 3))); @@ -163,7 +163,7 @@ public void applyCategoryMappingShouldTolerateBidsWithSameIdWithingDifferentBidd public void applyCategoryMappingShouldNotCallFetchCategoryWhenTranslateCategoriesFalse() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(1, "publisher", @@ -185,7 +185,7 @@ public void applyCategoryMappingShouldNotCallFetchCategoryWhenTranslateCategorie public void applyCategoryMappingShouldReturnFailedFutureWhenTranslateTrueAndAdServerNull() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(null, "publisher", null, true, true); @@ -201,7 +201,7 @@ bidderResponses, givenBidRequestWithTargeting(extRequestTargeting), Account.empt public void applyCategoryMappingShouldReturnFailedFutureWhenTranslateTrueAndAdServerIsThree() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(3, "publisher", null, true, true); @@ -217,7 +217,7 @@ bidderResponses, givenBidRequestWithTargeting(extRequestTargeting), Account.empt public void applyCategoryMappingShouldReturnUseFreewheelAdServerWhenAdServerIs1() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(1, "publisher", @@ -241,7 +241,7 @@ public void applyCategoryMappingShouldReturnUseFreewheelAdServerWhenAdServerIs1( public void applyCategoryMappingShouldReturnUseDpfAdServerWhenAdServerIs2() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(2, "publisher", @@ -265,7 +265,7 @@ public void applyCategoryMappingShouldReturnUseDpfAdServerWhenAdServerIs2() { public void applyCategoryMappingShouldRejectBidsWithFailedCategoryFetch() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBid", givenBidderBid(givenBid("2", null, "5", singletonList("cat2")), BidType.video, 3))); @@ -293,7 +293,7 @@ public void applyCategoryMappingShouldRejectBidsWithFailedCategoryFetch() { public void applyCategoryMappingShouldRejectBidsWithCatLengthMoreThanOne() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBid", givenBidderBid(givenBid("2", null, "5", asList("cat2-1", "cat2-2")), BidType.video, 3))); @@ -321,7 +321,7 @@ public void applyCategoryMappingShouldRejectBidsWithCatLengthMoreThanOne() { public void applyCategoryMappingShouldRejectBidsWithWhenCatIsNull() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse( "otherBid", givenBidderBid(givenBid("2", null, "5", null), BidType.video, 3))); @@ -349,7 +349,7 @@ public void applyCategoryMappingShouldRejectBidsWithWhenCatIsNull() { public void applyCategoryMappingShouldRejectBidWhenNullCategoryReturnedFromSource() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBid", givenBidderBid(givenBid("2", null, "5", singletonList("cat2")), BidType.video, 3))); @@ -377,7 +377,7 @@ public void applyCategoryMappingShouldRejectBidWhenNullCategoryReturnedFromSourc public void applyCategoryMappingShouldUseMediaTypePriceGranularityIfDefined() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = ExtRequestTargeting.builder() @@ -405,7 +405,7 @@ public void applyCategoryMappingShouldUseMediaTypePriceGranularityIfDefined() { public void applyCategoryMappingShouldRejectBidIfItsDurationLargerThanTargetingMax() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBid", givenBidderBid(givenBid("2", null, "5", singletonList("cat2")), BidType.video, 20))); @@ -433,7 +433,7 @@ public void applyCategoryMappingShouldRejectBidIfItsDurationLargerThanTargetingM public void applyCategoryMappingShouldReturnEmptyCategoryMappingResult() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, null))); final ExtRequestTargeting extRequestTargeting = ExtRequestTargeting.builder().build(); @@ -457,7 +457,7 @@ public void applyCategoryMappingShouldReturnFirstVideoCategoryIfPresent() { // given final List bidderResponses = List.of( givenBidderResponse( - "rubicon", + "magnite", givenBidderBid( givenBid("1", null, "10", singletonList("cat1"), "videoCategory"), BidType.video, @@ -482,7 +482,7 @@ public void applyCategoryMappingShouldReturnEmptyCategoryIfNotWithCategory() { // given final List bidderResponses = List.of( givenBidderResponse( - "rubicon", + "magnite", givenBidderBid( givenBid("1", null, "10", singletonList("cat1"), "videoCategory"), BidType.video, @@ -507,7 +507,7 @@ public void applyCategoryMappingShouldReturnFirstIabBidCategoryIfWithCategoryAnd // given final List bidderResponses = List.of( givenBidderResponse( - "rubicon", + "magnite", givenBidderBid( givenBid("1", null, "10", List.of("cat1")), BidType.video, @@ -532,7 +532,7 @@ public void applyCategoryMappingShouldReturnFetchedCategoryIfWithCategoryAndTran // given final List bidderResponses = List.of( givenBidderResponse( - "rubicon", + "magnite", givenBidderBid( givenBid("1", null, "10", List.of("cat1")), BidType.video, @@ -559,7 +559,7 @@ public void applyCategoryMappingShouldReturnFetchedCategoryIfWithCategoryAndTran public void applyCategoryMappingShouldSetFirstDurationFromRangeIfDurationIsNull() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, null))); final ExtRequestTargeting extRequestTargeting = givenTargeting(1, "publisher", @@ -582,7 +582,7 @@ public void applyCategoryMappingShouldSetFirstDurationFromRangeIfDurationIsNull( public void applyCategoryMappingShouldDeduplicateBidsByFetchedCategoryWhenWithCategoryIsTrue() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBid", givenBidderBid(givenBid("2", null, "5", singletonList("cat2")), BidType.video, 4))); @@ -610,7 +610,7 @@ public void applyCategoryMappingShouldDeduplicateBidsByFetchedCategoryWhenWithCa public void applyCategoryMappingShouldDeduplicateBidsByBidCatWhenWithCategoryIsTrueAndTranslateFalse() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBid", givenBidderBid(givenBid("2", null, "5", singletonList("cat1")), BidType.video, 4))); @@ -637,7 +637,7 @@ public void applyCategoryMappingShouldDeduplicateBidsByBidCatWhenWithCategoryIsT public void applyCategoryMappingShouldDeduplicateBidsByPriceAndDurationIfWithCategoryFalse() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBid", givenBidderBid(givenBid("2", null, "10", singletonList("cat2")), BidType.video, 10))); @@ -665,7 +665,7 @@ public void applyCategoryMappingShouldDeduplicateBidsByPriceAndDurationIfWithCat public void applyCategoryMappingShouldReturnDurCatBuiltFromPriceAndFetchedCategoryAndDuration() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(1, "publisher", asList(10, 15, 5), true, true); @@ -687,7 +687,7 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriceAndFetchedCatego public void applyCategoryMappingShouldReturnDurCatBuiltFromPriceAndBidCatAndDuration() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(1, "publisher", asList(10, 15, 5), true, false); @@ -709,7 +709,7 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriceAndBidCatAndDura public void applyCategoryMappingShouldReturnDurCatBuiltFromPriceAndBidCatAndDurationAndBidder() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(1, "publisher", asList(10, 15, 5), true, false) @@ -725,14 +725,14 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriceAndBidCatAndDura assertThat(resultFuture.succeeded()).isTrue(); assertThat(resultFuture.result().getBiddersToBidsCategories()) .isEqualTo(Collections.singletonMap(givenBid("1", null, "10", singletonList("cat1")), - "10.00_cat1_10s_rubicon")); + "10.00_cat1_10s_magnite")); } @Test public void applyCategoryMappingShouldReturnDurCatBuiltFromPriceAndDuration() { // given final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10))); final ExtRequestTargeting extRequestTargeting = givenTargeting(1, "publisher", asList(10, 15, 5), false, null); @@ -754,7 +754,7 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriorityAndDuration() // given final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") - .ext(mapper.createObjectNode().set("rubicon", givenDealTier("rubiconPrefix", 3))) + .ext(mapper.createObjectNode().set("magnite", givenDealTier("magnitePrefix", 3))) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), false, null)) @@ -763,7 +763,7 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriorityAndDuration() .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -777,7 +777,7 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriorityAndDuration() assertThat(resultFuture.succeeded()).isTrue(); assertThat(resultFuture.result().getBiddersToBidsCategories()) .isEqualTo(Collections.singletonMap(givenBid("1", "impId1", "10", singletonList("cat1")), - "rubiconPrefix3_10s")); + "magnitePrefix3_10s")); assertThat(resultFuture.result().getBidderResponses()) .extracting(BidderResponse::getSeatBid) .flatExtracting(BidderSeatBid::getBids).hasSize(1); @@ -791,7 +791,7 @@ public void applyCategoryMappingShouldUseDealTierFromImpExtPrebidBidders() { .imp(singletonList(Imp.builder().id("impId1") .ext(mapper.valueToTree(ExtImp.of(ExtImpPrebid.builder() .bidder(mapper.createObjectNode() - .set("rubicon", givenDealTier("prebidPrefix", 4))).build(), null))) + .set("magnite", givenDealTier("prebidPrefix", 4))).build(), null))) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), false, null)) @@ -800,7 +800,7 @@ public void applyCategoryMappingShouldUseDealTierFromImpExtPrebidBidders() { .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -825,9 +825,9 @@ public void applyCategoryMappingShouldUseDealTierFromImpExtPrebidBidders() { public void applyCategoryMappingShouldPrecedencePriorityAndDurationFromPrebidOverFromImpExt() { // given final ExtImp extImp = ExtImp.of(ExtImpPrebid.builder() - .bidder(mapper.createObjectNode().set("rubicon", givenDealTier("prebidPrefix", 4))).build(), null); + .bidder(mapper.createObjectNode().set("magnite", givenDealTier("prebidPrefix", 4))).build(), null); final ObjectNode impExt = mapper.valueToTree(extImp); - impExt.set("rubicon", givenDealTier("extPrefix", 3)); + impExt.set("magnite", givenDealTier("extPrefix", 3)); final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") .ext(impExt) @@ -839,7 +839,7 @@ public void applyCategoryMappingShouldPrecedencePriorityAndDurationFromPrebidOve .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -865,7 +865,7 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriorityCatAndDuratio // given final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") - .ext(mapper.createObjectNode().set("rubicon", givenDealTier("rubiconPrefix", 3))) + .ext(mapper.createObjectNode().set("magnite", givenDealTier("magnitePrefix", 3))) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), true, true)) @@ -874,7 +874,7 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriorityCatAndDuratio .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -888,7 +888,7 @@ public void applyCategoryMappingShouldReturnDurCatBuiltFromPriorityCatAndDuratio assertThat(resultFuture.succeeded()).isTrue(); assertThat(resultFuture.result().getBiddersToBidsCategories()) .isEqualTo(Collections.singletonMap(givenBid("1", "impId1", "10", singletonList("cat1")), - "rubiconPrefix3_fetchedCat1_10s")); + "magnitePrefix3_fetchedCat1_10s")); assertThat(resultFuture.result().getBidderResponses()) .extracting(BidderResponse::getSeatBid) .flatExtracting(BidderSeatBid::getBids).hasSize(1); @@ -902,7 +902,7 @@ public void applyCategoryMappingShouldBuildCatDurFromPriceCatAndDurIfSupportDeal // given final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") - .ext(mapper.createObjectNode().set("rubicon", givenDealTier("rubiconPrefix", 3))) + .ext(mapper.createObjectNode().set("magnite", givenDealTier("magnitePrefix", 3))) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), true, true)) @@ -911,7 +911,7 @@ public void applyCategoryMappingShouldBuildCatDurFromPriceCatAndDurIfSupportDeal .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -937,7 +937,7 @@ public void applyCategoryMappingShouldBuildCatDurFromPriceCatAndDurIfBidPriority // given final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") - .ext(mapper.createObjectNode().set("rubicon", givenDealTier("rubiconPrefix", 10))) + .ext(mapper.createObjectNode().set("magnite", givenDealTier("magnitePrefix", 10))) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), true, true)) @@ -946,7 +946,7 @@ public void applyCategoryMappingShouldBuildCatDurFromPriceCatAndDurIfBidPriority .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -972,7 +972,7 @@ public void applyCategoryMappingShouldBuildCatDurFromPriceCatAndDurIfBidPriority @Test public void applyCategoryMappingShouldIgnoreContextAndPrebidInImpExt() { // given - final ObjectNode impExt = mapper.createObjectNode().set("rubicon", givenDealTier("rubiconPrefix", 3)); + final ObjectNode impExt = mapper.createObjectNode().set("magnite", givenDealTier("magnitePrefix", 3)); impExt.set("context", mapper.createObjectNode()); impExt.set("prebid", mapper.createObjectNode()); final BidRequest bidRequest = BidRequest.builder() @@ -986,7 +986,7 @@ public void applyCategoryMappingShouldIgnoreContextAndPrebidInImpExt() { .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -1000,7 +1000,7 @@ public void applyCategoryMappingShouldIgnoreContextAndPrebidInImpExt() { assertThat(resultFuture.succeeded()).isTrue(); assertThat(resultFuture.result().getBiddersToBidsCategories()) .isEqualTo(Collections.singletonMap(givenBid("1", "impId1", "10", singletonList("cat1")), - "rubiconPrefix3_fetchedCat1_10s")); + "magnitePrefix3_fetchedCat1_10s")); assertThat(resultFuture.result().getBidderResponses()) .extracting(BidderResponse::getSeatBid) .flatExtracting(BidderSeatBid::getBids).hasSize(1); @@ -1012,7 +1012,7 @@ public void applyCategoryMappingShouldAddErrorIfImpBidderDoesNotHaveDealTierAndC // given final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") - .ext(mapper.createObjectNode().set("rubicon", mapper.createObjectNode())) + .ext(mapper.createObjectNode().set("magnite", mapper.createObjectNode())) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), true, true)) @@ -1021,7 +1021,7 @@ public void applyCategoryMappingShouldAddErrorIfImpBidderDoesNotHaveDealTierAndC .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -1040,7 +1040,7 @@ public void applyCategoryMappingShouldAddErrorIfImpBidderDoesNotHaveDealTierAndC .extracting(BidderResponse::getSeatBid) .flatExtracting(BidderSeatBid::getBids).hasSize(1); assertThat(resultFuture.result().getErrors()).hasSize(1) - .containsOnly("DealTier configuration not defined for bidder 'rubicon', imp ID 'impId1'"); + .containsOnly("DealTier configuration not defined for bidder 'magnite', imp ID 'impId1'"); } @Test @@ -1050,7 +1050,7 @@ public void applyCategoryMappingShouldAddErrorIfPrefixIsNullAndCreateRegularCatD mapper.createObjectNode().put("minDealTier", 3)); final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") - .ext(mapper.createObjectNode().set("rubicon", dealTier)) + .ext(mapper.createObjectNode().set("magnite", dealTier)) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), true, true)) @@ -1059,7 +1059,7 @@ public void applyCategoryMappingShouldAddErrorIfPrefixIsNullAndCreateRegularCatD .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -1078,7 +1078,7 @@ public void applyCategoryMappingShouldAddErrorIfPrefixIsNullAndCreateRegularCatD .extracting(BidderResponse::getSeatBid) .flatExtracting(BidderSeatBid::getBids).hasSize(1); assertThat(resultFuture.result().getErrors()).hasSize(1) - .containsOnly("DealTier configuration not valid for bidder 'rubicon', imp ID 'impId1' " + .containsOnly("DealTier configuration not valid for bidder 'magnite', imp ID 'impId1' " + "with a reason: dealTier.prefix empty string or null"); } @@ -1086,10 +1086,10 @@ public void applyCategoryMappingShouldAddErrorIfPrefixIsNullAndCreateRegularCatD public void applyCategoryMappingShouldAddErrorIfMinDealTierIsNullAndCreateRegularCatDur() { // given final JsonNode dealTier = mapper.createObjectNode().set("dealTier", - mapper.createObjectNode().put("prefix", "rubiconPrefix")); + mapper.createObjectNode().put("prefix", "magnitePrefix")); final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") - .ext(mapper.createObjectNode().set("rubicon", dealTier)) + .ext(mapper.createObjectNode().set("magnite", dealTier)) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), true, true)) @@ -1098,7 +1098,7 @@ public void applyCategoryMappingShouldAddErrorIfMinDealTierIsNullAndCreateRegula .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -1117,7 +1117,7 @@ public void applyCategoryMappingShouldAddErrorIfMinDealTierIsNullAndCreateRegula .extracting(BidderResponse::getSeatBid) .flatExtracting(BidderSeatBid::getBids).hasSize(1); assertThat(resultFuture.result().getErrors()).hasSize(1) - .containsOnly("DealTier configuration not valid for bidder 'rubicon', imp ID 'impId1' with a reason:" + .containsOnly("DealTier configuration not valid for bidder 'magnite', imp ID 'impId1' with a reason:" + " dealTier.minDealTier should be larger than 0, but was null"); } @@ -1126,7 +1126,7 @@ public void applyCategoryMappingShouldAddErrorIfMinDealTierLessThanZeroAndCreate // given final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder().id("impId1") - .ext(mapper.createObjectNode().set("rubicon", givenDealTier("prefix", -1))) + .ext(mapper.createObjectNode().set("magnite", givenDealTier("prefix", -1))) .build())) .ext(ExtRequest.of(ExtRequestPrebid.builder() .targeting(givenTargeting(1, "publisher", asList(10, 15, 5), true, true)) @@ -1135,7 +1135,7 @@ public void applyCategoryMappingShouldAddErrorIfMinDealTierLessThanZeroAndCreate .build(); final List bidderResponses = singletonList( - givenBidderResponse("rubicon", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), + givenBidderResponse("magnite", givenBidderBid(givenBid("1", "impId1", "10", singletonList("cat1")), BidType.video, 10))); given(applicationSettings.getCategories(anyString(), anyString(), any())).willReturn( @@ -1154,7 +1154,7 @@ public void applyCategoryMappingShouldAddErrorIfMinDealTierLessThanZeroAndCreate .extracting(BidderResponse::getSeatBid) .flatExtracting(BidderSeatBid::getBids).hasSize(1); assertThat(resultFuture.result().getErrors()).hasSize(1) - .containsOnly("DealTier configuration not valid for bidder 'rubicon', imp ID 'impId1' with a reason:" + .containsOnly("DealTier configuration not valid for bidder 'magnite', imp ID 'impId1' with a reason:" + " dealTier.minDealTier should be larger than 0, but was -1"); } @@ -1162,7 +1162,7 @@ public void applyCategoryMappingShouldAddErrorIfMinDealTierLessThanZeroAndCreate public void applyCategoryMappingShouldRejectAllBidsFromBidderInDifferentReasons() { // given final List bidderResponses = asList( - givenBidderResponse("rubicon", + givenBidderResponse("magnite", givenBidderBid(givenBid("1", null, "10", singletonList("cat1")), BidType.video, 10)), givenBidderResponse("otherBidder", givenBidderBid(givenBid("2", null, "10", null), BidType.video, 10), diff --git a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java index b5036c497c3..d021aeb1fd0 100644 --- a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java +++ b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java @@ -3248,10 +3248,10 @@ public void shouldIncrementGotBidsAndErrorMetricsIfBidderReturnsBidAndDifferentE .bids(singletonList(givenBidderBid(Bid.builder().impid("impId").price(TEN).build()))) .errors(asList( // two identical errors to verify corresponding metric is submitted only once - BidderError.badInput("rubicon error"), - BidderError.badInput("rubicon error"), - BidderError.badServerResponse("rubicon error"), - BidderError.failedToRequestBids("rubicon failed to request bids"), + BidderError.badInput("magnite error"), + BidderError.badInput("magnite error"), + BidderError.badServerResponse("magnite error"), + BidderError.failedToRequestBids("magnite failed to request bids"), BidderError.timeout("timeout error"), BidderError.generic("timeout error"))) .build())); diff --git a/src/test/java/org/prebid/server/auction/FpdResolverTest.java b/src/test/java/org/prebid/server/auction/FpdResolverTest.java index 1e094a120d6..5dd1e3fd461 100644 --- a/src/test/java/org/prebid/server/auction/FpdResolverTest.java +++ b/src/test/java/org/prebid/server/auction/FpdResolverTest.java @@ -565,7 +565,7 @@ public void resolveImpExtShouldCreateExtImpContextDataIfExtImpIsNull() { @Test public void resolveImpExtShouldCreateExtImpContextDataIfExtImpContextIsNullAndKeepOtherFields() { // given - final ObjectNode extImp = mapper.createObjectNode().put("prebid", 1).put("rubicon", 2); + final ObjectNode extImp = mapper.createObjectNode().put("prebid", 1).put("magnite", 2); final ObjectNode targeting = mapper.createObjectNode() .put("site", "site").put("replacedAttr", "fpdValue").put("fpdAttr", "fpdValue2"); @@ -573,7 +573,7 @@ public void resolveImpExtShouldCreateExtImpContextDataIfExtImpContextIsNullAndKe final ObjectNode result = target.resolveImpExt(extImp, targeting); // then - final ObjectNode expectedResult = mapper.createObjectNode().put("prebid", 1).put("rubicon", 2); + final ObjectNode expectedResult = mapper.createObjectNode().put("prebid", 1).put("magnite", 2); assertThat(result).isEqualTo(expectedResult .set("data", mapper.createObjectNode().put("replacedAttr", "fpdValue") .put("fpdAttr", "fpdValue2"))); diff --git a/src/test/java/org/prebid/server/auction/externalortb/StoredResponseProcessorTest.java b/src/test/java/org/prebid/server/auction/externalortb/StoredResponseProcessorTest.java index d281139df5f..55895873a41 100644 --- a/src/test/java/org/prebid/server/auction/externalortb/StoredResponseProcessorTest.java +++ b/src/test/java/org/prebid/server/auction/externalortb/StoredResponseProcessorTest.java @@ -63,7 +63,7 @@ public class StoredResponseProcessorTest extends VertxTest { private ApplicationSettings applicationSettings; @Mock - private BidRejectionTracker rubiconBidRejectionTracker; + private BidRejectionTracker magniteBidRejectionTracker; @Mock private BidRejectionTracker appnexusBidRejectionTracker; @@ -87,7 +87,7 @@ public void getStoredResponseResultShouldReturnSeatBidsForAuctionResponseId() th given(applicationSettings.getStoredResponses(any(), any())) .willReturn(Future.succeededFuture(StoredResponseDataResult.of(singletonMap("1", - mapper.writeValueAsString(singletonList(SeatBid.builder().seat("rubicon") + mapper.writeValueAsString(singletonList(SeatBid.builder().seat("magnite") .bid(singletonList(Bid.builder().id("id").build())).build()))), emptyList()))); @@ -98,7 +98,7 @@ public void getStoredResponseResultShouldReturnSeatBidsForAuctionResponseId() th assertThat(result.result()).isEqualTo(StoredResponseResult.of( emptyList(), singletonList(SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(singletonList(Bid.builder().id("id").impid("impId").build())) .build()), emptyMap())); @@ -109,7 +109,7 @@ public void getStoredResponseResultShouldNotChangeImpsAndReturnSeatBidsWhenThere // given final Imp imp = Imp.builder() .ext(mapper.valueToTree(ExtImp.of( - ExtImpPrebid.builder().bidder(mapper.createObjectNode().put("rubicon", 1)).build(), + ExtImpPrebid.builder().bidder(mapper.createObjectNode().put("magnite", 1)).build(), null))) .build(); // when @@ -169,7 +169,7 @@ public void getStoredResponseResultShouldReturnFailedFutureWhenErrorHappenedDuri public void getStoredResponseResultShouldReturnResultForBidStoredResponseId() { // given final Imp imp = givenImp("impId1", null, asList( - ExtStoredBidResponse.of("rubicon", "storedBidResponseId1"), + ExtStoredBidResponse.of("magnite", "storedBidResponseId1"), ExtStoredBidResponse.of("appnexus", "storedBidResponseId2"))); given(applicationSettings.getStoredResponses(any(), any())).willReturn( @@ -185,7 +185,7 @@ public void getStoredResponseResultShouldReturnResultForBidStoredResponseId() { assertThat(result.result()).isEqualTo(StoredResponseResult.of( singletonList(imp), emptyList(), - singletonMap("impId1", doubleMap("rubicon", "storedBidResponse1", "appnexus", "storedBidResponse2")))); + singletonMap("impId1", doubleMap("magnite", "storedBidResponse1", "appnexus", "storedBidResponse2")))); } @Test @@ -199,7 +199,7 @@ public void getStoredResponseResultShouldReturnResultForBidAndAuctionStoredRespo final Imp imp2 = givenImp( "impId2", null, - singletonList(ExtStoredBidResponse.of("rubicon", "storedBidResponseId"))); + singletonList(ExtStoredBidResponse.of("magnite", "storedBidResponseId"))); final List imps = asList(imp1, imp2); final Map storedResponse = new HashMap<>(); @@ -222,7 +222,7 @@ public void getStoredResponseResultShouldReturnResultForBidAndAuctionStoredRespo .seat("appnexus") .bid(singletonList(Bid.builder().id("id1").impid("impId1").build())) .build()), - singletonMap("impId2", singletonMap("rubicon", "storedBidResponse")))); + singletonMap("impId2", singletonMap("magnite", "storedBidResponse")))); } @Test @@ -253,9 +253,9 @@ public void getStoredResponseResultShouldMergeStoredSeatBidsForTheSameBidder() t final Map storedResponse = new HashMap<>(); storedResponse.put("storedAuctionResponse1", mapper.writeValueAsString(asList( SeatBid.builder().seat("appnexus").bid(singletonList(Bid.builder().id("id1").build())).build(), - SeatBid.builder().seat("rubicon").bid(singletonList(Bid.builder().id("id3").build())).build()))); + SeatBid.builder().seat("magnite").bid(singletonList(Bid.builder().id("id3").build())).build()))); storedResponse.put("storedAuctionResponse2", mapper.writeValueAsString(singletonList( - SeatBid.builder().seat("rubicon").bid(singletonList(Bid.builder().id("id2").build())).build()))); + SeatBid.builder().seat("magnite").bid(singletonList(Bid.builder().id("id2").build())).build()))); given(applicationSettings.getStoredResponses(any(), any())).willReturn( Future.succeededFuture(StoredResponseDataResult.of(storedResponse, emptyList()))); @@ -269,14 +269,14 @@ public void getStoredResponseResultShouldMergeStoredSeatBidsForTheSameBidder() t emptyList(), asList( SeatBid.builder() - .seat("appnexus") - .bid(singletonList(Bid.builder().id("id1").impid("impId1").build())) - .build(), - SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(asList( Bid.builder().id("id3").impid("impId1").build(), Bid.builder().id("id2").impid("impId2").build())) + .build(), + SeatBid.builder() + .seat("appnexus") + .bid(singletonList(Bid.builder().id("id1").impid("impId1").build())) .build()), emptyMap())); } @@ -291,7 +291,7 @@ public void getStoredResponseResultShouldUseStoredSeatBidsFromRequest() throws J "storedAuctionResponse1", null, SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(singletonList(Bid.builder().id("id4").build())) .build()), null), @@ -310,9 +310,9 @@ public void getStoredResponseResultShouldUseStoredSeatBidsFromRequest() throws J final Map storedResponse = new HashMap<>(); storedResponse.put("storedAuctionResponse1", mapper.writeValueAsString(asList( SeatBid.builder().seat("appnexus").bid(singletonList(Bid.builder().id("id1").build())).build(), - SeatBid.builder().seat("rubicon").bid(singletonList(Bid.builder().id("id3").build())).build()))); + SeatBid.builder().seat("magnite").bid(singletonList(Bid.builder().id("id3").build())).build()))); storedResponse.put("storedAuctionResponse2", mapper.writeValueAsString(singletonList( - SeatBid.builder().seat("rubicon").bid(singletonList(Bid.builder().id("id2").build())).build()))); + SeatBid.builder().seat("magnite").bid(singletonList(Bid.builder().id("id2").build())).build()))); given(applicationSettings.getStoredResponses(any(), any())).willReturn( Future.succeededFuture(StoredResponseDataResult.of(storedResponse, emptyList()))); @@ -326,14 +326,14 @@ public void getStoredResponseResultShouldUseStoredSeatBidsFromRequest() throws J emptyList(), asList( SeatBid.builder() - .seat("appnexus") - .bid(singletonList(Bid.builder().id("id5").impid("impId3").build())) - .build(), - SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(asList( Bid.builder().id("id4").impid("impId1").build(), Bid.builder().id("id2").impid("impId2").build())) + .build(), + SeatBid.builder() + .seat("appnexus") + .bid(singletonList(Bid.builder().id("id5").impid("impId3").build())) .build()), emptyMap())); } @@ -430,19 +430,19 @@ public void updateStoredBidResponseShouldTolerateMissingBidImpId() { .imp(singletonList(Imp.builder().id("imp1").build())) .build(); final BidderRequest bidderRequest = BidderRequest.builder() - .bidder("rubicon") + .bidder("magnite") .storedResponse("storedresponse") .bidRequest(bidRequest) .build(); final BidderResponse bidderResponse = BidderResponse.of( - "rubicon", + "magnite", BidderSeatBid.of( singletonList(BidderBid.of(Bid.builder().id("bid1").build(), BidType.banner, "USD"))), 100); final AuctionParticipation requestAuctionParticipation = AuctionParticipation.builder() - .bidder("rubicon") + .bidder("magnite") .bidderRequest(bidderRequest) .bidderResponse(bidderResponse) .build(); @@ -462,19 +462,19 @@ public void updateStoredBidResponseShouldNotModifyParticipationWithMoreThanOneIm .imp(List.of(Imp.builder().build(), Imp.builder().build())) .build(); final BidderRequest bidderRequest = BidderRequest.builder() - .bidder("rubicon") + .bidder("magnite") .storedResponse("storedresponse") .bidRequest(bidRequest) .build(); final BidderResponse bidderResponse = BidderResponse.of( - "rubicon", + "magnite", BidderSeatBid.of( singletonList(BidderBid.of(Bid.builder().id("bid1").build(), BidType.banner, "USD"))), 100); final AuctionParticipation requestAuctionParticipation = AuctionParticipation.builder() - .bidder("rubicon") + .bidder("magnite") .bidderRequest(bidderRequest) .bidderResponse(bidderResponse) .build(); @@ -494,7 +494,7 @@ public void updateStoredBidResponseShouldReplaceAllBidImpIdMacrosForStoredRespon .imp(singletonList(Imp.builder().id("impId").build())) .build(); final BidderRequest bidderRequest = BidderRequest.builder() - .bidder("rubicon") + .bidder("magnite") .storedResponse("storedresponse") .bidRequest(bidRequest) .build(); @@ -503,10 +503,10 @@ public void updateStoredBidResponseShouldReplaceAllBidImpIdMacrosForStoredRespon BidderBid.of(Bid.builder().impid("##PBSIMPID##").build(), BidType.banner, "USD"), BidderBid.of(Bid.builder().impid("##PBSIMPID##").build(), BidType.video, "USD")); final BidderResponse bidderResponse = BidderResponse.of( - "rubicon", BidderSeatBid.of(bids), 100); + "magnite", BidderSeatBid.of(bids), 100); final AuctionParticipation requestAuctionParticipation = AuctionParticipation.builder() - .bidder("rubicon") + .bidder("magnite") .bidderRequest(bidderRequest) .bidderResponse(bidderResponse) .build(); @@ -520,7 +520,7 @@ public void updateStoredBidResponseShouldReplaceAllBidImpIdMacrosForStoredRespon BidderBid.of(Bid.builder().impid("impId").build(), BidType.banner, "USD"), BidderBid.of(Bid.builder().impid("impId").build(), BidType.video, "USD")); final BidderResponse expectedBidderResponse = BidderResponse.of( - "rubicon", BidderSeatBid.of(expectedBids), 100); + "magnite", BidderSeatBid.of(expectedBids), 100); assertThat(result).containsExactly(requestAuctionParticipation.with(expectedBidderResponse)); } @@ -529,12 +529,12 @@ public void updateStoredBidResponseShouldReplaceAllBidImpIdMacrosForStoredRespon public void mergeWithBidderResponsesShouldReturnMergedStoredSeatWithResponseWithoutBlocked() { // given final BidderResponse bidderResponse = BidderResponse.of( - "rubicon", + "magnite", BidderSeatBid.of(singletonList(BidderBid.of( - Bid.builder().id("bid1").build(), BidType.banner, "rubicon", "USD"))), + Bid.builder().id("bid1").build(), BidType.banner, "magnite", "USD"))), 100); final AuctionParticipation requestAuctionParticipation = AuctionParticipation.builder() - .bidder("rubicon") + .bidder("magnite") .bidderResponse(bidderResponse) .build(); final AuctionParticipation blockedRequestAuctionParticipation = AuctionParticipation.builder() @@ -545,14 +545,14 @@ public void mergeWithBidderResponsesShouldReturnMergedStoredSeatWithResponseWith blockedRequestAuctionParticipation); final List seatBid = singletonList(SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(singletonList(Bid.builder().id("bid2").impid("storedImp").build())) .build()); final List imps = singletonList(Imp.builder().id("storedImp").banner(Banner.builder().build()).build()); final Map bidRejectionTrackers = Map.of( - "rubicon", rubiconBidRejectionTracker, + "magnite", magniteBidRejectionTracker, "appnexus", appnexusBidRejectionTracker); // when @@ -567,32 +567,32 @@ public void mergeWithBidderResponsesShouldReturnMergedStoredSeatWithResponseWith .impid("storedImp") .build(), BidType.banner, - "rubicon", + "magnite", "USD"), BidderBid.of( Bid.builder() .id("bid1") .build(), BidType.banner, - "rubicon", + "magnite", "USD")); verifyNoInteractions(appnexusBidRejectionTracker); - verify(rubiconBidRejectionTracker).restoreFromRejection(expectedBids); + verify(magniteBidRejectionTracker).restoreFromRejection(expectedBids); assertThat(result) .extracting(AuctionParticipation::getBidderResponse) - .containsOnly(BidderResponse.of("rubicon", BidderSeatBid.of(expectedBids), 100), null); + .containsOnly(BidderResponse.of("magnite", BidderSeatBid.of(expectedBids), 100), null); } @Test public void mergeWithBidderResponsesShouldMergeBidderResponsesWithoutCorrespondingStoredSeatBid() { // given - final List givenRubiconBids = singletonList(BidderBid.of( + final List givenMagniteBids = singletonList(BidderBid.of( Bid.builder().id("bid1").build(), BidType.banner, "USD")); - final BidderResponse bidderResponse = BidderResponse.of("rubicon", BidderSeatBid.of(givenRubiconBids), 100); + final BidderResponse bidderResponse = BidderResponse.of("magnite", BidderSeatBid.of(givenMagniteBids), 100); final AuctionParticipation requestAuctionParticipation = AuctionParticipation.builder() - .bidder("rubicon") + .bidder("magnite") .bidderResponse(bidderResponse) .build(); final List auctionParticipations = singletonList(requestAuctionParticipation); @@ -605,7 +605,7 @@ public void mergeWithBidderResponsesShouldMergeBidderResponsesWithoutCorrespondi final List imps = singletonList(Imp.builder().id("storedImp").banner(Banner.builder().build()).build()); final Map bidRejectionTrackers = Map.of( - "rubicon", rubiconBidRejectionTracker, + "magnite", magniteBidRejectionTracker, "appnexus", appnexusBidRejectionTracker); // when @@ -616,7 +616,7 @@ public void mergeWithBidderResponsesShouldMergeBidderResponsesWithoutCorrespondi final List expectedAppnexusBids = singletonList( BidderBid.of(Bid.builder().id("bid2").impid("storedImp").build(), BidType.banner, "appnexus", "USD")); - verify(rubiconBidRejectionTracker).restoreFromRejection(givenRubiconBids); + verify(magniteBidRejectionTracker).restoreFromRejection(givenMagniteBids); verify(appnexusBidRejectionTracker).restoreFromRejection(expectedAppnexusBids); final BidderResponse secondExpectedBidResponse = BidderResponse.of( @@ -632,15 +632,15 @@ public void mergeWithBidderResponsesShouldMergeBidderResponsesWithoutCorrespondi public void mergeWithBidderResponsesShouldMergeStoredSeatBidsWithoutBidderResponses() { // given final List seatBid = singletonList(SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(singletonList(Bid.builder().id("bid2").impid("storedImp").build())) .build()); final List imps = singletonList(Imp.builder().id("storedImp").banner(Banner.builder().build()).build()); final Map bidRejectionTrackers = Map.of( - "rubicon", rubiconBidRejectionTracker, - "appnexus", rubiconBidRejectionTracker); + "magnite", magniteBidRejectionTracker, + "appnexus", appnexusBidRejectionTracker); // when final List result = @@ -650,42 +650,42 @@ public void mergeWithBidderResponsesShouldMergeStoredSeatBidsWithoutBidderRespon final List expectedBids = singletonList(BidderBid.of( Bid.builder().id("bid2").impid("storedImp").build(), BidType.banner, - "rubicon", + "magnite", "USD")); - verify(rubiconBidRejectionTracker).restoreFromRejection(expectedBids); + verify(magniteBidRejectionTracker).restoreFromRejection(expectedBids); verifyNoInteractions(appnexusBidRejectionTracker); assertThat(result) .extracting(AuctionParticipation::getBidderResponse) - .contains(BidderResponse.of("rubicon", BidderSeatBid.of(expectedBids), 0)); + .contains(BidderResponse.of("magnite", BidderSeatBid.of(expectedBids), 0)); } @Test public void mergeWithBidderResponsesShouldResolveCurrencyFromBidderResponse() { // given final BidderResponse bidderResponse = BidderResponse.of( - "rubicon", + "magnite", BidderSeatBid.of( singletonList(BidderBid.of( - Bid.builder().id("bid1").build(), BidType.banner, "rubicon", "EUR"))), + Bid.builder().id("bid1").build(), BidType.banner, "magnite", "EUR"))), 100); final AuctionParticipation requestAuctionParticipation = AuctionParticipation.builder() - .bidder("rubicon") + .bidder("magnite") .bidderResponse(bidderResponse) .build(); final List auctionParticipations = singletonList(requestAuctionParticipation); final List seatBid = singletonList(SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(singletonList(Bid.builder().id("bid2").impid("storedImp").build())) .build()); final List imps = singletonList(Imp.builder().id("storedImp").banner(Banner.builder().build()).build()); final Map bidRejectionTrackers = Map.of( - "rubicon", rubiconBidRejectionTracker, - "appnexus", rubiconBidRejectionTracker); + "magnite", magniteBidRejectionTracker, + "appnexus", appnexusBidRejectionTracker); // when final List result = target.mergeWithBidderResponses( @@ -696,33 +696,33 @@ public void mergeWithBidderResponsesShouldResolveCurrencyFromBidderResponse() { BidderBid.of( Bid.builder().id("bid2").impid("storedImp").build(), BidType.banner, - "rubicon", + "magnite", "EUR"), BidderBid.of( Bid.builder().id("bid1").build(), BidType.banner, - "rubicon", + "magnite", "EUR")); - verify(rubiconBidRejectionTracker).restoreFromRejection(expectedBids); + verify(magniteBidRejectionTracker).restoreFromRejection(expectedBids); verifyNoInteractions(appnexusBidRejectionTracker); assertThat(result) .extracting(AuctionParticipation::getBidderResponse) - .contains(BidderResponse.of("rubicon", BidderSeatBid.of(expectedBids), 100)); + .contains(BidderResponse.of("magnite", BidderSeatBid.of(expectedBids), 100)); } @Test public void mergeWithBidderResponsesShouldResolveBidTypeFromStoredBidExt() { // given final BidderResponse bidderResponse = BidderResponse.of( - "rubicon", + "magnite", BidderSeatBid.of( singletonList(BidderBid.of( - Bid.builder().id("bid1").build(), BidType.banner, "rubicon", "USD"))), + Bid.builder().id("bid1").build(), BidType.banner, "magnite", "USD"))), 100); final AuctionParticipation requestAuctionParticipation = AuctionParticipation.builder() - .bidder("rubicon") + .bidder("magnite") .bidderResponse(bidderResponse) .build(); final List auctionParticipations = singletonList(requestAuctionParticipation); @@ -730,7 +730,7 @@ public void mergeWithBidderResponsesShouldResolveBidTypeFromStoredBidExt() { final ExtBidPrebid extBidPrebid = ExtBidPrebid.builder().type(BidType.video).build(); final List seatBid = singletonList(SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(singletonList(Bid.builder() .id("bid2") .impid("storedImp") @@ -741,8 +741,8 @@ public void mergeWithBidderResponsesShouldResolveBidTypeFromStoredBidExt() { final List imps = singletonList(Imp.builder().id("storedImp").banner(Banner.builder().build()).build()); final Map bidRejectionTrackers = Map.of( - "rubicon", rubiconBidRejectionTracker, - "appnexus", rubiconBidRejectionTracker); + "magnite", magniteBidRejectionTracker, + "appnexus", appnexusBidRejectionTracker); // when final List result = target.mergeWithBidderResponses( @@ -756,15 +756,15 @@ public void mergeWithBidderResponsesShouldResolveBidTypeFromStoredBidExt() { .impid("storedImp") .ext(mapper.createObjectNode() .set("prebid", mapper.valueToTree(extBidPrebid))).build(), - BidType.video, "rubicon", "USD"), - BidderBid.of(Bid.builder().id("bid1").build(), BidType.banner, "rubicon", "USD")); + BidType.video, "magnite", "USD"), + BidderBid.of(Bid.builder().id("bid1").build(), BidType.banner, "magnite", "USD")); - verify(rubiconBidRejectionTracker).restoreFromRejection(expectedBids); + verify(magniteBidRejectionTracker).restoreFromRejection(expectedBids); verifyNoInteractions(appnexusBidRejectionTracker); assertThat(result) .extracting(AuctionParticipation::getBidderResponse) - .contains(BidderResponse.of("rubicon", BidderSeatBid.of(expectedBids), 100)); + .contains(BidderResponse.of("magnite", BidderSeatBid.of(expectedBids), 100)); } @Test @@ -773,7 +773,7 @@ public void mergeWithBidderResponsesShouldThrowPrebidExceptionWhenExtBidPrebidIn final ObjectNode extBidPrebid = mapper.createObjectNode().put("type", "invalid"); final List seatBid = singletonList(SeatBid.builder() - .seat("rubicon") + .seat("magnite") .bid(singletonList(Bid.builder() .id("bid2") .impid("storedImp") @@ -784,14 +784,14 @@ public void mergeWithBidderResponsesShouldThrowPrebidExceptionWhenExtBidPrebidIn final List imps = singletonList(Imp.builder().id("storedImp").banner(Banner.builder().build()).build()); final Map bidRejectionTrackers = Map.of( - "rubicon", rubiconBidRejectionTracker, - "appnexus", rubiconBidRejectionTracker); + "magnite", magniteBidRejectionTracker, + "appnexus", appnexusBidRejectionTracker); // when and then assertThatThrownBy(() -> target.mergeWithBidderResponses(emptyList(), seatBid, imps, bidRejectionTrackers)) .isInstanceOf(PreBidException.class).hasMessage("Error decoding stored response bid.ext.prebid"); - verifyNoInteractions(appnexusBidRejectionTracker, rubiconBidRejectionTracker); + verifyNoInteractions(appnexusBidRejectionTracker, magniteBidRejectionTracker); } @Test @@ -799,9 +799,9 @@ public void mergeWithBidderResponsesShouldReturnSameResponseWhenThereAreNoStored // given final List givenBids = singletonList( BidderBid.of(Bid.builder().id("bid1").build(), BidType.banner, "USD")); - final BidderResponse bidderResponse = BidderResponse.of("rubicon", BidderSeatBid.of(givenBids), 100); + final BidderResponse bidderResponse = BidderResponse.of("magnite", BidderSeatBid.of(givenBids), 100); final AuctionParticipation requestAuctionParticipation = AuctionParticipation.builder() - .bidder("rubicon") + .bidder("magnite") .bidderResponse(bidderResponse) .build(); final List auctionParticipations = singletonList(requestAuctionParticipation); @@ -809,8 +809,8 @@ public void mergeWithBidderResponsesShouldReturnSameResponseWhenThereAreNoStored final List imps = singletonList(Imp.builder().banner(Banner.builder().build()).build()); final Map bidRejectionTrackers = Map.of( - "rubicon", rubiconBidRejectionTracker, - "appnexus", rubiconBidRejectionTracker); + "magnite", magniteBidRejectionTracker, + "appnexus", appnexusBidRejectionTracker); // when final List result = target.mergeWithBidderResponses( @@ -821,7 +821,7 @@ public void mergeWithBidderResponsesShouldReturnSameResponseWhenThereAreNoStored .extracting(AuctionParticipation::getBidderResponse) .containsOnly(bidderResponse); - verifyNoInteractions(appnexusBidRejectionTracker, rubiconBidRejectionTracker); + verifyNoInteractions(appnexusBidRejectionTracker, magniteBidRejectionTracker); } @Test diff --git a/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java b/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java index ad2c84c4669..bc757ddd8bb 100644 --- a/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java +++ b/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java @@ -1309,7 +1309,7 @@ public void shouldReturnBidRequestImpExtContextDataWithTargetingAttributes() thr // given routingContext.queryParams() .add("targeting", mapper.writeValueAsString( - Targeting.of(Arrays.asList("appnexus", "rubicon"), null, null))); + Targeting.of(Arrays.asList("appnexus", "magnite"), null, null))); given(fpdResolver.resolveImpExt(any(), any())) .willReturn(mapper.createObjectNode().set("context", mapper.createObjectNode() diff --git a/src/test/java/org/prebid/server/bidder/magnite/MagniteBidderTest.java b/src/test/java/org/prebid/server/bidder/magnite/MagniteBidderTest.java index 0012756a67c..1ee1eb0cb8e 100644 --- a/src/test/java/org/prebid/server/bidder/magnite/MagniteBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/magnite/MagniteBidderTest.java @@ -146,10 +146,10 @@ public class MagniteBidderTest extends VertxTest { private static final String BIDDER_NAME = "bidderName"; - private static final String ENDPOINT_URL = "http://rubiconproject.com/exchange.json"; + private static final String ENDPOINT_URL = "http://magniteproject.com/exchange.json"; private static final String DEFAULT_TK_X_INT = "prebid"; private static final String EXTERNAL_URL = "http://localhost:8080"; - private static final String APEX_RENDERER_URL = "https://video-outstream.rubiconproject.com/apex-2.2.1.js"; + private static final String APEX_RENDERER_URL = "https://video-outstream.magniteproject.com/apex-2.2.1.js"; private static final String USERNAME = "username"; private static final String PASSWORD = "password"; private static final String PBS_VERSION = "pbs_version"; @@ -417,7 +417,7 @@ public void makeHttpRequestsShouldReplaceDefaultParametersWithExtPrebidBiddersBi final Result>> result = target.makeHttpRequests(bidRequest); // then - final String expectedUrl = "http://rubiconproject.com/exchange.json?tk_xint=test"; + final String expectedUrl = "http://magniteproject.com/exchange.json?tk_xint=test"; assertThat(result.getValue()).hasSize(1).element(0).isNotNull() .returns(HttpMethod.POST, HttpRequest::getMethod) .returns(expectedUrl, HttpRequest::getUri); diff --git a/src/test/java/org/prebid/server/floors/BasicPriceFloorAdjusterTest.java b/src/test/java/org/prebid/server/floors/BasicPriceFloorAdjusterTest.java index 20d7308a271..c40588bbce0 100644 --- a/src/test/java/org/prebid/server/floors/BasicPriceFloorAdjusterTest.java +++ b/src/test/java/org/prebid/server/floors/BasicPriceFloorAdjusterTest.java @@ -44,7 +44,7 @@ @ExtendWith(MockitoExtension.class) public class BasicPriceFloorAdjusterTest extends VertxTest { - private static final String RUBICON = "rubicon"; + private static final String MAGNITE = "magnite"; @Mock(strictness = LENIENT) private FloorAdjustmentFactorResolver floorAdjustmentFactorResolver; @@ -74,19 +74,19 @@ public void adjustForImpShouldApplyAllAdjustments() { // when final Price adjustedBidPrice = target.adjustForImp( givenImp(identity()), - RUBICON, + MAGNITE, givenBidRequest, null, new ArrayList<>()); // then assertThat(adjustedBidPrice).isEqualTo(Price.of("UAH", new BigDecimal("117.00"))); - verify(floorAdjustmentFactorResolver).resolve(eq(Set.of(video_instream)), any(), eq(RUBICON)); + verify(floorAdjustmentFactorResolver).resolve(eq(Set.of(video_instream)), any(), eq(MAGNITE)); verify(floorAdjustmentsResolver).resolve( eq(Price.of("USD", new BigDecimal(100))), eq(givenBidRequest), eq(Set.of(video_instream)), - eq(RUBICON)); + eq(MAGNITE)); } @Test @@ -103,7 +103,7 @@ public void adjustForImpShouldNotApplyAdjustmentsWhenAdjustmentDisabledByAccount // when final Price adjustedBidPrice = target.adjustForImp( givenImp(identity()), - RUBICON, + MAGNITE, givenBidRequest(identity()), account, new ArrayList<>()); @@ -121,7 +121,7 @@ public void adjustForImpShouldNotApplyAdjustmentsWhenAdjustmentDisabledByRequest .bidadjustmentfactors(ExtRequestBidAdjustmentFactors.builder() .mediatypes(givenMediaTypes(Map.of( ImpMediaType.video, - Map.of(RUBICON, BigDecimal.valueOf(0.85D))))) + Map.of(MAGNITE, BigDecimal.valueOf(0.85D))))) .build()) .floors(PriceFloorRules.builder() .enforcement(PriceFloorEnforcement.builder() @@ -133,7 +133,7 @@ public void adjustForImpShouldNotApplyAdjustmentsWhenAdjustmentDisabledByRequest // when final Price adjustedBidPrice = target.adjustForImp( givenImp(identity()), - RUBICON, + MAGNITE, bidRequest, null, new ArrayList<>()); @@ -155,7 +155,7 @@ public void adjustForImpShouldApplyNoFactorAdjustmentsWhenBidAdjustmentsFactorIs // when final Price adjustedBidPrice = target.adjustForImp( imp, - RUBICON, + MAGNITE, bidRequest, null, new ArrayList<>()); @@ -167,7 +167,7 @@ public void adjustForImpShouldApplyNoFactorAdjustmentsWhenBidAdjustmentsFactorIs eq(Price.of(imp.getBidfloorcur(), imp.getBidfloor())), eq(bidRequest), eq(Set.of(video_instream)), - eq(RUBICON)); + eq(MAGNITE)); } @Test @@ -178,7 +178,7 @@ public void adjustForImpShouldReturnNullIfImpBidFloorIsNotPresent() { // when final Price adjustedBidPrice = target.adjustForImp( imp, - RUBICON, + MAGNITE, givenBidRequest(identity()), null, new ArrayList<>()); @@ -203,7 +203,7 @@ public void adjustForImpShouldReturnBidFloorNotFactoredByOtherBidder() { // when final Price adjustedBidPrice = target.adjustForImp( givenImp(identity()), - RUBICON, + MAGNITE, bidRequest, null, new ArrayList<>()); @@ -225,7 +225,7 @@ public void adjustForImpShouldReturnFactoredOfOneIfExtBidAdjustmentsFactorMediaT // when final Price adjustedBidPrice = target.adjustForImp( givenImp(identity()), - RUBICON, + MAGNITE, bidRequest, null, new ArrayList<>()); @@ -243,7 +243,7 @@ public void adjustForImpShouldReturnFactorOfOneIfNoMediaTypeInImpression() { // when final Price adjustedBidPrice = target.adjustForImp( imp, - RUBICON, + MAGNITE, bidRequest, null, new ArrayList<>()); @@ -260,14 +260,14 @@ public void adjustForImpShouldSkipMediaTypeIfNoMediaTypesOfImpFound() { .bidadjustmentfactors(ExtRequestBidAdjustmentFactors.builder() .mediatypes(givenMediaTypes(Map.of( ImpMediaType.video_outstream, - Map.of(RUBICON, BigDecimal.valueOf(0.8D))))) + Map.of(MAGNITE, BigDecimal.valueOf(0.8D))))) .build()) .build()))); // when final Price adjustedBidPrice = target.adjustForImp( givenImp(identity()), - RUBICON, + MAGNITE, bidRequest, null, new ArrayList<>()); @@ -287,7 +287,7 @@ public void adjustForImpShouldSkipBidAdjustmentsWhenResolverThrowsException() { // when final Price adjustedBidPrice = target.adjustForImp( givenImp(identity()), - RUBICON, + MAGNITE, givenBidRequest, null, new ArrayList<>()); @@ -303,7 +303,7 @@ private static BidRequest givenBidRequest(UnaryOperator bidderStatuses = - singletonList(BidderUsersyncStatus.builder().bidder("rubicon").build()); + singletonList(BidderUsersyncStatus.builder().bidder("magnite").build()); given(cookieSyncService.processContext(any())) .willAnswer(invocation -> Future.succeededFuture(invocation.getArgument(0))); diff --git a/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java b/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java index 815453e85ea..dab9d1328b9 100644 --- a/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java +++ b/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java @@ -79,10 +79,11 @@ @ExtendWith(MockitoExtension.class) public class SetuidHandlerTest extends VertxTest { - private static final String RUBICON = "rubicon"; + private static final String MAGNITE = "magnite"; + private static final String MAGNITE_COOKIE = "rubicon"; private static final String FACEBOOK = "audienceNetwork"; - private static final String ADNXS = "adnxs"; private static final String APPNEXUS = "appnexus"; + private static final String APPNEXUS_COOKIE = "adnxs"; @Mock(strictness = LENIENT) private UidsCookieService uidsCookieService; @@ -119,7 +120,7 @@ public class SetuidHandlerTest extends VertxTest { @BeforeEach public void setUp() { final Map bidderToGdpr = Map.of( - RUBICON, PrivacyEnforcementAction.allowAll(), + MAGNITE, PrivacyEnforcementAction.allowAll(), APPNEXUS, PrivacyEnforcementAction.allowAll(), FACEBOOK, PrivacyEnforcementAction.allowAll()); @@ -151,20 +152,20 @@ public void setUp() { Base64.getUrlEncoder().encodeToString(((UidsCookie) invocation.getArgument(0)) .toJson().getBytes())))); - given(bidderCatalog.usersyncReadyBidders()).willReturn(Set.of(RUBICON, FACEBOOK, APPNEXUS)); + given(bidderCatalog.usersyncReadyBidders()).willReturn(Set.of(MAGNITE, FACEBOOK, APPNEXUS)); given(bidderCatalog.isAlias(any())).willReturn(false); - given(bidderCatalog.usersyncerByName(eq(RUBICON))).willReturn( - Optional.of(Usersyncer.of(RUBICON, null, redirectMethod(), false, null))); - given(bidderCatalog.cookieFamilyName(eq(RUBICON))).willReturn(Optional.of(RUBICON)); + given(bidderCatalog.usersyncerByName(eq(MAGNITE))).willReturn( + Optional.of(Usersyncer.of(MAGNITE_COOKIE, null, redirectMethod(), false, null))); + given(bidderCatalog.cookieFamilyName(eq(MAGNITE))).willReturn(Optional.of(MAGNITE_COOKIE)); given(bidderCatalog.usersyncerByName(eq(FACEBOOK))).willReturn( Optional.of(Usersyncer.of(FACEBOOK, null, redirectMethod(), false, null))); given(bidderCatalog.cookieFamilyName(eq(FACEBOOK))).willReturn(Optional.of(FACEBOOK)); given(bidderCatalog.usersyncerByName(eq(APPNEXUS))).willReturn( - Optional.of(Usersyncer.of(ADNXS, null, redirectMethod(), false, null))); - given(bidderCatalog.cookieFamilyName(eq(APPNEXUS))).willReturn(Optional.of(ADNXS)); + Optional.of(Usersyncer.of(APPNEXUS_COOKIE, null, redirectMethod(), false, null))); + given(bidderCatalog.cookieFamilyName(eq(APPNEXUS))).willReturn(Optional.of(APPNEXUS_COOKIE)); given(activityInfrastructure.isAllowed(any(), any())) .willReturn(true); @@ -194,7 +195,7 @@ public void shouldRespondWithErrorAndTriggerMetricsAndAnalyticsWhenOptedOut() { given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(new UidsCookie(Uids.builder().uids(emptyMap()).optout(true).build(), jacksonMapper)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); // when setuidHandler.handle(routingContext); @@ -246,7 +247,7 @@ public void shouldRespondWithErrorIfBidderParamIsInvalid() { @Test public void shouldRespondWithBadRequestStatusIfGdprConsentIsInvalid() { // given - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(new UidsCookie(Uids.builder().uids(emptyMap()).build(), jacksonMapper)); @@ -258,7 +259,7 @@ public void shouldRespondWithBadRequestStatusIfGdprConsentIsInvalid() { setuidHandler.handle(routingContext); // then - verify(metrics).updateUserSyncTcfInvalidMetric(RUBICON); + verify(metrics).updateUserSyncTcfInvalidMetric(MAGNITE); verify(httpResponse).setStatusCode(eq(400)); verify(httpResponse).end(eq("Invalid request format: Consent string is invalid")); } @@ -266,7 +267,7 @@ public void shouldRespondWithBadRequestStatusIfGdprConsentIsInvalid() { @Test public void shouldRespondWithUnavailableForLegalReasonsStatusIfDisallowedActivity() { // given - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("account")).willReturn("accountId"); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(emptyUidsCookie()); @@ -287,7 +288,7 @@ public void shouldRespondWithUnavailableForLegalReasonsStatusIfDisallowedActivit @Test public void shouldRespondWithErrorOnInvalidAccountConfigException() { // given - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("account")).willReturn("accountId"); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(emptyUidsCookie()); @@ -311,10 +312,10 @@ public void shouldPassUnsuccessfulEventToAnalyticsReporterIfUidMissingInRequest( final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, null)) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, null)) .willReturn(unaltered(uidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); // when setuidHandler.handle(routingContext); @@ -323,7 +324,7 @@ public void shouldPassUnsuccessfulEventToAnalyticsReporterIfUidMissingInRequest( final SetuidEvent setuidEvent = captureSetuidEvent(); assertThat(setuidEvent).isEqualTo(SetuidEvent.builder() .status(200) - .bidder(RUBICON) + .bidder(MAGNITE_COOKIE) .success(false) .build()); } @@ -334,12 +335,12 @@ public void shouldRespondWithoutCookieIfGdprProcessingPreventsCookieSetting() { final PrivacyEnforcementAction privacyEnforcementAction = PrivacyEnforcementAction.restrictAll(); given(tcfDefinerService.resultForBidderNames(anySet(), any(), any())) .willReturn(Future.succeededFuture( - TcfResponse.of(true, singletonMap(RUBICON, privacyEnforcementAction), null))); + TcfResponse.of(true, singletonMap(MAGNITE, privacyEnforcementAction), null))); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(new UidsCookie(Uids.builder().uids(emptyMap()).build(), jacksonMapper)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpResponse.setStatusMessage(anyString())).willReturn(httpResponse); // when @@ -349,7 +350,7 @@ public void shouldRespondWithoutCookieIfGdprProcessingPreventsCookieSetting() { verify(httpResponse, never()).addCookie(any(Cookie.class)); verify(httpResponse).setStatusCode(eq(451)); verify(httpResponse).end(eq("The gdpr_consent param prevents cookies from being saved")); - verify(metrics).updateUserSyncTcfBlockedMetric(RUBICON); + verify(metrics).updateUserSyncTcfBlockedMetric(MAGNITE); final SetuidEvent setuidEvent = captureSetuidEvent(); assertThat(setuidEvent).isEqualTo(SetuidEvent.builder().status(451).build()); @@ -364,7 +365,7 @@ public void shouldRespondWithBadRequestStatusIfGdprProcessingFailsWithInvalidReq given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(new UidsCookie(Uids.builder().uids(emptyMap()).build(), jacksonMapper)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); // when setuidHandler.handle(routingContext); @@ -387,7 +388,7 @@ public void shouldRespondWithInternalServerErrorStatusIfGdprProcessingFailsWithU given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(new UidsCookie(Uids.builder().uids(emptyMap()).build(), jacksonMapper)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); // when setuidHandler.handle(routingContext); @@ -405,10 +406,10 @@ public void shouldPassAccountToPrivacyEnforcementServiceWhenAccountIsFound() { final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, null)) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, null)) .willReturn(updated(uidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("account")).willReturn("accId"); final AccountGdprConfig accountGdprConfig = AccountGdprConfig.builder() @@ -434,10 +435,10 @@ public void shouldPassAccountToPrivacyEnforcementServiceWhenAccountIsNotFound() final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, null)) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, null)) .willReturn(updated(uidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("account")).willReturn("accId"); given(applicationSettings.getAccountById(any(), any())).willReturn(Future.failedFuture("bad req")); @@ -454,15 +455,15 @@ public void shouldPassAccountToPrivacyEnforcementServiceWhenAccountIsNotFound() public void shouldRespondWithCookieFromRequestParam() throws IOException { // given final UidsCookie uidsCookie = emptyUidsCookie(); - final UidsCookie updatedUidsCookie = uidsCookie.updateUid(RUBICON, "J5VLCWQP-26-CWFT"); + final UidsCookie updatedUidsCookie = uidsCookie.updateUid(MAGNITE_COOKIE, "J5VLCWQP-26-CWFT"); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "J5VLCWQP-26-CWFT")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "J5VLCWQP-26-CWFT")) .willReturn(updated(updatedUidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT"); // when @@ -478,11 +479,11 @@ public void shouldRespondWithCookieFromRequestParamWhenBidderAndCookieFamilyAreD // given final UidsCookie uidsCookie = emptyUidsCookie(); - final UidsCookie updatedUidsCookie = uidsCookie.updateUid(ADNXS, "J5VLCWQP-26-CWFT"); + final UidsCookie updatedUidsCookie = uidsCookie.updateUid(APPNEXUS_COOKIE, "J5VLCWQP-26-CWFT"); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, ADNXS, "J5VLCWQP-26-CWFT")) + given(uidsCookieService.updateUidsCookie(uidsCookie, APPNEXUS_COOKIE, "J5VLCWQP-26-CWFT")) .willReturn(updated(updatedUidsCookie)); given(httpRequest.getParam("bidder")).willReturn(APPNEXUS); @@ -501,11 +502,11 @@ public void shouldRespondWithCookieFromRequestParamWhenBidderCaseInRequestIsDiff // given final UidsCookie uidsCookie = emptyUidsCookie(); - final UidsCookie updatedUidsCookie = uidsCookie.updateUid(ADNXS, "J5VLCWQP-26-CWFT"); + final UidsCookie updatedUidsCookie = uidsCookie.updateUid(APPNEXUS_COOKIE, "J5VLCWQP-26-CWFT"); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, ADNXS, "J5VLCWQP-26-CWFT")) + given(uidsCookieService.updateUidsCookie(uidsCookie, APPNEXUS_COOKIE, "J5VLCWQP-26-CWFT")) .willReturn(updated(updatedUidsCookie)); given(httpRequest.getParam("bidder")).willReturn("ApPnExUs"); @@ -528,7 +529,7 @@ public void shouldSendPixelWhenFParamIsEqualToIWhenTypeIsIframe() throws JsonPro given(uidsCookieService.updateUidsCookie(any(), any(), any())) .willReturn(updated(uidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("f")).willReturn("i"); given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT"); @@ -548,15 +549,15 @@ public void shouldSendEmptyResponseWhenFParamIsEqualToBWhenTypeIsRedirect() thro final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "J5VLCWQP-26-CWFT")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "J5VLCWQP-26-CWFT")) .willReturn(updated(uidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("f")).willReturn("b"); given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT"); - given(bidderCatalog.usersyncReadyBidders()).willReturn(singleton(RUBICON)); + given(bidderCatalog.usersyncReadyBidders()).willReturn(singleton(MAGNITE)); given(bidderCatalog.usersyncerByName(any())) - .willReturn(Optional.of(Usersyncer.of(RUBICON, null, redirectMethod(), false, null))); + .willReturn(Optional.of(Usersyncer.of(MAGNITE_COOKIE, null, redirectMethod(), false, null))); setuidHandler = new SetuidHandler( 2000, @@ -589,13 +590,13 @@ public void shouldSendEmptyResponseWhenFParamNotDefinedAndTypeIsIframe() throws final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "J5VLCWQP-26-CWFT")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "J5VLCWQP-26-CWFT")) .willReturn(updated(uidsCookie)); - given(bidderCatalog.usersyncerByName(eq(RUBICON))).willReturn( - Optional.of(Usersyncer.of(RUBICON, iframeMethod(), null, false, null))); + given(bidderCatalog.usersyncerByName(eq(MAGNITE))).willReturn( + Optional.of(Usersyncer.of(MAGNITE_COOKIE, iframeMethod(), null, false, null))); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT"); setuidHandler = new SetuidHandler( @@ -629,13 +630,13 @@ public void shouldSendPixelWhenFParamNotDefinedAndTypeIsRedirect() throws JsonPr final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "J5VLCWQP-26-CWFT")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "J5VLCWQP-26-CWFT")) .willReturn(updated(uidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); - given(bidderCatalog.usersyncReadyBidders()).willReturn(singleton(RUBICON)); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); + given(bidderCatalog.usersyncReadyBidders()).willReturn(singleton(MAGNITE)); given(bidderCatalog.usersyncerByName(any())) - .willReturn(Optional.of(Usersyncer.of(RUBICON, null, redirectMethod(), false, null))); + .willReturn(Optional.of(Usersyncer.of(MAGNITE_COOKIE, null, redirectMethod(), false, null))); given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT"); setuidHandler = new SetuidHandler( @@ -663,17 +664,17 @@ public void shouldSendPixelWhenFParamNotDefinedAndTypeIsRedirect() throws JsonPr public void shouldInCookieWithRequestValue() throws IOException { // given final Map uids = Map.of( - RUBICON, UidWithExpiry.live("J5VLCWQP-26-CWFT"), - ADNXS, UidWithExpiry.live("12345")); + MAGNITE_COOKIE, UidWithExpiry.live("J5VLCWQP-26-CWFT"), + APPNEXUS_COOKIE, UidWithExpiry.live("12345")); final UidsCookie uidsCookie = new UidsCookie(Uids.builder().uids(uids).build(), jacksonMapper); - final UidsCookie updatedUidsCookie = uidsCookie.updateUid(RUBICON, "updatedUid"); + final UidsCookie updatedUidsCookie = uidsCookie.updateUid(MAGNITE_COOKIE, "updatedUid"); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "updatedUid")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "updatedUid")) .willReturn(updated(updatedUidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("uid")).willReturn("updatedUid"); // when @@ -688,20 +689,20 @@ public void shouldInCookieWithRequestValue() throws IOException { public void shouldReturnMultipleCookies() { // given final Map uids = Map.of( - RUBICON, UidWithExpiry.live("J5VLCWQP-26-CWFT"), - ADNXS, UidWithExpiry.live("12345")); + MAGNITE_COOKIE, UidWithExpiry.live("J5VLCWQP-26-CWFT"), + APPNEXUS_COOKIE, UidWithExpiry.live("12345")); final UidsCookie uidsCookie = new UidsCookie(Uids.builder().uids(uids).build(), jacksonMapper); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); final UidsCookie givenUidsCookie = uidsCookie - .updateUid(RUBICON, "updatedUid") - .updateUid(ADNXS, "12345"); + .updateUid(MAGNITE_COOKIE, "updatedUid") + .updateUid(APPNEXUS_COOKIE, "12345"); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "updatedUid")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "updatedUid")) .willReturn(updated(givenUidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("uid")).willReturn("updatedUid"); // {"tempUIDs":{"adnxs":{"uid":"12345"}, "rubicon":{"uid":"updatedUid"}}} @@ -727,14 +728,14 @@ public void shouldRespondWithCookieIfUserIsNotInGdprScope() throws IOException { .willReturn(Future.succeededFuture(TcfResponse.of(false, emptyMap(), null))); final UidsCookie uidsCookie = emptyUidsCookie(); - final UidsCookie updatedUidsCookie = uidsCookie.updateUid(RUBICON, "J5VLCWQP-26-CWFT"); + final UidsCookie updatedUidsCookie = uidsCookie.updateUid(MAGNITE_COOKIE, "J5VLCWQP-26-CWFT"); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "J5VLCWQP-26-CWFT")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "J5VLCWQP-26-CWFT")) .willReturn(updated(updatedUidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT"); // when @@ -765,14 +766,14 @@ public void shouldSkipTcfChecksAndRespondWithCookieIfHostVendorIdNotDefined() th given(tcfDefinerService.getGdprHostVendorId()).willReturn(null); final UidsCookie uidsCookie = emptyUidsCookie(); - final UidsCookie updatedUidsCookie = uidsCookie.updateUid(RUBICON, "J5VLCWQP-26-CWFT"); + final UidsCookie updatedUidsCookie = uidsCookie.updateUid(MAGNITE_COOKIE, "J5VLCWQP-26-CWFT"); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "J5VLCWQP-26-CWFT")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "J5VLCWQP-26-CWFT")) .willReturn(updated(updatedUidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT"); // when @@ -790,10 +791,10 @@ public void shouldNotSendResponseIfClientClosedConnection() { final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "uid")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "uid")) .willReturn(updated(uidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("uid")).willReturn("uid"); given(routingContext.response().closed()).willReturn(true); @@ -809,15 +810,15 @@ public void shouldNotSendResponseIfClientClosedConnection() { public void shouldPassSuccessfulEventToAnalyticsReporter() { // given final UidsCookie uidsCookie = new UidsCookie( - Uids.builder().uids(singletonMap(RUBICON, UidWithExpiry.live("J5VLCWQP-26-CWFT"))).build(), + Uids.builder().uids(singletonMap(MAGNITE_COOKIE, UidWithExpiry.live("J5VLCWQP-26-CWFT"))).build(), jacksonMapper); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(uidsCookie); - given(uidsCookieService.updateUidsCookie(uidsCookie, RUBICON, "updatedUid")) + given(uidsCookieService.updateUidsCookie(uidsCookie, MAGNITE_COOKIE, "updatedUid")) .willReturn(updated(uidsCookie)); - given(httpRequest.getParam("bidder")).willReturn(RUBICON); + given(httpRequest.getParam("bidder")).willReturn(MAGNITE); given(httpRequest.getParam("uid")).willReturn("updatedUid"); // when @@ -827,7 +828,7 @@ public void shouldPassSuccessfulEventToAnalyticsReporter() { final SetuidEvent setuidEvent = captureSetuidEvent(); assertThat(setuidEvent).isEqualTo(SetuidEvent.builder() .status(200) - .bidder(RUBICON) + .bidder(MAGNITE_COOKIE) .uid("updatedUid") .success(true) .build()); diff --git a/src/test/java/org/prebid/server/it/ApplicationTest.java b/src/test/java/org/prebid/server/it/ApplicationTest.java index 001737f9fba..0e9c1d61864 100644 --- a/src/test/java/org/prebid/server/it/ApplicationTest.java +++ b/src/test/java/org/prebid/server/it/ApplicationTest.java @@ -66,9 +66,10 @@ public class ApplicationTest extends IntegrationTest { private static final String APPNEXUS = "appnexus"; - private static final String RUBICON = "rubicon"; + private static final String MAGNITE = "magnite"; private static final String GENERIC = "generic"; private static final String GENERIC_ALIAS = "genericAlias"; + private static final String MAGNITE_COOKIE = "rubicon"; private static final int ADMIN_PORT = 8060; @@ -295,7 +296,7 @@ public void cookieSyncShouldReturnBidderStatusWithExpectedUsersyncInfo() { final CookieSyncResponse cookieSyncResponse = given(SPEC) .cookies("host-cookie-name", "host-cookie-uid") .body(CookieSyncRequest.builder() - .bidders(Set.of(RUBICON, APPNEXUS)) + .bidders(Set.of(MAGNITE, APPNEXUS)) .gdpr(1) .gdprConsent(gdprConsent) .usPrivacy("1YNN") @@ -312,10 +313,10 @@ public void cookieSyncShouldReturnBidderStatusWithExpectedUsersyncInfo() { assertThat(cookieSyncResponse.getStatus()).isEqualTo(CookieSyncStatus.OK); assertThat(cookieSyncResponse.getBidderStatus()).containsExactlyInAnyOrder( BidderUsersyncStatus.builder() - .bidder(RUBICON) + .bidder(MAGNITE) .noCookie(true) .usersync(UsersyncInfo.of( - "http://localhost:8080/setuid?bidder=rubicon" + "http://localhost:8080/setuid?bidder=magnite" + "&gdpr=1&gdpr_consent=" + gdprConsent + "&us_privacy=1YNN" + "&gpp=" @@ -348,7 +349,7 @@ public void setuidShouldUpdateRubiconUidInUidCookie() throws IOException { .cookie("uids", "eyAidGVtcFVJRHMiOnsgInJ1Ymljb24iOnsgInVpZCI6Iko1VkxDV1FQ" + "LTI2LUNXRlQiLCAiZXhwaXJlcyI6IjIwMjMtMTItMDVUMTk6MDA6MDUuMTAzMzI5LTAzOjAwIiB9IH0gfQ==") // this constant is ok to use as long as it coincides with family name - .queryParam("bidder", RUBICON) + .queryParam("bidder", MAGNITE) .queryParam("uid", "updatedUid") .queryParam("gdpr", "1") .queryParam("gdpr_consent", "CPBCKiyPBCKiyAAAAAENA0CAAIAAAAAAACiQAaQAwAAgAgABoAAAAAA") @@ -369,9 +370,9 @@ public void setuidShouldUpdateRubiconUidInUidCookie() throws IOException { .extracting(Map::keySet) .extracting(ArrayList::new) .asList() - .containsExactly(RUBICON); - assertThat(uids.getUids().get(RUBICON).getUid()).isEqualTo("updatedUid"); - assertThat(uids.getUids().get(RUBICON).getExpires().toInstant()) + .containsExactly(MAGNITE_COOKIE); + assertThat(uids.getUids().get(MAGNITE_COOKIE).getUid()).isEqualTo("updatedUid"); + assertThat(uids.getUids().get(MAGNITE_COOKIE).getExpires().toInstant()) .isCloseTo(Instant.now().plus(14, ChronoUnit.DAYS), within(10, ChronoUnit.SECONDS)); } @@ -660,7 +661,7 @@ public void traceHandlerShouldReturn200Ok() { .param("level", "error") .param("duration", "1000") .param("account", "1001") - .param("bidderCode", "rubicon") + .param("bidderCode", MAGNITE) .post("/pbs-admin/tracelog") .then() .assertThat() diff --git a/src/test/java/org/prebid/server/log/CriteriaManagerTest.java b/src/test/java/org/prebid/server/log/CriteriaManagerTest.java index 0ddf1ded8bc..21e82e353be 100644 --- a/src/test/java/org/prebid/server/log/CriteriaManagerTest.java +++ b/src/test/java/org/prebid/server/log/CriteriaManagerTest.java @@ -31,14 +31,14 @@ public void setUp() { @Test public void addCriteriaShouldThrowIllegalArgumentExceptionWhenLoggerLevelHasInvalidValue() { assertThatIllegalArgumentException() - .isThrownBy(() -> criteriaManager.addCriteria("1001", "rubicon", "invalid", 800)) + .isThrownBy(() -> criteriaManager.addCriteria("1001", "magnite", "invalid", 800)) .withMessage("Invalid LoggingLevel: invalid"); } @Test public void addCriteriaShouldAddVertxTimerWithLimitedDurationInMillis() { // given and when - criteriaManager.addCriteria("1001", "rubicon", "error", 800000); + criteriaManager.addCriteria("1001", "magnite", "error", 800000); // then verify(vertx).setTimer(eq(300000L), any()); @@ -47,7 +47,7 @@ public void addCriteriaShouldAddVertxTimerWithLimitedDurationInMillis() { @Test public void addCriteriaShouldAddVertxTimerWithDefaultDurationInMillis() { // given and when - criteriaManager.addCriteria("1001", "rubicon", "error", 200000); + criteriaManager.addCriteria("1001", "magnite", "error", 200000); // then verify(vertx).setTimer(eq(200000L), any()); diff --git a/src/test/java/org/prebid/server/metric/CookieSyncMetricsTest.java b/src/test/java/org/prebid/server/metric/CookieSyncMetricsTest.java index a869c27f5b0..8091a1f72d1 100644 --- a/src/test/java/org/prebid/server/metric/CookieSyncMetricsTest.java +++ b/src/test/java/org/prebid/server/metric/CookieSyncMetricsTest.java @@ -13,6 +13,6 @@ public void forBidderShouldReturnSameBidderCookieSyncMetricsOnSuccessiveCalls() final CookieSyncMetrics cookieSyncMetrics = new CookieSyncMetrics(new MetricRegistry(), CounterType.counter); // when and then - assertThat(cookieSyncMetrics.forBidder("rubicon")).isSameAs(cookieSyncMetrics.forBidder("rubicon")); + assertThat(cookieSyncMetrics.forBidder("magnite")).isSameAs(cookieSyncMetrics.forBidder("magnite")); } } diff --git a/src/test/java/org/prebid/server/metric/MetricsTest.java b/src/test/java/org/prebid/server/metric/MetricsTest.java index eb0af781a7d..0eed97eab2d 100644 --- a/src/test/java/org/prebid/server/metric/MetricsTest.java +++ b/src/test/java/org/prebid/server/metric/MetricsTest.java @@ -45,7 +45,7 @@ @ExtendWith(MockitoExtension.class) public class MetricsTest { - private static final String RUBICON = "rubicon"; + private static final String MAGNITE = "magnite"; private static final String CONVERSANT = "conversant"; private static final String ACCOUNT_ID = "accountId"; private static final String ACCOUNT_ID_1 = "accountId1"; @@ -94,34 +94,34 @@ public void forAccountShouldReturnAccountMetricsConfiguredWithAccount() { @Test public void forAdapterShouldReturnSameAdapterMetricsOnSuccessiveCalls() { - assertThat(metrics.forAdapter(RUBICON)).isSameAs(metrics.forAdapter(RUBICON)); + assertThat(metrics.forAdapter(MAGNITE)).isSameAs(metrics.forAdapter(MAGNITE)); } @Test public void forAdapterShouldReturnAdapterMetricsConfiguredWithCounterType() { verifyCreatesConfiguredCounterType( - metrics -> metrics.forAdapter(RUBICON).incCounter(MetricName.bids_received)); + metrics -> metrics.forAdapter(MAGNITE).incCounter(MetricName.bids_received)); } @Test public void forAdapterShouldReturnAdapterMetricsConfiguredWithAdapterType() { // when - metrics.forAdapter(RUBICON).incCounter(MetricName.bids_received); + metrics.forAdapter(MAGNITE).incCounter(MetricName.bids_received); // then - assertThat(metricRegistry.counter("adapter.rubicon.bids_received").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.bids_received").getCount()).isOne(); } @Test public void shouldReturnSameAdapterRequestTypeMetricsOnSuccessiveCalls() { - assertThat(metrics.forAdapter(RUBICON).requestType(MetricName.amp)) - .isSameAs(metrics.forAdapter(RUBICON).requestType(MetricName.amp)); + assertThat(metrics.forAdapter(MAGNITE).requestType(MetricName.amp)) + .isSameAs(metrics.forAdapter(MAGNITE).requestType(MetricName.amp)); } @Test public void shouldReturnAdapterRequestTypeMetricsConfiguredWithCounterType() { verifyCreatesConfiguredCounterType(metrics -> metrics - .forAdapter(RUBICON) + .forAdapter(MAGNITE) .requestType(MetricName.openrtb2app) .incCounter(MetricName.requests)); } @@ -129,22 +129,22 @@ public void shouldReturnAdapterRequestTypeMetricsConfiguredWithCounterType() { @Test public void shouldReturnAdapterRequestTypeMetricsConfiguredWithAdapterType() { // when - metrics.forAdapter(RUBICON).requestType(MetricName.openrtb2web).incCounter(MetricName.requests); + metrics.forAdapter(MAGNITE).requestType(MetricName.openrtb2web).incCounter(MetricName.requests); // then - assertThat(metricRegistry.counter("adapter.rubicon.requests.type.openrtb2-web").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.requests.type.openrtb2-web").getCount()).isOne(); } @Test public void shouldReturnSameAdapterRequestMetricsOnSuccessiveCalls() { - assertThat(metrics.forAdapter(RUBICON).request()) - .isSameAs(metrics.forAdapter(RUBICON).request()); + assertThat(metrics.forAdapter(MAGNITE).request()) + .isSameAs(metrics.forAdapter(MAGNITE).request()); } @Test public void shouldReturnAdapterRequestMetricsConfiguredWithCounterType() { verifyCreatesConfiguredCounterType(metrics -> metrics - .forAdapter(RUBICON) + .forAdapter(MAGNITE) .request() .incCounter(MetricName.gotbids)); } @@ -152,16 +152,16 @@ public void shouldReturnAdapterRequestMetricsConfiguredWithCounterType() { @Test public void shouldReturnAdapterRequestMetricsConfiguredWithAdapterType() { // when - metrics.forAdapter(RUBICON).request().incCounter(MetricName.gotbids); + metrics.forAdapter(MAGNITE).request().incCounter(MetricName.gotbids); // then - assertThat(metricRegistry.counter("adapter.rubicon.requests.gotbids").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.requests.gotbids").getCount()).isOne(); } @Test public void shouldReturnSameAccountAdapterMetricsOnSuccessiveCalls() { - assertThat(metrics.forAccount(ACCOUNT_ID).adapter().forAdapter("rUbIcOn")) - .isSameAs(metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(RUBICON)); + assertThat(metrics.forAccount(ACCOUNT_ID).adapter().forAdapter("mAgNiTe")) + .isSameAs(metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(MAGNITE)); } @Test @@ -169,23 +169,23 @@ public void shouldReturnAccountAdapterMetricsConfiguredWithCounterType() { verifyCreatesConfiguredCounterType(metrics -> metrics .forAccount(ACCOUNT_ID) .adapter() - .forAdapter(RUBICON) + .forAdapter(MAGNITE) .incCounter(MetricName.bids_received)); } @Test public void shouldReturnAccountAdapterMetricsConfiguredWithAccountAndAdapterType() { // when - metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(RUBICON).incCounter(MetricName.bids_received); + metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(MAGNITE).incCounter(MetricName.bids_received); // then - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.bids_received").getCount()).isOne(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.bids_received").getCount()).isOne(); } @Test public void shouldReturnSameAccountAdapterRequestMetricsOnSuccessiveCalls() { - assertThat(metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(RUBICON).request()) - .isSameAs(metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(RUBICON).request()); + assertThat(metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(MAGNITE).request()) + .isSameAs(metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(MAGNITE).request()); } @Test @@ -193,7 +193,7 @@ public void shouldReturnAccountAdapterRequestMetricsConfiguredWithCounterType() verifyCreatesConfiguredCounterType(metrics -> metrics .forAccount(ACCOUNT_ID) .adapter() - .forAdapter(RUBICON) + .forAdapter(MAGNITE) .request() .incCounter(MetricName.gotbids)); } @@ -201,10 +201,10 @@ public void shouldReturnAccountAdapterRequestMetricsConfiguredWithCounterType() @Test public void shouldReturnAccountAdapterRequestMetricsConfiguredWithAccountAndAdapterType() { // when - metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(RUBICON).request().incCounter(MetricName.gotbids); + metrics.forAccount(ACCOUNT_ID).adapter().forAdapter(MAGNITE).request().incCounter(MetricName.gotbids); // then - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.gotbids").getCount()) + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.gotbids").getCount()) .isOne(); } @@ -253,24 +253,24 @@ public void userSyncShouldReturnUserSyncMetricsConfiguredWithPrefix() { @Test public void shouldReturnSameBidderUserSyncMetricsOnSuccessiveCalls() { - assertThat(metrics.userSync().forBidder(RUBICON)).isSameAs(metrics.userSync().forBidder(RUBICON)); + assertThat(metrics.userSync().forBidder(MAGNITE)).isSameAs(metrics.userSync().forBidder(MAGNITE)); } @Test public void shouldReturnBidderUserSyncMetricsConfiguredWithCounterType() { verifyCreatesConfiguredCounterType(metrics -> metrics .userSync() - .forBidder(RUBICON) + .forBidder(MAGNITE) .incCounter(MetricName.sets)); } @Test public void shouldReturnBidderUserSyncMetricsConfiguredWithBidder() { // when - metrics.userSync().forBidder(RUBICON).incCounter(MetricName.sets); + metrics.userSync().forBidder(MAGNITE).incCounter(MetricName.sets); // then - assertThat(metricRegistry.counter("usersync.rubicon.sets").getCount()).isOne(); + assertThat(metricRegistry.counter("usersync.magnite.sets").getCount()).isOne(); } @Test @@ -280,7 +280,7 @@ public void cookieSyncShouldReturnSameCookieSyncMetricsOnSuccessiveCalls() { @Test public void shouldReturnSameBidderCookieSyncMetricsOnSuccessiveCalls() { - assertThat(metrics.cookieSync().forBidder(RUBICON)).isSameAs(metrics.cookieSync().forBidder(RUBICON)); + assertThat(metrics.cookieSync().forBidder(MAGNITE)).isSameAs(metrics.cookieSync().forBidder(MAGNITE)); } @Test @@ -461,13 +461,13 @@ public void updateAccountDebugRequestMetricsShouldIncrementMetrics() { public void updateAdapterRequestTypeAndNoCookieMetricsShouldUpdateMetricsAsExpected() { // when - metrics.updateAdapterRequestTypeAndNoCookieMetrics("rUbIcON", MetricName.openrtb2app, true); - metrics.updateAdapterRequestTypeAndNoCookieMetrics(RUBICON, MetricName.amp, false); + metrics.updateAdapterRequestTypeAndNoCookieMetrics("mAgNiTe", MetricName.openrtb2app, true); + metrics.updateAdapterRequestTypeAndNoCookieMetrics(MAGNITE, MetricName.amp, false); // then - assertThat(metricRegistry.counter("adapter.rubicon.requests.type.openrtb2-app").getCount()).isEqualTo(1); - assertThat(metricRegistry.counter("adapter.rubicon.no_cookie_requests").getCount()).isOne(); - assertThat(metricRegistry.counter("adapter.rubicon.requests.type.amp").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.requests.type.openrtb2-app").getCount()).isEqualTo(1); + assertThat(metricRegistry.counter("adapter.magnite.no_cookie_requests").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.requests.type.amp").getCount()).isOne(); } @Test @@ -537,13 +537,13 @@ public void updateAlertsConfigMetricsShouldCreateMetricsAsExpected() { @Test public void updateAdapterResponseTimeShouldUpdateMetrics() { // when - metrics.updateAdapterResponseTime(RUBICON, Account.empty(ACCOUNT_ID), 500); + metrics.updateAdapterResponseTime(MAGNITE, Account.empty(ACCOUNT_ID), 500); metrics.updateAdapterResponseTime(CONVERSANT, Account.empty(ACCOUNT_ID), 500); metrics.updateAdapterResponseTime(CONVERSANT, Account.empty(ACCOUNT_ID), 500); // then - assertThat(metricRegistry.timer("adapter.rubicon.request_time").getCount()).isOne(); - assertThat(metricRegistry.timer("account.accountId.adapter.rubicon.request_time").getCount()).isOne(); + assertThat(metricRegistry.timer("adapter.magnite.request_time").getCount()).isOne(); + assertThat(metricRegistry.timer("account.accountId.adapter.magnite.request_time").getCount()).isOne(); assertThat(metricRegistry.timer("adapter.conversant.request_time").getCount()).isEqualTo(2); assertThat(metricRegistry.timer("account.accountId.adapter.conversant.request_time").getCount()).isEqualTo(2); } @@ -551,15 +551,15 @@ public void updateAdapterResponseTimeShouldUpdateMetrics() { @Test public void updateAdapterRequestBuyerUidScrubbedMetricsShouldIncrementMetrics() { // when - metrics.updateAdapterRequestBuyerUidScrubbedMetrics(RUBICON, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterRequestBuyerUidScrubbedMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); metrics.updateAdapterRequestBuyerUidScrubbedMetrics(CONVERSANT, Account.empty(ACCOUNT_ID)); metrics.updateAdapterRequestBuyerUidScrubbedMetrics(CONVERSANT, Account.empty(ACCOUNT_ID)); // then - assertThat(metricRegistry.counter("adapter.rubicon.requests.buyeruid_scrubbed") + assertThat(metricRegistry.counter("adapter.magnite.requests.buyeruid_scrubbed") .getCount()) .isOne(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.buyeruid_scrubbed") + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.buyeruid_scrubbed") .getCount()) .isOne(); assertThat(metricRegistry.counter("adapter.conversant.requests.buyeruid_scrubbed") @@ -573,13 +573,13 @@ public void updateAdapterRequestBuyerUidScrubbedMetricsShouldIncrementMetrics() @Test public void updateAdapterRequestNobidMetricsShouldIncrementMetrics() { // when - metrics.updateAdapterRequestNobidMetrics(RUBICON, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterRequestNobidMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); metrics.updateAdapterRequestNobidMetrics(CONVERSANT, Account.empty(ACCOUNT_ID)); metrics.updateAdapterRequestNobidMetrics(CONVERSANT, Account.empty(ACCOUNT_ID)); // then - assertThat(metricRegistry.counter("adapter.rubicon.requests.nobid").getCount()).isOne(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.nobid").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.requests.nobid").getCount()).isOne(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.nobid").getCount()).isOne(); assertThat(metricRegistry.counter("adapter.conversant.requests.nobid").getCount()).isEqualTo(2); assertThat(metricRegistry.counter("account.accountId.adapter.conversant.requests.nobid").getCount()) .isEqualTo(2); @@ -588,13 +588,13 @@ public void updateAdapterRequestNobidMetricsShouldIncrementMetrics() { @Test public void updateAdapterRequestGotbidsMetricsShouldIncrementMetrics() { // when - metrics.updateAdapterRequestGotbidsMetrics(RUBICON, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterRequestGotbidsMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); metrics.updateAdapterRequestGotbidsMetrics(CONVERSANT, Account.empty(ACCOUNT_ID)); metrics.updateAdapterRequestGotbidsMetrics(CONVERSANT, Account.empty(ACCOUNT_ID)); // then - assertThat(metricRegistry.counter("adapter.rubicon.requests.gotbids").getCount()).isOne(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.gotbids").getCount()) + assertThat(metricRegistry.counter("adapter.magnite.requests.gotbids").getCount()).isOne(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.gotbids").getCount()) .isOne(); assertThat(metricRegistry.counter("adapter.conversant.requests.gotbids").getCount()).isEqualTo(2); assertThat(metricRegistry.counter("account.accountId.adapter.conversant.requests.gotbids").getCount()) @@ -604,18 +604,18 @@ public void updateAdapterRequestGotbidsMetricsShouldIncrementMetrics() { @Test public void updateAdapterBidMetricsShouldUpdateMetrics() { // when - metrics.updateAdapterBidMetrics(RUBICON, Account.empty(ACCOUNT_ID), 1234L, true, "banner"); - metrics.updateAdapterBidMetrics(RUBICON, Account.empty(ACCOUNT_ID), 1234L, false, "video"); + metrics.updateAdapterBidMetrics(MAGNITE, Account.empty(ACCOUNT_ID), 1234L, true, "banner"); + metrics.updateAdapterBidMetrics(MAGNITE, Account.empty(ACCOUNT_ID), 1234L, false, "video"); metrics.updateAdapterBidMetrics(CONVERSANT, Account.empty(ACCOUNT_ID), 1234L, false, "banner"); metrics.updateAdapterBidMetrics(CONVERSANT, Account.empty(ACCOUNT_ID), 1234L, false, "banner"); // then - assertThat(metricRegistry.histogram("adapter.rubicon.prices").getCount()).isEqualTo(2); - assertThat(metricRegistry.histogram("account.accountId.adapter.rubicon.prices").getCount()).isEqualTo(2); - assertThat(metricRegistry.counter("adapter.rubicon.bids_received").getCount()).isEqualTo(2); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.bids_received").getCount()).isEqualTo(2); - assertThat(metricRegistry.counter("adapter.rubicon.banner.adm_bids_received").getCount()).isOne(); - assertThat(metricRegistry.counter("adapter.rubicon.video.nurl_bids_received").getCount()).isOne(); + assertThat(metricRegistry.histogram("adapter.magnite.prices").getCount()).isEqualTo(2); + assertThat(metricRegistry.histogram("account.accountId.adapter.magnite.prices").getCount()).isEqualTo(2); + assertThat(metricRegistry.counter("adapter.magnite.bids_received").getCount()).isEqualTo(2); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.bids_received").getCount()).isEqualTo(2); + assertThat(metricRegistry.counter("adapter.magnite.banner.adm_bids_received").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.video.nurl_bids_received").getCount()).isOne(); assertThat(metricRegistry.histogram("adapter.conversant.prices").getCount()).isEqualTo(2); assertThat(metricRegistry.histogram("account.accountId.adapter.conversant.prices").getCount()).isEqualTo(2); assertThat(metricRegistry.counter("adapter.conversant.bids_received").getCount()).isEqualTo(2); @@ -658,23 +658,23 @@ public void updateDisabledBidderMetricsShouldIncrementMetrics() { @Test public void updateAdapterRequestErrorMetricShouldIncrementMetrics() { // when - metrics.updateAdapterRequestErrorMetric(RUBICON, MetricName.badinput); + metrics.updateAdapterRequestErrorMetric(MAGNITE, MetricName.badinput); metrics.updateAdapterRequestErrorMetric(CONVERSANT, MetricName.badinput); metrics.updateAdapterRequestErrorMetric(CONVERSANT, MetricName.badinput); // then - assertThat(metricRegistry.counter("adapter.rubicon.requests.badinput").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.requests.badinput").getCount()).isOne(); assertThat(metricRegistry.counter("adapter.conversant.requests.badinput").getCount()).isEqualTo(2); } @Test public void updateSizeValidationMetricsShouldIncrementMetrics() { // when - metrics.updateSizeValidationMetrics(RUBICON, ACCOUNT_ID, MetricName.err); + metrics.updateSizeValidationMetrics(MAGNITE, ACCOUNT_ID, MetricName.err); metrics.updateSizeValidationMetrics(CONVERSANT, ACCOUNT_ID, MetricName.err); // then - assertThat(metricRegistry.counter("adapter.rubicon.response.validation.size.err").getCount()).isEqualTo(1); + assertThat(metricRegistry.counter("adapter.magnite.response.validation.size.err").getCount()).isEqualTo(1); assertThat(metricRegistry.counter("adapter.conversant.response.validation.size.err").getCount()).isEqualTo(1); assertThat(metricRegistry.counter("account.accountId.response.validation.size.err").getCount()).isEqualTo(2); } @@ -682,11 +682,11 @@ public void updateSizeValidationMetricsShouldIncrementMetrics() { @Test public void updateSecureValidationMetricsShouldIncrementMetrics() { // when - metrics.updateSecureValidationMetrics(RUBICON, ACCOUNT_ID, MetricName.err); + metrics.updateSecureValidationMetrics(MAGNITE, ACCOUNT_ID, MetricName.err); metrics.updateSecureValidationMetrics(CONVERSANT, ACCOUNT_ID, MetricName.err); // then - assertThat(metricRegistry.counter("adapter.rubicon.response.validation.secure.err").getCount()).isEqualTo(1); + assertThat(metricRegistry.counter("adapter.magnite.response.validation.secure.err").getCount()).isEqualTo(1); assertThat(metricRegistry.counter("adapter.conversant.response.validation.secure.err").getCount()).isEqualTo(1); assertThat(metricRegistry.counter("account.accountId.response.validation.secure.err").getCount()).isEqualTo(2); } @@ -694,11 +694,11 @@ public void updateSecureValidationMetricsShouldIncrementMetrics() { @Test public void updateSeatValidationMetricsShouldIncrementMetrics() { // when - metrics.updateSeatValidationMetrics(RUBICON); + metrics.updateSeatValidationMetrics(MAGNITE); metrics.updateSeatValidationMetrics(CONVERSANT); // then - assertThat(metricRegistry.counter("adapter.rubicon.response.validation.seat").getCount()).isEqualTo(1); + assertThat(metricRegistry.counter("adapter.magnite.response.validation.seat").getCount()).isEqualTo(1); assertThat(metricRegistry.counter("adapter.conversant.response.validation.seat").getCount()).isEqualTo(1); } @@ -732,42 +732,42 @@ public void updateUserSyncBadRequestMetricShouldIncrementMetric() { @Test public void updateUserSyncSetsMetricShouldIncrementMetric() { // when - metrics.updateUserSyncSetsMetric("RUBICON"); + metrics.updateUserSyncSetsMetric("MAGNITE"); // then - assertThat(metricRegistry.counter("usersync.rubicon.sets").getCount()).isOne(); + assertThat(metricRegistry.counter("usersync.magnite.sets").getCount()).isOne(); } @Test public void updateUserSyncTcfBlockedMetricShouldIncrementMetric() { // when - metrics.updateUserSyncTcfBlockedMetric(RUBICON); + metrics.updateUserSyncTcfBlockedMetric(MAGNITE); // then - assertThat(metricRegistry.counter("usersync.rubicon.tcf.blocked").getCount()).isOne(); + assertThat(metricRegistry.counter("usersync.magnite.tcf.blocked").getCount()).isOne(); } @Test public void updateCookieSyncTcfBlockedMetricShouldIncrementMetric() { // when - metrics.updateCookieSyncTcfBlockedMetric(RUBICON); + metrics.updateCookieSyncTcfBlockedMetric(MAGNITE); metrics.updateCookieSyncTcfBlockedMetric(CONVERSANT); metrics.updateCookieSyncTcfBlockedMetric(CONVERSANT); // then - assertThat(metricRegistry.counter("cookie_sync.rubicon.tcf.blocked").getCount()).isOne(); + assertThat(metricRegistry.counter("cookie_sync.magnite.tcf.blocked").getCount()).isOne(); assertThat(metricRegistry.counter("cookie_sync.conversant.tcf.blocked").getCount()).isEqualTo(2); } @Test public void updateCookieSyncFilteredMetricShouldIncrementMetric() { // when - metrics.updateCookieSyncFilteredMetric(RUBICON); + metrics.updateCookieSyncFilteredMetric(MAGNITE); metrics.updateCookieSyncFilteredMetric("CONVERSANT"); metrics.updateCookieSyncFilteredMetric(CONVERSANT); // then - assertThat(metricRegistry.counter("cookie_sync.rubicon.filtered").getCount()).isOne(); + assertThat(metricRegistry.counter("cookie_sync.magnite.filtered").getCount()).isOne(); assertThat(metricRegistry.counter("cookie_sync.conversant.filtered").getCount()).isEqualTo(2); } @@ -776,7 +776,7 @@ public void updateAuctionTcfMetricsShouldIncrementMetrics() { // when metrics.updateAuctionTcfAndLmtMetrics( activityInfrastructure, - RUBICON, + MAGNITE, MetricName.openrtb2web, true, true, true, true, true, false); metrics.updateAuctionTcfAndLmtMetrics( @@ -791,11 +791,11 @@ public void updateAuctionTcfMetricsShouldIncrementMetrics() { false, true, false, true, false, false); // then - assertThat(metricRegistry.counter("adapter.rubicon.openrtb2-web.tcf.userfpd_masked").getCount()).isOne(); - assertThat(metricRegistry.counter("adapter.rubicon.openrtb2-web.tcf.userid_removed").getCount()).isOne(); - assertThat(metricRegistry.counter("adapter.rubicon.openrtb2-web.tcf.geo_masked").getCount()).isOne(); - assertThat(metricRegistry.counter("adapter.rubicon.openrtb2-web.tcf.analytics_blocked").getCount()).isOne(); - assertThat(metricRegistry.counter("adapter.rubicon.openrtb2-web.tcf.request_blocked").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.openrtb2-web.tcf.userfpd_masked").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.openrtb2-web.tcf.userid_removed").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.openrtb2-web.tcf.geo_masked").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.openrtb2-web.tcf.analytics_blocked").getCount()).isOne(); + assertThat(metricRegistry.counter("adapter.magnite.openrtb2-web.tcf.request_blocked").getCount()).isOne(); assertThat(metricRegistry.counter("adapter.conversant.openrtb2-web.tcf.userfpd_masked").getCount()).isOne(); assertThat(metricRegistry.counter("adapter.conversant.openrtb2-app.tcf.userid_removed").getCount()).isOne(); assertThat(metricRegistry.counter("adapter.conversant.openrtb2-web.tcf.geo_masked").getCount()).isOne(); @@ -808,12 +808,12 @@ public void updateAuctionTcfMetricsShouldUpdateTransitUfpdActivityMetricWhenUser // when metrics.updateAuctionTcfAndLmtMetrics( activityInfrastructure, - RUBICON, + MAGNITE, MetricName.openrtb2web, true, false, false, false, false, false); // then - verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_UFPD, ComponentType.BIDDER, RUBICON); + verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_UFPD, ComponentType.BIDDER, MAGNITE); verifyNoMoreInteractions(activityInfrastructure); } @@ -822,12 +822,12 @@ public void updateAuctionTcfMetricsShouldUpdateTransitGeoActivityMetricWhenGeoMa // when metrics.updateAuctionTcfAndLmtMetrics( activityInfrastructure, - RUBICON, + MAGNITE, MetricName.openrtb2web, false, false, true, false, false, false); // then - verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_GEO, ComponentType.BIDDER, RUBICON); + verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_GEO, ComponentType.BIDDER, MAGNITE); verifyNoMoreInteractions(activityInfrastructure); } @@ -836,12 +836,12 @@ public void updateAuctionTcfMetricsShouldUpdateTransitEidsActivityMetricWhenGeoM // when metrics.updateAuctionTcfAndLmtMetrics( activityInfrastructure, - RUBICON, + MAGNITE, MetricName.openrtb2web, false, true, false, false, false, false); // then - verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_EIDS, ComponentType.BIDDER, RUBICON); + verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_EIDS, ComponentType.BIDDER, MAGNITE); verifyNoMoreInteractions(activityInfrastructure); } @@ -850,12 +850,12 @@ public void updateAuctionTcfMetricsShouldUpdateCallBidderActivityMetricWhenReque // when metrics.updateAuctionTcfAndLmtMetrics( activityInfrastructure, - RUBICON, + MAGNITE, MetricName.openrtb2web, false, false, false, false, true, false); // then - verify(activityInfrastructure).updateActivityMetrics(Activity.CALL_BIDDER, ComponentType.BIDDER, RUBICON); + verify(activityInfrastructure).updateActivityMetrics(Activity.CALL_BIDDER, ComponentType.BIDDER, MAGNITE); verifyNoMoreInteractions(activityInfrastructure); } @@ -864,14 +864,14 @@ public void updateAuctionTcfMetricsShouldUpdateTransmitUfpdEidsAndGeoActivityMet // when metrics.updateAuctionTcfAndLmtMetrics( activityInfrastructure, - RUBICON, + MAGNITE, MetricName.openrtb2web, false, false, false, false, false, true); // then - verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_EIDS, ComponentType.BIDDER, RUBICON); - verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_GEO, ComponentType.BIDDER, RUBICON); - verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_UFPD, ComponentType.BIDDER, RUBICON); + verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_EIDS, ComponentType.BIDDER, MAGNITE); + verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_GEO, ComponentType.BIDDER, MAGNITE); + verify(activityInfrastructure).updateActivityMetrics(Activity.TRANSMIT_UFPD, ComponentType.BIDDER, MAGNITE); verifyNoMoreInteractions(activityInfrastructure); } @@ -910,7 +910,7 @@ public void updatePrivacyLmtMetricShouldIncrementMetric() { // when metrics.updateAuctionTcfAndLmtMetrics( activityInfrastructure, - RUBICON, + MAGNITE, MetricName.openrtb2web, false, false, false, false, false, true); @@ -1031,10 +1031,10 @@ public void shouldNotUpdateAccountMetricsIfVerbosityIsNone() { metrics.updateAccountDebugRequestMetrics(Account.empty(ACCOUNT_ID), false); metrics.updateAccountDebugRequestMetrics(Account.empty(ACCOUNT_ID), true); metrics.updateAccountRequestMetrics(Account.empty(ACCOUNT_ID), MetricName.openrtb2web); - metrics.updateAdapterResponseTime(RUBICON, Account.empty(ACCOUNT_ID), 500); - metrics.updateAdapterRequestNobidMetrics(RUBICON, Account.empty(ACCOUNT_ID)); - metrics.updateAdapterRequestGotbidsMetrics(RUBICON, Account.empty(ACCOUNT_ID)); - metrics.updateAdapterBidMetrics(RUBICON, Account.empty(ACCOUNT_ID), 1234L, true, "banner"); + metrics.updateAdapterResponseTime(MAGNITE, Account.empty(ACCOUNT_ID), 500); + metrics.updateAdapterRequestNobidMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterRequestGotbidsMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterBidMetrics(MAGNITE, Account.empty(ACCOUNT_ID), 1234L, true, "banner"); metrics.updateDisabledBidderMetric(Account.empty(ACCOUNT_ID)); metrics.updateUnknownBidderMetric(Account.empty(ACCOUNT_ID)); @@ -1042,15 +1042,15 @@ public void shouldNotUpdateAccountMetricsIfVerbosityIsNone() { assertThat(metricRegistry.counter("account.accountId.requests").getCount()).isZero(); assertThat(metricRegistry.counter("account.accountId.debug_requests").getCount()).isZero(); assertThat(metricRegistry.counter("account.accountId.requests.type.openrtb2-web").getCount()).isZero(); - assertThat(metricRegistry.timer("account.accountId.adapter.rubicon.request_time").getCount()).isZero(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.nobid").getCount()).isZero(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.gotbids").getCount()).isZero(); - assertThat(metricRegistry.histogram("account.accountId.adapter.rubicon.prices").getCount()).isZero(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.bids_received").getCount()).isZero(); + assertThat(metricRegistry.timer("account.accountId.adapter.magnite.request_time").getCount()).isZero(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.nobid").getCount()).isZero(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.gotbids").getCount()).isZero(); + assertThat(metricRegistry.histogram("account.accountId.adapter.magnite.prices").getCount()).isZero(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.bids_received").getCount()).isZero(); assertThat(metricRegistry.counter( - "account.accountId.adapter.rubicon.requests.unknown_bidder").getCount()).isZero(); + "account.accountId.adapter.magnite.requests.unknown_bidder").getCount()).isZero(); assertThat(metricRegistry.counter( - "account.accountId.adapter.rubicon.requests.disabled_bidder").getCount()).isZero(); + "account.accountId.adapter.magnite.requests.disabled_bidder").getCount()).isZero(); } @Test @@ -1062,10 +1062,10 @@ public void shouldUpdateAccountRequestsMetricOnlyIfVerbosityIsBasic() { metrics.updateAccountRequestMetrics(Account.empty(ACCOUNT_ID), MetricName.openrtb2web); metrics.updateAccountDebugRequestMetrics(Account.empty(ACCOUNT_ID), false); metrics.updateAccountDebugRequestMetrics(Account.empty(ACCOUNT_ID), true); - metrics.updateAdapterResponseTime(RUBICON, Account.empty(ACCOUNT_ID), 500); - metrics.updateAdapterRequestNobidMetrics(RUBICON, Account.empty(ACCOUNT_ID)); - metrics.updateAdapterRequestGotbidsMetrics(RUBICON, Account.empty(ACCOUNT_ID)); - metrics.updateAdapterBidMetrics(RUBICON, Account.empty(ACCOUNT_ID), 1234L, true, "banner"); + metrics.updateAdapterResponseTime(MAGNITE, Account.empty(ACCOUNT_ID), 500); + metrics.updateAdapterRequestNobidMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterRequestGotbidsMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterBidMetrics(MAGNITE, Account.empty(ACCOUNT_ID), 1234L, true, "banner"); metrics.updateDisabledBidderMetric(Account.empty(ACCOUNT_ID)); metrics.updateUnknownBidderMetric(Account.empty(ACCOUNT_ID)); @@ -1073,15 +1073,15 @@ public void shouldUpdateAccountRequestsMetricOnlyIfVerbosityIsBasic() { assertThat(metricRegistry.counter("account.accountId.requests").getCount()).isOne(); assertThat(metricRegistry.counter("account.accountId.debug_requests").getCount()).isZero(); assertThat(metricRegistry.counter("account.accountId.requests.type.openrtb2-web").getCount()).isZero(); - assertThat(metricRegistry.timer("account.accountId.rubicon.request_time").getCount()).isZero(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.nobid").getCount()).isZero(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.gotbids").getCount()).isZero(); - assertThat(metricRegistry.histogram("account.accountId.adapter.rubicon.prices").getCount()).isZero(); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.bids_received").getCount()).isZero(); + assertThat(metricRegistry.timer("account.accountId.magnite.request_time").getCount()).isZero(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.nobid").getCount()).isZero(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.gotbids").getCount()).isZero(); + assertThat(metricRegistry.histogram("account.accountId.adapter.magnite.prices").getCount()).isZero(); + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.bids_received").getCount()).isZero(); assertThat(metricRegistry.counter( - "account.accountId.adapter.rubicon.requests.unknown_bidder").getCount()).isZero(); + "account.accountId.adapter.magnite.requests.unknown_bidder").getCount()).isZero(); assertThat(metricRegistry.counter( - "account.accountId.adapter.rubicon.requests.disabled_bidder").getCount()).isZero(); + "account.accountId.adapter.magnite.requests.disabled_bidder").getCount()).isZero(); } @Test @@ -1093,10 +1093,10 @@ public void shouldUpdateAccountRequestsMetricOnlyIfVerbosityIsDetailed() { metrics.updateAccountRequestMetrics(Account.empty(ACCOUNT_ID), MetricName.openrtb2web); metrics.updateAccountDebugRequestMetrics(Account.empty(ACCOUNT_ID), false); metrics.updateAccountDebugRequestMetrics(Account.empty(ACCOUNT_ID), true); - metrics.updateAdapterResponseTime(RUBICON, Account.empty(ACCOUNT_ID), 500); - metrics.updateAdapterRequestNobidMetrics(RUBICON, Account.empty(ACCOUNT_ID)); - metrics.updateAdapterRequestGotbidsMetrics(RUBICON, Account.empty(ACCOUNT_ID)); - metrics.updateAdapterBidMetrics(RUBICON, Account.empty(ACCOUNT_ID), 1234L, true, "banner"); + metrics.updateAdapterResponseTime(MAGNITE, Account.empty(ACCOUNT_ID), 500); + metrics.updateAdapterRequestNobidMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterRequestGotbidsMetrics(MAGNITE, Account.empty(ACCOUNT_ID)); + metrics.updateAdapterBidMetrics(MAGNITE, Account.empty(ACCOUNT_ID), 1234L, true, "banner"); metrics.updateDisabledBidderMetric(Account.empty(ACCOUNT_ID)); metrics.updateUnknownBidderMetric(Account.empty(ACCOUNT_ID)); @@ -1106,13 +1106,13 @@ public void shouldUpdateAccountRequestsMetricOnlyIfVerbosityIsDetailed() { .isEqualTo(1); assertThat(metricRegistry.counter("account.accountId.requests.type.openrtb2-web").getCount()) .isEqualTo(1); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.nobid").getCount()) + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.nobid").getCount()) .isEqualTo(1); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.requests.gotbids").getCount()) + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.requests.gotbids").getCount()) .isEqualTo(1); - assertThat(metricRegistry.histogram("account.accountId.adapter.rubicon.prices").getCount()) + assertThat(metricRegistry.histogram("account.accountId.adapter.magnite.prices").getCount()) .isEqualTo(1); - assertThat(metricRegistry.counter("account.accountId.adapter.rubicon.bids_received").getCount()) + assertThat(metricRegistry.counter("account.accountId.adapter.magnite.bids_received").getCount()) .isEqualTo(1); assertThat(metricRegistry.counter( "unknown_bidder").getCount()).isEqualTo(1); diff --git a/src/test/java/org/prebid/server/metric/UserSyncMetricsTest.java b/src/test/java/org/prebid/server/metric/UserSyncMetricsTest.java index 83e4ffb284a..e9b0a32aec3 100644 --- a/src/test/java/org/prebid/server/metric/UserSyncMetricsTest.java +++ b/src/test/java/org/prebid/server/metric/UserSyncMetricsTest.java @@ -13,6 +13,6 @@ public void forBidderShouldReturnSameBidderCookieSyncMetricsOnSuccessiveCalls() final UserSyncMetrics userSyncMetrics = new UserSyncMetrics(new MetricRegistry(), CounterType.counter); // when and then - assertThat(userSyncMetrics.forBidder("rubicon")).isSameAs(userSyncMetrics.forBidder("rubicon")); + assertThat(userSyncMetrics.forBidder("magnite")).isSameAs(userSyncMetrics.forBidder("magnite")); } } diff --git a/src/test/java/org/prebid/server/privacy/gdpr/Tcf2ServiceTest.java b/src/test/java/org/prebid/server/privacy/gdpr/Tcf2ServiceTest.java index bc99140d6db..79eff191ae1 100644 --- a/src/test/java/org/prebid/server/privacy/gdpr/Tcf2ServiceTest.java +++ b/src/test/java/org/prebid/server/privacy/gdpr/Tcf2ServiceTest.java @@ -171,13 +171,13 @@ private void initGdpr(PurposeOneTreatmentInterpretation p1TI) { @Test public void permissionsForShouldReturnByGdprPurpose() { // given - given(bidderCatalog.nameByVendorId(any())).willReturn("rubicon"); + given(bidderCatalog.nameByVendorId(any())).willReturn("magnite"); // when final Future> result = target.permissionsFor(singleton(1), tcString); // then - final VendorPermission expectedVendorPermission = VendorPermission.of(1, "rubicon", restrictAll()); + final VendorPermission expectedVendorPermission = VendorPermission.of(1, "magnite", restrictAll()); assertThat(result).succeededWith(singletonList(expectedVendorPermission)); verifyEachPurposeStrategyReceive(singletonList(withGvl(expectedVendorPermission, 1))); @@ -190,13 +190,13 @@ public void permissionsForShouldReturnByGdprPurpose() { public void permissionsForShouldReturnByGdprPurposeAndDowngradeToBasicTypeWhenVendorListServiceFailed() { // given given(vendorListService.forConsent(any())).willReturn(Future.failedFuture("Bad version")); - given(bidderCatalog.nameByVendorId(any())).willReturn("rubicon"); + given(bidderCatalog.nameByVendorId(any())).willReturn("magnite"); // when final Future> result = target.permissionsFor(singleton(1), tcString); // then - final VendorPermission expectedVendorPermission = VendorPermission.of(1, "rubicon", restrictAll()); + final VendorPermission expectedVendorPermission = VendorPermission.of(1, "magnite", restrictAll()); assertThat(result).succeededWith(singletonList(expectedVendorPermission)); final Purpose downgradedPurpose7 = Purpose.of( @@ -336,7 +336,7 @@ public void permissionsForShouldReturnVendorIdsResult() { @Test public void permissionsForShouldReturnAllDeniedWhenP1TIIsNoAccessAllowed() { // given - given(bidderCatalog.nameByVendorId(any())).willReturn("rubicon"); + given(bidderCatalog.nameByVendorId(any())).willReturn("magnite"); given(tcString.getPurposeOneTreatment()).willReturn(true); initTcf2Service(PurposeOneTreatmentInterpretation.noAccessAllowed); @@ -344,7 +344,7 @@ public void permissionsForShouldReturnAllDeniedWhenP1TIIsNoAccessAllowed() { final Future> result = target.permissionsFor(singleton(1), tcString); // then - final VendorPermission expectedVendorPermission = VendorPermission.of(1, "rubicon", restrictAll()); + final VendorPermission expectedVendorPermission = VendorPermission.of(1, "magnite", restrictAll()); assertThat(result).succeededWith(singletonList(expectedVendorPermission)); final List permissions = singletonList(withGvl(expectedVendorPermission, 1)); @@ -364,7 +364,7 @@ public void permissionsForShouldReturnAllDeniedWhenP1TIIsNoAccessAllowed() { @Test public void permissionsForShouldAllowAllWhenP1TIIsAccessAllowed() { // given - given(bidderCatalog.nameByVendorId(any())).willReturn("rubicon"); + given(bidderCatalog.nameByVendorId(any())).willReturn("magnite"); given(tcString.getPurposeOneTreatment()).willReturn(true); initTcf2Service(PurposeOneTreatmentInterpretation.accessAllowed); @@ -372,7 +372,7 @@ public void permissionsForShouldAllowAllWhenP1TIIsAccessAllowed() { final Future> result = target.permissionsFor(singleton(1), tcString); // then - final VendorPermission expectedVendorPermission = VendorPermission.of(1, "rubicon", restrictAll()); + final VendorPermission expectedVendorPermission = VendorPermission.of(1, "magnite", restrictAll()); assertThat(result).succeededWith(singletonList(expectedVendorPermission)); final List permissions = singletonList(withGvl(expectedVendorPermission, 1)); @@ -393,7 +393,7 @@ public void permissionsForShouldAllowAllWhenP1TIIsAccessAllowed() { @Test public void permissionsForShouldNotAllowAllWhenP1TIsFalseAndP1TIIsAccessAllowed() { // given - given(bidderCatalog.nameByVendorId(any())).willReturn("rubicon"); + given(bidderCatalog.nameByVendorId(any())).willReturn("magnite"); given(tcString.getPurposeOneTreatment()).willReturn(false); initTcf2Service(PurposeOneTreatmentInterpretation.accessAllowed); @@ -401,7 +401,7 @@ public void permissionsForShouldNotAllowAllWhenP1TIsFalseAndP1TIIsAccessAllowed( final Future> result = target.permissionsFor(singleton(1), tcString); // then - final VendorPermission expectedVendorPermission = VendorPermission.of(1, "rubicon", restrictAll()); + final VendorPermission expectedVendorPermission = VendorPermission.of(1, "magnite", restrictAll()); assertThat(result).succeededWith(singletonList(expectedVendorPermission)); final List standardPermissions = singletonList(withGvl(expectedVendorPermission, 1)); diff --git a/src/test/java/org/prebid/server/settings/FileApplicationSettingsTest.java b/src/test/java/org/prebid/server/settings/FileApplicationSettingsTest.java index 5c4bd81dff9..dd8bab98d16 100644 --- a/src/test/java/org/prebid/server/settings/FileApplicationSettingsTest.java +++ b/src/test/java/org/prebid/server/settings/FileApplicationSettingsTest.java @@ -133,7 +133,7 @@ public void getAccountByIdShouldReturnPresentAccount() { p1: { enforce-purpose: basic, enforce-vendors: false, - vendor-exceptions: [rubicon, appnexus] + vendor-exceptions: [magnite, appnexus] }, p2: { enforce-purpose: full, @@ -144,7 +144,7 @@ public void getAccountByIdShouldReturnPresentAccount() { special-features: { sf1: { enforce: true, - vendor-exceptions: [rubicon, appnexus] + vendor-exceptions: [magnite, appnexus] }, sf2: { enforce: false, @@ -210,12 +210,12 @@ public void getAccountByIdShouldReturnPresentAccount() { .p1(Purpose.of( EnforcePurpose.basic, false, - asList("rubicon", "appnexus"), + asList("magnite", "appnexus"), null)) .p2(Purpose.of(EnforcePurpose.full, true, singletonList("openx"), null)) .build()) .specialFeatures(SpecialFeatures.builder() - .sf1(SpecialFeature.of(true, asList("rubicon", "appnexus"))) + .sf1(SpecialFeature.of(true, asList("magnite", "appnexus"))) .sf2(SpecialFeature.of(false, singletonList("openx"))) .build()) .purposeOneTreatmentInterpretation(PurposeOneTreatmentInterpretation.accessAllowed) diff --git a/src/test/java/org/prebid/server/validation/ImpValidatorTest.java b/src/test/java/org/prebid/server/validation/ImpValidatorTest.java index fa109dc8f58..bbc329fbd07 100644 --- a/src/test/java/org/prebid/server/validation/ImpValidatorTest.java +++ b/src/test/java/org/prebid/server/validation/ImpValidatorTest.java @@ -54,7 +54,7 @@ @ExtendWith(MockitoExtension.class) public class ImpValidatorTest extends VertxTest { - private static final String RUBICON = "rubicon"; + private static final String MAGNITE = "magnite"; @Mock private BidderParamValidator bidderParamValidator; @@ -67,8 +67,8 @@ public class ImpValidatorTest extends VertxTest { public void setUp() { target = new ImpValidator(bidderParamValidator, bidderCatalog, jacksonMapper); - given(bidderCatalog.isValidName(RUBICON)).willReturn(true); - given(bidderCatalog.isActive(RUBICON)).willReturn(true); + given(bidderCatalog.isValidName(MAGNITE)).willReturn(true); + given(bidderCatalog.isActive(MAGNITE)).willReturn(true); } @Test @@ -146,7 +146,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasNullFormatAndN .format(null) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -169,7 +169,7 @@ public void validateImpsShouldReturnEmptyValidationMessagesWhenBannerHasNullForm .format(null) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -185,7 +185,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasEmptyFormatAnd .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -205,7 +205,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasEmptyFormatAnd .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -225,7 +225,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasEmptyFormatAnd .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -246,7 +246,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasEmptyFormatAnd .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -267,7 +267,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasZeroHeight() { .format(singletonList(Format.builder().build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -288,7 +288,7 @@ public void validateImpsShouldNotReturnValidationMessageForSizesIfImpIsInterstit .format(singletonList(Format.builder().w(1).h(1).build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -306,7 +306,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasEmptyFormatAnd .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -327,7 +327,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasZeroWidth() { .format(singletonList(Format.builder().build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -347,7 +347,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasEmptyFormatAnd .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -368,7 +368,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasNegativeWidth( .format(singletonList(Format.builder().build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -387,7 +387,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasEmptyFormatAnd .w(600) .format(emptyList()) .build()) - .ext(mapper.valueToTree(singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + .ext(mapper.valueToTree(singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -408,7 +408,7 @@ public void validateImpsShouldReturnValidationMessageWhenBannerHasNegativeHeight .format(singletonList(Format.builder().build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build()); // when & then @@ -1367,7 +1367,7 @@ public void validateImpsShouldReturnValidationMessageWhenStoredBidResponseBidder // given final ObjectNode prebid = mapper.valueToTree(ExtImpPrebid.builder() .storedBidResponse(singletonList(ExtStoredBidResponse.of(null, "id"))) - .bidder(mapper.createObjectNode().put("rubicon", 1)) + .bidder(mapper.createObjectNode().put("magnite", 1)) .build()); final List givenImps = singletonList(validImpBuilder() @@ -1384,7 +1384,7 @@ public void validateImpsShouldReturnValidationMessageWhenStoredBidResponseIdMiss // given final ObjectNode prebid = mapper.valueToTree(ExtImpPrebid.builder() .storedBidResponse(singletonList(ExtStoredBidResponse.of("bidder", null))) - .bidder(mapper.createObjectNode().put("rubicon", 1)) + .bidder(mapper.createObjectNode().put("magnite", 1)) .build()); final List givenImps = singletonList(validImpBuilder() @@ -1402,7 +1402,7 @@ public void validateImpsShouldReturnValidationMessageWhenStoredBidResponseBidder // given final ObjectNode prebid = mapper.valueToTree(ExtImpPrebid.builder() .storedBidResponse(singletonList(ExtStoredBidResponse.of("bidder", "id"))) - .bidder(mapper.createObjectNode().put("rubicon", 1)) + .bidder(mapper.createObjectNode().put("magnite", 1)) .build()); given(bidderCatalog.isValidName(eq("bidder"))).willReturn(false); @@ -1421,7 +1421,7 @@ public void validateImpsShouldReturnValidationMessageWhenStoredBidResponseBidder // given final ObjectNode prebid = mapper.valueToTree(ExtImpPrebid.builder() .storedBidResponse(singletonList(ExtStoredBidResponse.of("bidder", "id"))) - .bidder(mapper.createObjectNode().put("rubicon", 1)) + .bidder(mapper.createObjectNode().put("magnite", 1)) .build()); given(bidderCatalog.isValidName(eq("bidder"))).willReturn(true); @@ -1468,7 +1468,7 @@ public void validateImpsShouldReturnWarningAndDropBidderWhenImpExtPrebidBidderIs // given final List givenImps = givenValidImps(); - given(bidderCatalog.isValidName(eq(RUBICON))).willReturn(false); + given(bidderCatalog.isValidName(eq(MAGNITE))).willReturn(false); final List debugMessages = new ArrayList<>(); @@ -1477,8 +1477,8 @@ public void validateImpsShouldReturnWarningAndDropBidderWhenImpExtPrebidBidderIs // then assertThat(debugMessages) - .containsExactly("WARNING: request.imp[0].ext.prebid.bidder.rubicon was dropped with a reason: " - + "request.imp[0].ext.prebid.bidder contains unknown bidder: rubicon", + .containsExactly("WARNING: request.imp[0].ext.prebid.bidder.magnite was dropped with a reason: " + + "request.imp[0].ext.prebid.bidder contains unknown bidder: magnite", "WARNING: request.imp[0].ext must contain at least one valid bidder"); assertThat(givenImps) @@ -1504,8 +1504,8 @@ public void validateImpsShouldReturnWarningMessageAndDropBidderWhenBidderExtIsIn assertThat(debugMessages) .containsExactly( """ - WARNING: request.imp[0].ext.prebid.bidder.rubicon was dropped with a reason: \ - request.imp[0].ext.prebid.bidder.rubicon failed validation. + WARNING: request.imp[0].ext.prebid.bidder.magnite was dropped with a reason: \ + request.imp[0].ext.prebid.bidder.magnite failed validation. errorMessage1 errorMessage2""", "WARNING: request.imp[0].ext must contain at least one valid bidder"); @@ -1532,7 +1532,7 @@ public void validateImpsShouldReturnWarningMessageAndDropBidderWhenBidderExtIsIn final List debugMessages = new ArrayList<>(); // when - target.validateImps(givenImps, Map.of("someAlias", "rubicon"), debugMessages); + target.validateImps(givenImps, Map.of("someAlias", "magnite"), debugMessages); // then assertThat(debugMessages) @@ -1560,7 +1560,7 @@ public void validateImpsShouldReturnWarningMessageAndDropBidderWhenImpExtPrebidI // given final List givenImps = singletonList(validImpBuilder() .ext(mapper.valueToTree(singletonMap("prebid", - Map.of("imp", singletonMap("unknownBidder", 0), "bidder", singletonMap("rubicon", 0))))) + Map.of("imp", singletonMap("unknownBidder", 0), "bidder", singletonMap("magnite", 0))))) .build()); given(bidderCatalog.isValidName(eq("unknownBidder"))).willReturn(false); @@ -1588,13 +1588,13 @@ public void validateImpsShouldReturnNoMessageWhenImpExtPrebidImpBidderIsAlias() // given final List givenImps = singletonList(validImpBuilder() .ext(mapper.valueToTree(singletonMap("prebid", - Map.of("imp", singletonMap("rubiconAlias", 0), "bidder", singletonMap("rubicon", 0))))) + Map.of("imp", singletonMap("magniteAlias", 0), "bidder", singletonMap("magnite", 0))))) .build()); final List debugMessages = new ArrayList<>(); // when - target.validateImps(givenImps, Map.of("rubiconAlias", "rubicon"), debugMessages); + target.validateImps(givenImps, Map.of("magniteAlias", "magnite"), debugMessages); // then assertThat(debugMessages).isEmpty(); @@ -1603,7 +1603,7 @@ public void validateImpsShouldReturnNoMessageWhenImpExtPrebidImpBidderIsAlias() .extracting(Imp::getExt) .extracting(impExt -> impExt.get("prebid")) .extracting(prebid -> prebid.get("imp")) - .containsOnly(mapper.createObjectNode().put("rubiconAlias", 0)); + .containsOnly(mapper.createObjectNode().put("magniteAlias", 0)); } @Test @@ -1682,7 +1682,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasEmptyFormatAndN .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1702,7 +1702,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasEmptyFormatAndZ .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1722,7 +1722,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasZeroHeight() { .format(singletonList(Format.builder().build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1795,7 +1795,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasNullFormatAndNo .format(null) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1817,7 +1817,7 @@ public void validateImpShouldReturnEmptyValidationMessagesWhenBannerHasNullForma .format(null) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1833,7 +1833,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasEmptyFormatAndN .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1852,7 +1852,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasEmptyFormatAndN .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1873,7 +1873,7 @@ public void validateImpShouldNotReturnValidationMessageForSizesIfImpIsInterstiti .format(singletonList(Format.builder().w(1).h(1).build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1891,7 +1891,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasEmptyFormatAndZ .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1911,7 +1911,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasZeroWidth() { .format(singletonList(Format.builder().build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1931,7 +1931,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasEmptyFormatAndN .format(emptyList()) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1951,7 +1951,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasNegativeWidth() .format(singletonList(Format.builder().build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1970,7 +1970,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasEmptyFormatAndN .w(600) .format(emptyList()) .build()) - .ext(mapper.valueToTree(singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + .ext(mapper.valueToTree(singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -1990,7 +1990,7 @@ public void validateImpShouldReturnValidationMessageWhenBannerHasNegativeHeight( .format(singletonList(Format.builder().build())) .build()) .ext(mapper.valueToTree( - singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))) + singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))) .build(); // when & then @@ -2426,7 +2426,7 @@ private static Imp.ImpBuilder validImpBuilder() { .format(singletonList(Format.builder().wmin(1).wratio(5).hratio(1).build())) .build()) .pmp(Pmp.builder().deals(singletonList(Deal.builder().id("1").build())).build()) - .ext(mapper.valueToTree(singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))); + .ext(mapper.valueToTree(singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))); } } diff --git a/src/test/java/org/prebid/server/validation/RequestValidatorTest.java b/src/test/java/org/prebid/server/validation/RequestValidatorTest.java index 653b7bf6a1d..09cbe564002 100644 --- a/src/test/java/org/prebid/server/validation/RequestValidatorTest.java +++ b/src/test/java/org/prebid/server/validation/RequestValidatorTest.java @@ -71,7 +71,7 @@ @ExtendWith(MockitoExtension.class) public class RequestValidatorTest extends VertxTest { - private static final String RUBICON = "rubicon"; + private static final String MAGNITE = "magnite"; private static final String ACCOUNT_ID = "accountId"; @Mock(strictness = LENIENT) @@ -85,8 +85,8 @@ public class RequestValidatorTest extends VertxTest { @BeforeEach public void setUp() { - given(bidderCatalog.isValidName(eq(RUBICON))).willReturn(true); - given(bidderCatalog.isActive(eq(RUBICON))).willReturn(true); + given(bidderCatalog.isValidName(eq(MAGNITE))).willReturn(true); + given(bidderCatalog.isActive(eq(MAGNITE))).willReturn(true); target = new RequestValidator(bidderCatalog, impValidator, metrics, jacksonMapper, 0.01, false, true, true); } @@ -187,7 +187,7 @@ public void validateShouldReturnValidationMessageWhenAliasesKeyDoesntContainAlia // given final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of(ExtRequestPrebid.builder() - .aliases(singletonMap("pubmatic", "rubicon")) + .aliases(singletonMap("pubmatic", "magnite")) .aliasgvlids(singletonMap("between", 2)) .build())) .build(); @@ -205,7 +205,7 @@ public void validateShouldReturnValidationMessageWhenAliasgvlidsValueLowerThatOn // given final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of(ExtRequestPrebid.builder() - .aliases(singletonMap("pubmatic", "rubicon")) + .aliases(singletonMap("pubmatic", "magnite")) .aliasgvlids(singletonMap("pubmatic", 0)) .build())) .build(); @@ -1125,7 +1125,7 @@ public void validateShouldNotReturnAnyErrorInValidationResultWhenPrebidBuyerIdIs // given final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of(ExtRequestPrebid.builder() - .aliases(singletonMap("unknown-bidder", "rubicon")) + .aliases(singletonMap("unknown-bidder", "magnite")) .build())) .user(User.builder() .ext(ExtUser.builder() @@ -1147,7 +1147,7 @@ public void validateShouldNotReturnAnyErrorInValidationResultWhenPrebidBuyerIdIs final BidRequest bidRequest = validBidRequestBuilder() .user(User.builder() .ext(ExtUser.builder() - .prebid(ExtUserPrebid.of(singletonMap("rubicon", "42"))) + .prebid(ExtUserPrebid.of(singletonMap("magnite", "42"))) .build()) .build()) .build(); @@ -1196,7 +1196,7 @@ public void validateShouldReturnValidationMessageWhenEidHasEmptySource() { public void validateShouldReturnValidationMessageWhenAliasNameEqualsToBidderItPointsOn() { // given final ExtRequest ext = ExtRequest.of(ExtRequestPrebid.builder() - .aliases(singletonMap("rubicon", "rubicon")) + .aliases(singletonMap("magnite", "magnite")) .build()); final BidRequest bidRequest = validBidRequestBuilder().ext(ext).build(); @@ -1206,7 +1206,7 @@ public void validateShouldReturnValidationMessageWhenAliasNameEqualsToBidderItPo // then assertThat(result.getErrors()).hasSize(1) .containsOnly(""" - request.ext.prebid.aliases.rubicon defines a no-op alias. \ + request.ext.prebid.aliases.magnite defines a no-op alias. \ Choose a different alias, or remove this entry"""); } @@ -1284,7 +1284,7 @@ public void validateShouldReturnValidationWarningMessageWhenAliasPointOnDisabled public void validateShouldReturnEmptyValidationMessagesWhenAliasesWasUsed() { // given final ExtRequest ext = ExtRequest.of(ExtRequestPrebid.builder() - .aliases(singletonMap("alias", "rubicon")) + .aliases(singletonMap("alias", "magnite")) .build()); final BidRequest bidRequest = validBidRequestBuilder().ext(ext).build(); @@ -1314,7 +1314,7 @@ public void validateShouldReturnValidationResultWithErrorsWhenGdprIsNotOneOrZero public void validateShouldReturnValidationMessageWhenAdjustmentFactorNegative() { // given final ExtRequestBidAdjustmentFactors givenAdjustments = ExtRequestBidAdjustmentFactors.builder().build(); - givenAdjustments.addFactor("rubicon", BigDecimal.valueOf(-1.1)); + givenAdjustments.addFactor("magnite", BigDecimal.valueOf(-1.1)); final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of( ExtRequestPrebid.builder() @@ -1327,7 +1327,7 @@ public void validateShouldReturnValidationMessageWhenAdjustmentFactorNegative() // then assertThat(result.getErrors()).hasSize(1) .containsOnly( - "request.ext.prebid.bidadjustmentfactors.rubicon must be a positive number. Got -1.100000"); + "request.ext.prebid.bidadjustmentfactors.magnite must be a positive number. Got -1.100000"); } @Test @@ -1335,7 +1335,7 @@ public void validateShouldReturnValidationMessageWhenAdjustmentMediaFactorNegati // given final ExtRequestBidAdjustmentFactors givenAdjustments = ExtRequestBidAdjustmentFactors.builder() .mediatypes(new EnumMap<>(Collections.singletonMap(ImpMediaType.banner, - Collections.singletonMap("rubicon", BigDecimal.valueOf(-1.1))))) + Collections.singletonMap("magnite", BigDecimal.valueOf(-1.1))))) .build(); final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of( @@ -1349,7 +1349,7 @@ public void validateShouldReturnValidationMessageWhenAdjustmentMediaFactorNegati // then assertThat(result.getErrors()).hasSize(1) .containsOnly( - "request.ext.prebid.bidadjustmentfactors.banner.rubicon " + "request.ext.prebid.bidadjustmentfactors.banner.magnite " + "must be a positive number. Got -1.100000"); } @@ -1400,7 +1400,7 @@ public void validateShouldNotFailWhenBidderIsKnownAsAlternativeBidderCode() { final ExtRequestBidAdjustmentFactors givenAdjustments = ExtRequestBidAdjustmentFactors.builder().build(); givenAdjustments.addFactor("unknownBidder", BigDecimal.valueOf(1.1F)); final ExtRequestPrebidAlternateBidderCodes givenAlternativeBidderCodes = - ExtRequestPrebidAlternateBidderCodes.of(true, Map.of("rubicon", + ExtRequestPrebidAlternateBidderCodes.of(true, Map.of("magnite", ExtRequestPrebidAlternateBidderCodesBidder.of(true, Set.of("unknownBidder")))); final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of( @@ -1448,7 +1448,7 @@ public void validateShouldNotFailWhenMediaBidderIsKnownAsAlternativeBidderCode() .build(); givenAdjustments.addFactor("unknownBidder", BigDecimal.valueOf(1.1F)); final ExtRequestPrebidAlternateBidderCodes givenAlternativeBidderCodes = - ExtRequestPrebidAlternateBidderCodes.of(true, Map.of("rubicon", + ExtRequestPrebidAlternateBidderCodes.of(true, Map.of("magnite", ExtRequestPrebidAlternateBidderCodesBidder.of(true, Set.of("unknownBidder")))); final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of( @@ -1470,9 +1470,9 @@ public void validateShouldReturnEmptyValidationMessagesWhenBidderIsKnownAndAdjus // given final ExtRequestBidAdjustmentFactors givenAdjustments = ExtRequestBidAdjustmentFactors.builder() .mediatypes(new EnumMap<>(Collections.singletonMap(ImpMediaType.xNative, - Collections.singletonMap("rubicon", BigDecimal.valueOf(2.1))))) + Collections.singletonMap("magnite", BigDecimal.valueOf(2.1))))) .build(); - givenAdjustments.addFactor("rubicon", BigDecimal.valueOf(1.1)); + givenAdjustments.addFactor("magnite", BigDecimal.valueOf(1.1)); final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of( ExtRequestPrebid.builder() @@ -1490,16 +1490,16 @@ public void validateShouldReturnEmptyValidationMessagesWhenBidderIsKnownAndAdjus @Test public void validateShouldReturnEmptyValidationMessagesWhenBidderIsKnownAliasForCoreBidderAndAdjustmentIsValid() { // given - final String rubiconAlias = "rubicon_alias"; + final String magniteAlias = "magnite_alias"; final ExtRequestBidAdjustmentFactors givenAdjustments = ExtRequestBidAdjustmentFactors.builder() .mediatypes(new EnumMap<>(Collections.singletonMap(ImpMediaType.xNative, - Collections.singletonMap("rubicon_alias", BigDecimal.valueOf(2.1))))) + Collections.singletonMap("magnite_alias", BigDecimal.valueOf(2.1))))) .build(); - givenAdjustments.addFactor(rubiconAlias, BigDecimal.valueOf(1.1)); + givenAdjustments.addFactor(magniteAlias, BigDecimal.valueOf(1.1)); final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of( ExtRequestPrebid.builder() - .aliases(singletonMap(rubiconAlias, "rubicon")) + .aliases(singletonMap(magniteAlias, "magnite")) .bidadjustmentfactors(givenAdjustments) .build())) .build(); @@ -1514,13 +1514,13 @@ public void validateShouldReturnEmptyValidationMessagesWhenBidderIsKnownAliasFor @Test public void validateShouldReturnEmptyValidationMessagesWhenBidderIsKnownBidderConfigAliasAndAdjustmentIsValid() { // given - final String rubiconAlias = "rubicon_alias"; + final String magniteAlias = "magnite_alias"; final ExtRequestBidAdjustmentFactors givenAdjustments = ExtRequestBidAdjustmentFactors.builder().build(); - givenAdjustments.addFactor(rubiconAlias, BigDecimal.valueOf(1.1)); + givenAdjustments.addFactor(magniteAlias, BigDecimal.valueOf(1.1)); final BidRequest bidRequest = validBidRequestBuilder() .ext(ExtRequest.of( ExtRequestPrebid.builder() - .aliases(singletonMap(rubiconAlias, "rubicon")) + .aliases(singletonMap(magniteAlias, "magnite")) .bidadjustmentfactors(givenAdjustments) .build())) .build(); @@ -1529,7 +1529,7 @@ public void validateShouldReturnEmptyValidationMessagesWhenBidderIsKnownBidderCo final ValidationResult result = target.validate(Account.empty(ACCOUNT_ID), bidRequest, null, null); // then - verify(bidderCatalog).isValidName(rubiconAlias); + verify(bidderCatalog).isValidName(magniteAlias); assertThat(result.getErrors()).isEmpty(); } @@ -1600,7 +1600,7 @@ private static Imp.ImpBuilder validImpBuilder() { .format(singletonList(Format.builder().wmin(1).wratio(5).hratio(1).build())) .build()) .pmp(Pmp.builder().deals(singletonList(Deal.builder().id("1").build())).build()) - .ext(mapper.valueToTree(singletonMap("prebid", singletonMap("bidder", singletonMap("rubicon", 0))))); + .ext(mapper.valueToTree(singletonMap("prebid", singletonMap("bidder", singletonMap("magnite", 0))))); } } diff --git a/src/test/resources/org/prebid/server/functional/floor-rules.json b/src/test/resources/org/prebid/server/functional/floor-rules.json index 194c83ebc91..1bbc5446706 100644 --- a/src/test/resources/org/prebid/server/functional/floor-rules.json +++ b/src/test/resources/org/prebid/server/functional/floor-rules.json @@ -1,5 +1,5 @@ { - "floorProvider": "rubicon", + "floorProvider": "magnite", "modelGroups": [ { "modelWeight": 10, diff --git a/src/test/resources/org/prebid/server/it/storedimps/test-generic-stored-imp-cache-update.json b/src/test/resources/org/prebid/server/it/storedimps/test-generic-stored-imp-cache-update.json index 373d0646dea..038b749af92 100644 --- a/src/test/resources/org/prebid/server/it/storedimps/test-generic-stored-imp-cache-update.json +++ b/src/test/resources/org/prebid/server/it/storedimps/test-generic-stored-imp-cache-update.json @@ -11,10 +11,10 @@ "h": 600 }, "ext": { - "rubicon": { + "magnite": { "accountId": 5001, "siteId": 6001, "zoneId": 7001 } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/storedimps/test-rubicon-stored-request-2.json b/src/test/resources/org/prebid/server/it/storedimps/test-magnite-stored-request-2.json similarity index 93% rename from src/test/resources/org/prebid/server/it/storedimps/test-rubicon-stored-request-2.json rename to src/test/resources/org/prebid/server/it/storedimps/test-magnite-stored-request-2.json index b3ae9bfe3bd..24d53945bdd 100644 --- a/src/test/resources/org/prebid/server/it/storedimps/test-rubicon-stored-request-2.json +++ b/src/test/resources/org/prebid/server/it/storedimps/test-magnite-stored-request-2.json @@ -12,7 +12,7 @@ }, "ext": { "tid": "tid", - "rubicon": { + "magnite": { "accountId": 5001, "siteId": 6001, "zoneId": 7001 diff --git a/src/test/resources/org/prebid/server/it/storedresponses/test-stored-auction-response.json b/src/test/resources/org/prebid/server/it/storedresponses/test-stored-auction-response.json index bf02cc1bd3e..335e5feab1d 100644 --- a/src/test/resources/org/prebid/server/it/storedresponses/test-stored-auction-response.json +++ b/src/test/resources/org/prebid/server/it/storedresponses/test-stored-auction-response.json @@ -8,7 +8,7 @@ "price": 0.8 } ], - "seat": "rubicon", + "seat": "magnite", "group": 0 }, { diff --git a/src/test/resources/org/prebid/server/it/storedresponses/test-stored-bid-response.json b/src/test/resources/org/prebid/server/it/storedresponses/test-stored-bid-response.json index 3a3e7f5ba1a..175fe5f6a8c 100644 --- a/src/test/resources/org/prebid/server/it/storedresponses/test-stored-bid-response.json +++ b/src/test/resources/org/prebid/server/it/storedresponses/test-stored-bid-response.json @@ -13,8 +13,8 @@ "h": 250 } ], - "seat": "rubicon", + "seat": "magnite", "group": 0 } ] -} \ No newline at end of file +} 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 780fa391f0f..545105ec91f 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -496,7 +496,7 @@ adapters.magnite.aliases.rubicon.enabled=true adapters.magnite.aliases.rubicon.endpoint=http://localhost:8090/rubicon-exchange adapters.magnite.XAPI.Username=magnite_user adapters.magnite.XAPI.Password=magnite_password -adapters.magnite.usersync.redirect.url=http://localhost:8090/rubicon-usersync?gdpr={gdpr}&gdpr_consent={gdpr_consent} +adapters.magnite.usersync.redirect.url=http://localhost:8090/magnite-usersync?gdpr={gdpr}&gdpr_consent={gdpr_consent} adapters.magnite.usersync.redirect.uid-macro=magnite-macro adapters.salunamedia.enabled=true adapters.salunamedia.endpoint=http://localhost:8090/salunamedia-exchange @@ -710,7 +710,7 @@ auction.category-mapping-enabled=true video.enable-deprecated-endpoint=true currency-converter.external-rates.enabled=true currency-converter.external-rates.url=http://localhost:8090/currency-rates -amp.custom-targeting=rubicon +amp.custom-targeting=magnite cache.scheme=http cache.host=localhost:8090 cache.path=/cache diff --git a/src/test/resources/org/prebid/server/it/uid/test-uid-response.json b/src/test/resources/org/prebid/server/it/uid/test-uid-response.json index 85c3341ce56..25260d5e4be 100644 --- a/src/test/resources/org/prebid/server/it/uid/test-uid-response.json +++ b/src/test/resources/org/prebid/server/it/uid/test-uid-response.json @@ -3,4 +3,4 @@ "rubicon": "J5VLCWQP-26-CWFT", "adnxs": "12345" } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/changed-put-bid-request.json b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/changed-put-bid-request.json index ab4b4d39252..0f001683eba 100644 --- a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/changed-put-bid-request.json +++ b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/changed-put-bid-request.json @@ -17,7 +17,7 @@ "impid": "impIdWasChanged", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -27,7 +27,7 @@ "impid": "impStoredBidResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -40,7 +40,7 @@ "crid": "crid1", "w": 300, "h": 250, - "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs", + "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs", "ext": { "rp": { "targeting": [ @@ -124,12 +124,12 @@ "crid": "crid2", "w": 300, "h": 600, - "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { "type": "xml", - "value": "", + "value": "", "expiry": 120 } ] diff --git a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/missing-put-bid-request.json b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/missing-put-bid-request.json index d72ed026ec2..58b572e1819 100644 --- a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/missing-put-bid-request.json +++ b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/missing-put-bid-request.json @@ -10,7 +10,7 @@ "crid": "crid2", "w": 300, "h": 600, - "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -51,7 +51,7 @@ "crid": "crid1", "w": 300, "h": 250, - "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs", + "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs", "ext": { "rp": { "targeting": [ @@ -112,7 +112,7 @@ "impid": "impStoredAuctionResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -122,12 +122,12 @@ "impid": "impStoredBidResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { "type": "xml", - "value": "", + "value": "", "expiry": 120 } ] diff --git a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/original-bid-request.json b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/original-bid-request.json index 10550f10900..c8889e1fc93 100644 --- a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/original-bid-request.json +++ b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/original-bid-request.json @@ -45,7 +45,7 @@ "impid": "impStoredAuctionResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -55,7 +55,7 @@ "impid": "impStoredBidResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -68,7 +68,7 @@ "crid": "crid1", "w": 300, "h": 250, - "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs", + "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs", "ext": { "rp": { "targeting": [ @@ -152,12 +152,12 @@ "crid": "crid2", "w": 300, "h": 600, - "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { "type": "xml", - "value": "", + "value": "", "expiry": 120 } ] diff --git a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/redundant-put-bid-request.json b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/redundant-put-bid-request.json index 6bc682d5835..7c1ca23ae8d 100644 --- a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/redundant-put-bid-request.json +++ b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/redundant-put-bid-request.json @@ -20,7 +20,7 @@ "crid": "crid2", "w": 300, "h": 600, - "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -91,7 +91,7 @@ "crid": "crid1", "w": 300, "h": 250, - "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs", + "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs", "ext": { "rp": { "targeting": [ @@ -152,7 +152,7 @@ "impid": "impStoredAuctionResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -162,12 +162,12 @@ "impid": "impStoredBidResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { "type": "xml", - "value": "", + "value": "", "expiry": 120 } ] diff --git a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/unordered-bid-request.json b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/unordered-bid-request.json index fdacf300534..f41b05cc7a2 100644 --- a/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/unordered-bid-request.json +++ b/src/test/resources/org/prebid/server/it/util/bidcacherequestpattern/unordered-bid-request.json @@ -10,7 +10,7 @@ "crid": "crid2", "w": 300, "h": 600, - "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -81,7 +81,7 @@ "crid": "crid1", "w": 300, "h": 250, - "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs", + "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs", "ext": { "rp": { "targeting": [ @@ -142,7 +142,7 @@ "impid": "impStoredAuctionResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { @@ -152,12 +152,12 @@ "impid": "impStoredBidResponse", "crid": "crid1", "price": 0.8, - "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" + "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c181&a=5001&ts=1000&bidder=magnite&f=i&int=dmbjs" } }, { "type": "xml", - "value": "", + "value": "", "expiry": 120 } ] diff --git a/src/test/resources/org/prebid/server/it/vtrack/test-cache-request.json b/src/test/resources/org/prebid/server/it/vtrack/test-cache-request.json index ca96583ef8c..03ff96937d4 100644 --- a/src/test/resources/org/prebid/server/it/vtrack/test-cache-request.json +++ b/src/test/resources/org/prebid/server/it/vtrack/test-cache-request.json @@ -2,7 +2,7 @@ "puts": [ { "type": "xml", - "value": "prebid.org wrapper", + "value": "prebid.org wrapper", "ttlseconds": 3600 } ] diff --git a/src/test/resources/org/prebid/server/it/vtrack/test-vtrack-request.json b/src/test/resources/org/prebid/server/it/vtrack/test-vtrack-request.json index 1be8338394a..11a8c631836 100644 --- a/src/test/resources/org/prebid/server/it/vtrack/test-vtrack-request.json +++ b/src/test/resources/org/prebid/server/it/vtrack/test-vtrack-request.json @@ -5,7 +5,7 @@ "value": "prebid.org wrapper", "ttlseconds": 3600, "bidid": "bidid", - "bidder": "rubicon", + "bidder": "magnite", "timestamp": 1000 } ] diff --git a/src/test/resources/org/prebid/server/it/vtrack/test-vtrack-response.xml b/src/test/resources/org/prebid/server/it/vtrack/test-vtrack-response.xml index 19e3ace7ba3..66f9475d9b7 100644 --- a/src/test/resources/org/prebid/server/it/vtrack/test-vtrack-response.xml +++ b/src/test/resources/org/prebid/server/it/vtrack/test-vtrack-response.xml @@ -5,7 +5,7 @@ - +