refactor tests after review

Author: FilipStamenkovic

src/main/java/org/prebid/server/bidder/showheroes/ShowheroesBidder.java

@@ -122,22 +122,15 @@ private static ExtRequestPrebidChannel getPrebidChannel(BidRequest bidRequest) {
     private Imp modifyImp(BidRequest bidRequest, Imp imp, ExtRequestPrebidChannel prebidChannel) {
         final ExtImpShowheroes extImpShowheroes = parseImpExt(imp);
 
-        final Imp.ImpBuilder impBuilder = imp.toBuilder();
-
-        if (prebidChannel != null && imp.getDisplaymanager() == null) {
-            impBuilder.displaymanager(prebidChannel.getName());
-            impBuilder.displaymanagerver(prebidChannel.getVersion());
-        }
-
-        impBuilder.ext(modifyImpExt(imp, extImpShowheroes));
-
-        if (!shouldConvertFloor(imp)) {
-            return impBuilder.build();
-        }
-
-        return impBuilder
-                .bidfloorcur(BID_CURRENCY)
-                .bidfloor(resolveBidFloor(bidRequest, imp))
+        final boolean shouldSetDisplayManager = prebidChannel != null && imp.getDisplaymanager() == null;
+        final boolean shouldConvertFloor = shouldConvertFloor(imp);
+
+        return imp.toBuilder()
+                .displaymanager(shouldSetDisplayManager ? prebidChannel.getName() : imp.getDisplaymanager())
+                .displaymanagerver(shouldSetDisplayManager ? prebidChannel.getVersion() : imp.getDisplaymanagerver())
+                .bidfloorcur(shouldConvertFloor ? BID_CURRENCY : imp.getBidfloorcur())
+                .bidfloor(shouldConvertFloor ? resolveBidFloor(bidRequest, imp) : imp.getBidfloor())
+                .ext(modifyImpExt(imp, extImpShowheroes))
                 .build();
     }
 
@@ -187,7 +180,7 @@ public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequ
         try {
             final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class);
             return Result.of(extractBids(bidResponse), Collections.emptyList());
-        } catch (DecodeException | PreBidException e) {
+        } catch (DecodeException e) {
             return Result.withError(BidderError.badServerResponse(e.getMessage()));
         }
 
@@ -209,7 +202,7 @@ private List<BidderBid> extractBids(BidResponse bidResponse) {
                 .toList();
     }
 
-    private BidType getBidType(Bid bid) {
+    private static BidType getBidType(Bid bid) {
         return switch (bid.getMtype()) {
             case 1 -> BidType.banner;
             case 2 -> BidType.video;

src/test/java/org/prebid/server/bidder/showheroes/ShowheroesBidderTest.java

@@ -28,7 +28,6 @@
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Set;
 import java.util.function.Function;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -78,9 +77,12 @@ public void creationShouldFailOnInvalidEndpointUrl() {
     @Test
     public void makeHttpRequestsShouldReturnErrorIfImpExtCouldNotBeParsed() {
         // given
-        final BidRequest bidRequest = givenBidRequest(
-                impBuilder -> impBuilder
-                        .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))));
+        final BidRequest bidRequest = BidRequest.builder()
+                .site(Site.builder().page("https://test-example.com").build())
+                .imp(singletonList(Imp.builder()
+                                .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode())))
+                                .build()))
+                .build();
 
         // when
         final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -104,6 +106,7 @@ public void makeHttpRequestsShouldReturnErrorWhenSitePageIsEmpty() {
 
         // then
         assertThat(result.getErrors()).hasSize(1);
+        assertThat(result.getErrors().get(0).getMessage()).isEqualTo("BidRequest.site.page is required");
         assertThat(result.getValue()).isEmpty();
     }
 
@@ -120,13 +123,14 @@ public void makeHttpRequestsShouldReturnErrorWhenAppBundleIsEmpty() {
 
         // then
         assertThat(result.getErrors()).hasSize(1);
+        assertThat(result.getErrors().get(0).getMessage()).isEqualTo("BidRequest.app.bundle is required");
         assertThat(result.getValue()).isEmpty();
     }
 
     @Test
     public void makeHttpRequestsShouldCreateCorrectURL() {
         // given
-        final BidRequest bidRequest = givenBidRequest(identity());
+        final BidRequest bidRequest = givenBidRequest();
 
         // when
         final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -140,7 +144,7 @@ public void makeHttpRequestsShouldCreateCorrectURL() {
     @Test
     public void makeHttpRequestsShouldReturnPbsVersion() {
         // given
-        final BidRequest bidRequest = givenBidRequest(identity());
+        final BidRequest bidRequest = givenBidRequest();
 
         // when
         final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -221,19 +225,16 @@ public void makeHttpRequestsShouldCreateSingleRequestForAllImps() {
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue()).hasSize(1)
-                .extracting(HttpRequest::getImpIds)
-                .containsOnly(Set.of("imp1", "imp2"));
-
-        final BidRequest outgoingRequest = result.getValue().get(0).getPayload();
-        assertThat(outgoingRequest.getImp()).hasSize(2)
+                .extracting(HttpRequest::getPayload)
+                .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getId)
                 .containsExactly("imp1", "imp2");
     }
 
     @Test
     public void makeHttpRequestsShouldSetCorrectHeaders() {
         // given
-        final BidRequest bidRequest = givenBidRequest(identity());
+        final BidRequest bidRequest = givenBidRequest();
 
         // when
         final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -299,8 +300,7 @@ public void makeBidsShouldReturnVideoBidByDefaultWhenMtypeIsUnknown() throws Jso
         // then
         assertThat(result.getErrors()).isEmpty();
         assertThat(result.getValue())
-                .extracting(BidderBid::getBid, BidderBid::getType)
-                .containsExactly(tuple(Bid.builder().impid("123").mtype(99).build(), video));
+                .containsOnly(BidderBid.of(Bid.builder().impid("123").mtype(99).build(), video, null));
     }
 
     @Test
@@ -327,10 +327,10 @@ public void makeBidsShouldReturnMultipleBids() throws JsonProcessingException {
                         tuple(Bid.builder().impid("456").mtype(2).price(BigDecimal.TEN).build(), video));
     }
 
-    private static BidRequest givenBidRequest(Function<Imp.ImpBuilder, Imp.ImpBuilder> impCustomizer) {
+    private static BidRequest givenBidRequest() {
         return BidRequest.builder()
                 .site(Site.builder().page("https://test-example.com").build())
-                .imp(singletonList(givenImp(impCustomizer)))
+                .imp(singletonList(givenImp(identity())))
                 .build();
     }
 
@@ -359,4 +359,3 @@ private static BidderCall<BidRequest> givenHttpCall(BidResponse bidResponse)
                 null);
     }
 }
-