From 333a9bc6b35ad5b80f4bb364c1d367ecd76bf5a9 Mon Sep 17 00:00:00 2001 From: Jonathan Leibiusky Date: Mon, 28 Feb 2011 15:22:52 -0300 Subject: [PATCH] fix tests to use HashSet instead of LinkedHashSet --- .../tests/commands/JedisCommandTestBase.java | 19 ++++++-- .../jedis/tests/commands/SetCommandsTest.java | 44 +++++++++---------- 2 files changed, 37 insertions(+), 26 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 738e4ab..842b48e 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java +++ b/src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java @@ -1,11 +1,13 @@ package redis.clients.jedis.tests.commands; +import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Set; import org.junit.After; import org.junit.Before; +import org.junit.ComparisonFailure; import redis.clients.jedis.Jedis; import redis.clients.jedis.tests.HostAndPortUtil; @@ -52,10 +54,19 @@ public abstract class JedisCommandTestBase extends JedisTestBase { protected void assertEquals(Set expected, Set actual) { assertEquals(expected.size(), actual.size()); - Iterator iterator = expected.iterator(); - Iterator iterator2 = actual.iterator(); - while (iterator.hasNext() || iterator2.hasNext()) { - assertArrayEquals(iterator.next(), iterator2.next()); + Iterator e = expected.iterator(); + while (e.hasNext()) { + byte[] next = e.next(); + boolean contained = false; + for (byte[] element : expected) { + if (Arrays.equals(next, element)) { + contained = true; + } + } + if (!contained) { + throw new ComparisonFailure("element is missing", next + .toString(), actual.toString()); + } } } diff --git a/src/test/java/redis/clients/jedis/tests/commands/SetCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/SetCommandsTest.java index 38bc9ee..eff71ec 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/SetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/SetCommandsTest.java @@ -1,7 +1,7 @@ package redis.clients.jedis.tests.commands; import java.util.Arrays; -import java.util.LinkedHashSet; +import java.util.HashSet; import java.util.Set; import org.junit.Test; @@ -37,7 +37,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd("foo", "a"); jedis.sadd("foo", "b"); - Set expected = new LinkedHashSet(); + Set expected = new HashSet(); expected.add("a"); expected.add("b"); @@ -49,7 +49,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd(bfoo, ba); jedis.sadd(bfoo, bb); - Set bexpected = new LinkedHashSet(); + Set bexpected = new HashSet(); bexpected.add(bb); bexpected.add(ba); @@ -57,7 +57,7 @@ public class SetCommandsTest extends JedisCommandTestBase { assertEquals(bexpected, bmembers); } - + @Test public void srem() { jedis.sadd("foo", "a"); @@ -65,7 +65,7 @@ public class SetCommandsTest extends JedisCommandTestBase { long status = jedis.srem("foo", "a"); - Set expected = new LinkedHashSet(); + Set expected = new HashSet(); expected.add("b"); assertEquals(1, status); @@ -82,7 +82,7 @@ public class SetCommandsTest extends JedisCommandTestBase { long bstatus = jedis.srem(bfoo, ba); - Set bexpected = new LinkedHashSet(); + Set bexpected = new HashSet(); bexpected.add(bb); assertEquals(1, bstatus); @@ -130,10 +130,10 @@ public class SetCommandsTest extends JedisCommandTestBase { long status = jedis.smove("foo", "bar", "a"); - Set expectedSrc = new LinkedHashSet(); + Set expectedSrc = new HashSet(); expectedSrc.add("b"); - Set expectedDst = new LinkedHashSet(); + Set expectedDst = new HashSet(); expectedDst.add("c"); expectedDst.add("a"); @@ -153,10 +153,10 @@ public class SetCommandsTest extends JedisCommandTestBase { long bstatus = jedis.smove(bfoo, bbar, ba); - Set bexpectedSrc = new LinkedHashSet(); + Set bexpectedSrc = new HashSet(); bexpectedSrc.add(bb); - Set bexpectedDst = new LinkedHashSet(); + Set bexpectedDst = new HashSet(); bexpectedDst.add(bc); bexpectedDst.add(ba); @@ -221,7 +221,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd("bar", "b"); jedis.sadd("bar", "c"); - Set expected = new LinkedHashSet(); + Set expected = new HashSet(); expected.add("b"); Set intersection = jedis.sinter("foo", "bar"); @@ -234,7 +234,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd(bbar, bb); jedis.sadd(bbar, bc); - Set bexpected = new LinkedHashSet(); + Set bexpected = new HashSet(); bexpected.add(bb); Set bintersection = jedis.sinter(bfoo, bbar); @@ -249,7 +249,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd("bar", "b"); jedis.sadd("bar", "c"); - Set expected = new LinkedHashSet(); + Set expected = new HashSet(); expected.add("b"); long status = jedis.sinterstore("car", "foo", "bar"); @@ -264,7 +264,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd(bbar, bb); jedis.sadd(bbar, bc); - Set bexpected = new LinkedHashSet(); + Set bexpected = new HashSet(); bexpected.add(bb); long bstatus = jedis.sinterstore(bcar, bfoo, bbar); @@ -282,7 +282,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd("bar", "b"); jedis.sadd("bar", "c"); - Set expected = new LinkedHashSet(); + Set expected = new HashSet(); expected.add("a"); expected.add("b"); expected.add("c"); @@ -297,7 +297,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd(bbar, bb); jedis.sadd(bbar, bc); - Set bexpected = new LinkedHashSet(); + Set bexpected = new HashSet(); bexpected.add(bb); bexpected.add(bc); bexpected.add(ba); @@ -315,7 +315,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd("bar", "b"); jedis.sadd("bar", "c"); - Set expected = new LinkedHashSet(); + Set expected = new HashSet(); expected.add("a"); expected.add("b"); expected.add("c"); @@ -332,7 +332,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd(bbar, bb); jedis.sadd(bbar, bc); - Set bexpected = new LinkedHashSet(); + Set bexpected = new HashSet(); bexpected.add(bb); bexpected.add(bc); bexpected.add(ba); @@ -356,7 +356,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd("car", "a"); jedis.sadd("car", "d"); - Set expected = new LinkedHashSet(); + Set expected = new HashSet(); expected.add("x"); expected.add("b"); @@ -374,7 +374,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd(bcar, ba); jedis.sadd(bcar, bd); - Set bexpected = new LinkedHashSet(); + Set bexpected = new HashSet(); bexpected.add(bb); bexpected.add(bx); @@ -395,7 +395,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd("car", "a"); jedis.sadd("car", "d"); - Set expected = new LinkedHashSet(); + Set expected = new HashSet(); expected.add("d"); expected.add("a"); @@ -414,7 +414,7 @@ public class SetCommandsTest extends JedisCommandTestBase { jedis.sadd(bcar, ba); jedis.sadd(bcar, bd); - Set bexpected = new LinkedHashSet(); + Set bexpected = new HashSet(); bexpected.add(bd); bexpected.add(ba);