Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Verify order of elements in LinkedHashSets

Browse Source
This commit is contained in:
Jennifer Hickey
2013-08-01 17:49:16 -07:00
parent 4020f9d97d
commit 628cc175bc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/java/org/springframework/data/redis/matcher/Equals.java
View File

@@ -19,6 +19,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -54,8 +55,8 @@ public class Equals extends BaseMatcher<Object> {
@SuppressWarnings("rawtypes")
public boolean matches(Object actual) {
if (expected instanceof List) {
return listEquals((List) expected, (List) actual);
if (expected instanceof List || expected instanceof LinkedHashSet) {
return collectionEquals((Collection) expected, (Collection) actual);
} else if (expected instanceof Set) {
return setEquals((Set) expected, (Set) actual);
} else if (expected instanceof LinkedHashMap) {
@@ -66,7 +67,7 @@ public class Equals extends BaseMatcher<Object> {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private boolean listEquals(List expected, List actual) {
private boolean collectionEquals(Collection expected, Collection actual) {
if (expected.size() != actual.size()) {
return false;
}
@@ -74,8 +75,8 @@ public class Equals extends BaseMatcher<Object> {
Iterator<Object> expectedItr = expected.iterator();
while (expectedItr.hasNext()) {
Object expectedObj = expectedItr.next();
if (expectedObj instanceof List) {
if (!(listEquals((List) expectedObj, (List) actualItr.next()))) {
if (expectedObj instanceof List || expectedObj instanceof LinkedHashSet) {
if (!(collectionEquals((Collection) expectedObj, (Collection) actualItr.next()))) {
return false;
}
} else if (expectedObj instanceof Set) {