Skip to content

Commit ae62aca

Browse files
author
Joel Costigliola
committed
Ignore containers when checking compared fields existence in the recursive comparison
Fix #3349 Containers support is addressed by #3354
1 parent bad16ef commit ae62aca

File tree

4 files changed

+55
-20
lines changed

4 files changed

+55
-20
lines changed

‎assertj-core/src/main/java/org/assertj/core/api/recursive/comparison/DualValue.java

+1-14
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static java.lang.System.identityHashCode;
1717
import static java.util.Collections.unmodifiableList;
1818
import static java.util.Objects.requireNonNull;
19+
import static org.assertj.core.internal.RecursiveHelper.isContainer;
1920
import static org.assertj.core.api.recursive.comparison.FieldLocation.rootFieldLocation;
2021
import static org.assertj.core.util.Arrays.array;
2122
import static org.assertj.core.util.Arrays.isArray;
@@ -327,20 +328,6 @@ public boolean hasNoNullValues() {
327328
return actual != null && expected != null;
328329
}
329330

330-
private static boolean isContainer(Object o) {
331-
return o instanceof Iterable ||
332-
o instanceof Map ||
333-
o instanceof Optional ||
334-
o instanceof AtomicReference ||
335-
o instanceof AtomicReferenceArray ||
336-
o instanceof AtomicBoolean ||
337-
o instanceof AtomicInteger ||
338-
o instanceof AtomicIntegerArray ||
339-
o instanceof AtomicLong ||
340-
o instanceof AtomicLongArray ||
341-
isArray(o);
342-
}
343-
344331
public boolean hasPotentialCyclingValues() {
345332
return isPotentialCyclingValue(actual) && isPotentialCyclingValue(expected);
346333
}

