Fix generating ArbitraryNode even if self-recursive type (#541)

naver · Jan 10, 2023 · ef97dc1 · ef97dc1
1 parent 17fa09f
commit ef97dc1
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 10 deletions.
diff --git a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/ArbitraryTraverser.java b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/ArbitraryTraverser.java
@@ -19,6 +19,7 @@
 package com.navercorp.fixturemonkey.resolver;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -171,10 +172,6 @@ private List<ArbitraryNode> generateChildrenNodes(
 		for (int sequence = 0; sequence < childProperties.size(); sequence++) {
 			Property childProperty = childProperties.get(sequence);
 
-			if (context.isTraversed(childProperty)) {
-				continue;
-			}
-
 			ContainerPropertyGenerator containerPropertyGenerator =
 				this.generateOptions.getContainerPropertyGenerator(childProperty);
 			boolean childContainer = containerPropertyGenerator != null;
@@ -226,11 +223,21 @@ private List<ArbitraryNode> generateChildrenNodes(
 				childObjectProperty,
 				childContainerProperty
 			);
-			ArbitraryNode childNode = this.traverse(
-				childArbitraryProperty,
-				resolvedParentProperty,
-				context.appendArbitraryProperty(childArbitraryProperty)
-			);
+
+			ArbitraryNode childNode;
+			if (context.isTraversed(childProperty)) {
+				childNode = new ArbitraryNode(
+					resolvedParentProperty,
+					childArbitraryProperty,
+					Collections.emptyList()
+				);
+			} else {
+				childNode = this.traverse(
+					childArbitraryProperty,
+					resolvedParentProperty,
+					context.appendArbitraryProperty(childArbitraryProperty)
+				);
+			}
 			children.add(childNode);
 		}
 		return new ArrayList<>(children);

diff --git a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/TraverseContext.java b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/TraverseContext.java
@@ -25,6 +25,7 @@
 import org.apiguardian.api.API.Status;
 
 import com.navercorp.fixturemonkey.api.generator.ArbitraryProperty;
+import com.navercorp.fixturemonkey.api.property.MapEntryElementProperty;
 import com.navercorp.fixturemonkey.api.property.Property;
 
 @API(since = "0.4.0", status = Status.EXPERIMENTAL)
@@ -66,6 +67,11 @@ public TraverseContext appendArbitraryProperty(
 	public boolean isTraversed(Property property) {
 		return property.equals(rootArbitraryProperty.getObjectProperty().getProperty())
 			|| arbitraryProperties.stream()
-			.anyMatch(it -> property.equals(it.getObjectProperty().getProperty()));
+			.anyMatch(it -> isSameType(property, it.getObjectProperty().getProperty()));
+	}
+
+	private static boolean isSameType(Property p1, Property p2) {
+		boolean notMapEntry = !(p1 instanceof MapEntryElementProperty) || !(p2 instanceof MapEntryElementProperty);
+		return notMapEntry && p1.getAnnotatedType().getType().equals(p2.getAnnotatedType().getType());
 	}
 }
diff --git a/...est/java/com/navercorp/fixturemonkey/test/FixtureMonkeyV04OptionsAdditionalTestSpecs.java b/...est/java/com/navercorp/fixturemonkey/test/FixtureMonkeyV04OptionsAdditionalTestSpecs.java
@@ -279,4 +279,25 @@ public static class ConcreteStringValue extends AbstractValue {
 	public static class ConcreteIntValue extends AbstractValue {
 		private int intValue;
 	}
+
+	@Getter
+	public abstract static class SelfRecursiveAbstractValue {
+		private final List<SelfRecursiveAbstractValue> recursives;
+
+		@ConstructorProperties("recursives")
+		public SelfRecursiveAbstractValue(List<SelfRecursiveAbstractValue> recursives) {
+			this.recursives = recursives;
+		}
+	}
+
+	@Getter
+	public static class SelfRecursiveImplementationValue extends SelfRecursiveAbstractValue {
+		private final String value;
+
+		@ConstructorProperties({"recursives", "value"})
+		public SelfRecursiveImplementationValue(List<SelfRecursiveAbstractValue> recursives, String value) {
+			super(recursives);
+			this.value = value;
+		}
+	}
 }
diff --git a/...re-monkey/src/test/java/com/navercorp/fixturemonkey/test/FixtureMonkeyV04OptionsTest.java b/...re-monkey/src/test/java/com/navercorp/fixturemonkey/test/FixtureMonkeyV04OptionsTest.java
@@ -90,6 +90,8 @@
 import com.navercorp.fixturemonkey.test.FixtureMonkeyV04OptionsAdditionalTestSpecs.PairContainerPropertyGenerator;
 import com.navercorp.fixturemonkey.test.FixtureMonkeyV04OptionsAdditionalTestSpecs.PairIntrospector;
 import com.navercorp.fixturemonkey.test.FixtureMonkeyV04OptionsAdditionalTestSpecs.RegisterGroup;
+import com.navercorp.fixturemonkey.test.FixtureMonkeyV04OptionsAdditionalTestSpecs.SelfRecursiveAbstractValue;
+import com.navercorp.fixturemonkey.test.FixtureMonkeyV04OptionsAdditionalTestSpecs.SelfRecursiveImplementationValue;
 import com.navercorp.fixturemonkey.test.FixtureMonkeyV04OptionsAdditionalTestSpecs.SimpleObjectChild;
 import com.navercorp.fixturemonkey.test.FixtureMonkeyV04TestSpecs.ComplexObject;
 import com.navercorp.fixturemonkey.test.FixtureMonkeyV04TestSpecs.CustomContainer;
@@ -1418,4 +1420,19 @@ void setConcreteList() {
 
 		then(actual).isEqualTo(expected);
 	}
+
+	@Property
+	void sampleSelfRecursiveAbstract() {
+		LabMonkey sut = LabMonkey.labMonkeyBuilder()
+			.interfaceImplements(
+				SelfRecursiveAbstractValue.class,
+				Collections.singletonList(SelfRecursiveImplementationValue.class)
+			)
+			.objectIntrospector(ConstructorPropertiesArbitraryIntrospector.INSTANCE)
+			.build();
+
+		SelfRecursiveAbstractValue actual = sut.giveMeOne(SelfRecursiveAbstractValue.class);
+
+		then(actual).isNotNull();
+	}
 }