Suppress usage of "lenient" term in field by field comparison

assertj · Aug 27, 2015 · 30f24df · 30f24df
1 parent d9f63dc
commit 30f24df
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/org/assertj/core/api/AbstractObjectAssert.java b/src/main/java/org/assertj/core/api/AbstractObjectAssert.java
@@ -65,7 +65,7 @@ protected AbstractObjectAssert(A actual, Class<?> selfType) {
    * @throws AssertionError if the other object is not an instance of the actual type.
    */
   public S isEqualToIgnoringNullFields(A other) {
-    objects.assertIsLenientEqualsToIgnoringNullFields(info, actual, other);
+    objects.assertIsEqualToIgnoringNullFields(info, actual, other);
     return myself;
   }
 

diff --git a/src/main/java/org/assertj/core/internal/Objects.java b/src/main/java/org/assertj/core/internal/Objects.java
@@ -535,7 +535,7 @@ private boolean isActualIn(Object actual, Iterable<?> values) {
    * @throws AssertionError if the actual and the given object are not lenient equals.
    * @throws AssertionError if the other object is not an instance of the actual type.
    */
-  public <A> void assertIsLenientEqualsToIgnoringNullFields(AssertionInfo info, A actual, A other) {
+  public <A> void assertIsEqualToIgnoringNullFields(AssertionInfo info, A actual, A other) {
     assertNotNull(info, actual);
     assertOtherTypeIsCompatibleWithActualClass(info, other, actual.getClass());
     List<String> fieldsNames = new LinkedList<>();

diff --git a/...enientEqualsToByAcceptingFields_Test.java → ...EqualToComparingOnlyGivenFields_Test.java b/...enientEqualsToByAcceptingFields_Test.java → ...EqualToComparingOnlyGivenFields_Test.java
@@ -12,20 +12,20 @@
  */
 package org.assertj.core.api.object;
 
+import static org.mockito.Mockito.verify;
+
 import org.assertj.core.api.ObjectAssert;
 import org.assertj.core.api.ObjectAssertBaseTest;
 import org.assertj.core.test.Jedi;
 
-import static org.mockito.Mockito.verify;
-
 
 /**
  * Tests for <code>{@link ObjectAssert#isEqualToComparingOnlyGivenFields(Object, String...)}</code>.
  * 
  * @author Nicolas François
  * @author Mikhail Mazursky
  */
-public class ObjectAssert_isLenientEqualsToByAcceptingFields_Test extends ObjectAssertBaseTest {
+public class ObjectAssert_isEqualToComparingOnlyGivenFields_Test extends ObjectAssertBaseTest {
 
   private Jedi other = new Jedi("Yoda", "Blue");
 

diff --git a/...entEqualsToByIgnoringNullFields_Test.java → ...ert_isEqualToIgnoringNullFields_Test.java b/...entEqualsToByIgnoringNullFields_Test.java → ...ert_isEqualToIgnoringNullFields_Test.java
@@ -25,7 +25,7 @@
  * @author Nicolas François
  * @author Mikhail Mazursky
  */
-public class ObjectAssert_isLenientEqualsToByIgnoringNullFields_Test extends ObjectAssertBaseTest {
+public class ObjectAssert_isEqualToIgnoringNullFields_Test extends ObjectAssertBaseTest {
 
   private Jedi other = new Jedi("Yoda", "Green");
 
@@ -36,6 +36,6 @@ protected ObjectAssert<Jedi> invoke_api_method() {
 
   @Override
   protected void verify_internal_effects() {
-    verify(objects).assertIsLenientEqualsToIgnoringNullFields(getInfo(assertions), getActual(assertions), other);
+    verify(objects).assertIsEqualToIgnoringNullFields(getInfo(assertions), getActual(assertions), other);
   }
 }
diff --git a/...LenientEqualsToByIgnoringFields_Test.java → ...ertIsEqualToIgnoringGivenFields_Test.java b/...LenientEqualsToByIgnoringFields_Test.java → ...ertIsEqualToIgnoringGivenFields_Test.java
@@ -39,7 +39,7 @@
  * @author Nicolas François
  * @author Joel Costigliola
  */
-public class Objects_assertIsLenientEqualsToByIgnoringFields_Test extends ObjectsBaseTest {
+public class Objects_assertIsEqualToIgnoringGivenFields_Test extends ObjectsBaseTest {
 
   @Test
   public void should_pass_when_fields_are_equal() {

diff --git a/...entEqualsToByIgnoringNullFields_Test.java → ...sertIsEqualToIgnoringNullFields_Test.java b/...entEqualsToByIgnoringNullFields_Test.java → ...sertIsEqualToIgnoringNullFields_Test.java
@@ -35,27 +35,27 @@
  * @author Nicolas François
  * @author Joel Costigliola
  */
-public class Objects_assertIsLenientEqualsToByIgnoringNullFields_Test extends ObjectsBaseTest {
+public class Objects_assertIsEqualToIgnoringNullFields_Test extends ObjectsBaseTest {
 
   @Test
   public void should_pass_when_fields_are_equal() {
 	Jedi actual = new Jedi("Yoda", "Green");
 	Jedi other = new Jedi("Yoda", "Green");
-	objects.assertIsLenientEqualsToIgnoringNullFields(someInfo(), actual, other);
+	objects.assertIsEqualToIgnoringNullFields(someInfo(), actual, other);
   }
 
   @Test
   public void should_pass_when_some_other_field_is_null_but_not_actual() {
 	Jedi actual = new Jedi("Yoda", "Green");
 	Jedi other = new Jedi("Yoda", null);
-	objects.assertIsLenientEqualsToIgnoringNullFields(someInfo(), actual, other);
+	objects.assertIsEqualToIgnoringNullFields(someInfo(), actual, other);
   }
 
   @Test
   public void should_fail_if_actual_is_null() {
 	thrown.expectAssertionError(actualIsNull());
 	Jedi other = new Jedi("Yoda", "Green");
-	objects.assertIsLenientEqualsToIgnoringNullFields(someInfo(), null, other);
+	objects.assertIsEqualToIgnoringNullFields(someInfo(), null, other);
   }
 
   @Test
@@ -64,7 +64,7 @@ public void should_fail_when_some_actual_field_is_null_but_not_other() {
 	Jedi actual = new Jedi("Yoda", null);
 	Jedi other = new Jedi("Yoda", "Green");
 	try {
-	  objects.assertIsLenientEqualsToIgnoringNullFields(info, actual, other);
+	  objects.assertIsEqualToIgnoringNullFields(info, actual, other);
 	} catch (AssertionError err) {
 	  verify(failures).failure(info,
 		                       shouldBeEqualToIgnoringGivenFields(actual, newArrayList("lightSaberColor"),
@@ -82,7 +82,7 @@ public void should_fail_when_a_field_differ() {
 	Jedi actual = new Jedi("Yoda", "Green");
 	Jedi other = new Jedi("Soda", "Green");
 	try {
-	  objects.assertIsLenientEqualsToIgnoringNullFields(info, actual, other);
+	  objects.assertIsEqualToIgnoringNullFields(info, actual, other);
 	} catch (AssertionError err) {
 	  verify(failures).failure(info,
 		                       shouldBeEqualToIgnoringGivenFields(actual, newArrayList("name"),
@@ -100,7 +100,7 @@ public void should_fail_when_objects_to_compare_are_of_different_types() {
 	Jedi actual = new Jedi("Yoda", "Green");
 	Employee other = new Employee();
 	try {
-	  objects.assertIsLenientEqualsToIgnoringNullFields(info, actual, other);
+	  objects.assertIsEqualToIgnoringNullFields(info, actual, other);
 	} catch (AssertionError err) {
 	  verify(failures).failure(info, shouldBeInstance(other, actual.getClass()));
 	  return;
@@ -115,7 +115,7 @@ public void should_pass_when_private_fields_differ_but_are_not_compared() {
 	TestClassWithRandomId actual = new TestClassWithRandomId("1", 1);
 	TestClassWithRandomId other = new TestClassWithRandomId(null, 1);
 	// s field is ignored because null in other, and id also because it is private without public getter
-	objects.assertIsLenientEqualsToIgnoringNullFields(someInfo(), actual, other);
+	objects.assertIsEqualToIgnoringNullFields(someInfo(), actual, other);
 	// reset
 	Assertions.setAllowComparingPrivateFields(allowedToUsePrivateFields);
   }