From 1facd189488da8ea6666d271da4a13c1fdeb6863 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Sat, 14 Nov 2015 11:35:42 +0300
Subject: [PATCH] test improvements

---
 src/test/java/org/redisson/BaseTest.java      |  7 ++++
 .../java/org/redisson/RedissonSetTest.java    | 38 +++++++++----------
 src/test/java/org/redisson/TimeoutTest.java   | 17 +++++++--
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/test/java/org/redisson/BaseTest.java b/src/test/java/org/redisson/BaseTest.java
index 0e30253fc..464d63b49 100644
--- a/src/test/java/org/redisson/BaseTest.java
+++ b/src/test/java/org/redisson/BaseTest.java
@@ -24,7 +24,14 @@ public abstract class BaseTest {
             redisAddress = "127.0.0.1:6379";
         }
         Config config = new Config();
+//        config.useSentinelConnection().setMasterName("mymaster").addSentinelAddress("127.0.0.1:26379", "127.0.0.1:26389");
+//        config.useClusterServers().addNodeAddress("127.0.0.1:7004", "127.0.0.1:7001", "127.0.0.1:7000");
         config.useSingleServer().setAddress(redisAddress);
+//        .setPassword("mypass1");
+//        config.useMasterSlaveConnection()
+//        .setMasterAddress("127.0.0.1:6379")
+//        .addSlaveAddress("127.0.0.1:6399")
+//        .addSlaveAddress("127.0.0.1:6389");
         return config;
     }
 
diff --git a/src/test/java/org/redisson/RedissonSetTest.java b/src/test/java/org/redisson/RedissonSetTest.java
index ce7f628aa..f31f725fb 100644
--- a/src/test/java/org/redisson/RedissonSetTest.java
+++ b/src/test/java/org/redisson/RedissonSetTest.java
@@ -178,27 +178,23 @@ public class RedissonSetTest extends BaseTest {
         Assert.assertEquals(2, set.size());
     }
 
-//    @Test
-//    public void testIteratorRemoveHighVolume() {
-//        Set<Integer> set = redisson.getSet("set") /*new HashSet<Integer>()*/;
-//        for (int i = 0; i < 120000; i++) {
-//            set.add(i);
-//        }
-//        int cnt = 0;
-//        Iterator<Integer> iterator = set.iterator();
-//        while (iterator.hasNext()) {
-//            Integer integer = iterator.next();
-//            if (integer > -1) { // always
-//                iterator.remove();
-//            }
-//            cnt++;
-//        }
-//        System.out.println("-----------");
-//        for (Integer integer : set) {
-//            System.out.println(integer);
-//        }
-//        Assert.assertEquals(20000, cnt);
-//    }
+    @Test
+    public void testIteratorRemoveHighVolume() throws InterruptedException {
+        Set<Integer> set = redisson.getSet("set") /*new HashSet<Integer>()*/;
+        for (int i = 0; i < 10000; i++) {
+            set.add(i);
+        }
+        int cnt = 0;
+
+        Iterator<Integer> iterator = set.iterator();
+        while (iterator.hasNext()) {
+            Integer integer = iterator.next();
+            iterator.remove();
+            cnt++;
+        }
+        Assert.assertEquals(0, set.size());
+        Assert.assertEquals(10000, cnt);
+    }
 
     @Test
     public void testContainsAll() {
diff --git a/src/test/java/org/redisson/TimeoutTest.java b/src/test/java/org/redisson/TimeoutTest.java
index 9685094ad..f8da4b9ea 100644
--- a/src/test/java/org/redisson/TimeoutTest.java
+++ b/src/test/java/org/redisson/TimeoutTest.java
@@ -13,6 +13,17 @@ import org.redisson.core.RTopic;
 
 public class TimeoutTest extends BaseTest {
 
+//    @Test
+    public void testBrokenSlave() throws InterruptedException {
+        RMap<Integer, Integer> map = redisson.getMap("simple");
+        for (int i = 0; i < 1000; i++) {
+            map.put(i, i * 1000);
+            Thread.sleep(1000);
+            map.get(i);
+            System.out.println(i);
+        }
+    }
+
 //    @Test
     public void testPubSub() throws InterruptedException, ExecutionException {
         RTopic<String> topic = redisson.getTopic("simple");
@@ -32,14 +43,14 @@ public class TimeoutTest extends BaseTest {
 //    @Test
     public void testReplaceTimeout() throws InterruptedException, ExecutionException {
         RMap<Integer, Integer> map = redisson.getMap("simple");
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 1000; i++) {
             map.put(i, i * 1000);
             map.replace(i, i * 1000 + 1);
             Thread.sleep(1000);
             System.out.println(i);
         }
 
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 1000; i++) {
             Integer r = map.get(i);
             System.out.println(r);
         }
@@ -49,7 +60,7 @@ public class TimeoutTest extends BaseTest {
     public void testPutAsyncTimeout() throws InterruptedException, ExecutionException {
         RMap<Integer, Integer> map = redisson.getMap("simple");
         List<Future<Integer>> futures = new ArrayList<Future<Integer>>();
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 1000; i++) {
             Future<Integer> future = map.putAsync(i, i*1000);
             Thread.sleep(1000);
             futures.add(future);