From 07fe10381c77410754a9777186dd99a2fcced66b Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Wed, 20 Feb 2019 15:26:36 +0300
Subject: [PATCH] RedissonBatchTest test fixed

---
 .../java/org/redisson/RedissonBatchTest.java  | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/redisson/src/test/java/org/redisson/RedissonBatchTest.java b/redisson/src/test/java/org/redisson/RedissonBatchTest.java
index 7eb96fafa..813d8d529 100644
--- a/redisson/src/test/java/org/redisson/RedissonBatchTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonBatchTest.java
@@ -3,17 +3,11 @@ package org.redisson;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -28,12 +22,9 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.redisson.ClusterRunner.ClusterProcesses;
 import org.redisson.RedisRunner.FailedToStartRedisException;
-import org.redisson.RedisRunner.RedisProcess;
 import org.redisson.api.BatchOptions;
 import org.redisson.api.BatchOptions.ExecutionMode;
 import org.redisson.api.BatchResult;
-import org.redisson.api.ClusterNode;
-import org.redisson.api.NodeType;
 import org.redisson.api.RBatch;
 import org.redisson.api.RBucket;
 import org.redisson.api.RFuture;
@@ -48,7 +39,6 @@ import org.redisson.api.RedissonClient;
 import org.redisson.client.RedisException;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.config.Config;
-import org.redisson.config.ReadMode;
 
 @RunWith(Parameterized.class)
 public class RedissonBatchTest extends BaseTest {
@@ -117,7 +107,7 @@ public class RedissonBatchTest extends BaseTest {
         assertThat(b2f2.get()).isEqualTo(2d);
     }
     
-    @Test(timeout = 22000)
+    @Test(timeout = 15000)
     public void testPerformance() {
         RMap<String, String> map = redisson.getMap("map");
         Map<String, String> m = new HashMap<String, String>();
@@ -150,7 +140,7 @@ public class RedissonBatchTest extends BaseTest {
         
         BatchOptions batchOptions = BatchOptions.defaults().executionMode(ExecutionMode.REDIS_WRITE_ATOMIC);
         RBatch batch = redisson.createBatch(batchOptions);
-        for (int i = 0; i < 400000; i++) {
+        for (int i = 0; i < 300000; i++) {
             batch.getBucket("test").setAsync(123);
         }
         
@@ -233,10 +223,10 @@ public class RedissonBatchTest extends BaseTest {
         redisson.shutdown();
     }
 
-    @Test(timeout = 60000)
+    @Test
     public void testWriteTimeout() {
         Config config = createConfig();
-        config.useSingleServer().setTimeout(15000);
+        config.useSingleServer().setTimeout(3000);
         RedissonClient redisson = Redisson.create(config);
 
         RBatch batch = redisson.createBatch(batchOptions);
@@ -249,7 +239,14 @@ public class RedissonBatchTest extends BaseTest {
             }
         }
         
+        long s = System.currentTimeMillis();
         batch.execute();
+        long executionTime = System.currentTimeMillis() - s;
+        if (batchOptions.getExecutionMode() == ExecutionMode.IN_MEMORY) {
+            assertThat(executionTime).isLessThan(22000);
+        } else {
+            assertThat(executionTime).isLessThan(3500);
+        }
         assertThat(redisson.getMapCache("test").size()).isEqualTo(total);
         redisson.shutdown();
     }