Fix sampleList always return same element with AnonymousArbitraryIntr…

…ospector (#779)
naver · Oct 10, 2023 · ed8f41e · ed8f41e
1 parent 2979858
commit ed8f41e
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 29 deletions.
diff --git a/...ain/java/com/navercorp/fixturemonkey/api/introspector/AnonymousArbitraryIntrospector.java b/...ain/java/com/navercorp/fixturemonkey/api/introspector/AnonymousArbitraryIntrospector.java
@@ -53,36 +53,42 @@ public ArbitraryIntrospectorResult introspect(ArbitraryGeneratorContext context)
 		Property property = context.getResolvedProperty();
 		Class<?> type = Types.getActualType(property.getType());
 
-		Map<String, CombinableArbitrary<?>> arbitrariesByPropertyName =
-			context.getCombinableArbitrariesByPropertyName();
-
-		List<ArbitraryProperty> childrenProperties = context.getChildren();
-
-		InvocationHandlerBuilder invocationHandlerBuilder = new InvocationHandlerBuilder(new HashMap<>());
-
-		for (ArbitraryProperty arbitraryProperty : childrenProperties) {
-			Property childProperty = arbitraryProperty.getObjectProperty().getProperty();
-
-			if (!(childProperty instanceof MethodProperty)) {
-				continue;
-			}
-
-			MethodProperty methodProperty = (MethodProperty)childProperty;
-
-			Object combined = arbitrariesByPropertyName.get(childProperty.getName()).combined();
-			invocationHandlerBuilder.put(methodProperty.getMethodName(), combined);
-		}
-
-		if (invocationHandlerBuilder.generatedValuesByMethodName.isEmpty()) {
-			return new ArbitraryIntrospectorResult(CombinableArbitrary.NOT_GENERATED);
-		}
-
 		return new ArbitraryIntrospectorResult(
-			CombinableArbitrary.from(
-				type.cast(
-					Proxy.newProxyInstance(type.getClassLoader(), new Class[] {type}, invocationHandlerBuilder.build())
+			CombinableArbitrary.objectBuilder()
+				.properties(context.getCombinableArbitrariesByArbitraryProperty())
+				.build(
+					arbitrariesByPropertyName -> {
+						List<ArbitraryProperty> childrenProperties = context.getChildren();
+
+						InvocationHandlerBuilder invocationHandlerBuilder = new InvocationHandlerBuilder(
+							new HashMap<>());
+
+						for (ArbitraryProperty arbitraryProperty : childrenProperties) {
+							Property childProperty = arbitraryProperty.getObjectProperty().getProperty();
+
+							if (!(childProperty instanceof MethodProperty)) {
+								continue;
+							}
+
+							MethodProperty methodProperty = (MethodProperty)childProperty;
+
+							Object combined = arbitrariesByPropertyName.get(arbitraryProperty);
+							invocationHandlerBuilder.put(methodProperty.getMethodName(), combined);
+						}
+
+						if (invocationHandlerBuilder.generatedValuesByMethodName.isEmpty()) {
+							return null;
+						}
+
+						return type.cast(
+							Proxy.newProxyInstance(
+								type.getClassLoader(),
+								new Class[] {type},
+								invocationHandlerBuilder.build()
+							)
+						);
+					}
 				)
-			)
 		);
 	}
 

diff --git a/...in/com/navercorp/fixturemonkey/kotlin/test/PrimaryConstructorArbitraryIntrospectorTest.kt b/...in/com/navercorp/fixturemonkey/kotlin/test/PrimaryConstructorArbitraryIntrospectorTest.kt
@@ -74,7 +74,7 @@ class PrimaryConstructorArbitraryIntrospectorTest {
     @Property
     fun sampleInterface() {
         // when
-        val actual = sut.giveMeOne<InterfaceClass>()
+        val actual: InterfaceClass = sut.giveMeOne()
 
         then(actual).isNull()
     }

diff --git a/...ava-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/AnonymousInstanceTest.java b/...ava-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/AnonymousInstanceTest.java
@@ -22,8 +22,11 @@
 import static org.assertj.core.api.BDDAssertions.then;
 
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
 
 import com.navercorp.fixturemonkey.FixtureMonkey;
 import com.navercorp.fixturemonkey.javax.validation.plugin.JavaxValidationPlugin;
@@ -209,4 +212,15 @@ void setNestedInheritedInterface() {
 
 		then(actual).isEqualTo(expected);
 	}
+
+	@Test
+	void sampleListWouldReturnDiff() {
+		Set<Integer> actual = SUT.giveMeBuilder(Interface.class)
+			.sampleList(2)
+			.stream()
+			.map(Interface::integer)
+			.collect(Collectors.toSet());
+
+		then(actual).hasSize(2);
+	}
 }