Merge pull request #148 from sta-szek/#143-Implement-changing-fields-from-super-classes

Piotr Joński · web-flow · commit b2328ad459b3 · 2016-11-23T18:31:32.000+01:00
#143 implement changing fields from super classes
diff --git a/src/main/java/pl/pojo/tester/api/ConstructorParameters.java b/src/main/java/pl/pojo/tester/api/ConstructorParameters.java
@@ -23,7 +23,7 @@ public class ConstructorParameters {
     private final Class<?>[] constructorParametersTypes;
 
     /**
-     * Instantaites {@code ConstructorParameters} with given constructor parameters and constructor parameter's types.
+     * Instantiates {@code ConstructorParameters} with given constructor parameters and constructor parameter's types.
      *
      * @param constructorParameters      constructor parameters
      * @param constructorParametersTypes constructor parameter's types
diff --git a/src/main/java/pl/pojo/tester/api/DefaultPackageFilter.java b/src/main/java/pl/pojo/tester/api/DefaultPackageFilter.java
@@ -77,7 +77,7 @@ public Class<?>[] getClasses() {
                         .map(ClassLoader::loadClass)
                         .toArray(Class[]::new);
         } catch (final IOException e) {
-            throw new PacakgeFilterException(packageFile.toString(), e);
+            throw new PackageFilterException(packageFile.toString(), e);
         }
     }
 
@@ -103,7 +103,7 @@ private File getFile(final String packageName) {
                                   .getContextClassLoader()
                                   .getResource(packagePath);
         if (fileUrl == null) {
-            throw new PacakgeFilterException(packagePath, null);
+            throw new PackageFilterException(packagePath, null);
         }
         return new File(fileUrl.getFile());
     }
diff --git a/src/main/java/pl/pojo/tester/api/PackageFilterException.java b/src/main/java/pl/pojo/tester/api/PackageFilterException.java
@@ -9,15 +9,15 @@
  * @author Piotr Joński
  * @since 0.5.0
  */
-public class PacakgeFilterException extends RuntimeException {
+public class PackageFilterException extends RuntimeException {
 
     /**
      * Instantiates exception.
      *
      * @param packageName package name or file of package
      * @param cause       cause, which raised this exception
      */
-    public PacakgeFilterException(final String packageName, final IOException cause) {
+    public PackageFilterException(final String packageName, final IOException cause) {
         super(createMessage(packageName), cause);
     }
 
diff --git a/src/main/java/pl/pojo/tester/api/assertion/AbstractAssertion.java b/src/main/java/pl/pojo/tester/api/assertion/AbstractAssertion.java
@@ -110,10 +110,10 @@ public void areWellImplemented() {
 
     /**
      * Indicates, that class should be constructed using given constructor parameters. Constructor will be selected
-     * based on constructor paramter's types.
+     * based on constructor parameter's types.
      *
      * @param qualifiedClassName        class to instantiate
-     * @param constructorParameters     constructor paramters
+     * @param constructorParameters     constructor parameters
      * @param constructorParameterTypes constructor parameter's types
      *
      * @return itself
@@ -130,10 +130,10 @@ public AbstractAssertion create(final String qualifiedClassName, final Object[]
 
     /**
      * Indicates, that class should be constructed using given constructor parameters. Constructor will be selected
-     * based on constructor paramter's types.
+     * based on constructor parameter's types.
      *
      * @param qualifiedClassName    class to instantiate
-     * @param constructorParameters constructor paramters
+     * @param constructorParameters constructor parameters
      *
      * @return itself
      *
@@ -150,10 +150,10 @@ public AbstractAssertion create(final String qualifiedClassName, final Construct
 
     /**
      * Indicates, that class should be constructed using given constructor parameters. Constructor will be selected
-     * based on constructor paramter's types.
+     * based on constructor parameter's types.
      *
      * @param clazz                     class to instantiate
-     * @param constructorParameters     constructor paramters
+     * @param constructorParameters     constructor parameters
      * @param constructorParameterTypes constructor parameter's types
      *
      * @return itself
@@ -171,10 +171,10 @@ public AbstractAssertion create(final Class<?> clazz, final Object[] constructor
 
     /**
      * Indicates, that class should be constructed using given constructor parameters. Constructor will be selected
-     * based on constructor paramter's types.
+     * based on constructor parameter's types.
      *
      * @param clazz                 class to instantiate
-     * @param constructorParameters constructor paramters
+     * @param constructorParameters constructor parameters
      *
      * @return itself
      *
diff --git a/src/main/java/pl/pojo/tester/internal/instantiator/AbstractObjectInstantiator.java b/src/main/java/pl/pojo/tester/internal/instantiator/AbstractObjectInstantiator.java
@@ -2,7 +2,7 @@
 
 abstract class AbstractObjectInstantiator {
 
-    protected Class<?> clazz;
+    protected final Class<?> clazz;
 
     AbstractObjectInstantiator(final Class<?> clazz) {
         this.clazz = clazz;
diff --git a/src/main/java/pl/pojo/tester/internal/instantiator/Instantiable.java b/src/main/java/pl/pojo/tester/internal/instantiator/Instantiable.java
@@ -91,9 +91,7 @@ private static boolean canBeCreatedByDefaultConstructor(final Class<?> clazz) {
         final Constructor<?>[] constructors = clazz.getConstructors();
         return !qualifiesForProxy(clazz) && Arrays.stream(constructors)
                                                   .filter(Instantiable::isNoArgs)
-                                                  .filter(Instantiable::isPublic)
-                                                  .findAny()
-                                                  .isPresent();
+                                                  .anyMatch(Instantiable::isPublic);
     }
 
     private static boolean isPublic(final Constructor<?> constructor) {
diff --git a/src/main/java/pl/pojo/tester/internal/instantiator/ObjectGenerator.java b/src/main/java/pl/pojo/tester/internal/instantiator/ObjectGenerator.java
@@ -174,12 +174,21 @@ private Map<Class<?>, Predicate<String>> convertToMap(final ClassAndFieldPredica
     }
 
     private Object makeThemEqual(final Object object, final Object newInstance) {
-        final List<Field> allFields = FieldUtils.getAllFields(object.getClass());
+        final List<Field> allFields = getAllFields(object);
         for (final Field field : allFields) {
             final Object value = FieldUtils.getValue(object, field);
             FieldUtils.setValue(newInstance, field, value);
         }
         return newInstance;
     }
 
+    private List<Field> getAllFields(final Object object) {
+        Class<?> parent = object.getClass();
+        final List<Field> allFields = new ArrayList<>();
+        do {
+            allFields.addAll(FieldUtils.getAllFields(parent));
+        } while ((parent = parent.getSuperclass()) != null);
+        return allFields;
+    }
+
 }
diff --git a/src/main/java/pl/pojo/tester/internal/tester/AbstractTester.java b/src/main/java/pl/pojo/tester/internal/tester/AbstractTester.java
@@ -19,8 +19,8 @@
 
 public abstract class AbstractTester {
 
+    final TestAssertions testAssertions = new TestAssertions();
     ObjectGenerator objectGenerator;
-    TestAssertions testAssertions = new TestAssertions();
     private MultiValuedMap<Class<?>, ConstructorParameters> constructorParameters = new ArrayListValuedHashMap<>();
     private AbstractFieldValueChanger fieldValuesChanger = DefaultFieldValueChanger.INSTANCE;
 
diff --git a/src/main/java/pl/pojo/tester/internal/utils/MethodUtils.java b/src/main/java/pl/pojo/tester/internal/utils/MethodUtils.java
@@ -55,19 +55,20 @@ private static boolean prefixMatchesGettersPrefixAndHasExpectedLength(final Meth
         final Class<?> returnType = method.getReturnType();
         final String methodName = method.getName();
         final int fieldNameLength = fieldName.length();
-        final String upperCaseFirstLetterfieldName = upperCaseFirstLetter(fieldName);
+        final String upperCaseFirstLetterFieldName = upperCaseFirstLetter(fieldName);
 
         if (returnType.equals(boolean.class) || returnType.equals(Boolean.class)) {
             return (methodName.startsWith("is") && methodName.equals(fieldName))
-                   || ((methodName.endsWith(upperCaseFirstLetterfieldName))
+                   || ((methodName.endsWith(upperCaseFirstLetterFieldName))
                        && ((methodName.startsWith("is") && (methodName.length() == (fieldNameLength + 2)))
                            || (methodName.startsWith("has") && (methodName.length() == (fieldNameLength + 3)))
                            || (methodName.startsWith("get") && (methodName.length() == (fieldNameLength + 3)))
                            || (methodName.startsWith("have") && (methodName.length() == (fieldNameLength + 4)))
                            || (methodName.startsWith("contains") && (methodName.length() == (fieldNameLength + 8)))));
         } else {
-            return methodName.startsWith("get") && methodName.length() == fieldNameLength + 3 && methodName.endsWith(
-                    upperCaseFirstLetterfieldName);
+            return methodName.startsWith("get")
+                   && methodName.length() == fieldNameLength + 3
+                   && methodName.endsWith(upperCaseFirstLetterFieldName);
         }
     }
 
@@ -83,8 +84,9 @@ private static boolean prefixMatchesSettersPrefixAndHasExpectedLength(final Meth
             return methodName.startsWith("set") && methodName.endsWith(fieldNameWithoutPrefix);
 
         } else {
-            return methodName.startsWith("set") && methodName.length() == fieldNameLength + 3 && methodName.endsWith(
-                    upperCaseFirstLetterFieldName);
+            return methodName.startsWith("set")
+                   && methodName.length() == fieldNameLength + 3
+                   && methodName.endsWith(upperCaseFirstLetterFieldName);
         }
     }
 
diff --git a/src/test/java/pl/pojo/tester/api/DefaultPackageFilterTest.java b/src/test/java/pl/pojo/tester/api/DefaultPackageFilterTest.java
@@ -51,6 +51,6 @@ public void Should_Throw_Exception_When_Invalid_Package_Name() {
                                                                           .getClasses());
 
         // then
-        assertThat(result).isInstanceOf(PacakgeFilterException.class);
+        assertThat(result).isInstanceOf(PackageFilterException.class);
     }
 }
diff --git a/src/test/java/pl/pojo/tester/internal/instantiator/ObjectGeneratorTest.java b/src/test/java/pl/pojo/tester/internal/instantiator/ObjectGeneratorTest.java
@@ -9,6 +9,10 @@
 import classesForTest.fields.collections.map.Maps;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -27,6 +31,7 @@
 
 import java.util.List;
 import java.util.Random;
+import java.util.UUID;
 import java.util.stream.Stream;
 
 import static helpers.TestHelper.getDefaultDisplayName;
@@ -73,7 +78,8 @@ public Stream<DynamicTest> Should_Create_Same_Instance() {
         return Stream.of(new GoodPojo_Equals_HashCode_ToString(),
                          new ObjectContainingArray(),
                          new Collections(),
-                         new Maps())
+                         new Maps(),
+                         new SecondChild())
                      .map(value -> dynamicTest(getDefaultDisplayName(value), Should_Create_Same_Instance(value)));
     }
 
@@ -502,5 +508,31 @@ public void setTestEnum1(final TestEnum1 testEnum1) {
         }
     }
 
+    @Data
+    private class Parent {
+        private final UUID parentUUID;
+
+        private Parent() {this.parentUUID = UUID.randomUUID();}
+    }
+
+    @Getter
+    @Setter
+    @ToString(callSuper = true)
+    @EqualsAndHashCode(callSuper = true)
+    private class FirstChild extends Parent {
+        private final UUID childUUID;
+
+        private FirstChild() {this.childUUID = UUID.randomUUID();}
+    }
+
+    @Getter
+    @Setter
+    @ToString(callSuper = true)
+    @EqualsAndHashCode(callSuper = true)
+    private class SecondChild extends FirstChild {
+        private final UUID secondChild;
+
+        private SecondChild() {this.secondChild = UUID.randomUUID();}
+    }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class ConstructorParameters {`
`23`	`23`	`private final Class<?>[] constructorParametersTypes;`
`24`	`24`
`25`	`25`	`/**`
`26`		`- * Instantaites {@code ConstructorParameters} with given constructor parameters and constructor parameter's types.`
	`26`	`+ * Instantiates {@code ConstructorParameters} with given constructor parameters and constructor parameter's types.`
`27`	`27`	`*`
`28`	`28`	`* @param constructorParameters constructor parameters`
`29`	`29`	`* @param constructorParametersTypes constructor parameter's types`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public Class<?>[] getClasses() {`
`77`	`77`	`.map(ClassLoader::loadClass)`
`78`	`78`	`.toArray(Class[]::new);`
`79`	`79`	`} catch (final IOException e) {`
`80`		`- throw new PacakgeFilterException(packageFile.toString(), e);`
	`80`	`+ throw new PackageFilterException(packageFile.toString(), e);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`@@ -103,7 +103,7 @@ private File getFile(final String packageName) {`
`103`	`103`	`.getContextClassLoader()`
`104`	`104`	`.getResource(packagePath);`
`105`	`105`	`if (fileUrl == null) {`
`106`		`- throw new PacakgeFilterException(packagePath, null);`
	`106`	`+ throw new PackageFilterException(packagePath, null);`
`107`	`107`	`}`
`108`	`108`	`return new File(fileUrl.getFile());`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,10 @@ public void areWellImplemented() {`
`110`	`110`
`111`	`111`	`/**`
`112`	`112`	`* Indicates, that class should be constructed using given constructor parameters. Constructor will be selected`
`113`		`- * based on constructor paramter's types.`
	`113`	`+ * based on constructor parameter's types.`
`114`	`114`	`*`
`115`	`115`	`* @param qualifiedClassName class to instantiate`
`116`		`- * @param constructorParameters constructor paramters`
	`116`	`+ * @param constructorParameters constructor parameters`
`117`	`117`	`* @param constructorParameterTypes constructor parameter's types`
`118`	`118`	`*`
`119`	`119`	`* @return itself`
`@@ -130,10 +130,10 @@ public AbstractAssertion create(final String qualifiedClassName, final Object[]`
`130`	`130`
`131`	`131`	`/**`
`132`	`132`	`* Indicates, that class should be constructed using given constructor parameters. Constructor will be selected`
`133`		`- * based on constructor paramter's types.`
	`133`	`+ * based on constructor parameter's types.`
`134`	`134`	`*`
`135`	`135`	`* @param qualifiedClassName class to instantiate`
`136`		`- * @param constructorParameters constructor paramters`
	`136`	`+ * @param constructorParameters constructor parameters`
`137`	`137`	`*`
`138`	`138`	`* @return itself`
`139`	`139`	`*`
`@@ -150,10 +150,10 @@ public AbstractAssertion create(final String qualifiedClassName, final Construct`
`150`	`150`
`151`	`151`	`/**`
`152`	`152`	`* Indicates, that class should be constructed using given constructor parameters. Constructor will be selected`
`153`		`- * based on constructor paramter's types.`
	`153`	`+ * based on constructor parameter's types.`
`154`	`154`	`*`
`155`	`155`	`* @param clazz class to instantiate`
`156`		`- * @param constructorParameters constructor paramters`
	`156`	`+ * @param constructorParameters constructor parameters`
`157`	`157`	`* @param constructorParameterTypes constructor parameter's types`
`158`	`158`	`*`
`159`	`159`	`* @return itself`
`@@ -171,10 +171,10 @@ public AbstractAssertion create(final Class<?> clazz, final Object[] constructor`
`171`	`171`
`172`	`172`	`/**`
`173`	`173`	`* Indicates, that class should be constructed using given constructor parameters. Constructor will be selected`
`174`		`- * based on constructor paramter's types.`
	`174`	`+ * based on constructor parameter's types.`
`175`	`175`	`*`
`176`	`176`	`* @param clazz class to instantiate`
`177`		`- * @param constructorParameters constructor paramters`
	`177`	`+ * @param constructorParameters constructor parameters`
`178`	`178`	`*`
`179`	`179`	`* @return itself`
`180`	`180`	`*`
Original file line number	Diff line number	Diff line change
`@@ -174,12 +174,21 @@ private Map<Class<?>, Predicate<String>> convertToMap(final ClassAndFieldPredica`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`private Object makeThemEqual(final Object object, final Object newInstance) {`
`177`		`- final List<Field> allFields = FieldUtils.getAllFields(object.getClass());`
	`177`	`+ final List<Field> allFields = getAllFields(object);`
`178`	`178`	`for (final Field field : allFields) {`
`179`	`179`	`final Object value = FieldUtils.getValue(object, field);`
`180`	`180`	`FieldUtils.setValue(newInstance, field, value);`
`181`	`181`	`}`
`182`	`182`	`return newInstance;`
`183`	`183`	`}`
`184`	`184`
	`185`	`+ private List<Field> getAllFields(final Object object) {`
	`186`	`+ Class<?> parent = object.getClass();`
	`187`	`+ final List<Field> allFields = new ArrayList<>();`
	`188`	`+ do {`
	`189`	`+ allFields.addAll(FieldUtils.getAllFields(parent));`
	`190`	`+ } while ((parent = parent.getSuperclass()) != null);`
	`191`	`+ return allFields;`
	`192`	`+ }`
	`193`	`+`
`185`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ public void Should_Throw_Exception_When_Invalid_Package_Name() {`
`51`	`51`	`.getClasses());`
`52`	`52`
`53`	`53`	`// then`
`54`		`- assertThat(result).isInstanceOf(PacakgeFilterException.class);`
	`54`	`+ assertThat(result).isInstanceOf(PackageFilterException.class);`
`55`	`55`	`}`
`56`	`56`	`}`