From 99f29abd7bb768a7e6afe691ec94a2e07b393f64 Mon Sep 17 00:00:00 2001
From: Jonathan Leibiusky <jonathan.leibiusky@mercadolibre.com>
Date: Tue, 24 Aug 2010 15:29:59 -0300
Subject: [PATCH] Test will now flush everything before executing

---
 .../clients/jedis/tests/commands/JedisCommandTestBase.java   | 2 +-
 .../jedis/tests/commands/TransactionCommandsTest.java        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java b/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java
index 28814cc..2973e53 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java
@@ -24,7 +24,7 @@ public abstract class JedisCommandTestBase extends Assert {
 	jedis = new Jedis("localhost", Protocol.DEFAULT_PORT, 500);
 	jedis.connect();
 	jedis.auth("foobared");
-	jedis.flushDB();
+	jedis.flushAll();
     }
 
     @After
diff --git a/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
index 092fbcf..ef6b784 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
@@ -59,8 +59,6 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
     @Test
     public void watch() throws UnknownHostException, IOException {
 	jedis.watch("mykey");
-	String val = jedis.get("mykey");
-	val = "foo";
 	Transaction t = jedis.multi();
 
 	Jedis nj = new Jedis("localhost");
@@ -69,9 +67,10 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
 	nj.set("mykey", "bar");
 	nj.disconnect();
 
-	t.set("mykey", val);
+	t.set("mykey", "foo");
 	List<Object> resp = t.exec();
 	assertEquals(null, resp);
+	assertEquals("bar", jedis.get("mykey"));
     }
 
     @Test