From dea6bcfc74a7a904d60cf4eda187a36a90d29cea Mon Sep 17 00:00:00 2001 From: Marcos Tischer Vallim Date: Fri, 29 May 2026 01:12:12 -0300 Subject: [PATCH] test(integration): improve tests Signed-off-by: Marcos Tischer Vallim --- .../AmazonSqsThreadPoolExecutorTest.java | 2 +- .../RingBufferBlockingQueueTest.java | 16 +++++------ .../core/AbstractAmazonSqsConsumerTest.java | 2 +- .../core/AbstractAmazonSqsProducerTest.java | 28 +++++++++---------- .../lib/core/AmazonSqsProducerAsyncTest.java | 6 ++-- .../lib/core/AmazonSqsProducerSyncTest.java | 4 +-- .../lib/core/AmazonSqsProducerAsyncTest.java | 8 +++--- .../lib/core/AmazonSqsProducerSyncTest.java | 6 ++-- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/concurrent/AmazonSqsThreadPoolExecutorTest.java b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/concurrent/AmazonSqsThreadPoolExecutorTest.java index 2adedec..7c15577 100644 --- a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/concurrent/AmazonSqsThreadPoolExecutorTest.java +++ b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/concurrent/AmazonSqsThreadPoolExecutorTest.java @@ -109,7 +109,7 @@ void testSuccessActiveTaskCount() throws InterruptedException { } @Test - void testSuccessBlockingSubmissionPolicy() throws InterruptedException { + void testSuccessBlockingSubmissionPolicy() { final AmazonSqsThreadPoolExecutor amazonSqsThreadPoolExecutor = new AmazonSqsThreadPoolExecutor(1); amazonSqsThreadPoolExecutor.execute(() -> { diff --git a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/concurrent/RingBufferBlockingQueueTest.java b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/concurrent/RingBufferBlockingQueueTest.java index a07a692..eeec6df 100644 --- a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/concurrent/RingBufferBlockingQueueTest.java +++ b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/concurrent/RingBufferBlockingQueueTest.java @@ -41,7 +41,7 @@ class RingBufferBlockingQueueTest { @Test - void testSuccess() throws InterruptedException { + void testSuccess() { final ExecutorService producer = Executors.newSingleThreadExecutor(); final ScheduledExecutorService consumer = Executors.newSingleThreadScheduledExecutor(); @@ -85,7 +85,7 @@ void testSuccess() throws InterruptedException { } @Test - void testSuccessWhenIsEmpty() throws InterruptedException { + void testSuccessWhenIsEmpty() { final RingBufferBlockingQueue> ringBlockingQueue = spy(new RingBufferBlockingQueue<>()); final ExecutorService producer = Executors.newSingleThreadExecutor(); @@ -114,7 +114,7 @@ void testSuccessWhenIsEmpty() throws InterruptedException { } @Test - void testSuccessWhenIsFull() throws InterruptedException { + void testSuccessWhenIsFull() { final RingBufferBlockingQueue> ringBlockingQueue = spy(new RingBufferBlockingQueue<>(1)); final ExecutorService producer = Executors.newSingleThreadExecutor(); @@ -149,7 +149,7 @@ void testFailOffer() { } @Test - void testFailOfferWithParams() throws InterruptedException { + void testFailOfferWithParams() { final RingBufferBlockingQueue> ringBlockingQueue = new RingBufferBlockingQueue<>(); assertThrows(UnsupportedOperationException.class, () -> ringBlockingQueue.offer(RequestEntry.builder().withValue(0).build(), 1, TimeUnit.MILLISECONDS)); } @@ -157,11 +157,11 @@ void testFailOfferWithParams() throws InterruptedException { @Test void testFailPoll() { final RingBufferBlockingQueue> ringBlockingQueue = new RingBufferBlockingQueue<>(); - assertThrows(UnsupportedOperationException.class, () -> ringBlockingQueue.poll()); + assertThrows(UnsupportedOperationException.class, ringBlockingQueue::poll); } @Test - void testFailPollWithParams() throws InterruptedException { + void testFailPollWithParams() { final RingBufferBlockingQueue> ringBlockingQueue = new RingBufferBlockingQueue<>(); assertThrows(UnsupportedOperationException.class, () -> ringBlockingQueue.poll(1, TimeUnit.MILLISECONDS)); } @@ -169,7 +169,7 @@ void testFailPollWithParams() throws InterruptedException { @Test void testFailIterator() { final RingBufferBlockingQueue> ringBlockingQueue = new RingBufferBlockingQueue<>(); - assertThrows(UnsupportedOperationException.class, () -> ringBlockingQueue.iterator()); + assertThrows(UnsupportedOperationException.class, ringBlockingQueue::iterator); } @Test @@ -181,7 +181,7 @@ void testFailAdd() { @Test void testFailRemainingCapacity() { final RingBufferBlockingQueue> ringBlockingQueue = new RingBufferBlockingQueue<>(); - assertThrows(UnsupportedOperationException.class, () -> ringBlockingQueue.remainingCapacity()); + assertThrows(UnsupportedOperationException.class, ringBlockingQueue::remainingCapacity); } @Test diff --git a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/AbstractAmazonSqsConsumerTest.java b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/AbstractAmazonSqsConsumerTest.java index 4403a05..9247a68 100644 --- a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/AbstractAmazonSqsConsumerTest.java +++ b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/AbstractAmazonSqsConsumerTest.java @@ -617,7 +617,7 @@ static int batchSizeBytesThreshold() { } @Override - public void close() throws Exception { + public void close() { shutdown(); } diff --git a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/AbstractAmazonSqsProducerTest.java b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/AbstractAmazonSqsProducerTest.java index 4943cf1..bb9d5a5 100644 --- a/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/AbstractAmazonSqsProducerTest.java +++ b/amazon-sqs-java-messaging-lib-template/src/test/java/com/amazon/sqs/messaging/lib/core/AbstractAmazonSqsProducerTest.java @@ -72,7 +72,7 @@ void setUp() { } @Test - void testSendReturnsNonNullFuture() throws Exception { + void testSendReturnsNonNullFuture() { final RequestEntry entry = requestEntry(); final ListenableFuture future = producer.send(entry); @@ -81,7 +81,7 @@ void testSendReturnsNonNullFuture() throws Exception { } @Test - void testSendReturnsFutureOfCorrectType() throws Exception { + void testSendReturnsFutureOfCorrectType() { final RequestEntry entry = requestEntry(); final ListenableFuture future = producer.send(entry); @@ -90,7 +90,7 @@ void testSendReturnsFutureOfCorrectType() throws Exception { } @Test - void testSendRegistersPendingRequest() throws Exception { + void testSendRegistersPendingRequest() { final RequestEntry entry = requestEntry(); producer.send(entry); @@ -99,7 +99,7 @@ void testSendRegistersPendingRequest() throws Exception { } @Test - void testSendEnqueuesEntryInqueueRequests() throws Exception { + void testSendEnqueuesEntryInqueueRequests() throws InterruptedException { final RequestEntry entry = requestEntry(); producer.send(entry); @@ -108,7 +108,7 @@ void testSendEnqueuesEntryInqueueRequests() throws Exception { } @Test - void testSendStoredFutureMatchesReturnedFuture() throws Exception { + void testSendStoredFutureMatchesReturnedFuture() { final RequestEntry entry = requestEntry(); final ListenableFuture future = producer.send(entry); @@ -117,7 +117,7 @@ void testSendStoredFutureMatchesReturnedFuture() throws Exception { } @Test - void testSendMultipleEntriesRegistersAllPendingRequests() throws Exception { + void testSendMultipleEntriesRegistersAllPendingRequests() { final RequestEntry entry1 = requestEntry(); final RequestEntry entry2 = requestEntry(); final RequestEntry entry3 = requestEntry(); @@ -133,7 +133,7 @@ void testSendMultipleEntriesRegistersAllPendingRequests() throws Exception { } @Test - void testSendMultipleEntriesEnqueuesAllInqueueRequests() throws Exception { + void testSendMultipleEntriesEnqueuesAllInqueueRequests() throws InterruptedException { final RequestEntry entry1 = requestEntry(); final RequestEntry entry2 = requestEntry(); @@ -145,7 +145,7 @@ void testSendMultipleEntriesEnqueuesAllInqueueRequests() throws Exception { } @Test - void testSendPropagatesInterruptedExceptionFromQueue() throws Exception { + void testSendPropagatesInterruptedExceptionFromQueue() throws InterruptedException { final RequestEntry entry = requestEntry(); doThrow(InterruptedException.class).when(queueRequests).put(any()); @@ -153,7 +153,7 @@ void testSendPropagatesInterruptedExceptionFromQueue() throws Exception { } @Test - void testShutdownInvokesExecutorServiceShutdown() throws Exception { + void testShutdownInvokesExecutorServiceShutdown() throws InterruptedException { when(executorService.awaitTermination(anyLong(), any(TimeUnit.class))).thenReturn(true); producer.shutdown(); @@ -162,7 +162,7 @@ void testShutdownInvokesExecutorServiceShutdown() throws Exception { } @Test - void testShutdownAwaitsTerminationWith60Seconds() throws Exception { + void testShutdownAwaitsTerminationWith60Seconds() throws InterruptedException { when(executorService.awaitTermination(anyLong(), any(TimeUnit.class))).thenReturn(true); producer.shutdown(); @@ -171,7 +171,7 @@ void testShutdownAwaitsTerminationWith60Seconds() throws Exception { } @Test - void testShutdownDoesNotCallShutdownNowWhenTerminatesInTime() throws Exception { + void testShutdownDoesNotCallShutdownNowWhenTerminatesInTime() throws InterruptedException { when(executorService.awaitTermination(anyLong(), any(TimeUnit.class))).thenReturn(true); producer.shutdown(); @@ -180,7 +180,7 @@ void testShutdownDoesNotCallShutdownNowWhenTerminatesInTime() throws Exception { } @Test - void testShutdownCallsShutdownNowWhenTerminationTimeoutExpires() throws Exception { + void testShutdownCallsShutdownNowWhenTerminationTimeoutExpires() throws InterruptedException { when(executorService.awaitTermination(anyLong(), any(TimeUnit.class))).thenReturn(false); doReturn(Collections.emptyList()).when(executorService).shutdownNow(); @@ -190,7 +190,7 @@ void testShutdownCallsShutdownNowWhenTerminationTimeoutExpires() throws Exceptio } @Test - void testShutdownForcesShutdownWhenPendingTasksRemain() throws Exception { + void testShutdownForcesShutdownWhenPendingTasksRemain() throws InterruptedException { final List pendingTasks = Arrays.asList(mock(Runnable.class), mock(Runnable.class)); when(executorService.awaitTermination(anyLong(), any(TimeUnit.class))).thenReturn(false); doReturn(pendingTasks).when(executorService).shutdownNow(); @@ -201,7 +201,7 @@ void testShutdownForcesShutdownWhenPendingTasksRemain() throws Exception { } @Test - void testShutdownCompletesGracefullyWhenNoTasksAreDropped() throws Exception { + void testShutdownCompletesGracefullyWhenNoTasksAreDropped() throws InterruptedException { when(executorService.awaitTermination(anyLong(), any(TimeUnit.class))).thenReturn(false); doReturn(Collections.emptyList()).when(executorService).shutdownNow(); 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 9cce97f..6a0ffb0 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() throws Exception { + public void before() { final QueueProperty queueProperty = QueueProperty.builder() .fifo(false) .linger(50L) @@ -153,7 +153,7 @@ void testFailureMultipleEntry() { final SendMessageBatchRequest request = invocation.getArgument(0, SendMessageBatchRequest.class); final List resultEntries = request.getEntries().stream() .map(entry -> new BatchResultErrorEntry().withId(entry.getId())) - .collect(Collectors.toList());; + .collect(Collectors.toList()); return new SendMessageBatchResult().withFailed(resultEntries); }); @@ -228,7 +228,7 @@ void testSuccessBlockingSubmissionPolicy() { })); entries(2).forEach(entry -> { - sqsTemplate.send(entry).addCallback(null, failureCallback);; + sqsTemplate.send(entry).addCallback(null, failureCallback); }); verify(failureCallback, timeout(40000).times(1)).accept(any()); 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 c9592e3..453a9c2 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() throws Exception { + public void before() { final QueueProperty queueProperty = QueueProperty.builder() .fifo(true) .linger(50L) @@ -124,7 +124,7 @@ void testSuccessMultipleEntry() { final SendMessageBatchRequest request = invocation.getArgument(0, SendMessageBatchRequest.class); final List resultEntries = request.getEntries().stream() .map(entry -> new SendMessageBatchResultEntry().withId(entry.getId())) - .collect(Collectors.toList());; + .collect(Collectors.toList()); return new SendMessageBatchResult().withSuccessful(resultEntries); }); 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 3cc38fd..ef23c6f 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() throws Exception { + public void before() { final QueueProperty queueProperty = QueueProperty.builder() .fifo(false) .linger(50L) @@ -129,7 +129,7 @@ void testSuccessMultipleEntry() { final SendMessageBatchRequest request = invocation.getArgument(0, SendMessageBatchRequest.class); final List resultEntries = request.entries().stream() .map(entry -> SendMessageBatchResultEntry.builder().id(entry.id()).build()) - .collect(Collectors.toList());; + .collect(Collectors.toList()); return SendMessageBatchResponse.builder().successful(resultEntries).build(); }); @@ -154,7 +154,7 @@ void testFailureMultipleEntry() { final SendMessageBatchRequest request = invocation.getArgument(0, SendMessageBatchRequest.class); final List resultEntries = request.entries().stream() .map(entry -> BatchResultErrorEntry.builder().id(entry.id()).build()) - .collect(Collectors.toList());; + .collect(Collectors.toList()); return SendMessageBatchResponse.builder().failed(resultEntries).build(); }); @@ -229,7 +229,7 @@ void testSuccessBlockingSubmissionPolicy() { })); entries(2).forEach(entry -> { - sqsTemplate.send(entry).addCallback(null, failureCallback);; + sqsTemplate.send(entry).addCallback(null, failureCallback); }); verify(failureCallback, timeout(40000).times(1)).accept(any()); 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 83f592e..f1f93b9 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() throws Exception { + public void before() { final QueueProperty queueProperty = QueueProperty.builder() .fifo(true) .linger(50L) @@ -126,7 +126,7 @@ void testSuccessMultipleEntry() { final SendMessageBatchRequest request = invocation.getArgument(0, SendMessageBatchRequest.class); final List resultEntries = request.entries().stream() .map(entry -> SendMessageBatchResultEntry.builder().id(entry.id()).build()) - .collect(Collectors.toList());; + .collect(Collectors.toList()); return SendMessageBatchResponse.builder().successful(resultEntries).build(); }); @@ -151,7 +151,7 @@ void testFailureMultipleEntry() { final SendMessageBatchRequest request = invocation.getArgument(0, SendMessageBatchRequest.class); final List resultEntries = request.entries().stream() .map(entry -> BatchResultErrorEntry.builder().id(entry.id()).build()) - .collect(Collectors.toList());; + .collect(Collectors.toList()); return SendMessageBatchResponse.builder().failed(resultEntries).build(); });