Merge branch 'Object' of git://github.com/ivowiblo/jedis

Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedisCommands.java
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Commands.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java

src/test/java/redis/clients/jedis/tests/commands/ObjectCommandsTest.java

@@ -0,0 +1,49 @@
+package redis.clients.jedis.tests.commands;
+
+import org.junit.Test;
+
+import redis.clients.util.SafeEncoder;
+
+public class ObjectCommandsTest extends JedisCommandTestBase {
+
+    private String key = "mylist";
+    private byte[] binaryKey = SafeEncoder.encode(key);
+
+    @Test
+    public void objectRefcount() {
+	jedis.lpush(key, "hello world");
+	Long refcount = jedis.objectRefcount(key);
+	assertEquals(new Long(1), refcount);
+
+	// Binary
+	refcount = jedis.objectRefcount(binaryKey);
+	assertEquals(new Long(1), refcount);
+
+    }
+
+    @Test
+    public void objectEncoding() {
+	jedis.lpush(key, "hello world");
+	String encoding = jedis.objectEncoding(key);
+	assertEquals("ziplist", encoding);
+
+	// Binary
+	encoding = SafeEncoder.encode(jedis.objectEncoding(binaryKey));
+	assertEquals("ziplist", encoding);
+    }
+
+    @Test
+    public void objectIdletime() throws InterruptedException {
+	jedis.lpush(key, "hello world");
+
+	// Wait a little bit more than 10 seconds so the idle time is 10
+	// seconds.
+	Thread.sleep(10001);
+	Long time = jedis.objectIdletime(key);
+	assertEquals(new Long(10), time);
+
+	// Binary
+	time = jedis.objectIdletime(binaryKey);
+	assertEquals(new Long(10), time);
+    }
+}