Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Disambiguate isEqualToComparingFieldByFieldRecursively error message.
When two fields differ but had the same default representation, add the type and hashCode to the representation to highlight the field difference.
- Loading branch information
1 parent
048bb14
commit 9c5ebab
Showing
7 changed files
with
312 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
...a/org/assertj/core/error/ShouldBeEqualByComparingFieldByFieldRecursively_create_Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /** | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * Copyright 2012-2017 the original author or authors. | ||
| */ | ||
| package org.assertj.core.error; | ||
|
|
||
| import static java.lang.Integer.toHexString; | ||
| import static java.lang.String.format; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.error.ShouldBeEqualByComparingFieldByFieldRecursively.shouldBeEqualByComparingFieldByFieldRecursive; | ||
| import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; | ||
|
|
||
| import java.util.LinkedHashMap; | ||
| import java.util.LinkedHashSet; | ||
| import java.util.List; | ||
| import java.util.TreeMap; | ||
| import java.util.TreeSet; | ||
|
|
||
| import org.assertj.core.description.TextDescription; | ||
| import org.assertj.core.internal.DeepDifference; | ||
| import org.assertj.core.internal.DeepDifference.Difference; | ||
| import org.assertj.core.internal.objects.Objects_assertIsEqualToComparingFieldByFieldRecursive_Test.WithCollection; | ||
| import org.assertj.core.internal.objects.Objects_assertIsEqualToComparingFieldByFieldRecursive_Test.WithMap; | ||
| import org.junit.Test; | ||
|
|
||
| public class ShouldBeEqualByComparingFieldByFieldRecursively_create_Test { | ||
|
|
||
| @Test | ||
| public void should_use_unambiguous_fields_description_when_standard_description_of_actual_and_expected_collection_fields_values_are_identical() { | ||
| // GIVEN | ||
| WithCollection<String> withHashSet = new WithCollection<>(new LinkedHashSet<String>()); | ||
| WithCollection<String> withSortedSet = new WithCollection<>(new TreeSet<String>()); | ||
| withHashSet.collection.add("bar"); | ||
| withHashSet.collection.add("foo"); | ||
| withSortedSet.collection.addAll(withHashSet.collection); | ||
| List<Difference> differences = DeepDifference.determineDifferences(withHashSet, withSortedSet, null, null); | ||
| // WHEN | ||
| // @format:off | ||
| String message = shouldBeEqualByComparingFieldByFieldRecursive(withSortedSet, | ||
| withHashSet, | ||
| differences, | ||
| STANDARD_REPRESENTATION) | ||
| .create(new TextDescription("Test"), STANDARD_REPRESENTATION); | ||
| // @format:on | ||
| // THEN | ||
| assertThat(message).isEqualTo(format("[Test] %n" + | ||
| "Expecting:%n" + | ||
| " <WithCollection [collection=[bar, foo]]>%n" + | ||
| "to be equal to:%n" + | ||
| " <WithCollection [collection=[bar, foo]]>%n" + | ||
| "when recursively comparing field by field, but found the following difference(s):%n" | ||
| + "%n" + | ||
| "Path to difference: <collection>%n" + | ||
| "- expected: <[\"bar\", \"foo\"] (TreeSet@%s)>%n" + | ||
| "- actual : <[\"bar\", \"foo\"] (LinkedHashSet@%s)>", | ||
| toHexString(withSortedSet.collection.hashCode()), | ||
| toHexString(withHashSet.collection.hashCode()))); | ||
| } | ||
|
|
||
| @Test | ||
| public void should_use_unambiguous_fields_description_when_standard_description_of_actual_and_expected_map_fields_values_are_identical() { | ||
| // GIVEN | ||
| WithMap<Long, Boolean> withLinkedHashMap = new WithMap<>(new LinkedHashMap<Long, Boolean>()); | ||
| WithMap<Long, Boolean> withTreeMap = new WithMap<>(new TreeMap<Long, Boolean>()); | ||
| withLinkedHashMap.map.put(1L, true); | ||
| withLinkedHashMap.map.put(2L, false); | ||
| withTreeMap.map.putAll(withLinkedHashMap.map); | ||
| List<Difference> differences = DeepDifference.determineDifferences(withLinkedHashMap, withTreeMap, null, null); | ||
| // WHEN | ||
| // @format:off | ||
| String message = shouldBeEqualByComparingFieldByFieldRecursive(withTreeMap, | ||
| withLinkedHashMap, | ||
| differences, | ||
| STANDARD_REPRESENTATION) | ||
| .create(new TextDescription("Test"), STANDARD_REPRESENTATION); | ||
| // @format:on | ||
| // THEN | ||
| assertThat(message).isEqualTo(format("[Test] %n" + | ||
| "Expecting:%n" + | ||
| " <WithMap [map={1=true, 2=false}]>%n" + | ||
| "to be equal to:%n" + | ||
| " <WithMap [map={1=true, 2=false}]>%n" + | ||
| "when recursively comparing field by field, but found the following difference(s):%n" | ||
| + "%n" + | ||
| "Path to difference: <map>%n" + | ||
| "- expected: <{1L=true, 2L=false} (TreeMap@%s)>%n" + | ||
| "- actual : <{1L=true, 2L=false} (LinkedHashMap@%s)>", | ||
| toHexString(withTreeMap.map.hashCode()), | ||
| toHexString(withLinkedHashMap.map.hashCode()))); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.