Fix setLazy with value wrapped by Just would not be manipulated (#900)

naver · Jan 29, 2024 · c4cedf6 · c4cedf6
1 parent eaacb14
commit c4cedf6
Show file tree

Hide file tree

Showing 3 changed files with 25 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,6 +9,8 @@ sectionStart
 ### v.1.0.13
 Add InterfacePlugin supports abstract classes through `abstractClassExtends` option.
 
+Fix setLazy with value wrapped by Just would not be manipulated
+
 sectionEnd
 
 sectionStart

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
@@ -31,6 +31,7 @@ import com.navercorp.fixturemonkey.api.introspector.FactoryMethodArbitraryIntros
 import com.navercorp.fixturemonkey.api.introspector.FailoverIntrospector
 import com.navercorp.fixturemonkey.api.introspector.FieldReflectionArbitraryIntrospector
 import com.navercorp.fixturemonkey.api.type.Types.GeneratingWildcardType
+import com.navercorp.fixturemonkey.customizer.Values
 import com.navercorp.fixturemonkey.kotlin.KotlinPlugin
 import com.navercorp.fixturemonkey.kotlin.get
 import com.navercorp.fixturemonkey.kotlin.giveMeBuilder
@@ -389,6 +390,23 @@ class KotlinTest {
         then(actual).isNull()
     }
 
+    @RepeatedTest(TEST_COUNT)
+    fun setLazyJustNotChanged() {
+        // given
+        class StringObject(val string: String)
+
+        val expected = StringObject("test")
+
+        // when
+        val actual = SUT.giveMeBuilder<StringObject>()
+            .setLazy("$") { Values.just(expected) }
+            .setExp(StringObject::string, "notTest")
+            .sample()
+
+        // then
+        then(actual).isEqualTo(expected)
+    }
+
     companion object {
         private val SUT: FixtureMonkey = FixtureMonkey.builder()
             .plugin(KotlinPlugin())

diff --git a/...e-monkey/src/main/java/com/navercorp/fixturemonkey/customizer/NodeSetLazyManipulator.java b/...e-monkey/src/main/java/com/navercorp/fixturemonkey/customizer/NodeSetLazyManipulator.java
@@ -23,6 +23,7 @@
 
 import net.jqwik.api.Arbitrary;
 
+import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary;
 import com.navercorp.fixturemonkey.api.container.DecomposedContainerValueFactory;
 import com.navercorp.fixturemonkey.api.lazy.LazyArbitrary;
 import com.navercorp.fixturemonkey.customizer.Values.Just;
@@ -64,7 +65,10 @@ public void manipulate(ObjectNode objectNode) {
 		}
 
 		if (value instanceof Just) {
-			value = (T)((Just)value).getValue();
+			Just just = (Just)value;
+			objectNode.setArbitrary(CombinableArbitrary.from(just::getValue));
+			lazyArbitrary.clear();
+			return;
 		}
 
 		NodeSetDecomposedValueManipulator<T> nodeSetDecomposedValueManipulator =