Add navigation method tests to extracting variants

Author: scordio

src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Array_Test.java

@@ -23,7 +23,9 @@
 import java.util.List;
 import java.util.function.Function;
 
+import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.AbstractListAssert;
+import org.assertj.core.api.NavigationMethodBaseTest;
 import org.assertj.core.api.ObjectAssert;
 import org.assertj.core.internal.Objects;
 import org.assertj.core.test.Employee;
@@ -32,10 +34,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-/**
- * Tests for <code>{@link ObjectAssert#extracting(Function[])}</code>.
- */
-class ObjectAssert_extracting_with_Function_Array_Test {
+class ObjectAssert_extracting_with_Function_Array_Test implements NavigationMethodBaseTest<ObjectAssert<Employee>> {
 
   private Employee luke;
 
@@ -113,4 +112,14 @@ private static Objects comparatorOf(AbstractListAssert<?, ?, ?, ?> assertion) {
     return (Objects) PropertyOrFieldSupport.EXTRACTION.getValueOf("objects", assertion);
   }
 
+  @Override
+  public ObjectAssert<Employee> getAssertion() {
+    return new ObjectAssert<>(luke);
+  }
+
+  @Override
+  public AbstractAssert<?, ?> invoke_navigation_method(ObjectAssert<Employee> assertion) {
+    return assertion.extracting(Employee::getName, Employee::getAge);
+  }
+
 }

src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Test.java

@@ -24,7 +24,9 @@
 import java.util.Map;
 import java.util.function.Function;
 
+import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.AbstractObjectAssert;
+import org.assertj.core.api.NavigationMethodBaseTest;
 import org.assertj.core.api.ObjectAssert;
 import org.assertj.core.internal.Objects;
 import org.assertj.core.internal.TypeComparators;
@@ -34,10 +36,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-/**
- * Tests for <code>{@link ObjectAssert#extracting(Function)}</code>.
- */
-class ObjectAssert_extracting_with_Function_Test {
+class ObjectAssert_extracting_with_Function_Test implements NavigationMethodBaseTest<ObjectAssert<Employee>> {
 
   private Employee luke;
 
@@ -90,16 +89,6 @@ void should_throw_a_NullPointerException_if_the_given_extractor_is_null() {
                .hasMessage(shouldNotBeNull("extractor").create());
   }
 
-  @Test
-  void extracting_should_honor_registered_comparator() {
-    // GIVEN
-    ObjectAssert<Employee> assertion = assertThat(luke).usingComparator(ALWAYS_EQUALS);
-    // WHEN
-    AbstractObjectAssert<?, String> result = assertion.extracting(firstName);
-    // THEN
-    result.isEqualTo("YODA");
-  }
-
   @Test
   void extracting_should_keep_assertion_state() {
     // GIVEN
@@ -133,4 +122,15 @@ private static TypeComparators comparatorsByTypeOf(AbstractObjectAssert<?, ?> as
   private static Map<String, Comparator<?>> comparatorByPropertyOrFieldOf(AbstractObjectAssert<?, ?> assertion) {
     return (Map<String, Comparator<?>>) PropertyOrFieldSupport.EXTRACTION.getValueOf("comparatorByPropertyOrField", assertion);
   }
+
+  @Override
+  public ObjectAssert<Employee> getAssertion() {
+    return new ObjectAssert<>(luke);
+  }
+
+  @Override
+  public AbstractAssert<?, ?> invoke_navigation_method(ObjectAssert<Employee> assertion) {
+    return assertion.extracting(Employee::getAge);
+  }
+
 }

src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_and_InstanceOfAssertFactory_Test.java

@@ -27,21 +27,16 @@
 import org.assertj.core.api.AbstractCharSequenceAssert;
 import org.assertj.core.api.AbstractIntegerAssert;
 import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.InstanceOfAssertFactory;
 import org.assertj.core.api.NavigationMethodBaseTest;
 import org.assertj.core.api.ObjectAssert;
 import org.assertj.core.test.Employee;
 import org.assertj.core.test.Name;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 /**
- * Tests for <code>{@link ObjectAssert#extracting(Function, InstanceOfAssertFactory)}</code>.
- *
  * @author Stefano Cordio
  */
-@DisplayName("ObjectAssert extracting(Function, InstanceOfAssertFactory)")
 class ObjectAssert_extracting_with_Function_and_InstanceOfAssertFactory_Test
     implements NavigationMethodBaseTest<ObjectAssert<Employee>> {
 
@@ -130,7 +125,7 @@ void should_rethrow_any_extractor_function_exception() {
 
   @Override
   public ObjectAssert<Employee> getAssertion() {
-    return assertThat(luke);
+    return new ObjectAssert<>(luke);
   }
 
   @Override

src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Array_Test.java

@@ -20,19 +20,16 @@
 
 import java.math.BigDecimal;
 
+import org.assertj.core.api.AbstractAssert;
+import org.assertj.core.api.NavigationMethodBaseTest;
 import org.assertj.core.api.ObjectAssert;
 import org.assertj.core.test.Employee;
 import org.assertj.core.test.Name;
 import org.assertj.core.util.introspection.IntrospectionError;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-/**
- * Tests for <code>{@link ObjectAssert#extracting(String[])}</code>.
- */
-@DisplayName("ObjectAssert extracting(String[])")
-class ObjectAssert_extracting_with_String_Array_Test {
+class ObjectAssert_extracting_with_String_Array_Test implements NavigationMethodBaseTest<ObjectAssert<Employee>> {
 
   private Employee luke;
   private Employee leia;
@@ -115,6 +112,16 @@ void should_allow_to_specify_type_comparator_after_using_extracting_with_multipl
                       .containsExactly("Obi-Wan", new BigDecimal("1.82"));
   }
 
+  @Override
+  public ObjectAssert<Employee> getAssertion() {
+    return new ObjectAssert<>(luke);
+  }
+
+  @Override
+  public AbstractAssert<?, ?> invoke_navigation_method(ObjectAssert<Employee> assertion) {
+    return assertion.extracting("id", "name");
+  }
+
   @SuppressWarnings("unused")
   private static class Person {
 

src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Test.java

@@ -22,13 +22,16 @@
 import java.util.Comparator;
 import java.util.Optional;
 
+import org.assertj.core.api.AbstractAssert;
+import org.assertj.core.api.NavigationMethodBaseTest;
+import org.assertj.core.api.ObjectAssert;
 import org.assertj.core.test.Employee;
 import org.assertj.core.test.Name;
 import org.assertj.core.util.introspection.IntrospectionError;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class ObjectAssert_extracting_with_String_Test {
+class ObjectAssert_extracting_with_String_Test implements NavigationMethodBaseTest<ObjectAssert<Employee>> {
 
   private Employee luke;
   private Employee leia;
@@ -109,6 +112,16 @@ void should_throw_IntrospectionError_if_given_field_name_cannot_be_read() {
                 .hasMessageContaining("Can't find any field or property with name 'foo'.");
   }
 
+  @Override
+  public ObjectAssert<Employee> getAssertion() {
+    return new ObjectAssert<>(luke);
+  }
+
+  @Override
+  public AbstractAssert<?, ?> invoke_navigation_method(ObjectAssert<Employee> assertion) {
+    return assertion.extracting("name.first");
+  }
+
   @SuppressWarnings("unused")
   private static class Person {
 

src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_and_InstanceOfAssertFactory_Test.java

@@ -29,22 +29,17 @@
 import org.assertj.core.api.AbstractBigDecimalAssert;
 import org.assertj.core.api.AbstractLongAssert;
 import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.InstanceOfAssertFactory;
 import org.assertj.core.api.NavigationMethodBaseTest;
 import org.assertj.core.api.ObjectAssert;
 import org.assertj.core.test.Employee;
 import org.assertj.core.test.Name;
 import org.assertj.core.util.introspection.IntrospectionError;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 /**
- * Tests for <code>{@link ObjectAssert#extracting(String, InstanceOfAssertFactory)}</code>.
- *
  * @author Stefano Cordio
  */
-@DisplayName("ObjectAssert extracting(String, InstanceOfAssertFactory)")
 class ObjectAssert_extracting_with_String_and_InstanceOfAssertFactory_Test
     implements NavigationMethodBaseTest<ObjectAssert<Employee>> {
 
@@ -125,7 +120,7 @@ void should_allow_to_specify_type_comparator_after_using_extracting_with_single_
 
   @Override
   public ObjectAssert<Employee> getAssertion() {
-    return assertThat(luke);
+    return new ObjectAssert<>(luke);
   }
 
   @Override