tests fixed

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

@@ -1,9 +1,5 @@
 package org.redisson;
 
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -12,50 +8,31 @@ import org.redisson.api.RCollectionReactive;
 import org.redisson.api.RScoredSortedSetReactive;
 import org.redisson.api.RedissonReactiveClient;
 import org.redisson.config.Config;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.io.IOException;
+import java.util.Iterator;
+
 public abstract class BaseReactiveTest {
 
-    protected RedissonReactiveClient redisson;
-    protected static RedissonReactiveClient defaultRedisson;
+    protected static RedissonReactiveClient redisson;
 
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
-        if (!RedissonRuntimeEnvironment.isTravis) {
-            RedisRunner.startDefaultRedisServerInstance();
-            defaultRedisson = createInstance();
-        }
+        RedisRunner.startDefaultRedisServerInstance();
+        redisson = createInstance();
     }
 
     @AfterClass
-    public static void afterClass() throws IOException, InterruptedException {
-        if (!RedissonRuntimeEnvironment.isTravis) {
-            RedisRunner.shutDownDefaultRedisServerInstance();
-            defaultRedisson.shutdown();
-        }
+    public static void afterClass() throws InterruptedException {
+        redisson.shutdown();
+        RedisRunner.shutDownDefaultRedisServerInstance();
     }
 
     @Before
     public void before() throws IOException, InterruptedException {
-        if (RedissonRuntimeEnvironment.isTravis) {
-            RedisRunner.startDefaultRedisServerInstance();
-            redisson = createInstance();
-        } else {
-            if (redisson == null) {
-                redisson = defaultRedisson;
-            }
-            sync(redisson.getKeys().flushall());
-        }
-    }
-
-    @After
-    public void after() throws InterruptedException {
-        if (RedissonRuntimeEnvironment.isTravis) {
-            redisson.shutdown();
-            RedisRunner.shutDownDefaultRedisServerInstance();
-        }
+        redisson.getKeys().flushall();
     }
 
     public static <V> Iterable<V> sync(RScoredSortedSetReactive<V> list) {

redisson/src/test/java/org/redisson/RedissonTest.java

@@ -4,11 +4,12 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.util.CharsetUtil;
 import net.bytebuddy.utility.RandomString;
-import org.junit.*;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Test;
 import org.redisson.ClusterRunner.ClusterProcesses;
 import org.redisson.RedisRunner.RedisProcess;
 import org.redisson.api.*;
-import org.redisson.api.redisnode.RedisCluster;
 import org.redisson.api.redisnode.RedisClusterMaster;
 import org.redisson.api.redisnode.RedisNodes;
 import org.redisson.client.*;
@@ -40,13 +41,9 @@ import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
-import static org.redisson.BaseTest.createInstance;
 
-public class RedissonTest {
+public class RedissonTest extends BaseTest {
 
-    protected RedissonClient redisson;
-    protected static RedissonClient defaultRedisson;
-    
 //    @Test
     public void testLeak() throws InterruptedException {
         Config config = new Config();
@@ -122,43 +119,6 @@ public class RedissonTest {
         localRedisson.shutdown();
     }
     
-    @BeforeClass
-    public static void beforeClass() throws IOException, InterruptedException {
-        if (!RedissonRuntimeEnvironment.isTravis) {
-            RedisRunner.startDefaultRedisServerInstance();
-            defaultRedisson = BaseTest.createInstance();
-        }
-    }
-
-    @AfterClass
-    public static void afterClass() throws IOException, InterruptedException {
-        if (!RedissonRuntimeEnvironment.isTravis) {
-            RedisRunner.shutDownDefaultRedisServerInstance();
-            defaultRedisson.shutdown();
-        }
-    }
-
-    @Before
-    public void before() throws IOException, InterruptedException {
-        if (RedissonRuntimeEnvironment.isTravis) {
-            RedisRunner.startDefaultRedisServerInstance();
-            redisson = createInstance();
-        } else {
-            if (redisson == null) {
-                redisson = defaultRedisson;
-            }
-            redisson.getKeys().flushall();
-        }
-    }
-
-    @After
-    public void after() throws InterruptedException {
-        if (RedissonRuntimeEnvironment.isTravis) {
-            redisson.shutdown();
-            RedisRunner.shutDownDefaultRedisServerInstance();
-        }
-    }
-    
     public static class Dummy {
         private String field;
     }