Skip to content

Commit 7a76b57

Browse files
Rename ignoringFieldsByRegexes to ignoringFieldsMatchingRegexes and ignoreFieldsByRegexes to ignoreFieldsMatchingRegexes.
1 parent 3e2f8e8 commit 7a76b57

6 files changed

+15
-15
lines changed

src/main/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,20 +300,20 @@ public RecursiveComparisonAssert ignoringFields(String... fieldsToIgnore) {
300300
*
301301
* // assertion succeeds as name and all home fields are ignored in the comparison
302302
* assertThat(sherlock).usingRecursiveComparison()
303-
* .ignoringFieldsByRegexes("n.me", "home.*")
303+
* .ignoringFieldsMatchingRegexes("n.me", "home.*")
304304
* .isEqualTo(noName);
305305
*
306306
* // although home fields are ignored, assertion fails as name fields differ.
307307
* assertThat(sherlock).usingRecursiveComparison()
308-
* .ignoringFields("home.*")
308+
* .ignoringFieldsMatchingRegexes("home.*")
309309
* .isEqualTo(noName);</code></pre>
310310
*
311311
* @param regexes regexes used to ignore fields in the comparison.
312312
* @return this {@link RecursiveComparisonAssert} to chain other methods.
313313
*/
314314
@CheckReturnValue
315-
public RecursiveComparisonAssert ignoringFieldsByRegexes(String... regexes) {
316-
recursiveComparisonConfiguration.ignoreFieldsByRegexes(regexes);
315+
public RecursiveComparisonAssert ignoringFieldsMatchingRegexes(String... regexes) {
316+
recursiveComparisonConfiguration.ignoreFieldsMatchingRegexes(regexes);
317317
return this;
318318
}
319319

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ public void ignoreFields(String... fieldsToIgnore) {
116116
/**
117117
* Allows to ignore in the recursive comparison the object under test fields matching the given regexes. The given regexes are added to the already registered ones.
118118
* <p>
119-
* See {@link RecursiveComparisonAssert#ignoringFieldsByRegexes(String...) RecursiveComparisonAssert#ignoringFieldsByRegexes(String...)} for examples.
119+
* See {@link RecursiveComparisonAssert#ignoringFieldsMatchingRegexes(String...) RecursiveComparisonAssert#ignoringFieldsMatchingRegexes(String...)} for examples.
120120
*
121121
* @param regexes regexes used to ignore fields in the comparison.
122122
*/
123-
public void ignoreFieldsByRegexes(String... regexes) {
123+
public void ignoreFieldsMatchingRegexes(String... regexes) {
124124
ignoredFieldsRegexes.addAll(Stream.of(regexes)
125125
.map(Pattern::compile)
126126
.collect(toList()));

src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_fluent_API_Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ public void should_allow_to_ignore_fields() {
105105
}
106106

107107
@Test
108-
public void should_allow_to_ignore_fields_by_regexes() {
108+
public void should_allow_to_ignore_fields_matching_regexes() {
109109
// GIVEN
110110
String regex1 = "foo";
111111
String regex2 = ".*foo.*";
112112
// WHEN
113113
RecursiveComparisonConfiguration configuration = assertThat(ACTUAL).usingRecursiveComparison()
114-
.ignoringFieldsByRegexes(regex1, regex2)
114+
.ignoringFieldsMatchingRegexes(regex1, regex2)
115115
.getRecursiveComparisonConfiguration();
116116
// THEN
117117
assertThat(configuration.getIgnoredFieldsRegexes()).extracting(Pattern::pattern)

src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ public void should_fail_when_actual_differs_from_expected_even_when_some_fields_
321321
expected.neighbour.neighbour = new Person("James");
322322
expected.neighbour.neighbour.home.address.number = 457;
323323

324-
recursiveComparisonConfiguration.ignoreFieldsByRegexes(".*name", ".*home.*number");
324+
recursiveComparisonConfiguration.ignoreFieldsMatchingRegexes(".*name", ".*home.*number");
325325

326326
// WHEN
327327
compareRecursivelyFailsAsExpected(actual, expected);

src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_multiLineDescription_Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void should_show_that_some_given_fields_are_ignored() {
6060
@Test
6161
public void should_show_the_regexes_used_to_ignore_fields() {
6262
// WHEN
63-
recursiveComparisonConfiguration.ignoreFieldsByRegexes("foo", "bar", "foo.bar");
63+
recursiveComparisonConfiguration.ignoreFieldsMatchingRegexes("foo", "bar", "foo.bar");
6464
String multiLineDescription = recursiveComparisonConfiguration.multiLineDescription(STANDARD_REPRESENTATION);
6565
// THEN
6666
assertThat(multiLineDescription).contains(format("- the fields matching the following regexes were ignored in the comparison: foo, bar, foo.bar%n"));
@@ -161,7 +161,7 @@ public void should_show_a_complete_multiline_description() {
161161
// GIVEN
162162
recursiveComparisonConfiguration.setIgnoreAllActualNullFields(true);
163163
recursiveComparisonConfiguration.ignoreFields("foo", "bar", "foo.bar");
164-
recursiveComparisonConfiguration.ignoreFieldsByRegexes("f.*", ".ba.", "..b%sr..");
164+
recursiveComparisonConfiguration.ignoreFieldsMatchingRegexes("f.*", ".ba.", "..b%sr..");
165165
recursiveComparisonConfiguration.ignoreOverriddenEqualsForFieldsMatchingRegexes(".*oo", ".ar", "oo.ba");
166166
recursiveComparisonConfiguration.ignoreOverriddenEqualsForTypes(String.class, Multimap.class);
167167
recursiveComparisonConfiguration.ignoreOverriddenEqualsForFields("foo", "baz", "foo.baz");

src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_shouldIgnoreFields_Test.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,18 @@ private static Stream<Arguments> ignoringSpecifiedFieldsSource() {
9494
@Test
9595
public void ignoring_fields_with_regex_does_not_replace_previous_regexes() {
9696
// WHEN
97-
recursiveComparisonConfiguration.ignoreFieldsByRegexes("foo");
98-
recursiveComparisonConfiguration.ignoreFieldsByRegexes("bar", "baz");
97+
recursiveComparisonConfiguration.ignoreFieldsMatchingRegexes("foo");
98+
recursiveComparisonConfiguration.ignoreFieldsMatchingRegexes("bar", "baz");
9999
// THEN
100100
assertThat(recursiveComparisonConfiguration.getIgnoredFieldsRegexes()).extracting(Pattern::pattern)
101101
.containsExactlyInAnyOrder("foo", "bar", "baz");
102102
}
103103

104104
@ParameterizedTest(name = "{0} should be ignored with these regexes {1}")
105105
@MethodSource("ignoringRegexSpecifiedFieldsSource")
106-
public void should_ignore_fields_specified_with_regex(DualKey dualKey, List<String> regexes) {
106+
public void should_ignore_fields_matching_given_regexes(DualKey dualKey, List<String> regexes) {
107107
// GIVEN
108-
recursiveComparisonConfiguration.ignoreFieldsByRegexes(regexes.toArray(new String[0]));
108+
recursiveComparisonConfiguration.ignoreFieldsMatchingRegexes(regexes.toArray(new String[0]));
109109
// WHEN
110110
boolean ignored = recursiveComparisonConfiguration.shouldIgnore(dualKey);
111111
// THEN

0 commit comments

Comments
 (0)