Fix generating record constructor properties (#823)

naver · Nov 16, 2023 · 53dd62b · 53dd62b
1 parent fcfbf20
commit 53dd62b
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 1 deletion.
diff --git a/...-api/src/main/java/com/navercorp/fixturemonkey/api/property/DefaultPropertyGenerator.java b/...-api/src/main/java/com/navercorp/fixturemonkey/api/property/DefaultPropertyGenerator.java
@@ -19,6 +19,7 @@
 package com.navercorp.fixturemonkey.api.property;
 
 import java.beans.ConstructorProperties;
+import java.lang.reflect.Parameter;
 import java.util.Arrays;
 import java.util.List;
 
@@ -31,7 +32,9 @@ public final class DefaultPropertyGenerator implements PropertyGenerator {
 		new CompositePropertyGenerator(
 			Arrays.asList(
 				new ConstructorParameterPropertyGenerator(
-					it -> it.getAnnotation(ConstructorProperties.class) != null,
+					it -> it.getAnnotation(ConstructorProperties.class) != null
+						|| Arrays.stream(it.getParameters()).anyMatch(Parameter::isNamePresent)
+						|| it.getParameters().length == 0,
 					it -> true
 				),
 				new FieldPropertyGenerator(it -> true, it -> true),

diff --git a/...c/test/java/com/navercorp/fixturemonkey/tests/java17/ConstructorPropertiesRecordTest.java b/...c/test/java/com/navercorp/fixturemonkey/tests/java17/ConstructorPropertiesRecordTest.java
@@ -29,6 +29,8 @@
 import com.navercorp.fixturemonkey.tests.java17.RecordTestSpecs.ContainerRecord;
 import com.navercorp.fixturemonkey.tests.java17.RecordTestSpecs.DateTimeRecord;
 import com.navercorp.fixturemonkey.tests.java17.RecordTestSpecs.JavaTypeRecord;
+import com.navercorp.fixturemonkey.tests.java17.RecordTestSpecs.NoArgsConstructorRecord;
+import com.navercorp.fixturemonkey.tests.java17.RecordTestSpecs.TwoConstructorsRecord;
 
 class ConstructorPropertiesRecordTest {
 	private static final FixtureMonkey SUT = FixtureMonkey.builder()
@@ -98,4 +100,41 @@ void fixedInterfaceContainer() {
 
 		then(actual).isNotNull();
 	}
+
+	@RepeatedTest(TEST_COUNT)
+	void sampleTwoConstructorsRecord() {
+		String actual = SUT.giveMeBuilder(TwoConstructorsRecord.class)
+			.setNotNull("string")
+			.sample()
+			.string();
+
+		then(actual).isNotNull();
+	}
+
+	@RepeatedTest(TEST_COUNT)
+	void fixedTwoConstructorsRecord() {
+		String actual = SUT.giveMeBuilder(TwoConstructorsRecord.class)
+			.setNotNull("string")
+			.fixed()
+			.sample()
+			.string();
+
+		then(actual).isNotNull();
+	}
+
+	@RepeatedTest(TEST_COUNT)
+	void sampleNoArgsConstructorRecord() {
+		NoArgsConstructorRecord actual = SUT.giveMeOne(NoArgsConstructorRecord.class);
+
+		then(actual).isNotNull();
+	}
+
+	@RepeatedTest(TEST_COUNT)
+	void fixedNoArgsConstructorRecord() {
+		NoArgsConstructorRecord actual = SUT.giveMeBuilder(NoArgsConstructorRecord.class)
+			.fixed()
+			.sample();
+
+		then(actual).isNotNull();
+	}
 }
diff --git a/...java-17-tests/src/test/java/com/navercorp/fixturemonkey/tests/java17/RecordTestSpecs.java b/...java-17-tests/src/test/java/com/navercorp/fixturemonkey/tests/java17/RecordTestSpecs.java
@@ -116,4 +116,15 @@ public record ComplexContainerRecord(
 		Stream<String> stream
 	) {
 	}
+
+	public record NoArgsConstructorRecord() {
+	}
+
+	public record TwoConstructorsRecord(
+		String string
+	) {
+		public TwoConstructorsRecord(Integer integer) {
+			this(String.valueOf(integer));
+		}
+	}
 }