refactoring

redisson/src/test/java/org/redisson/RedissonBatchTest.java

@@ -419,6 +419,7 @@ public class RedissonBatchTest extends BaseTest {
 
     @ParameterizedTest
     @MethodSource("data")
+    @Timeout(20)
     public void testSyncSlaves(BatchOptions batchOptions) throws FailedToStartRedisException, IOException, InterruptedException {
         RedisRunner master1 = new RedisRunner().randomPort().randomDir().nosave();
         RedisRunner master2 = new RedisRunner().randomPort().randomDir().nosave();

redisson/src/test/java/org/redisson/RedissonBucketTest.java

@@ -184,7 +184,6 @@ public class RedissonBucketTest extends BaseTest {
     
     @Test
     public void testSizeInMemory() {
-        Assumptions.assumeTrue(RedisRunner.getDefaultRedisServerInstance().getRedisVersion().compareTo("4.0.0") > 0);
         RBucket<Integer> al = redisson.getBucket("test");
         al.set(1234);
         assertThat(al.sizeInMemory()).isEqualTo(51);

redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java

@@ -1,7 +1,20 @@
 package org.redisson.executor;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import mockit.Invocation;
-import static org.awaitility.Awaitility.await;
+import mockit.Mock;
+import mockit.MockUp;
+import org.junit.jupiter.api.*;
+import org.redisson.BaseTest;
+import org.redisson.RedisRunner;
+import org.redisson.Redisson;
+import org.redisson.RedissonNode;
+import org.redisson.api.*;
+import org.redisson.api.annotation.RInject;
+import org.redisson.api.executor.TaskFinishedListener;
+import org.redisson.api.executor.TaskStartedListener;
+import org.redisson.config.Config;
+import org.redisson.config.RedissonNodeConfig;
+import org.redisson.connection.balancer.RandomLoadBalancer;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -12,22 +25,8 @@ import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.jupiter.api.AfterEach;
+import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.jupiter.api.Assertions;
+import static org.awaitility.Awaitility.await;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.redisson.*;
-import org.redisson.api.*;
-import org.redisson.api.annotation.RInject;
-import org.redisson.api.executor.TaskFinishedListener;
-import org.redisson.api.executor.TaskStartedListener;
-import org.redisson.config.Config;
-import org.redisson.config.RedissonNodeConfig;
-import org.redisson.connection.balancer.RandomLoadBalancer;
-
-import mockit.Invocation;
-import mockit.Mock;
-import mockit.MockUp;
 
 public class RedissonExecutorServiceTest extends BaseTest {
 
@@ -455,6 +454,7 @@ public class RedissonExecutorServiceTest extends BaseTest {
     }
     
     @Test
+    @Timeout(1)
     public void testRejectExecute() {
         Assertions.assertThrows(RejectedExecutionException.class, () -> {
             RExecutorService e = redisson.getExecutorService("test");