From 5670e29776418b99e9fdde9a8e4235a980c3c4b3 Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Wed, 2 Mar 2016 11:27:25 -0500 Subject: [PATCH] Test fixes Class rule for Redis Do not pass message collector for test input bindings --- .../cloud/stream/config/ErrorChannelTests.java | 6 +++--- .../cloud/stream/config/MessageChannelConfigurerTests.java | 6 +++--- .../cloud/stream/test/binder/TestSupportBinder.java | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/ErrorChannelTests.java b/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/ErrorChannelTests.java index ab493db8d..6a4e06282 100644 --- a/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/ErrorChannelTests.java +++ b/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/ErrorChannelTests.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.Rule; +import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,8 +53,8 @@ import org.springframework.util.Assert; @SpringApplicationConfiguration({ErrorChannelTests.TestSource.class, ErrorChannelTests.TestErrorSink.class}) public class ErrorChannelTests { - @Rule - public RedisTestSupport redisTestSupport = new RedisTestSupport(); + @ClassRule + public static RedisTestSupport redisTestSupport = new RedisTestSupport(); @Autowired @Bindings(TestErrorSink.class) diff --git a/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/MessageChannelConfigurerTests.java b/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/MessageChannelConfigurerTests.java index 80954ecc7..4c53e4124 100644 --- a/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/MessageChannelConfigurerTests.java +++ b/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/config/MessageChannelConfigurerTests.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.Rule; +import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,8 +54,8 @@ import org.springframework.tuple.Tuple; MessageChannelConfigurerTests.TestSink.class}) public class MessageChannelConfigurerTests { - @Rule - public RedisTestSupport redisTestSupport = new RedisTestSupport(); + @ClassRule + public static RedisTestSupport redisTestSupport = new RedisTestSupport(); @Autowired @Bindings(TestSink.class) private Sink testSink; diff --git a/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinder.java b/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinder.java index dbfe0725a..70567de9a 100644 --- a/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinder.java +++ b/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinder.java @@ -53,7 +53,7 @@ public class TestSupportBinder implements Binder { @Override public Binding bindConsumer(String name, String group, MessageChannel inboundBindTarget, Properties properties) { - return new TestBinding(inboundBindTarget, messageCollector); + return new TestBinding(inboundBindTarget, null); } /** @@ -124,7 +124,9 @@ public class TestSupportBinder implements Binder { @Override public void unbind() { - messageCollector.unregister(target); + if (messageCollector != null) { + messageCollector.unregister(target); + } } } }