From 09b56d14adb8202ea129b828d4d9a33234dcb4f6 Mon Sep 17 00:00:00 2001 From: Oleksandr Zhevedenko <720803+Net-burst@users.noreply.github.com> Date: Tue, 4 Feb 2025 13:16:09 -0500 Subject: [PATCH 1/4] Insticator: fix video validation logic --- .../org/prebid/server/bidder/insticator/InsticatorBidder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/insticator/InsticatorBidder.java b/src/main/java/org/prebid/server/bidder/insticator/InsticatorBidder.java index 562dd763473..4a1bd8b19dd 100644 --- a/src/main/java/org/prebid/server/bidder/insticator/InsticatorBidder.java +++ b/src/main/java/org/prebid/server/bidder/insticator/InsticatorBidder.java @@ -109,7 +109,7 @@ private void validateImp(Imp imp) { if (isInvalidDimension(video.getH()) || isInvalidDimension(video.getW()) - || CollectionUtils.isNotEmpty(video.getMimes())) { + || CollectionUtils.isEmpty(video.getMimes())) { throw new PreBidException("One or more invalid or missing video field(s) w, h, mimes"); } From 749c2cb9b48d8e0730b3a646c6f108643acfa63a Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Feb 2025 20:33:50 +0200 Subject: [PATCH 2/4] update unit test --- .../insticator/InsticatorBidderTest.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java b/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java index 9a6326327a0..5ebb8bde187 100644 --- a/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java @@ -449,11 +449,11 @@ public void makeHttpRequestsShouldMakeOneRequestWhenOneImpIsValidAndAnotherAreIn final BidRequest bidRequest = givenBidRequest( imp -> imp.id("givenImpId1").ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))), imp -> imp.id("givenImpId2"), - imp -> imp.id("givenImpId3").video(Video.builder().mimes(null).build()), - imp -> imp.id("givenImpId4").video(Video.builder().h(null).build()), - imp -> imp.id("givenImpId5").video(Video.builder().h(0).build()), - imp -> imp.id("givenImpId6").video(Video.builder().w(null).build()), - imp -> imp.id("givenImpId7").video(Video.builder().w(0).build())); + imp -> imp.id("givenImpId3").video(givenVideo(video -> video.mimes(null))), + imp -> imp.id("givenImpId4").video(givenVideo(video -> video.h(null))), + imp -> imp.id("givenImpId5").video(givenVideo(video -> video.h(0))), + imp -> imp.id("givenImpId6").video(givenVideo(video -> video.w(null))), + imp -> imp.id("givenImpId7").video(givenVideo(video -> video.w(0)))); //when final Result>> result = target.makeHttpRequests(bidRequest); @@ -569,6 +569,14 @@ private static Imp givenImp(UnaryOperator impCustomizer) { .build(); } + private static Video givenVideo(UnaryOperator videoCustomizer) { + return videoCustomizer.apply(Video.builder() + .mimes(List.of("video/mp4")) + .h(100) + .w(100)) + .build(); + } + private static ObjectNode givenImpExt(String adUnitId) { return givenImpExt(adUnitId, "publisherId"); } From 7fdb639b294c0aadd4fd232032810c8e809a9290 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Feb 2025 20:40:11 +0200 Subject: [PATCH 3/4] update unit test --- .../server/bidder/insticator/InsticatorBidderTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java b/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java index 5ebb8bde187..8ff6fd6f995 100644 --- a/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java @@ -13,6 +13,9 @@ import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; + +import java.util.Collections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -42,6 +45,7 @@ import static java.util.function.UnaryOperator.identity; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.InstanceOfAssertFactories.COLLECTION; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given; @@ -450,6 +454,7 @@ public void makeHttpRequestsShouldMakeOneRequestWhenOneImpIsValidAndAnotherAreIn imp -> imp.id("givenImpId1").ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))), imp -> imp.id("givenImpId2"), imp -> imp.id("givenImpId3").video(givenVideo(video -> video.mimes(null))), + imp -> imp.id("givenImpId3").video(givenVideo(video -> video.mimes(Collections.emptyList()))), imp -> imp.id("givenImpId4").video(givenVideo(video -> video.h(null))), imp -> imp.id("givenImpId5").video(givenVideo(video -> video.h(0))), imp -> imp.id("givenImpId6").video(givenVideo(video -> video.w(null))), From 27551df09f1d230b1d627d4ae70445c4053385f8 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Tue, 4 Feb 2025 20:41:50 +0200 Subject: [PATCH 4/4] fix code style --- .../server/bidder/insticator/InsticatorBidderTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java b/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java index 8ff6fd6f995..aed7e02037a 100644 --- a/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java @@ -13,9 +13,6 @@ import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; - -import java.util.Collections; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -36,6 +33,7 @@ import java.math.BigDecimal; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Set; import java.util.function.UnaryOperator; @@ -45,7 +43,6 @@ import static java.util.function.UnaryOperator.identity; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.InstanceOfAssertFactories.COLLECTION; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given;