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

Fixed the ordering of arguments in assertions for a couple of older tests.

Browse Source
This commit is contained in:
Daniel Josefsson
2013-11-08 22:54:27 +00:00
parent 17f6ee63dc
commit 4fb85d0d60
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/test/java/redis/clients/jedis/tests/commands/ScriptingCommandsTest.java
View File

@@ -151,26 +151,26 @@ public class ScriptingCommandsTest extends JedisCommandTestBase {
} }
} }
@Test @Test
public void scriptEvalReturnNullValues() { public void scriptEvalReturnNullValues() {
String script = "return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}"; String script = "return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}";
List<String> results = (List<String>) jedis.eval(script, 2, "key1", "key2", "1", "2"); List<String> results = (List<String>) jedis.eval(script, 2, "key1", "key2", "1", "2");
assertEquals(results.get(0), "key1"); assertEquals("key1", results.get(0));
assertEquals(results.get(1), "key2"); assertEquals("key2", results.get(1));
assertEquals(results.get(2), "1"); assertEquals("1", results.get(2));
assertEquals(results.get(3), "2"); assertEquals("2", results.get(3));
} }
@Test @Test
public void scriptEvalShaReturnNullValues() { public void scriptEvalShaReturnNullValues() {
String script = "return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}"; String script = "return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}";
String sha = jedis.scriptLoad(script); String sha = jedis.scriptLoad(script);
List<String> results = (List<String>) jedis.evalsha(sha, 2, "key1", "key2", "1", "2"); List<String> results = (List<String>) jedis.evalsha(sha, 2, "key1", "key2", "1", "2");
assertEquals(results.get(0), "key1"); assertEquals("key1", results.get(0));
assertEquals(results.get(1), "key2"); assertEquals("key2", results.get(1));
assertEquals(results.get(2), "1"); assertEquals("1", results.get(2));
assertEquals(results.get(3), "2"); assertEquals("2", results.get(3));
} }
private <T> CombinableMatcher<List<T>> listWithItem(T expected) { private <T> CombinableMatcher<List<T>> listWithItem(T expected) {
return both(CoreMatchers.<List<T>>instanceOf(List.class)).and(hasItem(equalTo(expected))); return both(CoreMatchers.<List<T>>instanceOf(List.class)).and(hasItem(equalTo(expected)));