Remove mockito from 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.16.0</mockito.version>
-        <mockito-junit-jupiter.version>5.16.0</mockito-junit-jupiter.version>
+        <mockito.version>5.19.0</mockito.version>
+        <mockito-junit-jupiter.version>5.19.0</mockito-junit-jupiter.version>
         <junit-pioneer.version>2.3.0</junit-pioneer.version>
         <crac.version>1.5.0</crac.version>
 
@@ -321,7 +321,7 @@
             <dependency>
                 <groupId>org.junit-pioneer</groupId>
                 <artifactId>junit-pioneer</artifactId>
-                <version>2.0.0</version>
+                <version>${junit-pioneer.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

powertools-common/pom.xml

@@ -14,8 +14,8 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powertools-common</artifactId>
@@ -76,11 +76,6 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
@@ -90,21 +85,15 @@
     <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>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>3.5.3</version>
                         <configuration>
-                            <argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-common,experimental-class-define-support
+                            <argLine>-Dorg.graalvm.nativeimage.imagecode=agent
+                                -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-common,experimental-class-define-support
                                 --add-opens java.base/java.util=ALL-UNNAMED
                                 --add-opens java.base/java.lang=ALL-UNNAMED
                             </argLine>
@@ -115,13 +104,6 @@
         </profile>
         <profile>
             <id>graalvm-native</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-subclass</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
             <build>
                 <plugins>
                     <plugin>
@@ -145,28 +127,11 @@
                                 <buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
                                 <buildArg>--no-fallback</buildArg>
                                 <buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
-                                <buildArg>-H:ClassInitialization=net.bytebuddy.ClassFileVersion:rerun</buildArg>
-                                <buildArg>-H:ClassInitialization=net.bytebuddy.utility.dispatcher.JavaDispatcher:rerun</buildArg>
-                                <buildArg>-H:ClassInitialization=net.bytebuddy.utility.Invoker$Dispatcher:rerun</buildArg>
-                                <buildArg>-H:ClassInitialization=net.bytebuddy.utility.GraalImageCode:rerun</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>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$AbstractBase</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic$1</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic$2</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.utility.dispatcher.JavaDispatcher$DynamicClassLoader</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase$ForLoadedExecutable</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$AbstractBase</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$ForLoadedType</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.description.method.MethodDescription$ForLoadedMethod</buildArg>
-                                <buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Super$Instantiation$2</buildArg>
-                                <buildArg>
-                                    --trace-class-initialization=net.bytebuddy.description.type.TypeDescription$ForLoadedType,net.bytebuddy.description.method.MethodDescription$ForLoadedMethod,net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase$ForLoadedExecutable
-                                </buildArg>
                                 <buildArg>--verbose</buildArg>
                                 <buildArg>--native-image-info</buildArg>
                                 <buildArg>-H:+UnlockExperimentalVMOptions</buildArg>

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

@@ -16,15 +16,10 @@
 
 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;
@@ -33,22 +28,26 @@
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 
-class LambdaHandlerProcessorTest {
+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;
 
-    private Signature signature = mock(Signature.class);
-    private ProceedingJoinPoint pjpMock = mock(ProceedingJoinPoint.class);
+class LambdaHandlerProcessorTest {
 
     @Test
     void isHandlerMethod_shouldRecognizeRequestHandler() {
-        Object[] args = {new Object(), mock(Context.class)};
+        Context context = new TestLambdaContext();
+        Object[] args = { new Object(), context };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestHandler.class, args);
 
         assertThat(LambdaHandlerProcessor.isHandlerMethod(pjpMock)).isTrue();
     }
 
     @Test
     void isHandlerMethod_shouldRecognizeRequestStreamHandler() {
-        Object[] args = {mock(InputStream.class), mock(OutputStream.class), mock(Context.class)};
+        Object[] args = { new TestInputStream(), new TestOutputStream(), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         assertThat(LambdaHandlerProcessor.isHandlerMethod(pjpMock)).isTrue();
@@ -65,23 +64,23 @@ void isHandlerMethod_shouldReturnFalse() {
 
     @Test
     void placedOnRequestHandler_shouldRecognizeRequestHandler() {
-        Object[] args = {new Object(), mock(Context.class)};
+        Object[] args = { new Object(), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestHandler.class, args);
 
         assertThat(LambdaHandlerProcessor.placedOnRequestHandler(pjpMock)).isTrue();
     }
 
     @Test
     void placedOnStreamHandler_shouldRecognizeRequestStreamHandler() {
-        Object[] args = {mock(InputStream.class), mock(OutputStream.class), mock(Context.class)};
+        Object[] args = { new TestInputStream(), new TestOutputStream(), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         assertThat(LambdaHandlerProcessor.placedOnStreamHandler(pjpMock)).isTrue();
     }
 
     @Test
     void placedOnRequestHandler_shouldInvalidateOnWrongNoOfArgs() {
-        Object[] args = {new Object()};
+        Object[] args = { new Object() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestHandler.class, args);
 
         boolean isPlacedOnRequestHandler = LambdaHandlerProcessor.placedOnRequestHandler(pjpMock);
@@ -91,7 +90,7 @@ void placedOnRequestHandler_shouldInvalidateOnWrongNoOfArgs() {
 
     @Test
     void placedOnRequestHandler_shouldInvalidateOnWrongTypeOfArgs() {
-        Object[] args = {new Object(), new Object()};
+        Object[] args = { new Object(), new Object() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestHandler.class, args);
 
         boolean isPlacedOnRequestHandler = LambdaHandlerProcessor.placedOnRequestHandler(pjpMock);
@@ -101,7 +100,7 @@ void placedOnRequestHandler_shouldInvalidateOnWrongTypeOfArgs() {
 
     @Test
     void placedOnStreamHandler_shouldInvalidateOnWrongNoOfArgs() {
-        Object[] args = {new Object()};
+        Object[] args = { new Object() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         boolean isPlacedOnStreamHandler = LambdaHandlerProcessor.placedOnStreamHandler(pjpMock);
@@ -111,7 +110,7 @@ void placedOnStreamHandler_shouldInvalidateOnWrongNoOfArgs() {
 
     @Test
     void placedOnStreamHandler_shouldInvalidateOnWrongTypeOfArgs() {
-        Object[] args = {new Object(), new Object(), new Object()};
+        Object[] args = { new Object(), new Object(), new Object() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         boolean isPlacedOnStreamHandler = LambdaHandlerProcessor.placedOnStreamHandler(pjpMock);
@@ -121,7 +120,7 @@ void placedOnStreamHandler_shouldInvalidateOnWrongTypeOfArgs() {
 
     @Test
     void placedOnStreamHandler_shouldInvalidateOnTypeOfArgs_invalidOutputStreamArg() {
-        Object[] args = {mock(InputStream.class), new Object(), mock(Context.class)};
+        Object[] args = { new TestInputStream(), new Object(), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         boolean isPlacedOnStreamHandler = LambdaHandlerProcessor.placedOnStreamHandler(pjpMock);
@@ -131,7 +130,7 @@ void placedOnStreamHandler_shouldInvalidateOnTypeOfArgs_invalidOutputStreamArg()
 
     @Test
     void placedOnStreamHandler_shouldInvalidateOnTypeOfArgs_invalidContextArg() {
-        Object[] args = {mock(InputStream.class), mock(OutputStream.class), new Object()};
+        Object[] args = { new TestInputStream(), new TestOutputStream(), new Object() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         boolean isPlacedOnStreamHandler = LambdaHandlerProcessor.placedOnStreamHandler(pjpMock);
@@ -144,9 +143,9 @@ void placedOnStreamHandler_shouldInvalidateOnTypeOfArgs_invalidContextArg() {
     void getXrayTraceId_present() {
         String traceID = "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1\"";
 
-        Optional xRayTraceId = LambdaHandlerProcessor.getXrayTraceId();
+        Optional<String> xRayTraceId = LambdaHandlerProcessor.getXrayTraceId();
 
-        assertThat(xRayTraceId.isPresent()).isTrue();
+        assertThat(xRayTraceId).isPresent();
         assertThat(traceID.split(";")[0].replace(LambdaConstants.ROOT_EQUALS, "")).isEqualTo(xRayTraceId.get());
     }
 
@@ -161,7 +160,7 @@ void getXrayTraceId_notPresent() {
 
     @Test
     void extractContext_fromRequestHandler() {
-        Object[] args = {new Object(), mock(Context.class)};
+        Object[] args = { new Object(), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestHandler.class, args);
 
         Context context = LambdaHandlerProcessor.extractContext(pjpMock);
@@ -171,7 +170,7 @@ void extractContext_fromRequestHandler() {
 
     @Test
     void extractContext_fromStreamRequestHandler() {
-        Object[] args = {mock(InputStream.class), mock(OutputStream.class), mock(Context.class)};
+        Object[] args = { new TestInputStream(), new TestOutputStream(), new TestLambdaContext() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
 
         Context context = LambdaHandlerProcessor.extractContext(pjpMock);
@@ -181,7 +180,7 @@ void extractContext_fromStreamRequestHandler() {
 
     @Test
     void extractContext_notKnownHandler() {
-        Object[] args = {new Object()};
+        Object[] args = { new Object() };
         ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(Object.class, args);
 
         Context context = LambdaHandlerProcessor.extractContext(pjpMock);
@@ -230,10 +229,8 @@ void serviceName_Undefined() {
         assertThat(LambdaHandlerProcessor.serviceName()).isEqualTo(LambdaConstants.SERVICE_UNDEFINED);
     }
 
-    private ProceedingJoinPoint mockRequestHandlerPjp(Class handlerClass, Object[] handlerArgs) {
-        when(signature.getDeclaringType()).thenReturn(handlerClass);
-        when(pjpMock.getArgs()).thenReturn(handlerArgs);
-        when(pjpMock.getSignature()).thenReturn(signature);
-        return pjpMock;
+    private ProceedingJoinPoint mockRequestHandlerPjp(Class<?> handlerClass, Object[] handlerArgs) {
+        TestSignature signature = new TestSignature(handlerClass);
+        return new TestProceedingJoinPoint(signature, handlerArgs);
     }
 }

powertools-common/src/test/java/software/amazon/lambda/powertools/common/stubs/TestInputStream.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 Amazon.com, Inc. or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package software.amazon.lambda.powertools.common.stubs;
+
+import java.io.InputStream;
+
+public class TestInputStream extends InputStream {
+    @Override
+    public int read() {
+        return -1;
+    }
+}

powertools-common/src/test/java/software/amazon/lambda/powertools/common/stubs/TestLambdaContext.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2023 Amazon.com, Inc. or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package software.amazon.lambda.powertools.common.stubs;
+
+import com.amazonaws.services.lambda.runtime.ClientContext;
+import com.amazonaws.services.lambda.runtime.CognitoIdentity;
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
+
+public class TestLambdaContext implements Context {
+    @Override
+    public String getAwsRequestId() {
+        return "test-request-id";
+    }
+
+    @Override
+    public String getLogGroupName() {
+        return "test-log-group";
+    }
+
+    @Override
+    public String getLogStreamName() {
+        return "test-log-stream";
+    }
+
+    @Override
+    public String getFunctionName() {
+        return "test-function";
+    }
+
+    @Override
+    public String getFunctionVersion() {
+        return "1";
+    }
+
+    @Override
+    public String getInvokedFunctionArn() {
+        return "arn:aws:lambda:us-east-1:123456789012:function:test";
+    }
+
+    @Override
+    public CognitoIdentity getIdentity() {
+        return null;
+    }
+
+    @Override
+    public ClientContext getClientContext() {
+        return null;
+    }
+
+    @Override
+    public int getRemainingTimeInMillis() {
+        return 30000;
+    }
+
+    @Override
+    public int getMemoryLimitInMB() {
+        return 128;
+    }
+
+    @Override
+    public LambdaLogger getLogger() {
+        return null;
+    }
+}