From 818d1900cdd47148d03253145cbc4ed4d7b77d07 Mon Sep 17 00:00:00 2001 From: Marcos Tischer Vallim Date: Fri, 29 May 2026 02:41:46 -0300 Subject: [PATCH] test(integration): improve tests Signed-off-by: Marcos Tischer Vallim --- .../lib/core/ListenableFutureTest.java | 6 ++-- .../messaging/lib/core/AmazonSqsConsumer.java | 30 +++++++++---------- .../lib/core/AmazonSqsProducerAsyncTest.java | 2 +- .../lib/core/AmazonSqsProducerSyncTest.java | 2 +- .../messaging/lib/core/AmazonSqsConsumer.java | 30 +++++++++---------- .../lib/core/AmazonSqsProducerAsyncTest.java | 2 +- .../lib/core/AmazonSqsProducerSyncTest.java | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/ListenableFutureTest.java b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/ListenableFutureTest.java index d83a7eb..6ad4f44 100644 --- a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/ListenableFutureTest.java +++ b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/ListenableFutureTest.java @@ -18,6 +18,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -85,7 +86,7 @@ void testAddCallbackWithSuccessOnlyDoesNotThrowOnFail() { listenableFuture.addCallback(successCallback); - org.junit.jupiter.api.Assertions.assertDoesNotThrow(() -> listenableFuture.fail(entry)); + assertDoesNotThrow(() -> listenableFuture.fail(entry)); } @Test @@ -111,10 +112,9 @@ void testFailDoesNotInvokeSuccessCallback() { @Test void testAddCallbackDefaultFailureCallbackIsNoOp() { final boolean[] called = { false }; - final Consumer successCallback = result -> called[0] = true; final ResponseFailEntry entry = mock(ResponseFailEntry.class); - listenableFuture.addCallback(successCallback); + listenableFuture.addCallback(successCallback -> called[0] = true); listenableFuture.fail(entry); assertThat(called[0], is(false)); diff --git a/amazon-sqs-java-messaging-lib-v1/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java b/amazon-sqs-java-messaging-lib-v1/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java index 3ad1437..c93090c 100644 --- a/amazon-sqs-java-messaging-lib-v1/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java +++ b/amazon-sqs-java-messaging-lib-v1/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java @@ -113,16 +113,16 @@ protected void handleError(final SendMessageBatchRequest publishBatchRequest, fi LOGGER.error("Error processing batch request: {}", message, throwable); - publishBatchRequest.getEntries().forEach(entry -> { - Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> { + publishBatchRequest.getEntries().forEach(entry -> + Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> listenableFuture.fail(ResponseFailEntry.builder() .withId(entry.getId()) .withCode(code) .withMessage(message) .withSenderFault(true) - .build()); - }); - }); + .build()) + ) + ); } /** @@ -130,26 +130,26 @@ protected void handleError(final SendMessageBatchRequest publishBatchRequest, fi */ @Override protected void handleResponse(final SendMessageBatchResult publishBatchResult) { - publishBatchResult.getSuccessful().forEach(entry -> { - Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> { + publishBatchResult.getSuccessful().forEach(entry -> + Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> listenableFuture.success(ResponseSuccessEntry.builder() .withId(entry.getId()) .withMessageId(entry.getMessageId()) .withSequenceNumber(entry.getSequenceNumber()) - .build()); - }); - }); + .build()) + ) + ); - publishBatchResult.getFailed().forEach(entry -> { - Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> { + publishBatchResult.getFailed().forEach(entry -> + Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> listenableFuture.fail(ResponseFailEntry.builder() .withId(entry.getId()) .withCode(entry.getCode()) .withMessage(entry.getMessage()) .withSenderFault(entry.getSenderFault()) - .build()); - }); - }); + .build()) + ) + ); } } diff --git a/amazon-sqs-java-messaging-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java b/amazon-sqs-java-messaging-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java index 6a0ffb0..6187c29 100644 --- a/amazon-sqs-java-messaging-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java +++ b/amazon-sqs-java-messaging-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java @@ -63,7 +63,7 @@ class AmazonSqsProducerAsyncTest { private AmazonSQS amazonSQS; @BeforeEach - public void before() { + void before() { final QueueProperty queueProperty = QueueProperty.builder() .fifo(false) .linger(50L) diff --git a/amazon-sqs-java-messaging-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java b/amazon-sqs-java-messaging-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java index 453a9c2..cc46e58 100644 --- a/amazon-sqs-java-messaging-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java +++ b/amazon-sqs-java-messaging-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java @@ -59,7 +59,7 @@ class AmazonSqsProducerSyncTest { private AmazonSQS amazonSQS; @BeforeEach - public void before() { + void before() { final QueueProperty queueProperty = QueueProperty.builder() .fifo(true) .linger(50L) diff --git a/amazon-sqs-java-messaging-lib-v2/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java b/amazon-sqs-java-messaging-lib-v2/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java index 6c2b3b8..93089f3 100644 --- a/amazon-sqs-java-messaging-lib-v2/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java +++ b/amazon-sqs-java-messaging-lib-v2/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java @@ -115,16 +115,16 @@ protected void handleError(final SendMessageBatchRequest publishBatchRequest, fi LOGGER.error("Error processing batch request: {}", message, throwable); - publishBatchRequest.entries().forEach(entry -> { - Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> { + publishBatchRequest.entries().forEach(entry -> + Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> listenableFuture.fail(ResponseFailEntry.builder() .withId(entry.id()) .withCode(code) .withMessage(message) .withSenderFault(true) - .build()); - }); - }); + .build()) + ) + ); } /** @@ -132,26 +132,26 @@ protected void handleError(final SendMessageBatchRequest publishBatchRequest, fi */ @Override protected void handleResponse(final SendMessageBatchResponse publishBatchResult) { - publishBatchResult.successful().forEach(entry -> { - Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> { + publishBatchResult.successful().forEach(entry -> + Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> listenableFuture.success(ResponseSuccessEntry.builder() .withId(entry.id()) .withMessageId(entry.messageId()) .withSequenceNumber(entry.sequenceNumber()) - .build()); - }); - }); + .build()) + ) + ); - publishBatchResult.failed().forEach(entry -> { - Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> { + publishBatchResult.failed().forEach(entry -> + Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> listenableFuture.fail(ResponseFailEntry.builder() .withId(entry.id()) .withCode(entry.code()) .withMessage(entry.message()) .withSenderFault(entry.senderFault()) - .build()); - }); - }); + .build()) + ) + ); } } diff --git a/amazon-sqs-java-messaging-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java b/amazon-sqs-java-messaging-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java index ef23c6f..0f01810 100644 --- a/amazon-sqs-java-messaging-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java +++ b/amazon-sqs-java-messaging-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java @@ -64,7 +64,7 @@ class AmazonSqsProducerAsyncTest { private SqsClient amazonSQS; @BeforeEach - public void before() { + void before() { final QueueProperty queueProperty = QueueProperty.builder() .fifo(false) .linger(50L) diff --git a/amazon-sqs-java-messaging-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java b/amazon-sqs-java-messaging-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java index f1f93b9..ac3fa55 100644 --- a/amazon-sqs-java-messaging-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java +++ b/amazon-sqs-java-messaging-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java @@ -61,7 +61,7 @@ class AmazonSqsProducerSyncTest { private SqsClient amazonSQS; @BeforeEach - public void before() { + void before() { final QueueProperty queueProperty = QueueProperty.builder() .fifo(true) .linger(50L)