Polish for 0.5 (#584)

naver · Feb 28, 2023 · f8c8423 · f8c8423
1 parent 1ab7167
commit f8c8423
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/fixture-monkey-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/type/KotlinTypes.kt b/fixture-monkey-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/type/KotlinTypes.kt
@@ -91,7 +91,7 @@ fun getAnnotatedType(ownerType: AnnotatedType, kProperty: KProperty<*>): Annotat
 
         override fun getRawType(): Type = type.rawType
 
-        override fun getOwnerType(): Type = type.ownerType
+        override fun getOwnerType(): Type? = type.ownerType
     }
 
     val resolvedGenericsTypesArray = resolvedGenericsTypes.toTypedArray()

diff --git a/...src/main/java/com/navercorp/fixturemonkey/resolver/NodeSetDecomposedValueManipulator.java b/...src/main/java/com/navercorp/fixturemonkey/resolver/NodeSetDecomposedValueManipulator.java
@@ -63,13 +63,23 @@ public NodeSetDecomposedValueManipulator(
 	public void manipulate(ArbitraryNode arbitraryNode) {
 		Class<?> actualType = Types.getActualType(arbitraryNode.getProperty().getType());
 		if (value != null && !isAssignable(value.getClass(), actualType)) {
+			String parentNodeLogMessage = arbitraryNode.getResolvedParentProperty() != null
+				? String.format(
+				"parent node type : %s",
+				arbitraryNode.getResolvedParentProperty().getType().getTypeName()
+			)
+				: "";
 			throw new IllegalArgumentException(
-				"The value is not of the same type as the property."
-					+ " node name: " + arbitraryNode.getArbitraryProperty()
-					.getObjectProperty()
-					.getResolvedPropertyName()
-					+ " node type: " + arbitraryNode.getProperty().getType().getTypeName()
-					+ " value type: " + value.getClass().getTypeName()
+				String.format(
+					"The value is not of the same type as the property.\n"
+						+ "%s node name: %s, node type: %s, value type: %s",
+					parentNodeLogMessage,
+					arbitraryNode.getArbitraryProperty()
+						.getObjectProperty()
+						.getResolvedPropertyName(),
+					arbitraryNode.getProperty().getType().getTypeName(),
+					value.getClass().getTypeName()
+				)
 			);
 		}
 		setValue(arbitraryNode, value);