Fix Kotlin setPostCondition extension (#801)

naver · Oct 30, 2023 · dbffdf1 · dbffdf1
1 parent c5cc9ee
commit dbffdf1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/...y-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/ArbitraryBuilderExtensions.kt b/...y-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/ArbitraryBuilderExtensions.kt
@@ -30,22 +30,22 @@ fun <T> ArbitraryBuilder<T>.setInner(innerSpecConfigurer: ((InnerSpec) -> Unit))
     return this.setInner(InnerSpec().apply(innerSpecConfigurer))
 }
 
-inline fun <reified T> ArbitraryBuilder<T>.setPostCondition(expression: String, noinline predicate: (T) -> Boolean) =
-    this.setPostCondition(expression, T::class.java, predicate)
+inline fun <T, reified U> ArbitraryBuilder<T>.setPostCondition(expression: String, noinline predicate: (U) -> Boolean) =
+    this.setPostCondition(expression, U::class.java, predicate)
 
-inline fun <reified T> ArbitraryBuilder<T>.setPostCondition(
+inline fun <T, reified U> ArbitraryBuilder<T>.setPostCondition(
     expressionGenerator: ExpressionGenerator,
-    noinline predicate: (T) -> Boolean
-) = this.setPostCondition(expressionGenerator, T::class.java, predicate)
+    noinline predicate: (U) -> Boolean
+) = this.setPostCondition(expressionGenerator, U::class.java, predicate)
 
-inline fun <reified T> ArbitraryBuilder<T>.setPostCondition(
+inline fun <T, reified U> ArbitraryBuilder<T>.setPostCondition(
     expression: String,
-    noinline predicate: (T) -> Boolean,
+    noinline predicate: (U) -> Boolean,
     limit: Int
-) = this.setPostCondition(expression, T::class.java, predicate, limit)
+) = this.setPostCondition(expression, U::class.java, predicate, limit)
 
-inline fun <reified T> ArbitraryBuilder<T>.setPostCondition(
+inline fun <T, reified U> ArbitraryBuilder<T>.setPostCondition(
     expressionGenerator: ExpressionGenerator,
-    noinline predicate: (T) -> Boolean,
+    noinline predicate: (U) -> Boolean,
     limit: Int
-) = this.setPostCondition(expressionGenerator, T::class.java, predicate, limit)
+) = this.setPostCondition(expressionGenerator, U::class.java, predicate, limit)
diff --git a/...otlin-tests/src/test/kotlin/com/navercorp/fixturemonkey/tests/kotlin/KotestInJunitTest.kt b/...otlin-tests/src/test/kotlin/com/navercorp/fixturemonkey/tests/kotlin/KotestInJunitTest.kt
@@ -22,7 +22,9 @@ import com.navercorp.fixturemonkey.FixtureMonkey
 import com.navercorp.fixturemonkey.javax.validation.plugin.JavaxValidationPlugin
 import com.navercorp.fixturemonkey.kotest.KotestPlugin
 import com.navercorp.fixturemonkey.kotlin.KotlinPlugin
+import com.navercorp.fixturemonkey.kotlin.giveMeBuilder
 import com.navercorp.fixturemonkey.kotlin.giveMeOne
+import com.navercorp.fixturemonkey.kotlin.setPostCondition
 import com.navercorp.fixturemonkey.tests.TestEnvironment.TEST_COUNT
 import org.assertj.core.api.BDDAssertions.then
 import org.junit.jupiter.api.RepeatedTest
@@ -713,6 +715,20 @@ class KotestInJunitTest {
         }
     }
 
+    @RepeatedTest(TEST_COUNT)
+    fun setPostConditionExtension() {
+        class StringObject(val string: String)
+
+        val actual = SUT.giveMeBuilder<StringObject>()
+            .setPostCondition<StringObject, String>("string") {
+                it.length < 5
+            }
+            .sample()
+            .string
+
+        then(actual).hasSizeLessThan(5)
+    }
+
     companion object {
         private val SUT: FixtureMonkey = FixtureMonkey.builder()
             .plugin(JavaxValidationPlugin())