Make test less confusing

Author: Pankaj Agrawal

powertools-sqs/src/test/java/software/amazon/lambda/powertools/sqs/handlers/PartialBatchFailureSuppressedHandler.java

@@ -7,7 +7,7 @@
 import software.amazon.lambda.powertools.sqs.SqsMessageHandler;
 
 import static com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage;
-import static software.amazon.lambda.powertools.sqs.internal.SqsMessageBatchProcessorAspectTest.sqsClient;
+import static software.amazon.lambda.powertools.sqs.internal.SqsMessageBatchProcessorAspectTest.mockedRandom;
 
 public class PartialBatchFailureSuppressedHandler implements RequestHandler<SQSEvent, String> {
     @Override
@@ -25,7 +25,7 @@ public String process(SQSMessage message) {
                 throw new RuntimeException("2e1424d4-f796-459a-8184-9c92662be6da");
             }
 
-            sqsClient.listQueues();
+            mockedRandom.nextInt();
             return "Success";
         }
     }

powertools-sqs/src/test/java/software/amazon/lambda/powertools/sqs/handlers/PartialBatchPartialFailureHandler.java

@@ -7,7 +7,7 @@
 import software.amazon.lambda.powertools.sqs.SqsMessageHandler;
 
 import static com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage;
-import static software.amazon.lambda.powertools.sqs.internal.SqsMessageBatchProcessorAspectTest.sqsClient;
+import static software.amazon.lambda.powertools.sqs.internal.SqsMessageBatchProcessorAspectTest.mockedRandom;
 
 public class PartialBatchPartialFailureHandler implements RequestHandler<SQSEvent, String> {
     @Override
@@ -25,7 +25,7 @@ public String process(SQSMessage message) {
                 throw new RuntimeException("2e1424d4-f796-459a-8184-9c92662be6da");
             }
 
-            sqsClient.listQueues();
+            mockedRandom.nextInt();
             return "Success";
         }
     }

powertools-sqs/src/test/java/software/amazon/lambda/powertools/sqs/handlers/PartialBatchSuccessHandler.java

@@ -7,7 +7,7 @@
 import software.amazon.lambda.powertools.sqs.SqsMessageHandler;
 
 import static com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage;
-import static software.amazon.lambda.powertools.sqs.internal.SqsMessageBatchProcessorAspectTest.sqsClient;
+import static software.amazon.lambda.powertools.sqs.internal.SqsMessageBatchProcessorAspectTest.mockedRandom;
 
 public class PartialBatchSuccessHandler implements RequestHandler<SQSEvent, String> {
     @Override
@@ -21,7 +21,7 @@ private class InnerMessageHandler implements SqsMessageHandler<Object> {
 
         @Override
         public String process(SQSMessage message) {
-            sqsClient.listQueues();
+            mockedRandom.nextInt();
             return "Success";
         }
     }

powertools-sqs/src/test/java/software/amazon/lambda/powertools/sqs/internal/SqsMessageBatchProcessorAspectTest.java

@@ -1,6 +1,7 @@
 package software.amazon.lambda.powertools.sqs.internal;
 
 import java.io.IOException;
+import java.util.Random;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
@@ -31,7 +32,8 @@
 import static software.amazon.lambda.powertools.sqs.PowertoolsSqs.overrideSqsClient;
 
 public class SqsMessageBatchProcessorAspectTest {
-    public static final SqsClient sqsClient = mock(SqsClient.class);
+    public static final Random mockedRandom = mock(Random.class);
+    private static final SqsClient sqsClient = mock(SqsClient.class);
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private SQSEvent event;
@@ -42,6 +44,7 @@ public class SqsMessageBatchProcessorAspectTest {
     @BeforeEach
     void setUp() throws IOException {
         overrideSqsClient(sqsClient);
+        reset(mockedRandom);
         reset(sqsClient);
         setupContext();
         event = MAPPER.readValue(this.getClass().getResource("/sampleSqsBatchEvent.json"), SQSEvent.class);
@@ -57,7 +60,7 @@ void setUp() throws IOException {
     void shouldBatchProcessAllMessageSuccessfullyAndNotDeleteFromSQS() {
         requestHandler.handleRequest(event, context);
 
-        verify(sqsClient, times(2)).listQueues();
+        verify(mockedRandom, times(2)).nextInt();
         verify(sqsClient, times(0)).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
     }
 
@@ -83,7 +86,7 @@ void shouldBatchProcessMessageWithSuccessDeletedOnFailureInBatchFromSQS() {
                             .contains("Success");
                 });
 
-        verify(sqsClient).listQueues();
+        verify(mockedRandom).nextInt();
         verify(sqsClient).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
     }
 
@@ -93,7 +96,7 @@ void shouldBatchProcessMessageWithSuccessDeletedOnFailureWithSuppressionInBatchF
 
         requestHandler.handleRequest(event, context);
 
-        verify(sqsClient).listQueues();
+        verify(mockedRandom).nextInt();
         verify(sqsClient).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
     }