DATAREDIS-580 - Move Master/Slave test to Sentinel integration test class.

Reuse guards to make sure we can use a slave server.

Author: mp911de

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryTests.java

@@ -20,7 +20,6 @@
 import static org.hamcrest.core.IsNull.*;
 import static org.junit.Assert.*;
 
-import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.reactive.BaseRedisReactiveCommands;
@@ -363,28 +362,6 @@ public void factoryCreatesPooledConnections() {
 		factory.destroy();
 	}
 
-	@Test // DATAREDIS-580
-	public void factoryUsesMasterSlaveConnections() {
-
-		LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().readFrom(ReadFrom.SLAVE)
-				.build();
-
-		LettuceConnectionFactory factory = new LettuceConnectionFactory(SettingsUtils.standaloneConfiguration(),
-				configuration);
-		factory.afterPropertiesSet();
-
-		RedisConnection connection = factory.getConnection();
-
-		try {
-			assertThat(connection.ping(), is(equalTo("PONG")));
-			assertThat(connection.info().getProperty("role"), is(equalTo("slave")));
-		} finally {
-			this.connection.close();
-		}
-
-		factory.destroy();
-	}
-
 	@Test // DATAREDIS-576
 	public void connectionAppliesClientName() {
 

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelIntegrationTests.java

@@ -35,8 +35,10 @@
 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.AbstractConnectionIntegrationTests;
 import org.springframework.data.redis.connection.DefaultStringRedisConnection;
+import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisSentinelConfiguration;
 import org.springframework.data.redis.connection.RedisSentinelConnection;
 import org.springframework.data.redis.connection.RedisServer;
@@ -210,4 +212,26 @@ public void factoryWithReadFromSlaveSettings() {
 			connection.close();
 		}
 	}
+
+	@Test // DATAREDIS-580
+	public void factoryUsesMasterSlaveConnections() {
+
+		LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().readFrom(ReadFrom.SLAVE)
+				.build();
+
+		LettuceConnectionFactory factory = new LettuceConnectionFactory(SettingsUtils.standaloneConfiguration(),
+				configuration);
+		factory.afterPropertiesSet();
+
+		RedisConnection connection = factory.getConnection();
+
+		try {
+			assertThat(connection.ping(), is(equalTo("PONG")));
+			assertThat(connection.info().getProperty("role"), is(equalTo("slave")));
+		} finally {
+			this.connection.close();
+		}
+
+		factory.destroy();
+	}
 }