refactoring

redisson/src/test/java/org/redisson/BaseReactiveTest.java

@@ -4,15 +4,11 @@ import org.junit.jupiter.api.BeforeAll;
 import org.reactivestreams.Publisher;
 import org.redisson.api.RCollectionReactive;
 import org.redisson.api.RScoredSortedSetReactive;
-import org.redisson.api.RedissonClient;
 import org.redisson.api.RedissonReactiveClient;
-import org.redisson.config.Config;
-import org.testcontainers.containers.GenericContainer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.Iterator;
-import java.util.function.Consumer;
 
 public abstract class BaseReactiveTest extends RedisDockerTest {
 
@@ -47,22 +43,4 @@ public abstract class BaseReactiveTest extends RedisDockerTest {
         return flux.single().block();
     }
 
-    protected void testWithParamsReactive(Consumer<RedissonReactiveClient> redissonCallback, String... params) {
-        GenericContainer<?> redis = createRedis(params);
-        redis.start();
-
-        Config config = new Config();
-        config.setProtocol(protocol);
-        config.useSingleServer().setAddress("redis://127.0.0.1:" + redis.getFirstMappedPort());
-        RedissonClient redisson = Redisson.create(config);
-        RedissonReactiveClient redissonReactiveClient = redisson.reactive();
-
-        try {
-            redissonCallback.accept(redissonReactiveClient);
-        } finally {
-            redisson.shutdown();
-            redis.stop();
-        }
-    }
-
 }

redisson/src/test/java/org/redisson/RedisDockerTest.java

@@ -106,9 +106,7 @@ public class RedisDockerTest {
         GenericContainer<?> redis = createRedis(params);
         redis.start();
 
-        Config config = new Config();
-        config.setProtocol(protocol);
-        config.useSingleServer().setAddress("redis://127.0.0.1:" + redis.getFirstMappedPort());
+        Config config = createConfig(redis);
         RedissonClient redisson = Redisson.create(config);
 
         try {

redisson/src/test/java/org/redisson/RedissonReactiveListMultimapTest.java

@@ -301,9 +301,9 @@ public class RedissonReactiveListMultimapTest extends BaseReactiveTest {
 
     @Test
     public void testListener() {
-        testWithParamsReactive(redisson -> {
+        testWithParams(redisson -> {
             Queue<Integer> nfs = new ConcurrentLinkedQueue<>();
-            RListMultimapReactive<Object, Object> map = redisson.getListMultimap("test1");
+            RListMultimapReactive<Object, Object> map = redisson.reactive().getListMultimap("test1");
             sync(map.addListener((MapPutListener) name -> nfs.add(1)));
             sync(map.addListener((MapRemoveListener) name -> nfs.add(2)));
             sync(map.addListener((ListAddListener) name -> nfs.add(3)));