Skip to content

Commit 628cc17

Browse files
committed
Verify order of elements in LinkedHashSets
1 parent 4020f9d commit 628cc17

File tree

1 file changed

+6
-5
lines changed
  • src/test/java/org/springframework/data/redis/matcher

1 file changed

+6
-5
lines changed

src/test/java/org/springframework/data/redis/matcher/Equals.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Collection;
2020
import java.util.Iterator;
2121
import java.util.LinkedHashMap;
22+
import java.util.LinkedHashSet;
2223
import java.util.List;
2324
import java.util.Map;
2425
import java.util.Set;
@@ -54,8 +55,8 @@ public void describeTo(Description description) {
5455

5556
@SuppressWarnings("rawtypes")
5657
public boolean matches(Object actual) {
57-
if (expected instanceof List) {
58-
return listEquals((List) expected, (List) actual);
58+
if (expected instanceof List || expected instanceof LinkedHashSet) {
59+
return collectionEquals((Collection) expected, (Collection) actual);
5960
} else if (expected instanceof Set) {
6061
return setEquals((Set) expected, (Set) actual);
6162
} else if (expected instanceof LinkedHashMap) {
@@ -66,16 +67,16 @@ public boolean matches(Object actual) {
6667
}
6768

6869
@SuppressWarnings({ "unchecked", "rawtypes" })
69-
private boolean listEquals(List expected, List actual) {
70+
private boolean collectionEquals(Collection expected, Collection actual) {
7071
if (expected.size() != actual.size()) {
7172
return false;
7273
}
7374
Iterator<Object> actualItr = actual.iterator();
7475
Iterator<Object> expectedItr = expected.iterator();
7576
while (expectedItr.hasNext()) {
7677
Object expectedObj = expectedItr.next();
77-
if (expectedObj instanceof List) {
78-
if (!(listEquals((List) expectedObj, (List) actualItr.next()))) {
78+
if (expectedObj instanceof List || expectedObj instanceof LinkedHashSet) {
79+
if (!(collectionEquals((Collection) expectedObj, (Collection) actualItr.next()))) {
7980
return false;
8081
}
8182
} else if (expectedObj instanceof Set) {

0 commit comments

Comments
 (0)