From 1c0f006bd11a0b177c72486b10d2fea4ef5e7241 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Sat, 6 Feb 2016 12:36:05 +0300
Subject: [PATCH] Hamcrest classes removed from RedissonSetCacheTest

---
 .../org/redisson/RedissonSetCacheTest.java    | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/test/java/org/redisson/RedissonSetCacheTest.java b/src/test/java/org/redisson/RedissonSetCacheTest.java
index 1c1636f95..9e5532ab0 100644
--- a/src/test/java/org/redisson/RedissonSetCacheTest.java
+++ b/src/test/java/org/redisson/RedissonSetCacheTest.java
@@ -1,5 +1,7 @@
 package org.redisson;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collections;
@@ -9,9 +11,6 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import static org.assertj.core.api.Assertions.*;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
 import org.redisson.codec.MsgPackJacksonCodec;
@@ -46,11 +45,11 @@ public class RedissonSetCacheTest extends BaseTest {
     public void testAddExpire() throws InterruptedException, ExecutionException {
         RSetCache<String> set = redisson.getSetCache("simple3");
         set.add("123", 1, TimeUnit.SECONDS);
-        Assert.assertThat(set, Matchers.contains("123"));
+        assertThat(set).contains("123");
 
         Thread.sleep(1000);
 
-        Assert.assertFalse(set.contains("123"));
+        assertThat(set).doesNotContain("123");
     }
 
     @Test
@@ -93,14 +92,14 @@ public class RedissonSetCacheTest extends BaseTest {
 
         Assert.assertTrue(set.remove(1));
         Assert.assertFalse(set.contains(1));
-        Assert.assertThat(set, Matchers.containsInAnyOrder(3, 7));
+        assertThat(set).containsOnly(3, 7);
 
         Assert.assertFalse(set.remove(1));
-        Assert.assertThat(set, Matchers.containsInAnyOrder(3, 7));
+        assertThat(set).containsOnly(3, 7);
 
         Assert.assertTrue(set.remove(3));
         Assert.assertFalse(set.contains(3));
-        Assert.assertThat(set, Matchers.contains(7));
+        assertThat(set).containsOnly(7);
         Assert.assertEquals(1, set.size());
     }
 
@@ -122,7 +121,7 @@ public class RedissonSetCacheTest extends BaseTest {
             }
         }
 
-        Assert.assertThat(set, Matchers.containsInAnyOrder("1", "3"));
+        assertThat(set).contains("1", "3");
 
         int iteration = 0;
         for (Iterator<String> iterator = set.iterator(); iterator.hasNext();) {
@@ -172,7 +171,7 @@ public class RedissonSetCacheTest extends BaseTest {
         }
 
         Assert.assertTrue(set.retainAll(Arrays.asList(1, 2)));
-        Assert.assertThat(set, Matchers.containsInAnyOrder(1, 2));
+        assertThat(set).containsOnly(1, 2);
         Assert.assertEquals(2, set.size());
     }
 
@@ -218,10 +217,10 @@ public class RedissonSetCacheTest extends BaseTest {
 
         Thread.sleep(1000);
 
-        MatcherAssert.assertThat(Arrays.asList(set.toArray()), Matchers.<Object>containsInAnyOrder("1", "4", "5", "3"));
+        assertThat(set.toArray()).containsOnly("1", "4", "5", "3");
 
         String[] strs = set.toArray(new String[0]);
-        MatcherAssert.assertThat(Arrays.asList(strs), Matchers.containsInAnyOrder("1", "4", "5", "3"));
+        assertThat(strs).containsOnly("1", "4", "5", "3");
     }
 
     @Test
@@ -300,7 +299,7 @@ public class RedissonSetCacheTest extends BaseTest {
         set.add(2);
 
         Assert.assertFalse(set.retainAll(Arrays.asList(1, 2))); // nothing changed
-        Assert.assertThat(set, Matchers.containsInAnyOrder(1, 2));
+        assertThat(set).containsOnly(1, 2);
     }
 
     @Test
@@ -314,7 +313,7 @@ public class RedissonSetCacheTest extends BaseTest {
 
         Thread.sleep(1000);
 
-        MatcherAssert.assertThat(cache, Matchers.contains("0", "2", "3"));
+        assertThat(cache).contains("0", "2", "3");
     }
 
     @Test