rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pipeline-multi' of git://github.com/pietern/jedis into pietern-pipeline-multi

Browse Source 
Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Transaction.java
This commit is contained in:
Jonathan Leibiusky
2011-02-28 15:56:11 -03:00
parent 333a9bc6b3 e7e4c4c26d
commit 80d2f9d103
6 changed files with 205 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
View File

@@ -41,14 +41,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
public void multi() {
Transaction trans = jedis.multi();
String status = trans.sadd("foo", "a");
assertEquals(Keyword.QUEUED.name(), status);
status = trans.sadd("foo", "b");
assertEquals(Keyword.QUEUED.name(), status);
status = trans.scard("foo");
assertEquals(Keyword.QUEUED.name(), status);
trans.sadd("foo", "a");
trans.sadd("foo", "b");
trans.scard("foo");
List<Object> response = trans.exec();
@@ -61,14 +56,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
// Binary
trans = jedis.multi();
status = trans.sadd(bfoo, ba);
assertEquals(Keyword.QUEUED.name(), status);
status = trans.sadd(bfoo, bb);
assertEquals(Keyword.QUEUED.name(), status);
status = trans.scard(bfoo);
assertEquals(Keyword.QUEUED.name(), status);
trans.sadd(bfoo, ba);
trans.sadd(bfoo, bb);
trans.scard(bfoo);
response = trans.exec();
@@ -85,14 +75,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
List<Object> response = jedis.multi(new TransactionBlock() {
@Override
public void execute() {
String status = sadd("foo", "a");
assertEquals(Keyword.QUEUED.name(), status);
status = sadd("foo", "b");
assertEquals(Keyword.QUEUED.name(), status);
status = scard("foo");
assertEquals(Keyword.QUEUED.name(), status);
sadd("foo", "a");
sadd("foo", "b");
scard("foo");
}
});
@@ -106,14 +91,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
response = jedis.multi(new TransactionBlock() {
@Override
public void execute() {
String status = sadd(bfoo, ba);
assertEquals(Keyword.QUEUED.name(), status);
status = sadd(bfoo, bb);
assertEquals(Keyword.QUEUED.name(), status);
status = scard(bfoo);
assertEquals(Keyword.QUEUED.name(), status);
sadd(bfoo, ba);
sadd(bfoo, bb);
scard(bfoo);
}
});