Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tck tests #2197

Merged
merged 5 commits into from
Aug 22, 2024
Merged

Fix tck tests #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd36edb
tck: NoBodyResponseTest
sdelamo Aug 22, 2024
a129dfd
tck: ResponseStatusTest
sdelamo Aug 22, 2024
3c0004f
core micronaut 4.6.2
sdelamo Aug 22, 2024
a110b5d
groovy 4.0.22
sdelamo Aug 22, 2024
432716d
fix test
sdelamo Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...main/java/io/micronaut/function/aws/proxy/alb/ApplicationLoadBalancerServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerResponseEvent;
import io.micronaut.core.annotation.Internal;
import io.micronaut.core.convert.ConversionService;
import io.micronaut.core.util.StringUtils;
import io.micronaut.function.BinaryTypeConfiguration;
import io.micronaut.function.aws.proxy.AbstractServletHttpResponse;
import io.micronaut.function.aws.proxy.MapCollapseUtils;
Expand Down Expand Up @@ -49,7 +50,10 @@ public ApplicationLoadBalancerResponseEvent getNativeResponse() {
nativeResponse.setBody(Base64.getMimeEncoder().encodeToString(body.toByteArray()));
} else {
nativeResponse.setIsBase64Encoded(false);
nativeResponse.setBody(body.toString(getCharacterEncoding()));
String bodyStr = body.toString(getCharacterEncoding());
if (StringUtils.isNotEmpty(bodyStr)) {
nativeResponse.setBody(bodyStr);
}
}
return nativeResponse;
}
Expand Down
9 changes: 6 additions & 3 deletions ...rc/main/java/io/micronaut/function/aws/proxy/payload1/ApiGatewayProxyServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
import io.micronaut.core.annotation.Internal;
import io.micronaut.core.convert.ConversionService;
import io.micronaut.core.util.StringUtils;
import io.micronaut.function.BinaryTypeConfiguration;
import io.micronaut.function.aws.proxy.AbstractServletHttpResponse;
import io.micronaut.function.aws.proxy.MapCollapseUtils;
Expand All @@ -42,7 +43,6 @@ protected ApiGatewayProxyServletResponse(ConversionService conversionService, Bi
@Override
public APIGatewayProxyResponseEvent getNativeResponse() {
APIGatewayProxyResponseEvent apiGatewayProxyResponseEvent = new APIGatewayProxyResponseEvent()
.withBody(body.toString())
.withStatusCode(status)
.withMultiValueHeaders(MapCollapseUtils.getMultiHeaders(headers))
.withHeaders(MapCollapseUtils.getSingleValueHeaders(headers));
Expand All @@ -53,8 +53,11 @@ public APIGatewayProxyResponseEvent getNativeResponse() {
.withBody(Base64.getMimeEncoder().encodeToString(body.toByteArray()));
} else {
apiGatewayProxyResponseEvent
.withIsBase64Encoded(false)
.withBody(body.toString(getCharacterEncoding()));
.withIsBase64Encoded(false);
String bodyStr = body.toString(getCharacterEncoding());
if (StringUtils.isNotEmpty(bodyStr)) {
apiGatewayProxyResponseEvent.withBody(bodyStr);
}
}
return apiGatewayProxyResponseEvent;
}
Expand Down
6 changes: 5 additions & 1 deletion ...ava/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPResponseServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse;
import io.micronaut.core.annotation.Internal;
import io.micronaut.core.convert.ConversionService;
import io.micronaut.core.util.StringUtils;
import io.micronaut.function.BinaryTypeConfiguration;
import io.micronaut.function.aws.proxy.AbstractServletHttpResponse;
import io.micronaut.function.aws.proxy.MapCollapseUtils;
Expand Down Expand Up @@ -51,7 +52,10 @@ public APIGatewayV2HTTPResponse getNativeResponse() {
.withIsBase64Encoded(true)
.withBody(Base64.getMimeEncoder().encodeToString(body.toByteArray()));
} else {
apiGatewayV2HTTPResponseBuilder.withBody(body.toString(getCharacterEncoding()));
String bodyStr = body.toString(getCharacterEncoding());
if (StringUtils.isNotEmpty(bodyStr)) {
apiGatewayV2HTTPResponseBuilder.withBody(bodyStr);
}
}

return apiGatewayV2HTTPResponseBuilder.build();
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
micronaut = "4.6.1"
micronaut = "4.6.2"
micronaut-docs = "2.0.0"
micronaut-test = "4.5.0"
groovy = "4.0.15"
groovy = "4.0.22"
spock = "2.3-groovy-4.0"

bouncycastle = '1.70'
Expand All @@ -18,7 +18,7 @@ micronaut-reactor = "3.5.0"

micronaut-security = "4.9.1"
micronaut-serde = "2.11.0"
micronaut-servlet = "4.10.0"
micronaut-servlet = "4.10.1"
micronaut-test-resources="2.5.4"
micronaut-views = "5.4.4"
micronaut-validation = "4.7.0"
Expand Down
2 changes: 0 additions & 2 deletions ...t/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
"io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
"io.micronaut.http.server.tck.tests.NoBodyResponseTest",
"io.micronaut.http.server.tck.tests.ResponseStatusTest",
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
})
@SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy Application Load Balancer Event")
Expand Down
7 changes: 1 addition & 6 deletions ...cronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package io.micronaut.http.server.tck.lambda.tests;

import org.junit.platform.suite.api.ExcludeClassNamePatterns;
import org.junit.platform.suite.api.SelectPackages;
import org.junit.platform.suite.api.Suite;
import org.junit.platform.suite.api.SuiteDisplayName;
import org.junit.platform.suite.api.*;

@Suite
@SelectPackages({
Expand All @@ -16,8 +13,6 @@
"io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
"io.micronaut.http.server.tck.tests.NoBodyResponseTest",
"io.micronaut.http.server.tck.tests.ResponseStatusTest",
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
})
@SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v1 Event model")
Expand Down
7 changes: 1 addition & 6 deletions ...cronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package io.micronaut.http.server.tck.lambda.tests;

import org.junit.platform.suite.api.ExcludeClassNamePatterns;
import org.junit.platform.suite.api.SelectPackages;
import org.junit.platform.suite.api.Suite;
import org.junit.platform.suite.api.SuiteDisplayName;
import org.junit.platform.suite.api.*;

@Suite
@SelectPackages({
Expand All @@ -16,8 +13,6 @@
"io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
"io.micronaut.http.server.tck.tests.NoBodyResponseTest",
"io.micronaut.http.server.tck.tests.ResponseStatusTest",
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
})
@SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v2 Event model")
Expand Down
1 change: 0 additions & 1 deletion .../io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"io.micronaut.http.server.tck.lambda.tests"
})
@ExcludeClassNamePatterns({
"io.micronaut.http.server.tck.tests.ResponseStatusTest",
"io.micronaut.http.server.tck.tests.forms.FormsSubmissionsWithListsTest",
"io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
"io.micronaut.http.server.tck.tests.LocalErrorReadingBodyTest", // Binding body different type (e.g. a String in error handler)
Expand Down
Loading