Added Test timeout

redisson/src/test/java/org/redisson/BaseReactiveTest.java

@@ -2,11 +2,14 @@ package org.redisson;
 
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.rules.Timeout;
 import org.reactivestreams.Publisher;
 import org.redisson.api.RCollectionReactive;
 import org.redisson.api.RScoredSortedSetReactive;
@@ -18,6 +21,9 @@ import reactor.rx.Streams;
 
 public abstract class BaseReactiveTest {
 
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     protected RedissonReactiveClient redisson;
     protected static RedissonReactiveClient defaultRedisson;
 

redisson/src/test/java/org/redisson/BaseTest.java

@@ -1,15 +1,21 @@
 package org.redisson;
 
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.rules.Timeout;
 import org.redisson.api.RedissonClient;
 import org.redisson.codec.MsgPackJacksonCodec;
 import org.redisson.config.Config;
 
 public abstract class BaseTest {
+    
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
 
     protected RedissonClient redisson;
     protected static RedissonClient defaultRedisson;

redisson/src/test/java/org/redisson/RedisClientTest.java

@@ -34,9 +34,14 @@ import org.redisson.misc.RedissonPromise;
 
 import io.netty.util.concurrent.FutureListener;
 import io.netty.util.concurrent.ImmediateEventExecutor;
+import org.junit.ClassRule;
+import org.junit.rules.Timeout;
 
 public class RedisClientTest {
 
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
         if (!RedissonRuntimeEnvironment.isTravis) {

redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java

@@ -11,12 +11,17 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 import org.redisson.api.RCountDownLatch;
 import org.redisson.api.RedissonClient;
 
 public class RedissonCountDownLatchConcurrentTest {
     
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
         if (!RedissonRuntimeEnvironment.isTravis) {

redisson/src/test/java/org/redisson/RedissonMultiLockTest.java

@@ -14,9 +14,14 @@ import org.redisson.config.Config;
 
 import static com.jayway.awaitility.Awaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.ClassRule;
+import org.junit.rules.Timeout;
 
 public class RedissonMultiLockTest {
 
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     @Test
     public void testMultiThreads() throws IOException, InterruptedException {
         RedisProcess redis1 = redisTestMultilockInstance(6320);

redisson/src/test/java/org/redisson/RedissonRedLockTest.java

@@ -16,9 +16,14 @@ import org.redisson.config.Config;
 
 import static com.jayway.awaitility.Awaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.ClassRule;
+import org.junit.rules.Timeout;
 
 public class RedissonRedLockTest {
 
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     @Test
     public void testLockFailed() throws IOException, InterruptedException {
         RedisProcess redis1 = redisTestMultilockInstance(6320);

redisson/src/test/java/org/redisson/RedissonTest.java

@@ -32,10 +32,15 @@ import org.redisson.connection.ConnectionListener;
 
 import static com.jayway.awaitility.Awaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.ClassRule;
+import org.junit.rules.Timeout;
 import static org.redisson.BaseTest.createInstance;
 
 public class RedissonTest {
 
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     protected RedissonClient redisson;
     protected static RedissonClient defaultRedisson;
 

redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java

@@ -19,7 +19,9 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 import org.redisson.RedisRunner.RedisProcess;
 import org.redisson.api.RPatternTopic;
 import org.redisson.api.RTopic;
@@ -33,6 +35,9 @@ import org.redisson.config.Config;
 
 public class RedissonTopicPatternTest {
 
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
         if (!RedissonRuntimeEnvironment.isTravis) {

redisson/src/test/java/org/redisson/RedissonTopicTest.java

@@ -36,9 +36,14 @@ import org.redisson.config.Config;
 
 import com.jayway.awaitility.Awaitility;
 import com.jayway.awaitility.Duration;
+import org.junit.ClassRule;
+import org.junit.rules.Timeout;
 
 public class RedissonTopicTest {
 
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
         if (!RedissonRuntimeEnvironment.isTravis) {

redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java

@@ -17,13 +17,19 @@ import org.redisson.config.Config;
 
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.rules.Timeout;
 import static org.redisson.BaseTest.createInstance;
 
 @RunWith(Parameterized.class)
 public class RedissonTwoLockedThread {
 
+    @ClassRule
+    public static Timeout classTimeout = new Timeout(15, TimeUnit.MINUTES);
+
     @Parameterized.Parameters(name= "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][] {{new JsonJacksonCodec()}, {new SerializationCodec()}});