Fix missing required PropertyGenerator within introspectors (#908)

naver · Jan 30, 2024 · e02c115 · e02c115
1 parent 019c6e0
commit e02c115
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 1 deletion.
diff --git a/docs/content/v1.0.x/release-notes/_index.md b/docs/content/v1.0.x/release-notes/_index.md
@@ -9,7 +9,9 @@ sectionStart
 ### v.1.0.13
 Add InterfacePlugin supports abstract classes through `abstractClassExtends` option.
 
-Fix setLazy with value wrapped by Just would not be manipulated
+Fix setLazy with value wrapped by Just would not be manipulated.
+
+Fix missing required PropertyGenerator within introspectors.
 
 sectionEnd
 

diff --git a/...rc/main/java/com/navercorp/fixturemonkey/api/introspector/TypedArbitraryIntrospector.java b/...rc/main/java/com/navercorp/fixturemonkey/api/introspector/TypedArbitraryIntrospector.java
@@ -18,13 +18,16 @@
 
 package com.navercorp.fixturemonkey.api.introspector;
 
+import javax.annotation.Nullable;
+
 import org.apiguardian.api.API;
 import org.apiguardian.api.API.Status;
 
 import com.navercorp.fixturemonkey.api.generator.ArbitraryGeneratorContext;
 import com.navercorp.fixturemonkey.api.matcher.Matcher;
 import com.navercorp.fixturemonkey.api.matcher.MatcherOperator;
 import com.navercorp.fixturemonkey.api.property.Property;
+import com.navercorp.fixturemonkey.api.property.PropertyGenerator;
 
 /**
  * Introspects specific properties matched by {@link Matcher}.
@@ -46,4 +49,14 @@ public ArbitraryIntrospectorResult introspect(ArbitraryGeneratorContext context)
 	public boolean match(Property property) {
 		return arbitraryIntrospector.match(property);
 	}
+
+	@Nullable
+	@Override
+	public PropertyGenerator getRequiredPropertyGenerator(Property property) {
+		if (arbitraryIntrospector.match(property)) {
+			return arbitraryIntrospector.getOperator().getRequiredPropertyGenerator(property);
+		}
+
+		return null;
+	}
 }
diff --git a/...om/navercorp/fixturemonkey/kotlin/introspector/PrimaryConstructorArbitraryIntrospector.kt b/...om/navercorp/fixturemonkey/kotlin/introspector/PrimaryConstructorArbitraryIntrospector.kt
@@ -23,7 +23,10 @@ import com.navercorp.fixturemonkey.api.container.ConcurrentLruCache
 import com.navercorp.fixturemonkey.api.generator.ArbitraryGeneratorContext
 import com.navercorp.fixturemonkey.api.introspector.ArbitraryIntrospector
 import com.navercorp.fixturemonkey.api.introspector.ArbitraryIntrospectorResult
+import com.navercorp.fixturemonkey.api.property.Property
+import com.navercorp.fixturemonkey.api.property.PropertyGenerator
 import com.navercorp.fixturemonkey.api.type.Types
+import com.navercorp.fixturemonkey.kotlin.property.KotlinPropertyGenerator
 import org.apiguardian.api.API
 import org.apiguardian.api.API.Status.MAINTAINED
 import org.slf4j.LoggerFactory
@@ -71,6 +74,8 @@ class PrimaryConstructorArbitraryIntrospector : ArbitraryIntrospector {
         )
     }
 
+    override fun getRequiredPropertyGenerator(property: Property): PropertyGenerator = KOTLIN_PROPERTY_GENERATOR
+
     private fun resolveArbitrary(
         parameter: KParameter,
         arbitrariesByPropertyName: Map<String?, Any?>,
@@ -91,6 +96,7 @@ class PrimaryConstructorArbitraryIntrospector : ArbitraryIntrospector {
     companion object {
         val INSTANCE = PrimaryConstructorArbitraryIntrospector()
         private val LOGGER = LoggerFactory.getLogger(PrimaryConstructorArbitraryIntrospector::class.java)
+        private val KOTLIN_PROPERTY_GENERATOR = KotlinPropertyGenerator()
         private val CONSTRUCTOR_CACHE = ConcurrentLruCache<Class<*>, KFunction<*>>(2048)
     }
 }
diff --git a/...java-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/ConstructorTestSpecs.java b/...java-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/ConstructorTestSpecs.java
@@ -1,5 +1,6 @@
 package com.navercorp.fixturemonkey.tests.java;
 
+import java.beans.ConstructorProperties;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -225,4 +226,17 @@ public SimpleContainerObject(List<JavaTypeObject> list) {
 			this.list = list;
 		}
 	}
+
+	public static class FieldAndConstructorParameterMismatchObject {
+		private final String value;
+
+		@ConstructorProperties("integer")
+		public FieldAndConstructorParameterMismatchObject(int integer) {
+			this.value = String.valueOf(integer);
+		}
+
+		public String getValue() {
+			return value;
+		}
+	}
 }
diff --git a/...onkey-tests/java-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/JavaTest.java b/...onkey-tests/java-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/JavaTest.java
@@ -62,6 +62,7 @@
 import com.navercorp.fixturemonkey.resolver.ArbitraryBuilderCandidateFactory;
 import com.navercorp.fixturemonkey.resolver.ArbitraryBuilderCandidateList;
 import com.navercorp.fixturemonkey.tests.java.ConstructorAndPropertyTestSpecs.ConsturctorAndProperty;
+import com.navercorp.fixturemonkey.tests.java.ConstructorTestSpecs.FieldAndConstructorParameterMismatchObject;
 import com.navercorp.fixturemonkey.tests.java.ConstructorTestSpecs.SimpleContainerObject;
 import com.navercorp.fixturemonkey.tests.java.ImmutableDepthTestSpecs.DepthStringValueList;
 import com.navercorp.fixturemonkey.tests.java.ImmutableDepthTestSpecs.OneDepthStringValue;
@@ -1209,4 +1210,18 @@ void fieldReflectionArbitraryIntrospectorSampleTwiceResultNotMutated() {
 		String expected = stringObject.getObject().getValue();
 		then(actual).isEqualTo(expected);
 	}
+
+	@Test
+	void fieldAndConstructorParameterMismatch() {
+		FixtureMonkey sut = FixtureMonkey.builder()
+			.pushExactTypeArbitraryIntrospector(
+				FieldAndConstructorParameterMismatchObject.class,
+				ConstructorPropertiesArbitraryIntrospector.INSTANCE
+			)
+			.build();
+
+		String actual = sut.giveMeOne(FieldAndConstructorParameterMismatchObject.class).getValue();
+
+		then(actual).isNotNull();
+	}
 }
diff --git a/...tests/kotlin-tests/src/test/kotlin/com/navercorp/fixturemonkey/tests/kotlin/KotlinTest.kt b/...tests/kotlin-tests/src/test/kotlin/com/navercorp/fixturemonkey/tests/kotlin/KotlinTest.kt
@@ -40,6 +40,7 @@ import com.navercorp.fixturemonkey.kotlin.giveMeOne
 import com.navercorp.fixturemonkey.kotlin.instantiator.instantiateBy
 import com.navercorp.fixturemonkey.kotlin.into
 import com.navercorp.fixturemonkey.kotlin.intoGetter
+import com.navercorp.fixturemonkey.kotlin.introspector.PrimaryConstructorArbitraryIntrospector
 import com.navercorp.fixturemonkey.kotlin.pushExactTypeArbitraryIntrospector
 import com.navercorp.fixturemonkey.kotlin.setExp
 import com.navercorp.fixturemonkey.kotlin.setExpGetter
@@ -407,6 +408,22 @@ class KotlinTest {
         then(actual).isEqualTo(expected)
     }
 
+    @RepeatedTest(TEST_COUNT)
+    fun pushPrimaryConstructorIntrospector() {
+        // given
+        class StringObject(val string: String)
+
+        val sut = FixtureMonkey.builder()
+            .pushExactTypeArbitraryIntrospector<StringObject>(PrimaryConstructorArbitraryIntrospector.INSTANCE)
+            .build()
+
+        // when
+        val actual = sut.giveMeOne<StringObject>().string
+
+        // then
+        then(actual).isNotNull
+    }
+
     companion object {
         private val SUT: FixtureMonkey = FixtureMonkey.builder()
             .plugin(KotlinPlugin())