diff --git a/pom.xml b/pom.xml index c39367b9..5f01c037 100644 --- a/pom.xml +++ b/pom.xml @@ -45,11 +45,16 @@ - + + commons-logging + commons-logging + 1.1.1 + test + redis.clients jedis - 2.1.0 + 2.6.0 test @@ -75,7 +80,7 @@ org.springframework.data spring-data-redis - 1.1.0.RELEASE + 1.4.1.RELEASE test diff --git a/src/test/java/redis/embedded/RedisSentinelTest.java b/src/test/java/redis/embedded/RedisSentinelTest.java new file mode 100644 index 00000000..6bac326b --- /dev/null +++ b/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 { + + } +} \ No newline at end of file diff --git a/src/test/java/redis/embedded/RedisServerClusterTest.java b/src/test/java/redis/embedded/RedisServerClusterTest.java index 40658d7a..2db77240 100644 --- a/src/test/java/redis/embedded/RedisServerClusterTest.java +++ b/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); diff --git a/src/test/java/redis/embedded/RedisServerTest.java b/src/test/java/redis/embedded/RedisServerTest.java index bcd043e1..cbdf94e5 100644 --- a/src/test/java/redis/embedded/RedisServerTest.java +++ b/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);