Merge branch 'binaryAPI' of git://github.com/yaourt/jedis

Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
This commit is contained in:
Jonathan Leibiusky
2010-11-15 23:55:57 -03:00
41 changed files with 8489 additions and 2326 deletions

View File

@@ -9,6 +9,7 @@ import org.junit.Test;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisShardInfo;
import redis.clients.jedis.Protocol;
import redis.clients.jedis.ShardedJedis;
import redis.clients.jedis.ShardedJedisPipeline;
import redis.clients.jedis.tests.HostAndPortUtil.HostAndPort;
@@ -141,7 +142,12 @@ public class ShardedJedisTest extends Assert {
}
});
assertEquals("a", results.get(0));
assertEquals("b", results.get(1));
List<Object> expected = new ArrayList<Object>(2);
expected.add("a".getBytes(Protocol.UTF8));
expected.add("b".getBytes(Protocol.UTF8));
assertEquals(2, results.size());
assertArrayEquals("a".getBytes(Protocol.UTF8), (byte[]) results.get(0));
assertArrayEquals("b".getBytes(Protocol.UTF8), (byte[]) results.get(1));
}
}