Fix some more U tests ...

This commit is contained in:
Yaourt
2010-11-05 09:33:57 +01:00
parent ead39394a1
commit dab21609e6

View File

@@ -49,22 +49,44 @@ public class JedisTest extends JedisCommandTestBase {
assertEquals(expected.size(), result.size()); assertEquals(expected.size(), result.size());
final Iterator expectedit = expected.iterator(); final Iterator expectedit = expected.iterator();
final Iterator responseit = result.iterator();
while(expectedit.hasNext()) { while(expectedit.hasNext()) {
final Object exp = expectedit.next(); final Object exp = expectedit.next();
final Object resp = responseit.next(); final Iterator responseit = result.iterator();
if(exp instanceof byte[]) { boolean found = false;
final byte[] bexp = (byte[]) exp; while(responseit.hasNext() && !found) {
final byte[] bresp = (byte[]) resp; final Object resp = responseit.next();
Assert.assertArrayEquals(bexp, bresp); if(exp instanceof byte[]) {
} else if (exp instanceof List) { final byte[] bexp = (byte[]) exp;
final List subexp = (List) exp; final byte[] bresp = (byte[]) resp;
final List subresp = (List) resp; if(arraysAreEquals(bexp, bresp)) {
compareList(subexp, subresp); found = true;
} else { }
assertEquals(exp, resp); // Assert.assertArrayEquals(bexp, bresp);
} } else if (exp instanceof List) {
final List subexp = (List) exp;
final List subresp = (List) resp;
compareList(subexp, subresp);
} else {
assertEquals(exp, resp);
}
}
if(!found){
fail("Result doesn't contain " + exp.toString());
}
} }
} }
public static boolean arraysAreEquals(final byte[] expected, final byte[] result) {
if(expected.length != result.length) {
return false;
}
for(int i=0; i < expected.length; i++) {
if(expected[i] != result[i]) {
return false;
}
}
return true;
}
} }