diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectRetryBehaviorWiremockTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectRetryBehaviorWiremockTest.java index a5e2d03363fc..3560dbab3bd0 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectRetryBehaviorWiremockTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectRetryBehaviorWiremockTest.java @@ -162,9 +162,9 @@ public void getObject_5xxErrorResponses_shouldNotReuseInitialErrorResponseWhenLo .isInstanceOf(CompletionException.class) .hasCauseInstanceOf(S3Exception.class) .hasMessageNotContaining(firstRequestId) - .hasMessageNotContaining(String.valueOf(firstErrorStatusCode)) + .hasMessageNotContaining("Status Code: " + firstErrorStatusCode) .hasMessageContaining(secondRequestId) - .hasMessageContaining(String.valueOf(secondErrorStatusCode)); + .hasMessageContaining("Status Code: " + secondErrorStatusCode); verify(MAX_ATTEMPTS, getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, KEY)))); verify(0, getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=2", BUCKET, KEY)))); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java index 6c85b9e06843..9fd58e6a5fa0 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java @@ -20,7 +20,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.lessThanOrExactly; import static com.github.tomakehurst.wiremock.client.WireMock.matching; +import static com.github.tomakehurst.wiremock.client.WireMock.moreThan; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.verify; @@ -220,7 +222,8 @@ public void getObject_single500WithinMany200s_shouldNotRetryError(AsyncResponseT assertThat(e.getCause()).isInstanceOf(S3Exception.class); } - verify(1, getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, errorKey)))); + verify(moreThan(0), getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, errorKey)))); + verify(lessThanOrExactly(2), getRequestedFor(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, errorKey)))); } private static Stream partSizeAndTransformerParams() {