‎assertj-core/src/main/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static java.util.stream.Collectors.toSet;
2121
import static org.assertj.core.configuration.ConfigurationProvider.CONFIGURATION_PROVIDER;
2222
import static org.assertj.core.data.MapEntry.entry;
23+
import static org.assertj.core.internal.RecursiveHelper.isContainer;
2324
import static org.assertj.core.internal.TypeComparators.defaultTypeComparators;
2425
import static org.assertj.core.util.Lists.list;
2526
import static org.assertj.core.util.Sets.newLinkedHashSet;
@@ -1095,17 +1096,23 @@ void checkComparedFieldsExist(Object actual) {
10951096

10961097
private Optional<Entry<FieldLocation, String>> checkComparedFieldExists(Object actual, FieldLocation comparedFieldLocation) {
10971098
Object node = actual;
1098-
for (int nestingLevel = 0; nestingLevel < comparedFieldLocation.getDecomposedPath().size(); nestingLevel++) {
1099+
int nestingLevel = 0;
1100+
while (nestingLevel < comparedFieldLocation.getDecomposedPath().size()) {
10991101
if (node == null) {
11001102
// won't be able to get children nodes, assume the field is known as we can't check it
11011103
return Optional.empty();
11021104
}
1105+
if (isContainer(node)) {
1106+
// TODO: supported with https://github.com/assertj/assertj/issues/3354
1107+
return Optional.empty();
1108+
}
11031109
String comparedFieldNodeNameElement = comparedFieldLocation.getDecomposedPath().get(nestingLevel);
11041110
Set<String> nodeNames = introspectionStrategy.getChildrenNodeNamesOf(node);
11051111
if (!nodeNames.contains(comparedFieldNodeNameElement)) {
11061112
return Optional.of(entry(comparedFieldLocation, comparedFieldNodeNameElement));
11071113
}
11081114
node = introspectionStrategy.getChildNodeValue(comparedFieldNodeNameElement, node);
1115+
nestingLevel++;
11091116
}
11101117
return Optional.empty();
11111118
}

‎assertj-core/src/main/java/org/assertj/core/internal/RecursiveHelper.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.assertj.core.internal;
2+
3+
import java.util.Map;
4+
import java.util.Optional;
5+
import java.util.concurrent.atomic.AtomicBoolean;
6+
import java.util.concurrent.atomic.AtomicInteger;
7+
import java.util.concurrent.atomic.AtomicIntegerArray;
8+
import java.util.concurrent.atomic.AtomicLong;
9+
import java.util.concurrent.atomic.AtomicLongArray;
10+
import java.util.concurrent.atomic.AtomicReference;
11+
import java.util.concurrent.atomic.AtomicReferenceArray;
12+
13+
import static org.assertj.core.util.Arrays.isArray;
14+
15+
public class RecursiveHelper {
16+
public static boolean isContainer(Object o) {
17+
return o instanceof Iterable ||
18+
o instanceof Map ||
19+
o instanceof Optional ||
20+
o instanceof AtomicReference ||
21+
o instanceof AtomicReferenceArray ||
22+
o instanceof AtomicBoolean ||
23+
o instanceof AtomicInteger ||
24+
o instanceof AtomicIntegerArray ||
25+
o instanceof AtomicLong ||
26+
o instanceof AtomicLongArray ||
27+
isArray(o);
28+
}
29+
}

‎assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_comparingOnlyFields_Test.java

+17-5
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ private static Stream<Arguments> should_fail_when_non_existent_fields_specified(
300300
Person alice = new Person("Alice");
301301
Person jack = new Person("Jack");
302302
Person joan = new Person("Joan");
303-
Person joe = new Person("Joe");
304303
john.neighbour = jack;
305304
alice.neighbour = joan;
306305
jack.neighbour = john;
@@ -318,8 +317,8 @@ private static Stream<Arguments> should_fail_when_non_existent_fields_specified(
318317
arguments(john, alice, array("name", "neighbour", "number"), "{number}"),
319318
arguments(john, alice, array("neighbor"), "{neighbor}"),
320319
arguments(john, alice, array("neighbour.neighbor.name"), "{neighbor in <neighbour.neighbor.name>}"),
321-
arguments(sherlockHolmes, drWatson, array("friends.other"), "{other in <friends.other>}"),
322-
arguments(sherlockHolmes, drWatson, array("friends.name"), "{name in <friends.name>}"),
320+
// TODO for https://github.com/assertj/assertj/issues/3354
321+
// arguments(sherlockHolmes, drWatson, array("friends.other"), "{other in <friends.other>}"),
323322
arguments(john, alice, array("neighbour.neighbour.name", "neighbour.neighbour.number"),
324323
"{number in <neighbour.neighbour.number>}"));
325324
}
@@ -426,15 +425,15 @@ void should_only_check_compared_fields_existence_at_the_root_level() {
426425
.isEqualTo(expected);
427426
}
428427

429-
class WithNames {
428+
static class WithNames {
430429
Collection<Name> names;
431430

432431
public WithNames(Collection<Name> names) {
433432
this.names = names;
434433
}
435434
}
436435

437-
class Name {
436+
static class Name {
438437
String first;
439438
String last;
440439

@@ -444,4 +443,17 @@ public Name(String first, String last) {
444443
}
445444
}
446445

446+
// https://github.com/assertj/assertj/issues/3354
447+
@Test
448+
void checking_compared_fields_existence_should_skip_containers_in_field_location() {
449+
// GIVEN
450+
FriendlyPerson sherlock1 = new FriendlyPerson("Sherlock Holmes");
451+
sherlock1.friends.add(new FriendlyPerson("Dr. John Watson"));
452+
FriendlyPerson sherlock2 = new FriendlyPerson("Sherlock Holmes");
453+
sherlock2.friends.add(new FriendlyPerson("Dr. John Watson"));
454+
// WHEN/THEN
455+
then(sherlock1).usingRecursiveComparison()
456+
.comparingOnlyFields("friends.name")
457+
.isEqualTo(sherlock2);
458+
}
447459
}

0 commit comments

Comments
 (0)