From a8ffacd30ac55c502d1f006deb3e690e0135ba68 Mon Sep 17 00:00:00 2001 From: Jonathan Leibiusky Date: Tue, 14 Sep 2010 12:08:56 -0300 Subject: [PATCH] Added bunch of missing commands and a test to check if Jedis is updated --- src/main/java/redis/clients/jedis/Client.java | 24 +++++++ src/main/java/redis/clients/jedis/Jedis.java | 29 ++++++++ .../tests/JedisNewCommandsCheckTest.java | 72 +++++++++++++++++++ .../commands/AllKindOfValuesCommandsTest.java | 16 +++++ .../tests/commands/ControlCommandsTest.java | 15 +++- .../tests/commands/ListCommandsTest.java | 19 +++++ .../commands/StringValuesCommandsTest.java | 6 ++ 7 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 src/test/java/redis/clients/jedis/tests/JedisNewCommandsCheckTest.java diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index d76164fc46..58a08f833b 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -563,4 +563,28 @@ public void configGet(String pattern) { public void configSet(String parameter, String value) { sendCommand("CONFIG", "SET", parameter, value); } + + public void strlen(String key) { + sendCommand("STRLEN", key); + } + + public void sync() { + sendCommand("SYNC"); + } + + public void lpushx(String key, String string) { + sendCommand("LPUSHX", key, string); + } + + public void persist(String key) { + sendCommand("PERSIST", key); + } + + public void rpushx(String key, String string) { + sendCommand("RPUSHX", key, string); + } + + public void echo(String string) { + sendCommand("ECHO", string); + } } \ No newline at end of file diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index db7c84eb37..14af0ce527 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -790,4 +790,33 @@ public String configSet(String parameter, String value) { public boolean isConnected() { return client.isConnected(); } + + public int strlen(String key) { + client.strlen(key); + return client.getIntegerReply(); + } + + public void sync() { + client.sync(); + } + + public int lpushx(String key, String string) { + client.lpushx(key, string); + return client.getIntegerReply(); + } + + public int persist(String key) { + client.persist(key); + return client.getIntegerReply(); + } + + public int rpushx(String key, String string) { + client.rpushx(key, string); + return client.getIntegerReply(); + } + + public String echo(String string) { + client.echo(string); + return client.getBulkReply(); + } } \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/tests/JedisNewCommandsCheckTest.java b/src/test/java/redis/clients/jedis/tests/JedisNewCommandsCheckTest.java new file mode 100644 index 0000000000..509c5c249e --- /dev/null +++ b/src/test/java/redis/clients/jedis/tests/JedisNewCommandsCheckTest.java @@ -0,0 +1,72 @@ +package redis.clients.jedis.tests; + +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashSet; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPubSub; +import redis.clients.jedis.Transaction; + +public class JedisNewCommandsCheckTest extends Assert { + @Test + @Ignore(value = "Ignored because still missing information for DEBUG and LINSERT commands") + public void checkJedisIsUpdated() throws IOException { + String[] commands = getAvailableCommands(); + Set implementedCommands = getImplementedCommands(); + + Set missingCommands = new HashSet(); + for (String command : commands) { + if (!implementedCommands.contains(command.trim())) { + missingCommands.add(command); + } + } + + if (!missingCommands.isEmpty()) { + fail("There are missing commands: " + missingCommands.toString()); + } + } + + private Set getImplementedCommands() { + Method[] methods = Jedis.class.getDeclaredMethods(); + Set implementedCommands = new HashSet(); + for (Method method : methods) { + implementedCommands.add(method.getName().trim().toLowerCase()); + } + + methods = JedisPubSub.class.getDeclaredMethods(); + for (Method method : methods) { + implementedCommands.add(method.getName().trim().toLowerCase()); + } + + methods = Transaction.class.getDeclaredMethods(); + for (Method method : methods) { + implementedCommands.add(method.getName().trim().toLowerCase()); + } + implementedCommands.add("config"); + return implementedCommands; + } + + private String[] getAvailableCommands() throws MalformedURLException, + IOException { + URL url = new URL("http://dimaion.com/redis/master"); + InputStream openStream = url.openStream(); + DataInputStream dis = new DataInputStream(new BufferedInputStream( + openStream)); + byte[] all = new byte[dis.available()]; + dis.readFully(all); + String commandList = new String(all); + String[] commands = commandList.split("\n"); + return commands; + } +} diff --git a/src/test/java/redis/clients/jedis/tests/commands/AllKindOfValuesCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/AllKindOfValuesCommandsTest.java index 03e4de2b26..e0f3681dd0 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/AllKindOfValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/AllKindOfValuesCommandsTest.java @@ -219,4 +219,20 @@ public void flushAll() { jedis.select(1); assertEquals(0, jedis.dbSize()); } + + @Test + public void persist() { + jedis.setex("foo", 60 * 60, "bar"); + assertTrue(jedis.ttl("foo") > 0); + int status = jedis.persist("foo"); + assertEquals(1, status); + assertEquals(-1, jedis.ttl("foo")); + } + + @Test + public void echo() { + String result = jedis.echo("hello world"); + assertEquals("hello world", result); + } + } \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java index 2dc4b5e330..45f27f10f8 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java @@ -16,8 +16,13 @@ public void save() { @Test public void bgsave() { - String status = jedis.bgsave(); - assertEquals("Background saving started", status); + try { + String status = jedis.bgsave(); + assertEquals("Background saving started", status); + } catch (JedisException e) { + assertEquals("ERR background save already in progress", e + .getMessage()); + } } @Test @@ -72,4 +77,10 @@ public void configSet() { assertEquals("OK", status); jedis.configSet("maxmemory", memory); } + + @Test + public void sync() { + jedis.sync(); + } + } \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/tests/commands/ListCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/ListCommandsTest.java index 44bf6f9868..a49e936f8e 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/ListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/ListCommandsTest.java @@ -249,6 +249,25 @@ public void run() { assertEquals(2, result.size()); assertEquals("foo", result.get(0)); assertEquals("bar", result.get(1)); + } + + @Test + public void lpushx() { + int status = jedis.lpushx("foo", "bar"); + assertEquals(0, status); + jedis.lpush("foo", "a"); + status = jedis.lpushx("foo", "b"); + assertEquals(2, status); + } + + @Test + public void rpushx() { + int status = jedis.rpushx("foo", "bar"); + assertEquals(0, status); + + jedis.lpush("foo", "a"); + status = jedis.rpushx("foo", "b"); + assertEquals(2, status); } } \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java index 0139ff40e4..1571193317 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java @@ -169,4 +169,10 @@ public void substr() { assertEquals("This is a string", jedis.substr("s", 0, -1)); assertEquals(" string", jedis.substr("s", 9, 100000)); } + + @Test + public void strlen() { + jedis.set("s", "This is a string"); + assertEquals("This is a string".length(), jedis.strlen("s")); + } } \ No newline at end of file