From 311c4a34b215591900cb8ba37119d3ccf193cbbc Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 20 May 2019 11:10:32 -0500 Subject: [PATCH] Added additional cleanup to RoutingFunctionTests --- .../cloud/stream/function/RoutingFunctionTests.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/RoutingFunctionTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/RoutingFunctionTests.java index cacf7ea99..de1e1eedc 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/RoutingFunctionTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/RoutingFunctionTests.java @@ -19,6 +19,7 @@ package org.springframework.cloud.stream.function; import java.util.function.Function; import org.junit.After; +import org.junit.Before; import org.junit.Test; import reactor.core.publisher.Flux; @@ -35,8 +36,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.util.MimeTypeUtils; - - import static org.assertj.core.api.Assertions.assertThat; /** @@ -52,6 +51,12 @@ public class RoutingFunctionTests { System.getProperties().remove("spring.cloud.stream.function.definition"); } + @Before + public void before() { + System.getProperties().remove("spring.cloud.function.routing.enabled"); + System.getProperties().remove("spring.cloud.stream.function.definition"); + } + @Test public void testDefaultRoutingFunctionBinding() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(