INT-2328-v3 polishing tests

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

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;

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<String>("3"));
 		Thread.sleep(1000);
 		verify(handler, times(3)).handleMessage(Mockito.any(Message.class));
+		channel.stop();
 	}
 }

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<String>("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 {

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

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() {

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();
 	}
 
 }

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();
 	}