refactoring

redisson/src/test/java/org/redisson/RedissonSortedSetTest.java

@@ -28,55 +28,41 @@ import org.redisson.client.codec.StringCodec;
 import org.redisson.config.Config;
 import org.redisson.connection.balancer.RandomLoadBalancer;
 
-public class RedissonSortedSetTest extends BaseTest {
+public class RedissonSortedSetTest extends RedisDockerTest {
 
     @Test
-    public void testNameMapper() throws InterruptedException, IOException {
+    public void testNameMapper() {
-        RedisRunner master1 = new RedisRunner().port(6890).randomDir().nosave();
+        testInCluster(client -> {
-        RedisRunner master2 = new RedisRunner().port(6891).randomDir().nosave();
+            Config config = client.getConfig();
-        RedisRunner master3 = new RedisRunner().port(6892).randomDir().nosave();
+            config.useClusterServers()
-        RedisRunner slave1 = new RedisRunner().port(6900).randomDir().nosave();
+                    .setNameMapper(new NameMapper() {
-        RedisRunner slave2 = new RedisRunner().port(6901).randomDir().nosave();
+                        @Override
-        RedisRunner slave3 = new RedisRunner().port(6902).randomDir().nosave();
+                        public String map(String name) {
-
+                            return name + ":suffix:";
-        ClusterRunner clusterRunner = new ClusterRunner()
+                        }
-                .addNode(master1, slave1)
+
-                .addNode(master2, slave2)
+                        @Override
-                .addNode(master3, slave3);
+                        public String unmap(String name) {
-        ClusterRunner.ClusterProcesses process = clusterRunner.run();
+                            return name.replace(":suffix:", "");
-
+                        }
-        Thread.sleep(5000);
+                    });
-
+            RedissonClient redisson = Redisson.create(config);
-        Config config = new Config();
+
-        config.useClusterServers()
+            RSortedSet<Long> set = redisson.getSortedSet("simple", LongCodec.INSTANCE);
-                .setNameMapper(new NameMapper() {
+            set.add(2L);
-                    @Override
+            set.add(0L);
-                    public String map(String name) {
+            set.add(1L);
-                        return name + ":suffix:";
+            set.add(5L);
-                    }
+
-
+            assertThat(set.first()).isEqualTo(0L);
-                    @Override
+            assertThat(set.last()).isEqualTo(5L);
-                    public String unmap(String name) {
+
-                        return name.replace(":suffix:", "");
+            assertThat(set.readAll()).containsExactly(0L, 1L, 2L, 5L);
-                    }
+            set.delete();
-                })
+
-                .setLoadBalancer(new RandomLoadBalancer())
+            assertThat(redisson.getKeys().count()).isZero();
-                .addNodeAddress(process.getNodes().stream().findAny().get().getRedisServerAddressAndPort());
+            redisson.shutdown();
-        RedissonClient redisson = Redisson.create(config);
+        });
-
-        RSortedSet<Long> set = redisson.getSortedSet("simple", LongCodec.INSTANCE);
-        set.add(2L);
-        set.add(0L);
-        set.add(1L);
-        set.add(5L);
-
-        assertThat(set.first()).isEqualTo(0L);
-        assertThat(set.last()).isEqualTo(5L);
-
-        assertThat(set.readAll()).containsExactly(0L, 1L, 2L, 5L);
-        set.delete();
-
-        assertThat(redisson.getKeys().count()).isZero();
     }