From b999b2e2a766bf5437df545ea622695ff9599908 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 23 Mar 2018 10:53:19 +0100 Subject: [PATCH] DATAREDIS-792 - Polishing. Use SettingsUtil to obtain hostname/port instead of constant values. Fix typo in test class name. --- .../data/redis/connection/jedis/ScanTests.java | 11 ++++++----- .../jedis/TransactionalJedisItegrationTests.java | 8 ++++---- ...java => TransactionalLettuceIntegrationTests.java} | 11 +++++------ .../redis/listener/SubscriptionConnectionTests.java | 6 +++--- .../redis/test/util/LettuceRedisClientProvider.java | 6 ++++-- 5 files changed, 22 insertions(+), 20 deletions(-) rename src/test/java/org/springframework/data/redis/connection/lettuce/{TransactionalLettuceItegrationTests.java => TransactionalLettuceIntegrationTests.java} (83%) diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/ScanTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/ScanTests.java index 415f2cbbf..d186cabe6 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/ScanTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/ScanTests.java @@ -33,6 +33,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.springframework.data.redis.ConnectionFactoryTracker; +import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.connection.lettuce.LettuceTestClientResources; @@ -43,7 +44,7 @@ import org.springframework.data.redis.core.ScanOptions; import org.springframework.data.redis.core.StringRedisTemplate; /** - * @autor Mark Paluch + * @author Mark Paluch * @author Christoph Strobl */ @RunWith(Parameterized.class) @@ -65,14 +66,14 @@ public class ScanTests { public static List params() { JedisConnectionFactory jedisConnectionFactory = new JedisConnectionFactory(); - jedisConnectionFactory.setHostName("127.0.0.1"); - jedisConnectionFactory.setPort(6379); + jedisConnectionFactory.setHostName(SettingsUtils.getHost()); + jedisConnectionFactory.setPort(SettingsUtils.getPort()); jedisConnectionFactory.afterPropertiesSet(); LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(); lettuceConnectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources()); - lettuceConnectionFactory.setHostName("127.0.0.1"); - lettuceConnectionFactory.setPort(6379); + lettuceConnectionFactory.setHostName(SettingsUtils.getHost()); + lettuceConnectionFactory.setPort(SettingsUtils.getPort()); lettuceConnectionFactory.afterPropertiesSet(); return Arrays. asList(jedisConnectionFactory, lettuceConnectionFactory); diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/TransactionalJedisItegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/TransactionalJedisItegrationTests.java index 8c470d5c5..f03b3a0a9 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/TransactionalJedisItegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/TransactionalJedisItegrationTests.java @@ -17,12 +17,14 @@ package org.springframework.data.redis.connection.jedis; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.AbstractTransactionalTestBase; import org.springframework.data.redis.connection.jedis.TransactionalJedisItegrationTests.JedisContextConfiguration; import org.springframework.test.context.ContextConfiguration; /** * @author Christoph Strobl + * @author Mark Paluch */ @ContextConfiguration(classes = { JedisContextConfiguration.class }) public class TransactionalJedisItegrationTests extends AbstractTransactionalTestBase { @@ -35,11 +37,9 @@ public class TransactionalJedisItegrationTests extends AbstractTransactionalTest public JedisConnectionFactory redisConnectionFactory() { JedisConnectionFactory factory = new JedisConnectionFactory(); - factory.setHostName("localhost"); - factory.setPort(6379); + factory.setHostName(SettingsUtils.getHost()); + factory.setPort(SettingsUtils.getPort()); return factory; } - } - } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/TransactionalLettuceItegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/TransactionalLettuceIntegrationTests.java similarity index 83% rename from src/test/java/org/springframework/data/redis/connection/lettuce/TransactionalLettuceItegrationTests.java rename to src/test/java/org/springframework/data/redis/connection/lettuce/TransactionalLettuceIntegrationTests.java index d424c1a35..90b800c4c 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/TransactionalLettuceItegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/TransactionalLettuceIntegrationTests.java @@ -17,8 +17,9 @@ package org.springframework.data.redis.connection.lettuce; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.AbstractTransactionalTestBase; -import org.springframework.data.redis.connection.lettuce.TransactionalLettuceItegrationTests.LettuceContextConfiguration; +import org.springframework.data.redis.connection.lettuce.TransactionalLettuceIntegrationTests.LettuceContextConfiguration; import org.springframework.test.context.ContextConfiguration; /** @@ -26,7 +27,7 @@ import org.springframework.test.context.ContextConfiguration; * @author Mark Paluch */ @ContextConfiguration(classes = { LettuceContextConfiguration.class }) -public class TransactionalLettuceItegrationTests extends AbstractTransactionalTestBase { +public class TransactionalLettuceIntegrationTests extends AbstractTransactionalTestBase { @Configuration public static class LettuceContextConfiguration extends RedisContextConfiguration { @@ -37,11 +38,9 @@ public class TransactionalLettuceItegrationTests extends AbstractTransactionalTe LettuceConnectionFactory factory = new LettuceConnectionFactory(); factory.setClientResources(LettuceTestClientResources.getSharedClientResources()); - factory.setHostName("localhost"); - factory.setPort(6379); + factory.setHostName(SettingsUtils.getHost()); + factory.setPort(SettingsUtils.getPort()); return factory; } - } - } diff --git a/src/test/java/org/springframework/data/redis/listener/SubscriptionConnectionTests.java b/src/test/java/org/springframework/data/redis/listener/SubscriptionConnectionTests.java index 0e677fcab..86391812e 100644 --- a/src/test/java/org/springframework/data/redis/listener/SubscriptionConnectionTests.java +++ b/src/test/java/org/springframework/data/redis/listener/SubscriptionConnectionTests.java @@ -18,6 +18,7 @@ package org.springframework.data.redis.listener; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.apache.commons.logging.Log; @@ -93,7 +94,6 @@ public class SubscriptionConnectionTests { JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); jedisConnFactory.setPort(port); jedisConnFactory.setHostName(host); - jedisConnFactory.setDatabase(2); jedisConnFactory.afterPropertiesSet(); // Lettuce @@ -101,7 +101,6 @@ public class SubscriptionConnectionTests { lettuceConnFactory.setClientResources(LettuceTestClientResources.getSharedClientResources()); lettuceConnFactory.setPort(port); lettuceConnFactory.setHostName(host); - lettuceConnFactory.setDatabase(2); lettuceConnFactory.setValidateConnection(true); lettuceConnFactory.afterPropertiesSet(); @@ -116,7 +115,8 @@ public class SubscriptionConnectionTests { RedisMessageListenerContainer container = new RedisMessageListenerContainer(); container.setConnectionFactory(connectionFactory); container.setBeanName("container" + i); - container.addMessageListener(new MessageListenerAdapter(handler), Arrays.asList(new ChannelTopic(CHANNEL))); + container.addMessageListener(new MessageListenerAdapter(handler), + Collections.singletonList(new ChannelTopic(CHANNEL))); container.setTaskExecutor(new SyncTaskExecutor()); container.setSubscriptionExecutor(new SimpleAsyncTaskExecutor()); container.afterPropertiesSet(); diff --git a/src/test/java/org/springframework/data/redis/test/util/LettuceRedisClientProvider.java b/src/test/java/org/springframework/data/redis/test/util/LettuceRedisClientProvider.java index 71490ea63..da3dcf4a0 100644 --- a/src/test/java/org/springframework/data/redis/test/util/LettuceRedisClientProvider.java +++ b/src/test/java/org/springframework/data/redis/test/util/LettuceRedisClientProvider.java @@ -19,15 +19,17 @@ import io.lettuce.core.RedisClient; import io.lettuce.core.RedisURI; import org.junit.rules.ExternalResource; +import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.lettuce.LettuceTestClientResources; /** * @author Christoph Strobl + * @author Mark Paluch */ public class LettuceRedisClientProvider extends ExternalResource { - String host = "127.0.0.1"; - int port = 6379; + String host = SettingsUtils.getHost(); + int port = SettingsUtils.getPort(); RedisClient client;