Add back Mockito to powertools-common.

Author: phipag

pom.xml

@@ -113,8 +113,8 @@
         <aws.sdk.v1.version>1.12.781</aws.sdk.v1.version>
         <versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
         <elastic.version>1.7.0</elastic.version>
-        <mockito.version>5.19.0</mockito.version>
-        <mockito-junit-jupiter.version>5.19.0</mockito-junit-jupiter.version>
+        <mockito.version>5.19.1-SNAPSHOT</mockito.version>
+        <mockito-junit-jupiter.version>5.19.1-SNAPSHOT</mockito-junit-jupiter.version>
         <junit-pioneer.version>2.3.0</junit-pioneer.version>
         <crac.version>1.5.0</crac.version>
 

powertools-common/pom.xml

@@ -81,10 +81,22 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>
             <id>generate-graalvm-files</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-subclass</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
             <build>
                 <plugins>
                     <plugin>
@@ -104,6 +116,13 @@
         </profile>
         <profile>
             <id>graalvm-native</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-subclass</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
             <build>
                 <plugins>
                     <plugin>
@@ -126,16 +145,11 @@
                                 <buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
                                 <buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
                                 <buildArg>--no-fallback</buildArg>
-                                <buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
-                                <buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
-                                <buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
-                                <buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>
-                                <buildArg>--initialize-at-build-time=java.lang.annotation.Annotation</buildArg>
-                                <buildArg>--initialize-at-build-time=org.junit.runners.model.FrameworkField</buildArg>
                                 <buildArg>--verbose</buildArg>
                                 <buildArg>--native-image-info</buildArg>
                                 <buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
                                 <buildArg>-H:Log=registerResource:5</buildArg>
+                                <buildArg>-H:+ReportExceptionStackTraces</buildArg>
                             </buildArgs>
                         </configuration>
                     </plugin>

powertools-common/src/test/java/software/amazon/lambda/powertools/common/internal/LambdaHandlerProcessorTest.java

@@ -16,10 +16,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Optional;
 
 import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.ClearEnvironmentVariable;
 import org.junitpioneer.jupiter.SetEnvironmentVariable;
@@ -29,10 +34,6 @@
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 
 import software.amazon.lambda.powertools.common.stubs.TestLambdaContext;
-import software.amazon.lambda.powertools.common.stubs.TestInputStream;
-import software.amazon.lambda.powertools.common.stubs.TestOutputStream;
-import software.amazon.lambda.powertools.common.stubs.TestProceedingJoinPoint;
-import software.amazon.lambda.powertools.common.stubs.TestSignature;
 
 class LambdaHandlerProcessorTest {
 
@@ -47,7 +48,7 @@ void isHandlerMethod_shouldRecognizeRequestHandler() {
 
     @Test
     void isHandlerMethod_shouldRecognizeRequestStreamHandler() {
-        Object[] args = { new TestInputStream(), new TestOutputStream(), new TestLambdaContext() };
+        Object[] args = { mock(InputStream.class), mock(OutputStream.class), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         assertThat(LambdaHandlerProcessor.isHandlerMethod(pjpMock)).isTrue();
@@ -72,7 +73,7 @@ void placedOnRequestHandler_shouldRecognizeRequestHandler() {
 
     @Test
     void placedOnStreamHandler_shouldRecognizeRequestStreamHandler() {
-        Object[] args = { new TestInputStream(), new TestOutputStream(), new TestLambdaContext() };
+        Object[] args = { mock(InputStream.class), mock(OutputStream.class), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         assertThat(LambdaHandlerProcessor.placedOnStreamHandler(pjpMock)).isTrue();
@@ -120,7 +121,7 @@ void placedOnStreamHandler_shouldInvalidateOnWrongTypeOfArgs() {
 
     @Test
     void placedOnStreamHandler_shouldInvalidateOnTypeOfArgs_invalidOutputStreamArg() {
-        Object[] args = { new TestInputStream(), new Object(), new TestLambdaContext() };
+        Object[] args = { mock(InputStream.class), new Object(), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         boolean isPlacedOnStreamHandler = LambdaHandlerProcessor.placedOnStreamHandler(pjpMock);
@@ -130,7 +131,7 @@ void placedOnStreamHandler_shouldInvalidateOnTypeOfArgs_invalidOutputStreamArg()
 
     @Test
     void placedOnStreamHandler_shouldInvalidateOnTypeOfArgs_invalidContextArg() {
-        Object[] args = { new TestInputStream(), new TestOutputStream(), new Object() };
+        Object[] args = { mock(InputStream.class), mock(OutputStream.class), new Object() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         boolean isPlacedOnStreamHandler = LambdaHandlerProcessor.placedOnStreamHandler(pjpMock);
@@ -170,7 +171,7 @@ void extractContext_fromRequestHandler() {
 
     @Test
     void extractContext_fromStreamRequestHandler() {
-        Object[] args = { new TestInputStream(), new TestOutputStream(), new TestLambdaContext() };
+        Object[] args = { mock(InputStream.class), mock(OutputStream.class), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         Context context = LambdaHandlerProcessor.extractContext(pjpMock);
@@ -230,7 +231,14 @@ void serviceName_Undefined() {
     }
 
     private ProceedingJoinPoint mockRequestHandlerPjp(Class<?> handlerClass, Object[] handlerArgs) {
-        TestSignature signature = new TestSignature(handlerClass);
-        return new TestProceedingJoinPoint(signature, handlerArgs);
+        ProceedingJoinPoint pjp = mock(ProceedingJoinPoint.class);
+        Signature signature = mock(Signature.class);
+
+        when(signature.getDeclaringType()).thenReturn(handlerClass);
+        when(signature.getName()).thenReturn("handleRequest");
+        when(pjp.getSignature()).thenReturn(signature);
+        when(pjp.getArgs()).thenReturn(handlerArgs);
+
+        return pjp;
     }
 }