Move bitfield tests to proper place (#1409)

* and fix some unneed preparing / cleaning up
redis · Oct 16, 2016 · 686a5f8 · 686a5f8
1 parent e9d85af
commit 686a5f8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 46 deletions.
diff --git a/src/test/java/redis/clients/jedis/tests/JedisTest.java b/src/test/java/redis/clients/jedis/tests/JedisTest.java
@@ -155,37 +155,4 @@ public void checkDisconnectOnQuit() {
     assertFalse(jedis.getClient().isConnected());
   }
 
-  @Test
-  public void testBitfield() {
-    Jedis jedis = new Jedis("redis://localhost:6380");
-    jedis.auth("foobared");
-    jedis.del("mykey");
-    try {
-      List<Long> responses = jedis.bitfield("mykey", "INCRBY","i5","100","1", "GET", "u4", "0");
-      assertEquals(1l, responses.get(0).longValue());
-      assertEquals(0l, responses.get(1).longValue());
-    } finally {
-      jedis.del("mykey");
-    }
-  }
-
-  @Test
-  /**
-   * Binary Jedis tests should be in their own class
-   */
-  public void testBinaryBitfield() {
-    jedis.close();
-    BinaryJedis binaryJedis = new BinaryJedis("localhost");
-    binaryJedis.auth("foobared");
-    binaryJedis.del("mykey".getBytes());
-    try {
-      List<byte[]> responses = binaryJedis.bitfield("mykey".getBytes(), "INCRBY".getBytes(),"i5".getBytes(),"100".getBytes(),"1".getBytes(), "GET".getBytes(), "u4".getBytes(), "0".getBytes());
-      assertEquals(1l, responses.get(0));
-      assertEquals(0l, responses.get(1));
-    } finally {
-      binaryJedis.del("mykey".getBytes());
-      binaryJedis.close();
-    }
-  }
-
 }
diff --git a/src/test/java/redis/clients/jedis/tests/commands/BitCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/BitCommandsTest.java
@@ -10,6 +10,8 @@
 import redis.clients.jedis.BitPosParams;
 import redis.clients.jedis.Protocol;
 
+import java.util.List;
+
 public class BitCommandsTest extends JedisCommandTestBase {
   @Test
   public void setAndgetbit() {
@@ -141,8 +143,6 @@ public void setAndgetrange() {
 
   @Test
   public void bitCount() {
-    jedis.del("foo");
-
     jedis.setbit("foo", 16, true);
     jedis.setbit("foo", 24, true);
     jedis.setbit("foo", 40, true);
@@ -153,8 +153,6 @@ public void bitCount() {
 
     long c3 = jedis.bitcount("foo", 2L, 5L);
     assertEquals(3, c3);
-
-    jedis.del("foo");
   }
 
   @Test
@@ -173,26 +171,32 @@ public void bitOp() {
     jedis.bitop(BitOP.XOR, "resultXor", "key1", "key2");
     String resultXor = jedis.get("resultXor");
     assertEquals("\u0024", resultXor);
-
-    jedis.del("resultAnd");
-    jedis.del("resultOr");
-    jedis.del("resultXor");
-    jedis.del("key1");
-    jedis.del("key2");
   }
 
   @Test
   public void bitOpNot() {
-    jedis.del("key");
     jedis.setbit("key", 0, true);
     jedis.setbit("key", 4, true);
 
     jedis.bitop(BitOP.NOT, "resultNot", "key");
 
     String resultNot = jedis.get("resultNot");
     assertEquals("\u0077", resultNot);
+  }
 
-    jedis.del("key");
-    jedis.del("resultNot");
+  @Test
+  public void testBitfield() {
+    List<Long> responses = jedis.bitfield("mykey", "INCRBY","i5","100","1", "GET", "u4", "0");
+    assertEquals(1L, responses.get(0).longValue());
+    assertEquals(0L, responses.get(1).longValue());
   }
+
+  @Test
+  public void testBinaryBitfield() {
+    List<byte[]> responses = jedis.bitfield("mykey".getBytes(), "INCRBY".getBytes(),"i5".getBytes(),
+        "100".getBytes(),"1".getBytes(), "GET".getBytes(), "u4".getBytes(), "0".getBytes());
+    assertEquals(1L, responses.get(0));
+    assertEquals(0L, responses.get(1));
+  }
+
 }