test: added some tests

Author: darklight3it

aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoaderTest.java

@@ -2,6 +2,9 @@
 
 import com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
@@ -13,7 +16,6 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class EventHandlerLoaderTest {
@@ -60,32 +62,48 @@ void PojoHandlerTest_twoParams() throws Exception {
         assertSuccessfulInvocation(lambdaRequestHandler);
     }
 
-    @Test
-    void PojoHandler_outputSerializer_ignoresClientContextPlatform() throws Exception {
+    // Before 2.13.0, a client context with env.platform equal to "Android" (case-insensitive) switched POJO
+    // serialization to Gson, which binds fields: pojoOutputHandler returned {"internalField":"field-based-value"}
+    // and pojoInputHandler returned "x:true". Every client context must now produce the Jackson result.
+
+    @ParameterizedTest(name = "clientContext={0}")
+    @NullSource
+    @ValueSource(strings = {
+            "{\"env\":{\"platform\":\"Android\"}}",
+            "{\"env\":{\"platform\":\"android\"}}",
+            "{\"env\":{\"platform\":\"iPhoneOS\"}}",
+            "{\"env\":{}}",
+            "{}"
+    })
+    void PojoHandler_outputSerializer_ignoresClientContextPlatform(String clientContext) throws Exception {
         LambdaRequestHandler handler =
                 getLambdaRequestHandler("test.lambda.handlers.POJOHanlderImpl::pojoOutputHandler");
 
         InvocationRequest request = getTestInvocationRequest();
-        request.setClientContext("{\"env\":{\"platform\":\"Android\"}}");
-
-        String result = handler.call(request).toString();
+        request.setClientContext(clientContext);
 
-        assertTrue(result.contains("beanProperty"),
-                "expected property-based (Jackson) serialization, got: " + result);
-        assertFalse(result.contains("internalField"),
-                "caller ClientContext must not switch serialization to field-based (Gson), got: " + result);
+        assertEquals("{\"beanProperty\":\"property-based-value\"}", handler.call(request).toString());
     }
 
-    @Test
-    void PojoHandler_inputSerializer_bindsOnlyBeanProperties() throws Exception {
+    @ParameterizedTest(name = "clientContext={0}")
+    @NullSource
+    @ValueSource(strings = {
+            "{\"env\":{\"platform\":\"Android\"}}",
+            "{\"env\":{\"platform\":\"android\"}}",
+            "{\"env\":{\"platform\":\"iPhoneOS\"}}",
+            "{\"env\":{}}",
+            "{}"
+    })
+    void PojoHandler_inputSerializer_ignoresClientContextPlatform(String clientContext) throws Exception {
         LambdaRequestHandler handler =
                 getLambdaRequestHandler("test.lambda.handlers.POJOHanlderImpl::pojoInputHandler");
 
         InvocationRequest request = getTestInvocationRequest();
-        request.setClientContext("{\"env\":{\"platform\":\"Android\"}}");
+        request.setClientContext(clientContext);
         request.setContent("{\"name\":\"x\",\"locked\":true}".getBytes());
 
-        assertEquals("false", handler.call(request).toString());
+        // name has a setter and binds; locked has only a getter and keeps its default
+        assertEquals("\"x:false\"", handler.call(request).toString());
     }
 
     private LambdaRequestHandler getLambdaRequestHandler(String handler) throws ClassNotFoundException {

aws-lambda-java-runtime-interface-client/src/test/java/test/lambda/handlers/POJOHanlderImpl.java

@@ -39,8 +39,8 @@ public String getBeanProperty() {
     }
 
     @SuppressWarnings("unused")
-    public boolean pojoInputHandler(PojoInput input) {
-        return input.isLocked();
+    public String pojoInputHandler(PojoInput input) {
+        return input.getName() + ":" + input.isLocked();
     }
 
     @SuppressWarnings("unused")

aws-lambda-java-tests/src/main/java/com/amazonaws/services/lambda/runtime/tests/LambdaEventAssert.java

@@ -53,6 +53,27 @@ public static <T> void assertSerializationRoundTrip(String fileName, Class<T> ta
         PojoSerializer<T> serializer = LambdaEventSerializers.serializerFor(targetClass,
                 ClassLoader.getSystemClassLoader());
 
+        assertSerializationRoundTrip(fileName, serializer);
+    }
+
+    /**
+     * Round-trip using a caller-supplied {@link PojoSerializer}.
+     *
+     * <p>
+     * Use this overload to check a serializer that is not obtained from
+     * {@link LambdaEventSerializers}, such as one built by the runtime
+     * interface client or a custom serializer. It performs the same two
+     * consecutive round-trips and tree comparison as
+     * {@link #assertSerializationRoundTrip(String, Class)}.
+     * </p>
+     *
+     * @param fileName   classpath resource name (must end with {@code .json})
+     * @param serializer the serializer used for every deserialize and
+     *                   serialize step
+     * @throws AssertionError if the original and final JSON trees differ
+     */
+    public static <T> void assertSerializationRoundTrip(String fileName, PojoSerializer<T> serializer) {
+        
         if (!fileName.endsWith(".json")) {
             throw new IllegalArgumentException("File " + fileName + " must have json extension");
         }