init sentinel test; fixed cluster test so that we don't attempt to re…

…turn the connection twice; same for server test; added missing common-logging dependency; updated jedis and spring data versions

pom.xml

@@ -45,11 +45,16 @@
     </distributionManagement>
 
     <dependencies>
-
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>2.1.0</version>
+            <version>2.6.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -75,7 +80,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
-            <version>1.1.0.RELEASE</version>
+            <version>1.4.1.RELEASE</version>
             <scope>test</scope>
         </dependency>
 

src/test/java/redis/embedded/RedisSentinelTest.java

@@ -0,0 +1,17 @@
+package redis.embedded;
+
+import org.junit.After;
+import org.junit.Before;
+
+public class RedisSentinelTest {
+
+    @Before
+    public void setUp() throws Exception {
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+
+    }
+}

src/test/java/redis/embedded/RedisServerClusterTest.java

@@ -40,7 +40,6 @@ public void testSimpleOperationsAfterRun() throws Exception {
             assertEquals("1", jedis.mget("abc").get(0));
             assertEquals("2", jedis.mget("def").get(0));
             assertEquals(null, jedis.mget("xyz").get(0));
-            pool.returnResource(jedis);
         } finally {
             if (jedis != null)
                 pool.returnResource(jedis);

src/test/java/redis/embedded/RedisServerTest.java

@@ -1,14 +1,11 @@
 package redis.embedded;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
-
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
+import static org.junit.Assert.*;
+
 public class RedisServerTest {
 
 	private RedisServer redisServer;
@@ -60,7 +57,6 @@ public void testSimpleOperationsAfterRun() throws Exception {
 			assertEquals("1", jedis.mget("abc").get(0));
 			assertEquals("2", jedis.mget("def").get(0));
 			assertEquals(null, jedis.mget("xyz").get(0));
-			pool.returnResource(jedis);
 		} finally {
 			if (jedis != null)
 				pool.returnResource(jedis);