From b1f7653d5f8c37abfc8a7654ebacc939c6d77414 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Wed, 15 Jul 2015 13:37:30 +0300
Subject: [PATCH] tests optimization

---
 .../java/org/redisson/BaseConcurrentTest.java |  4 +---
 src/test/java/org/redisson/BaseTest.java      | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/test/java/org/redisson/BaseConcurrentTest.java b/src/test/java/org/redisson/BaseConcurrentTest.java
index 6d3f0fbc8..af2140ca8 100644
--- a/src/test/java/org/redisson/BaseConcurrentTest.java
+++ b/src/test/java/org/redisson/BaseConcurrentTest.java
@@ -2,13 +2,11 @@ package org.redisson;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-public abstract class BaseConcurrentTest {
+public abstract class BaseConcurrentTest extends BaseTest {
 
     protected void testMultiInstanceConcurrency(int iterations, final RedissonRunnable runnable) throws InterruptedException {
         ExecutorService executor = Executors.newCachedThreadPool();
diff --git a/src/test/java/org/redisson/BaseTest.java b/src/test/java/org/redisson/BaseTest.java
index 7979549c8..0a4cee849 100644
--- a/src/test/java/org/redisson/BaseTest.java
+++ b/src/test/java/org/redisson/BaseTest.java
@@ -1,15 +1,21 @@
 package org.redisson;
 
 import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 
 public abstract class BaseTest {
 
-    protected Redisson redisson;
+    protected static Redisson redisson;
 
-    @Before
-    public void before() {
-        this.redisson = createInstance();
+    @BeforeClass
+    public static void beforeClass() {
+        redisson = createInstance();
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        redisson.shutdown();
     }
 
     public static Redisson createInstance() {
@@ -19,17 +25,12 @@ public abstract class BaseTest {
         }
         Config config = new Config();
         config.useSingleServer().setAddress(redisAddress);
-//        config.setCodec(new SerializationCodec());
         return Redisson.create(config);
     }
 
     @After
     public void after() {
-        try {
-            redisson.flushdb();
-        } finally {
-            redisson.shutdown();
-        }
+        redisson.flushdb();
     }
 
 }