Refine contribution e86984d

* Make ReflectionUtils#getWriteMethod public
* Move chained setters tests into a dedicated class

easy-random-core/src/main/java/org/jeasy/random/util/ReflectionUtils.java

@@ -543,7 +543,7 @@ private static void rejectUnsupportedTypes(Class<?> type) {
      * @param field field to get the write method for
      * @return Optional of write method or empty if field has no write method
      */
-    private static Optional<Method> getWriteMethod(Field field) {
+    public static Optional<Method> getWriteMethod(Field field) {
         return getPublicMethod("set" + capitalize(field.getName()), field.getDeclaringClass(), field.getType());
     }
 

easy-random-core/src/test/java/org/jeasy/random/ChainedSettersSupportTest.java

@@ -0,0 +1,118 @@
+/*
+ * The MIT License
+ *
+ *   Copyright (c) 2020, Mahmoud Ben Hassine ([email protected])
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ */
+package org.jeasy.random;
+
+import org.jeasy.random.beans.ChainedSetterBean;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ChainedSettersSupportTest {
+
+	@Test
+	void generatedBeanWithFluentSetterShouldBeCorrectlyPopulated() {
+		// given
+		EasyRandom easyRandom = new EasyRandom();
+
+		// when
+		ChainedSetterBean chainedSetterBean = easyRandom.nextObject(ChainedSetterBean.class);
+
+		// then
+		assertThat(chainedSetterBean.getName()).isNotEmpty();
+		assertThat(chainedSetterBean.getIndex()).isNotEqualTo(0);
+	}
+
+	@Test
+	void chainSettersWithOverriddenFieldShouldBeRandomized() {
+		// given
+		class BaseClass {
+			private String field; // field overridden (note: not setter)
+
+			public BaseClass setField(String field) {
+				this.field = field;
+				return this;
+			}
+		}
+		class SubClass extends BaseClass {
+			private int field; // note: field overridden
+		}
+		EasyRandom easyRandom = new EasyRandom();
+
+		// when
+		SubClass value = easyRandom.nextObject(SubClass.class);
+
+		// then
+		assertFalse(((BaseClass) value).field.isEmpty());
+		assertTrue(value.field != 0);
+	}
+
+	@Test
+	void chainSettersWithOverriddenSetterShouldBeRandomized() {
+		// given
+		class BaseClass {
+			private String field; // setter overridden
+			private int f; // single-char name
+
+			public BaseClass setField(String field) {
+				this.field = field;
+				return this;
+			}
+
+			public String getField() {
+				return field;
+			}
+
+			public int getF() {
+				return f;
+			}
+
+			public BaseClass setF(int f) {
+				this.f = f;
+				return this;
+			}
+		}
+		class SubClassB extends BaseClass {
+			@Override
+			public SubClassB setField(String field) {
+				super.setField(field);
+				return this;
+			}
+		}
+		class SubClassA extends BaseClass {
+			private SubClassB subClassB;
+		}
+		EasyRandom easyRandom = new EasyRandom();
+
+		// when
+		SubClassA value = easyRandom.nextObject(SubClassA.class);
+
+		// then
+		assertNotNull(value.getField());
+		assertTrue(value.getF() != 0);
+	}
+
+}

easy-random-core/src/test/java/org/jeasy/random/EasyRandomTest.java

@@ -66,15 +66,6 @@ void generatedBeansShouldBeCorrectlyPopulated() {
         validatePerson(person);
     }
 
-    @Test
-    void generatedBeanWithFluentSetterShouldBeCorrectlyPopulated() {
-        // when
-        ChainedSetterBean chainedSetterBean = easyRandom.nextObject(ChainedSetterBean.class);
-
-        // then
-        assertThat(chainedSetterBean.getName()).isNotEmpty();
-    }
-
     @Test
     void shouldFailIfSetterInvocationFails() {
         EasyRandom easyRandom = new EasyRandom();