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

Simplified unit test for compatibility with JDK6.

Browse Source
This commit is contained in:
Daniel Josefsson
2014-02-08 10:10:45 +00:00
parent 40c8a93340
commit f81f75177c
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,8 @@
package redis.clients.jedis.tests.commands;
import org.hamcrest.CoreMatchers;
import org.hamcrest.core.CombinableMatcher;
import org.hamcrest.Matcher;
import org.junit.Test;
import redis.clients.jedis.BinaryJedis;
import redis.clients.jedis.exceptions.JedisDataException;
import redis.clients.util.SafeEncoder;
@@ -11,9 +10,7 @@ import redis.clients.util.SafeEncoder;
import java.util.ArrayList;
import java.util.List;
import static org.hamcrest.CoreMatchers.both;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.hasItem;
public class ScriptingCommandsTest extends JedisCommandTestBase {
@@ -204,7 +201,7 @@ public class ScriptingCommandsTest extends JedisCommandTestBase {
assertEquals("2", results.get(3));
}
private <T> CombinableMatcher<List<T>> listWithItem(T expected) {
return both(CoreMatchers.<List<T>>instanceOf(List.class)).and(hasItem(equalTo(expected)));
private <T> Matcher<Iterable<? super T>> listWithItem(T expected) {
return CoreMatchers.<T>hasItem(equalTo(expected));
}
}