From 3c354d94a440bf3b8c0beedda5ca7573f0b45654 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 6 Jun 2019 15:02:36 +0200 Subject: [PATCH] Fixed failing adapter tests --- .../aws/SpringBootApiGatewayRequestHandlerTests.java | 7 +++++++ .../adapter/aws/SpringBootStreamHandlerTests.java | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java index 6f606858d..d56113d12 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java @@ -24,6 +24,8 @@ import java.util.function.Supplier; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; + +import org.junit.After; import org.junit.Test; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; @@ -43,6 +45,11 @@ public class SpringBootApiGatewayRequestHandlerTests { private SpringBootApiGatewayRequestHandler handler; + @After + public void after() { + System.clearProperty("function.name"); + } + @Test public void supplierBean() { System.setProperty("function.name", "supplier"); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java index 2b798c7ae..20a681a37 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java @@ -23,6 +23,8 @@ import java.util.Map; import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; + +import org.junit.After; import org.junit.Test; import reactor.core.publisher.Flux; @@ -44,6 +46,13 @@ public class SpringBootStreamHandlerTests { private SpringBootStreamHandler handler; + @After + public void after() { + if (handler != null) { + handler.close(); + } + } + @Test public void functionBeanWithJacksonConfig() throws Exception { this.handler = new SpringBootStreamHandler(FunctionConfigWithJackson.class);