fix: Micronaut Lambda Test compilation with 3.9.2

Close: #1742 - Micronaut Framework 3.9.2 - ignore test in tck fix test
micronaut-projects · Jun 1, 2023 · 15bbf41 · 15bbf41
1 parent 13897da
commit 15bbf41
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/...-logging/src/test/groovy/io/micronaut/aws/cloudwatch/logging/CloudwatchLoggingSpec.groovy b/...-logging/src/test/groovy/io/micronaut/aws/cloudwatch/logging/CloudwatchLoggingSpec.groovy
@@ -54,25 +54,23 @@ class CloudwatchLoggingSpec extends Specification {
             mockLogging.getPutLogsRequestList().size() != 0
         }
 
-        def putLogRequestList = ((MockLogging) logging).getPutLogsRequestList()
+        List<PutLogEventsRequest> putLogRequestList = ((MockLogging) logging).getPutLogsRequestList()
         putLogRequestList.stream().allMatch(x -> x.logGroupName() == applicationConfiguration.getName().get())
         putLogRequestList.stream().allMatch(x -> x.logStreamName() == testHost)
 
         ObjectMapper mapper = ObjectMapper.getDefault()
 
-        def logEntries = new ArrayList<Map<String, String>>()
+        List<Map<String, String>> logEntries = new ArrayList<Map<String, String>>()
 
-        putLogRequestList.forEach(
-                x -> {
-                    x.logEvents().stream().forEach(y -> logEntries.add(
-                            mapper.readValue(y.message(), HashMap.class) as Map<String, String>
-                    ))
-                }
-        )
+        for (PutLogEventsRequest x : putLogRequestList) {
+            for (InputLogEvent y : x.logEvents()) {
+                logEntries.add(mapper.readValue(y.message(), HashMap.class) as Map<String, String>)
+            }
+        }
 
-        logEntries.stream().anyMatch(x -> x.logger == 'io.micronaut.context.env.DefaultEnvironment')
-        logEntries.stream().anyMatch(x -> x.logger == 'io.micronaut.aws.cloudwatch.logging.CloudwatchLoggingSpec')
-        logEntries.stream().anyMatch(x -> x.message == logMessage)
+        logEntries.any {  it['logger'] == 'io.micronaut.context.DefaultApplicationContext$RuntimeConfiguredEnvironment' }
+        logEntries.any {  it['logger'] == 'io.micronaut.aws.cloudwatch.logging.CloudwatchLoggingSpec' }
+        logEntries.any {  it['message'] == logMessage }
         MockAppender.getEvents().size() == 0
 
         when:

diff --git a/...aws-test/src/main/java/io/micronaut/function/aws/test/MicronautLambdaJunit5Extension.java b/...aws-test/src/main/java/io/micronaut/function/aws/test/MicronautLambdaJunit5Extension.java
@@ -57,7 +57,8 @@ private MicronautTestValue buildValueObject(MicronautLambdaTest micronautTest) {
                 micronautTest.rebuildContext(),
                 micronautTest.contextBuilder(),
                 micronautTest.transactionMode(),
-                micronautTest.startApplication());
+                micronautTest.startApplication(),
+            micronautTest.resolveParameters());
     }
 
     @Override

diff --git a/...aws-test/src/main/java/io/micronaut/function/aws/test/annotation/MicronautLambdaTest.java b/...aws-test/src/main/java/io/micronaut/function/aws/test/annotation/MicronautLambdaTest.java
@@ -105,4 +105,14 @@
      * @return true if {@link io.micronaut.runtime.EmbeddedApplication} should be started
      */
     boolean startApplication() default true;
+
+    /**
+     * By default, with JUnit 5 the test method parameters will be resolved to beans if possible.
+     * This behaviour can be problematic if in combination with the {@code ParameterizedTest} annotation.
+     * Setting this member to {@code false} will completely disable bean resolution for method parameters.
+     * <p>
+     *
+     * @return Whether to resolve test method parameters as beans.
+     */
+    boolean resolveParameters() default true;
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-micronaut = "3.8.8"
+micronaut = "3.9.2"
 micronaut-docs = "2.0.0"
 micronaut-test = "3.9.1"
 groovy = "3.0.13"
@@ -16,7 +16,7 @@ managed-aws-lambda = '1.2.2'
 managed-aws-lambda-events = '3.11.1'
 managed-aws-serverless-core = '1.9.2'
 managed-aws-cdk-lib='2.73.0'
-micronaut-starter = "3.8.8"
+micronaut-starter = "3.9.2"
 servlet-api = "2.5"
 slf4j = "1.7.36"
 javapoet = "1.13.0"

diff --git a/.../io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java b/.../io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java
@@ -15,7 +15,9 @@
     "io.micronaut.http.server.tck.tests.BodyTest",
     "io.micronaut.http.server.tck.tests.OctetTest",
     "io.micronaut.http.server.tck.tests.endpoints.health.HealthTest",
-    "io.micronaut.http.server.tck.tests.staticresources.StaticResourceTest"
+    "io.micronaut.http.server.tck.tests.staticresources.StaticResourceTest",
+    "io.micronaut.http.server.tck.tests.cors.CrossOriginTest",
+    "io.micronaut.http.server.tck.tests.constraintshandler.ControllerConstraintHandlerTest"
 })
 public class MicronautLambdaHandlerHttpServerTestSuite {
 }