Skip to content

Commit 5f5206f

Browse files
t-sormontet-sormonte
committed
Implementation of test class review comments round 2
1 parent f56a79a commit 5f5206f

File tree

2 files changed

+46
-33
lines changed

2 files changed

+46
-33
lines changed

‎src/test/java/org/prebid/server/bidder/sparteo/SparteoBidderTest.java

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,10 @@ public void makeHttpRequestsShouldReturnEmptyResultWhenRequestHasNoImps() {
475475
@Test
476476
public void makeBidsShouldReturnErrorWhenResponseStatusIs204() {
477477
// given
478-
final BidderCall<BidRequest> httpCall = givenHttpCall(givenBidRequest(), 204, "");
478+
final BidderCall<BidRequest> httpCall = BidderCall.succeededHttp(
479+
HttpRequest.<BidRequest>builder().payload(givenBidRequest()).build(),
480+
HttpResponse.of(204, null, ""),
481+
null);
479482

480483
// when
481484
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -493,7 +496,10 @@ public void makeBidsShouldReturnErrorWhenResponseStatusIs204() {
493496
@Test
494497
public void makeBidsShouldReturnErrorWhenResponseStatusIsNot200Or204() {
495498
// given
496-
final BidderCall<BidRequest> httpCall = givenHttpCall(givenBidRequest(), 400, "Bad Request");
499+
final BidderCall<BidRequest> httpCall = BidderCall.succeededHttp(
500+
HttpRequest.<BidRequest>builder().payload(givenBidRequest()).build(),
501+
HttpResponse.of(400, null, "Bad Request"),
502+
null);
497503

498504
// when
499505
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -510,7 +516,10 @@ public void makeBidsShouldReturnErrorWhenResponseStatusIsNot200Or204() {
510516
@Test
511517
public void makeBidsShouldReturnErrorWhenResponseBodyIsInvalidJson() {
512518
// given
513-
final BidderCall<BidRequest> httpCall = givenHttpCall(givenBidRequest(), 200, "invalid_json");
519+
final BidderCall<BidRequest> httpCall = BidderCall.succeededHttp(
520+
HttpRequest.<BidRequest>builder().payload(givenBidRequest()).build(),
521+
HttpResponse.of(200, null, "invalid_json"),
522+
null);
514523

515524
// when
516525
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -527,7 +536,10 @@ public void makeBidsShouldReturnErrorWhenResponseBodyIsInvalidJson() {
527536
@Test
528537
public void makeBidsShouldReturnEmptyResultWhenBidResponseIsNull() throws JsonProcessingException {
529538
// given
530-
final BidderCall<BidRequest> httpCall = givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(null));
539+
final BidderCall<BidRequest> httpCall = BidderCall.succeededHttp(
540+
HttpRequest.<BidRequest>builder().payload(givenBidRequest()).build(),
541+
HttpResponse.of(400, null, "null"),
542+
null);
531543

532544
// when
533545
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -543,7 +555,7 @@ public void makeBidsShouldReturnEmptyResultWhenBidResponseHasNoSeatBids()
543555
// given
544556
final BidResponse bidResponse = BidResponse.builder().seatbid(Collections.emptyList()).build();
545557
final BidderCall<BidRequest> httpCall =
546-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
558+
givenHttpCall(givenBidRequest(), bidResponse);
547559

548560
// when
549561
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -560,7 +572,7 @@ public void makeBidsShouldReturnBannerBidWhenMediaTypeIsBanner() throws JsonProc
560572
BidType.banner.getName());
561573
final BidResponse bidResponse = givenBidResponse(bid, "EUR");
562574
final BidderCall<BidRequest> httpCall =
563-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
575+
givenHttpCall(givenBidRequest(), bidResponse);
564576

565577
// when
566578
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -579,7 +591,7 @@ public void makeBidsShouldReturnVideoBidWhenMediaTypeIsVideo() throws JsonProces
579591
BidType.video.getName());
580592
final BidResponse bidResponse = givenBidResponse(bid, "EUR");
581593
final BidderCall<BidRequest> httpCall =
582-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
594+
givenHttpCall(givenBidRequest(), bidResponse);
583595

584596
// when
585597
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -598,7 +610,7 @@ public void makeBidsShouldReturnNativeBidWhenMediaTypeIsNative() throws JsonProc
598610
BidType.xNative.getName());
599611
final BidResponse bidResponse = givenBidResponse(bid, "EUR");
600612
final BidderCall<BidRequest> httpCall =
601-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
613+
givenHttpCall(givenBidRequest(), bidResponse);
602614

603615
// when
604616
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -620,7 +632,7 @@ public void makeBidsShouldReturnErrorForUnsupportedMediaTypeAndProcessOthers() t
620632
BidType.banner.getName());
621633
final BidResponse bidResponse = givenBidResponse(List.of(audioBid, bannerBid), "EUR");
622634
final BidderCall<BidRequest> httpCall =
623-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
635+
givenHttpCall(givenBidRequest(), bidResponse);
624636

625637
// when
626638
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -641,7 +653,7 @@ public void makeBidsShouldReturnErrorWhenBidExtIsNull() throws JsonProcessingExc
641653
final Bid bid = givenBid(builder -> builder.impid("imp1").ext(null), null);
642654
final BidResponse bidResponse = givenBidResponse(bid, "USD");
643655
final BidderCall<BidRequest> httpCall =
644-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
656+
givenHttpCall(givenBidRequest(), bidResponse);
645657

646658
// when
647659
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -659,7 +671,7 @@ public void makeBidsShouldReturnErrorWhenPrebidIsMissingInBidExt() throws JsonPr
659671
final Bid bid = givenBid(builder -> builder.impid("imp1").ext(mapper.createObjectNode()), null);
660672
final BidResponse bidResponse = givenBidResponse(bid, "USD");
661673
final BidderCall<BidRequest> httpCall =
662-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
674+
givenHttpCall(givenBidRequest(), bidResponse);
663675

664676
// when
665677
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -677,7 +689,7 @@ public void makeBidsShouldReturnErrorWhenPrebidTypeIsMissingInBidExt() throws Js
677689
final Bid bid = givenBid(builder -> builder.impid("imp1").ext(createBidExtWithEmptyPrebid()), null);
678690
final BidResponse bidResponse = givenBidResponse(bid, "USD");
679691
final BidderCall<BidRequest> httpCall =
680-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
692+
givenHttpCall(givenBidRequest(), bidResponse);
681693

682694
// when
683695
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -697,7 +709,7 @@ public void makeBidsShouldReturnErrorWhenPrebidCannotBeParsed() throws JsonProce
697709
final Bid bid = givenBid(builder -> builder.impid("imp1").ext(malformedExt), null);
698710
final BidResponse bidResponse = givenBidResponse(bid, "USD");
699711
final BidderCall<BidRequest> httpCall =
700-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
712+
givenHttpCall(givenBidRequest(), bidResponse);
701713

702714
// when
703715
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -715,7 +727,7 @@ public void makeBidsShouldReturnErrorWhenPrebidTypeIsUnsupported() throws JsonPr
715727
final Bid bid = givenBid(builder -> builder.impid("imp1"), "unknown-type");
716728
final BidResponse bidResponse = givenBidResponse(bid, "USD");
717729
final BidderCall<BidRequest> httpCall =
718-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
730+
givenHttpCall(givenBidRequest(), bidResponse);
719731

720732
// when
721733
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -739,7 +751,7 @@ public void makeBidsShouldProcessValidBidsWhenSeatBidContainsNulls() throws Json
739751

740752
final BidResponse bidResponse = givenBidResponse(bids, "USD");
741753
final BidderCall<BidRequest> httpCall =
742-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
754+
givenHttpCall(givenBidRequest(), bidResponse);
743755

744756
// when
745757
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -769,7 +781,7 @@ public void makeBidsShouldCorrectlyProcessMultipleBidsAndSeatBids() throws JsonP
769781

770782
final BidResponse bidResponse = BidResponse.builder().cur("USD").seatbid(asList(seatBid1, seatBid2)).build();
771783
final BidderCall<BidRequest> httpCall =
772-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
784+
givenHttpCall(givenBidRequest(), bidResponse);
773785

774786
// when
775787
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -794,7 +806,7 @@ public void makeBidsShouldReturnErrorWhenPrebidExtIsNullNode() throws JsonProces
794806
final Bid bid = givenBid(builder -> builder.impid("imp1").ext(bidExtWithNullPrebid), null);
795807
final BidResponse bidResponse = givenBidResponse(bid, "USD");
796808
final BidderCall<BidRequest> httpCall =
797-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
809+
givenHttpCall(givenBidRequest(), bidResponse);
798810

799811
// when
800812
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -826,7 +838,7 @@ public void makeBidsShouldProcessValidSeatBidsWhenResponseContainsNulls() throws
826838

827839
final BidResponse bidResponse = BidResponse.builder().cur("USD").seatbid(seatBidsWithNull).build();
828840
final BidderCall<BidRequest> httpCall =
829-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
841+
givenHttpCall(givenBidRequest(), bidResponse);
830842

831843
// when
832844
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -846,7 +858,7 @@ public void makeBidsShouldReturnEmptyResultWhenSeatBidHasNullBidList() throws Js
846858
final BidResponse bidResponse =
847859
BidResponse.builder().cur("USD").seatbid(singletonList(seatBidWithNullBids)).build();
848860
final BidderCall<BidRequest> httpCall =
849-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
861+
givenHttpCall(givenBidRequest(), bidResponse);
850862

851863
// when
852864
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -863,7 +875,7 @@ public void makeBidsShouldReturnEmptyResultWhenSeatBidHasEmptyBidList() throws J
863875
final BidResponse bidResponse =
864876
BidResponse.builder().cur("USD").seatbid(singletonList(seatBidWithEmptyBids)).build();
865877
final BidderCall<BidRequest> httpCall =
866-
givenHttpCall(givenBidRequest(), 200, mapper.writeValueAsString(bidResponse));
878+
givenHttpCall(givenBidRequest(), bidResponse);
867879

868880
// when
869881
final Result<List<BidderBid>> result = sparteoBidder.makeBids(httpCall, givenBidRequest());
@@ -907,11 +919,16 @@ private BidResponse givenBidResponse(Bid bid, String currency) {
907919
return givenBidResponse(singletonList(bid), currency);
908920
}
909921

910-
private BidderCall<BidRequest> givenHttpCall(BidRequest bidRequest, int statusCode, String body) {
911-
return BidderCall.succeededHttp(
912-
HttpRequest.<BidRequest>builder().payload(bidRequest).build(),
913-
HttpResponse.of(statusCode, null, body),
914-
null);
922+
private BidderCall<BidRequest> givenHttpCall(BidRequest bidRequest, BidResponse bidResponse) {
923+
try {
924+
final String body = mapper.writeValueAsString(bidResponse);
925+
return BidderCall.succeededHttp(
926+
HttpRequest.<BidRequest>builder().payload(bidRequest).build(),
927+
HttpResponse.of(200, null, body),
928+
null);
929+
} catch (JsonProcessingException e) {
930+
throw new RuntimeException("Failed to serialize BidResponse in test setup", e);
931+
}
915932
}
916933

917934
private ObjectNode createBidExtWithType(String bidType) {

‎src/test/java/org/prebid/server/it/SparteoTest.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,17 @@ public class SparteoTest extends IntegrationTest {
1616
public void openrtb2AuctionShouldRespondWithBidsFromSparteoBanner() throws Exception {
1717
WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/sparteo-exchange"))
1818
.withRequestBody(equalToJson(
19-
jsonFrom("openrtb2/sparteo/test-sparteo-bid-request.json")
20-
))
19+
jsonFrom("openrtb2/sparteo/test-sparteo-bid-request.json")))
2120
.willReturn(aResponse().withBody(
22-
jsonFrom("openrtb2/sparteo/test-sparteo-bid-response.json")
23-
)));
21+
jsonFrom("openrtb2/sparteo/test-sparteo-bid-response.json"))));
2422

2523
final Response response = responseFor(
2624
"openrtb2/sparteo/test-auction-sparteo-request.json",
27-
Endpoint.openrtb2_auction
28-
);
25+
Endpoint.openrtb2_auction);
2926

3027
assertJsonEquals(
3128
"openrtb2/sparteo/test-auction-sparteo-response.json",
3229
response,
33-
singletonList("sparteo")
34-
);
30+
singletonList("sparteo"));
3531
}
3632
}

0 commit comments

Comments
 (0)