exists, sismember and hexists return Boolean instead of long

This commit is contained in:
Jonathan Leibiusky
2010-11-30 12:51:01 -03:00
parent 81ec9f8af3
commit cd9e17a709
11 changed files with 70 additions and 86 deletions

View File

@@ -52,6 +52,5 @@ public class JedisTest extends JedisCommandTestBase {
// every 10 seconds or so
Thread.sleep(20000);
jedis.hmget("foobar", "foo");
jedis.configSet("timeout", "300");
}
}

View File

@@ -37,23 +37,23 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
status = jedis.set(bfoo, bbar);
assertEquals("OK", status);
long reply = jedis.exists("foo");
assertEquals(1, reply);
boolean reply = jedis.exists("foo");
assertTrue(reply);
reply = jedis.exists(bfoo);
assertEquals(1, reply);
assertTrue(reply);
reply = jedis.del("foo");
assertEquals(1, reply);
long lreply = jedis.del("foo");
assertEquals(1, lreply);
reply = jedis.del(bfoo);
assertEquals(1, reply);
lreply = jedis.del(bfoo);
assertEquals(1, lreply);
reply = jedis.exists("foo");
assertEquals(0, reply);
assertFalse(reply);
reply = jedis.exists(bfoo);
assertEquals(0, reply);
assertFalse(reply);
}
@Test
@@ -65,12 +65,12 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
long reply = jedis.del("foo1", "foo2", "foo3");
assertEquals(3, reply);
reply = jedis.exists("foo1");
assertEquals(0, reply);
reply = jedis.exists("foo2");
assertEquals(0, reply);
reply = jedis.exists("foo3");
assertEquals(0, reply);
Boolean breply = jedis.exists("foo1");
assertFalse(breply);
breply = jedis.exists("foo2");
assertFalse(breply);
breply = jedis.exists("foo3");
assertFalse(breply);
jedis.set("foo1", "bar1");
@@ -88,12 +88,12 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
reply = jedis.del(bfoo1, bfoo2, bfoo3);
assertEquals(3, reply);
reply = jedis.exists(bfoo1);
assertEquals(0, reply);
reply = jedis.exists(bfoo2);
assertEquals(0, reply);
reply = jedis.exists(bfoo3);
assertEquals(0, reply);
breply = jedis.exists(bfoo1);
assertFalse(breply);
breply = jedis.exists(bfoo2);
assertFalse(breply);
breply = jedis.exists(bfoo3);
assertFalse(breply);
jedis.set(bfoo1, bbar1);

View File

@@ -150,9 +150,9 @@ public class HashesCommandsTest extends JedisCommandTestBase {
hash.put("car", "bar");
jedis.hmset("foo", hash);
assertEquals(0, jedis.hexists("bar", "foo").intValue());
assertEquals(0, jedis.hexists("foo", "foo").intValue());
assertEquals(1, jedis.hexists("foo", "bar").intValue());
assertFalse(jedis.hexists("bar", "foo"));
assertFalse(jedis.hexists("foo", "foo"));
assertTrue(jedis.hexists("foo", "bar"));
// Binary
Map<byte[], byte[]> bhash = new HashMap<byte[], byte[]>();
@@ -160,9 +160,9 @@ public class HashesCommandsTest extends JedisCommandTestBase {
bhash.put(bcar, bbar);
jedis.hmset(bfoo, bhash);
assertEquals(0, jedis.hexists(bbar, bfoo).intValue());
assertEquals(0, jedis.hexists(bfoo, bfoo).intValue());
assertEquals(1, jedis.hexists(bfoo, bbar).intValue());
assertFalse(jedis.hexists(bbar, bfoo));
assertFalse(jedis.hexists(bfoo, bfoo));
assertTrue(jedis.hexists(bfoo, bbar));
}

View File

@@ -28,6 +28,7 @@ public abstract class JedisCommandTestBase extends JedisTestBase {
jedis = new Jedis(hnp.host, hnp.port, 500);
jedis.connect();
jedis.auth("foobared");
jedis.configSet("timeout", "300");
jedis.flushAll();
}

View File

@@ -199,21 +199,17 @@ public class SetCommandsTest extends JedisCommandTestBase {
jedis.sadd("foo", "a");
jedis.sadd("foo", "b");
long status = jedis.sismember("foo", "a");
assertEquals(1, status);
assertTrue(jedis.sismember("foo", "a"));
status = jedis.sismember("foo", "c");
assertEquals(0, status);
assertFalse(jedis.sismember("foo", "c"));
// Binary
jedis.sadd(bfoo, ba);
jedis.sadd(bfoo, bb);
long bstatus = jedis.sismember(bfoo, ba);
assertEquals(1, bstatus);
assertTrue(jedis.sismember(bfoo, ba));
bstatus = jedis.sismember(bfoo, bc);
assertEquals(0, bstatus);
assertFalse(jedis.sismember(bfoo, bc));
}