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 4bb9da1bda..09756f84d9 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 @@ -15,11 +15,6 @@ */ package org.springframework.integration.redis.channel; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - -import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; import org.springframework.beans.factory.BeanFactory; @@ -27,13 +22,17 @@ import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.message.GenericMessage; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Oleg Zhurakousky * @since 2.0 */ public class SubscribableRedisChannelTests { - @Test //@Ignore // requires instance of redis-server + @Test public void pubSubChanneTest() throws Exception{ JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); connectionFactory.setPort(7379); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml index ccc6ca2ad0..56a6884685 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml @@ -12,5 +12,7 @@ - + + + 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 f07de1185a..6773cf6777 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 @@ -35,7 +35,7 @@ import org.springframework.integration.test.util.TestUtils; */ public class RedisChannelParserTests { - @Test @Ignore // requires redis-server instance + @Test public void testPubSubChannelConfig(){ ApplicationContext context = new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); SubscribableChannel redisChannel = context.getBean("redisChannel", SubscribableChannel.class); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml index 2c5fa2f367..2d7b0ff437 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml @@ -1,26 +1,26 @@ - + - + - + - + + + - + 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 db1abf68f6..119c46bb60 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 @@ -54,9 +54,10 @@ public class RedisInboundChannelAdapterParserTests { assertEquals(converterBean, accessor.getPropertyValue("messageConverter")); } - @Test @Ignore + @Test public void testInboundChannelAdapterMessaging() { JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); + connectionFactory.setPort(7379); connectionFactory.afterPropertiesSet(); connectionFactory.getConnection().publish("foo".getBytes(), "Hello Redis from foo".getBytes()); QueueChannel receiveChannel = context.getBean("receiveChannel", QueueChannel.class); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml index eff01ad803..ae7a12d7f0 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml @@ -20,7 +20,9 @@ - + + + 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 f3aded87e9..a470b15fec 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 @@ -56,7 +56,7 @@ public class RedisOutboundChannelAdapterParserTests { assertEquals(converterBean, accessor.getPropertyValue("messageConverter")); } - @Test @Ignore // requires redis-server instance + @Test public void testOutboundChannelAdapterMessaging(){ MessageChannel sendChannel = context.getBean("sendChannel", MessageChannel.class); sendChannel.send(new GenericMessage("Hello Redis")); 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 9ac6774ab1..f2f7abd08b 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 @@ -33,13 +33,14 @@ import org.springframework.integration.channel.QueueChannel; */ public class RedisInboundChannelAdapterTests { - @Test @Ignore + @Test public void testRedisInboundChannelAdapter() throws Exception { int numToTest = 100; String redisChannelName = "si.test.channel"; QueueChannel channel = new QueueChannel(); JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); + connectionFactory.setPort(7379); connectionFactory.afterPropertiesSet(); RedisInboundChannelAdapter adapter = new RedisInboundChannelAdapter(connectionFactory); 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 648ecb1b5c..f5a355f7b9 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 @@ -45,6 +45,7 @@ public class RedisPublishingMessageHandlerTests { final CountDownLatch latch = new CountDownLatch(numToTest); JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); + connectionFactory.setPort(7379); connectionFactory.afterPropertiesSet(); MessageListenerAdapter listener = new MessageListenerAdapter();