From 25393017efd187d7c96ff226f9cc33191b9447cf Mon Sep 17 00:00:00 2001 From: Danylo Date: Thu, 24 Apr 2025 14:16:04 +0200 Subject: [PATCH 1/2] Use `equalsIgnoreCase` instead of `equals` --- .../java/org/prebid/server/util/BidderUtil.java | 2 +- .../java/org/prebid/server/util/BidderUtilTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/prebid/server/util/BidderUtil.java b/src/main/java/org/prebid/server/util/BidderUtil.java index d6869e3b72d..21755842d2a 100644 --- a/src/main/java/org/prebid/server/util/BidderUtil.java +++ b/src/main/java/org/prebid/server/util/BidderUtil.java @@ -63,7 +63,7 @@ public static boolean isValidPrice(Price price) { public static boolean shouldConvertBidFloor(Price price, String bidderCurrency) { return isValidPrice(price) - && !StringUtils.equals(price.getCurrency(), bidderCurrency); + && !StringUtils.equalsIgnoreCase(price.getCurrency(), bidderCurrency); } public static PriceFloorInfo resolvePriceFloor(Bid bid, BidRequest bidRequest) { diff --git a/src/test/java/org/prebid/server/util/BidderUtilTest.java b/src/test/java/org/prebid/server/util/BidderUtilTest.java index 49bb231b487..66d4ee82bb2 100644 --- a/src/test/java/org/prebid/server/util/BidderUtilTest.java +++ b/src/test/java/org/prebid/server/util/BidderUtilTest.java @@ -8,6 +8,7 @@ import com.iab.openrtb.request.Video; import com.iab.openrtb.response.Bid; import org.junit.jupiter.api.Test; +import org.prebid.server.bidder.model.Price; import org.prebid.server.bidder.model.PriceFloorInfo; import org.prebid.server.proto.openrtb.ext.response.BidType; @@ -48,6 +49,18 @@ public void isValidPriceShouldReturnTrueIfPriceIsGreaterThenZero() { assertThat(BidderUtil.isValidPrice(BigDecimal.ONE)).isTrue(); } + @Test + public void shouldConvertBidFloorShouldReturnTrueIfCurrenciesAreDifferent() { + // when and then + assertThat(BidderUtil.shouldConvertBidFloor(Price.of("USD", BigDecimal.ONE), "EUR")).isTrue(); + } + + @Test + public void shouldConvertBidFloorShouldReturnFalseIfCurrenciesAreSame() { + // when and then + assertThat(BidderUtil.shouldConvertBidFloor(Price.of("uSd", BigDecimal.ONE), "UsD")).isFalse(); + } + @Test public void resolvePriceFloorShouldReturnNullIfBidIsMissing() { // when From 000c95456289bb461e93b7b39ec68948bbf26f83 Mon Sep 17 00:00:00 2001 From: Danylo Date: Mon, 28 Apr 2025 13:45:39 +0200 Subject: [PATCH 2/2] Fix checkstyle and move test to a proper package --- .../java/org/prebid/server/{adtgorg => it}/AdtgorgTest.java | 3 +-- src/test/java/org/prebid/server/util/BidderUtilTest.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) rename src/test/java/org/prebid/server/{adtgorg => it}/AdtgorgTest.java (94%) diff --git a/src/test/java/org/prebid/server/adtgorg/AdtgorgTest.java b/src/test/java/org/prebid/server/it/AdtgorgTest.java similarity index 94% rename from src/test/java/org/prebid/server/adtgorg/AdtgorgTest.java rename to src/test/java/org/prebid/server/it/AdtgorgTest.java index 465bbcc0229..c4010b86dbe 100644 --- a/src/test/java/org/prebid/server/adtgorg/AdtgorgTest.java +++ b/src/test/java/org/prebid/server/it/AdtgorgTest.java @@ -1,9 +1,8 @@ -package org.prebid.server.adtgorg; +package org.prebid.server.it; import io.restassured.response.Response; import org.json.JSONException; import org.junit.jupiter.api.Test; -import org.prebid.server.it.IntegrationTest; import org.prebid.server.model.Endpoint; import java.io.IOException; diff --git a/src/test/java/org/prebid/server/util/BidderUtilTest.java b/src/test/java/org/prebid/server/util/BidderUtilTest.java index 66d4ee82bb2..2d618ffc58f 100644 --- a/src/test/java/org/prebid/server/util/BidderUtilTest.java +++ b/src/test/java/org/prebid/server/util/BidderUtilTest.java @@ -55,8 +55,8 @@ public void shouldConvertBidFloorShouldReturnTrueIfCurrenciesAreDifferent() { assertThat(BidderUtil.shouldConvertBidFloor(Price.of("USD", BigDecimal.ONE), "EUR")).isTrue(); } - @Test - public void shouldConvertBidFloorShouldReturnFalseIfCurrenciesAreSame() { + @Test + public void shouldConvertBidFloorShouldReturnFalseIfCurrenciesAreSameIgnoringCase() { // when and then assertThat(BidderUtil.shouldConvertBidFloor(Price.of("uSd", BigDecimal.ONE), "UsD")).isFalse(); }