From d9531a74fdce43130a6f9af6077e6c8e5a6a430b Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 21 Dec 2011 14:10:08 -0500 Subject: [PATCH] INT-2328-v3 polishing tests --- spring-integration-redis/si-redis.conf | 2 +- .../redis/channel/SubscribableRedisChannel.java | 6 +++--- .../redis/channel/SubscribableRedisChannelTests.java | 1 + .../integration/redis/config/RedisChannelParserTests.java | 8 +++++--- .../config/RedisInboundChannelAdapterParserTests.java | 2 ++ .../config/RedisOutboundChannelAdapterParserTests.java | 3 ++- .../redis/inbound/RedisInboundChannelAdapterTests.java | 3 ++- .../outbound/RedisPublishingMessageHandlerTests.java | 1 + 8 files changed, 17 insertions(+), 9 deletions(-) diff --git a/spring-integration-redis/si-redis.conf b/spring-integration-redis/si-redis.conf index be34f59102..b2bd5a7d37 100644 --- a/spring-integration-redis/si-redis.conf +++ b/spring-integration-redis/si-redis.conf @@ -1,5 +1,5 @@ # minimal config #daemonize yes bind 127.0.0.1 -loglevel notice +loglevel debug port 7379 \ No newline at end of file diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java index 4bb904074c..fe0f3e53d7 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java @@ -21,7 +21,7 @@ import java.util.concurrent.Executor; import org.springframework.beans.factory.DisposableBean; import org.springframework.context.SmartLifecycle; import org.springframework.core.task.SimpleAsyncTaskExecutor; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.listener.ChannelTopic; @@ -51,7 +51,7 @@ import org.springframework.util.ErrorHandler; public class SubscribableRedisChannel extends AbstractMessageChannel implements SubscribableChannel, SmartLifecycle, DisposableBean { private final RedisMessageListenerContainer container = new RedisMessageListenerContainer(); - private final JedisConnectionFactory connectionFactory; + private final RedisConnectionFactory connectionFactory; private final RedisTemplate redisTemplate; private final String topicName; @@ -64,7 +64,7 @@ public class SubscribableRedisChannel extends AbstractMessageChannel implements private volatile RedisSerializer serializer = new StringRedisSerializer(); private volatile MessageConverter messageConverter = new SimpleMessageConverter(); - public SubscribableRedisChannel(JedisConnectionFactory connectionFactory, String topicName) { + public SubscribableRedisChannel(RedisConnectionFactory connectionFactory, String topicName) { Assert.notNull(connectionFactory, "'connectionFactory' must not be null"); Assert.hasText(topicName, "'topicName' must not be empty"); this.connectionFactory = connectionFactory; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java index d7c093d7af..bf2705dadf 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java @@ -54,5 +54,6 @@ public class SubscribableRedisChannelTests extends RedisAvailableTests{ channel.send(new GenericMessage("3")); Thread.sleep(1000); verify(handler, times(3)).handleMessage(Mockito.any(Message.class)); + channel.stop(); } } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java index b48225fda3..6166a955aa 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java @@ -18,7 +18,7 @@ package org.springframework.integration.redis.config; import org.junit.Test; import org.mockito.Mockito; -import org.springframework.context.ApplicationContext; + import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.serializer.RedisSerializer; @@ -41,7 +41,7 @@ public class RedisChannelParserTests extends RedisAvailableTests{ @Test @RedisAvailable public void testPubSubChannelConfig(){ - ApplicationContext context = new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); SubscribableChannel redisChannel = context.getBean("redisChannel", SubscribableChannel.class); JedisConnectionFactory connectionFactory = TestUtils.getPropertyValue(redisChannel, "connectionFactory", JedisConnectionFactory.class); @@ -49,12 +49,13 @@ public class RedisChannelParserTests extends RedisAvailableTests{ assertEquals(connectionFactory, context.getBean("redisConnectionFactory")); assertEquals(redisSerializer, context.getBean("redisSerializer")); assertEquals("si.test.topic", TestUtils.getPropertyValue(redisChannel, "topicName")); + context.stop(); } @Test @RedisAvailable public void testPubSubChannelUsage() throws Exception { - ApplicationContext context = new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); SubscribableChannel redisChannel = context.getBean("redisChannel", SubscribableChannel.class); final Message m = new GenericMessage("Hello Redis"); @@ -68,6 +69,7 @@ public class RedisChannelParserTests extends RedisAvailableTests{ redisChannel.send(m); Thread.sleep(1000); Mockito.verify(marker, Mockito.times(1)).mark(); + context.stop(); } interface Marker { diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java index c74b1db4f8..9b1a025d00 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java @@ -18,6 +18,7 @@ package org.springframework.integration.redis.config; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -42,6 +43,7 @@ public class RedisInboundChannelAdapterParserTests extends RedisAvailableTests{ @Autowired private ApplicationContext context; + @Test @RedisAvailable diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java index 8370958466..7e92fe2f0c 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java @@ -18,6 +18,7 @@ package org.springframework.integration.redis.config; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -44,7 +45,7 @@ public class RedisOutboundChannelAdapterParserTests extends RedisAvailableTests{ @Autowired private ApplicationContext context; - + @Test @RedisAvailable public void validateConfiguration() { diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java index c0e5dc39b7..f6a5bf22a4 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java @@ -50,7 +50,7 @@ public class RedisInboundChannelAdapterTests extends RedisAvailableTests{ adapter.setOutputChannel(channel); adapter.afterPropertiesSet(); adapter.start(); - + StringRedisTemplate redisTemplate = new StringRedisTemplate(connectionFactory); redisTemplate.afterPropertiesSet(); for (int i = 0; i < numToTest; i++) { @@ -68,6 +68,7 @@ public class RedisInboundChannelAdapterTests extends RedisAvailableTests{ counter++; } assertEquals(numToTest, counter); + adapter.stop(); } } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java index ea1910239e..2e0a00b94a 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java @@ -69,6 +69,7 @@ public class RedisPublishingMessageHandlerTests extends RedisAvailableTests{ } latch.await(3, TimeUnit.SECONDS); assertEquals(0, latch.getCount()); + container.stop(); }