diff --git a/redisson/pom.xml b/redisson/pom.xml
index 0f3c0983957..a34eac35628 100644
--- a/redisson/pom.xml
+++ b/redisson/pom.xml
@@ -81,9 +81,9 @@
test
- com.jayway.awaitility
+ org.awaitility
awaitility
- 1.7.0
+ 3.0.0
test
diff --git a/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
index 4dab4f00411..11fbd9ec24d 100644
--- a/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
@@ -1,6 +1,6 @@
package org.redisson;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
diff --git a/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
index 3d533f5d41c..75fbac8b1ac 100644
--- a/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
@@ -1,6 +1,6 @@
package org.redisson;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -63,7 +63,7 @@ public void run() {
assertThat(queue.offer(6, 3, TimeUnit.SECONDS)).isTrue();
assertThat(System.currentTimeMillis() - start).isBetween(1000L, 2000L);
- await().atMost(2, TimeUnit.SECONDS).until(() -> assertThat(executed.get()).isTrue());
+ await().atMost(2, TimeUnit.SECONDS).until(() -> executed.get());
assertThat(queue).containsExactly(2, 3, 4, 5, 6);
@@ -142,7 +142,7 @@ public void run() {
queue1.put(4);
- await().atMost(5, TimeUnit.SECONDS).until(() -> assertThat(executed.get()).isTrue());
+ await().atMost(5, TimeUnit.SECONDS).until(() -> executed.get());
assertThat(queue1).containsExactly(2, 3, 4);
@@ -292,7 +292,7 @@ public void run() {
t.join();
- await().atMost(5, TimeUnit.SECONDS).until(() -> assertThat(executed.get()).isTrue());
+ await().atMost(5, TimeUnit.SECONDS).until(() -> executed.get());
redisson.shutdown();
runner.stop();
diff --git a/redisson/src/test/java/org/redisson/RedissonFairLockTest.java b/redisson/src/test/java/org/redisson/RedissonFairLockTest.java
index e935e88722d..0f156b3c618 100644
--- a/redisson/src/test/java/org/redisson/RedissonFairLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonFairLockTest.java
@@ -1,5 +1,6 @@
package org.redisson;
+import static org.awaitility.Awaitility.*;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -7,14 +8,11 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
-import static com.jayway.awaitility.Awaitility.*;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.api.RLock;
-import com.jayway.awaitility.Awaitility;
-
public class RedissonFairLockTest extends BaseConcurrentTest {
@Test
@@ -144,7 +142,7 @@ public void testAutoExpire() throws InterruptedException {
Assert.assertTrue(latch.await(1, TimeUnit.SECONDS));
RLock lock = redisson.getFairLock("lock");
- Awaitility.await().atMost(redisson.getConfig().getLockWatchdogTimeout(), TimeUnit.MILLISECONDS).until(() -> !lock.isLocked());
+ await().atMost(redisson.getConfig().getLockWatchdogTimeout(), TimeUnit.MILLISECONDS).until(() -> !lock.isLocked());
}
@Test
@@ -377,7 +375,7 @@ public void testConcurrency_MultiInstance_Ordering() throws InterruptedException
t1.start();
}
- await().atMost(30, TimeUnit.SECONDS).until(() -> assertThat(lockedCounter.get()).isEqualTo(totalThreads));
+ await().atMost(30, TimeUnit.SECONDS).until(() -> lockedCounter.get() == totalThreads);
}
diff --git a/redisson/src/test/java/org/redisson/RedissonLockTest.java b/redisson/src/test/java/org/redisson/RedissonLockTest.java
index 994b4c4afaf..78d5f8e7db9 100644
--- a/redisson/src/test/java/org/redisson/RedissonLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonLockTest.java
@@ -12,7 +12,7 @@
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
-import com.jayway.awaitility.Awaitility;
+import static org.awaitility.Awaitility.*;
public class RedissonLockTest extends BaseConcurrentTest {
@@ -100,7 +100,7 @@ public void run() {
t.join();
r.shutdown();
- Awaitility.await().atMost(redisson.getConfig().getLockWatchdogTimeout(), TimeUnit.MILLISECONDS).until(() -> !lock.isLocked());
+ await().atMost(redisson.getConfig().getLockWatchdogTimeout(), TimeUnit.MILLISECONDS).until(() -> !lock.isLocked());
}
@Test
diff --git a/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java b/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
index 36ab07e0821..14aa94e3138 100644
--- a/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
@@ -19,6 +19,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
+import org.awaitility.Duration;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.api.MapOptions;
@@ -36,8 +37,7 @@
import org.redisson.codec.JsonJacksonCodec;
import org.redisson.codec.MsgPackJacksonCodec;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
+import static org.awaitility.Awaitility.*;
public class RedissonMapCacheTest extends BaseMapTest {
@@ -1034,7 +1034,7 @@ public void onCreated(EntryEvent event) {
});
runnable.run();
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(ref);
+ await().atMost(Duration.ONE_SECOND).untilTrue(ref);
map.removeListener(createListener1);
}
@@ -1090,7 +1090,7 @@ public void onExpired(EntryEvent event) {
});
runnable.run();
- Awaitility.await().atMost(Duration.ONE_MINUTE).untilTrue(ref);
+ await().atMost(Duration.ONE_MINUTE).untilTrue(ref);
map.removeListener(createListener1);
}
@@ -1113,7 +1113,7 @@ public void onUpdated(EntryEvent event) {
});
runnable.run();
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(ref);
+ await().atMost(Duration.ONE_SECOND).untilTrue(ref);
map.removeListener(createListener1);
}
@@ -1148,7 +1148,7 @@ public void onRemoved(EntryEvent event) {
});
runnable.run();
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(ref);
+ await().atMost(Duration.ONE_SECOND).untilTrue(ref);
map.removeListener(createListener1);
}
diff --git a/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
index 0a3d832edc2..de4612ba2c7 100644
--- a/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
@@ -12,7 +12,7 @@
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
public class RedissonMultiLockTest {
@@ -87,7 +87,7 @@ public void run() {
t.start();
t.join();
- await().atMost(5, TimeUnit.SECONDS).until(() -> assertThat(executed.get()).isTrue());
+ await().atMost(5, TimeUnit.SECONDS).until(() -> executed.get());
lock.unlock();
diff --git a/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java b/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java
index 893492134ac..ca411e5b60d 100644
--- a/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java
@@ -1,6 +1,5 @@
package org.redisson;
-import static com.jayway.awaitility.Awaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import java.security.SecureRandom;
@@ -10,6 +9,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
+import org.awaitility.Duration;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.ClusterRunner.ClusterProcesses;
@@ -18,8 +18,7 @@
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
+import static org.awaitility.Awaitility.*;
public class RedissonReadWriteLockTest extends BaseConcurrentTest {
@@ -32,7 +31,7 @@ public void testWriteLockExpiration() throws InterruptedException {
RLock l2 = rw1.writeLock();
assertThat(l2.tryLock(1000, 1000, TimeUnit.MILLISECONDS)).isTrue();
- Awaitility.await().atMost(Duration.TEN_SECONDS).until(() -> {
+ await().atMost(Duration.TEN_SECONDS).until(() -> {
RReadWriteLock rw2 = redisson.getReadWriteLock("test2s3");
try {
return !rw2.writeLock().tryLock(3000, 1000, TimeUnit.MILLISECONDS);
@@ -370,7 +369,7 @@ public void testAutoExpire() throws InterruptedException {
});
RReadWriteLock lock1 = redisson.getReadWriteLock("lock");
- Awaitility.await().atMost(redisson.getConfig().getLockWatchdogTimeout(), TimeUnit.MILLISECONDS).until(() -> !lock1.writeLock().isLocked());
+ await().atMost(redisson.getConfig().getLockWatchdogTimeout(), TimeUnit.MILLISECONDS).until(() -> !lock1.writeLock().isLocked());
}
@Test
diff --git a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
index b1518087020..8c15c20c082 100644
--- a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
@@ -17,7 +17,7 @@
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
public class RedissonRedLockTest {
@@ -316,7 +316,7 @@ public void run() {
t.start();
t.join();
- await().atMost(5, TimeUnit.SECONDS).until(() -> assertThat(executed.get()).isTrue());
+ await().atMost(5, TimeUnit.SECONDS).until(() -> executed.get());
lock.unlock();
diff --git a/redisson/src/test/java/org/redisson/RedissonTest.java b/redisson/src/test/java/org/redisson/RedissonTest.java
index 3660ef1711c..c35c02ed49b 100644
--- a/redisson/src/test/java/org/redisson/RedissonTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTest.java
@@ -1,6 +1,6 @@
package org.redisson;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.redisson.BaseTest.createInstance;
@@ -289,8 +289,8 @@ public void onConnect(InetSocketAddress addr) {
Assert.assertEquals(0, pp.stop());
- await().atMost(2, TimeUnit.SECONDS).until(() -> assertThat(connectCounter.get()).isEqualTo(1));
- await().atMost(2, TimeUnit.SECONDS).until(() -> assertThat(disconnectCounter.get()).isEqualTo(1));
+ await().atMost(2, TimeUnit.SECONDS).until(() -> connectCounter.get() == 1);
+ await().atMost(2, TimeUnit.SECONDS).until(() -> disconnectCounter.get() == 1);
}
@Test
diff --git a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
index e13e42e5dff..0dc2f4cb888 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
@@ -1,6 +1,6 @@
package org.redisson;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/redisson/src/test/java/org/redisson/RedissonTopicTest.java b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
index 5eacbddd9fd..535abb755d1 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
@@ -1,7 +1,7 @@
package org.redisson;
-import static com.jayway.awaitility.Awaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
import java.io.IOException;
import java.io.Serializable;
@@ -16,6 +16,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.awaitility.Duration;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -34,9 +35,6 @@
import org.redisson.client.codec.StringCodec;
import org.redisson.config.Config;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
-
public class RedissonTopicTest {
@BeforeClass
@@ -157,7 +155,7 @@ public void testCommandsOrdering() throws InterruptedException {
});
topic1.publish(123L);
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(stringMessageReceived);
+ await().atMost(Duration.ONE_SECOND).untilTrue(stringMessageReceived);
redisson1.shutdown();
}
@@ -178,7 +176,7 @@ public void onMessage(String channel, String msg) {
});
stringTopic.publish("testmsg");
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(stringMessageReceived);
+ await().atMost(Duration.ONE_SECOND).untilTrue(stringMessageReceived);
stringTopic.removeListener(listenerId);
}
@@ -213,8 +211,8 @@ public void onMessage(String channel, Long msg) {
});
longTopic.publish(1L);
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(stringMessageReceived);
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(longMessageReceived);
+ await().atMost(Duration.ONE_SECOND).untilTrue(stringMessageReceived);
+ await().atMost(Duration.ONE_SECOND).untilTrue(longMessageReceived);
}
@Test
diff --git a/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java b/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
index 514662deb36..5ba5e9a9efe 100644
--- a/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
+++ b/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
@@ -14,6 +14,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.awaitility.Duration;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -28,8 +29,7 @@
import org.redisson.config.Config;
import org.redisson.config.RedissonNodeConfig;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
+import static org.awaitility.Awaitility.*;
public class RedissonExecutorServiceTest extends BaseTest {
@@ -121,7 +121,7 @@ public void testBatchExecute() {
e.execute(new IncrementRunnableTask("myCounter"), new IncrementRunnableTask("myCounter"),
new IncrementRunnableTask("myCounter"), new IncrementRunnableTask("myCounter"));
- Awaitility.await().atMost(Duration.FIVE_SECONDS).until(() -> redisson.getAtomicLong("myCounter").get() == 4);
+ await().atMost(Duration.FIVE_SECONDS).until(() -> redisson.getAtomicLong("myCounter").get() == 4);
}
@Test