Add better support Kotest

naver · Jan 16, 2024 · 45d7359 · 45d7359
1 parent 23a3f22
commit 45d7359
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/docs/content/v1.0.x/release-notes/_index.md b/docs/content/v1.0.x/release-notes/_index.md
@@ -11,6 +11,8 @@ Fix setting object field by any other type.
 
 Refactor does not throw exception when it cannot generate, the next ArbitraryIntrospector will be used.
 
+Add better support Kotest by modifying `giveMeArb` more Kotlin-like, by adding `setArb` API.
+
 sectionEnd
 
 sectionStart

diff --git a/fixture-monkey-kotest/src/main/kotlin/com/navercorp/fixturemonkey/kotest/ArbExtension.kt b/fixture-monkey-kotest/src/main/kotlin/com/navercorp/fixturemonkey/kotest/ArbExtension.kt
@@ -22,14 +22,19 @@ package com.navercorp.fixturemonkey.kotest
 
 import com.navercorp.fixturemonkey.ArbitraryBuilder
 import com.navercorp.fixturemonkey.FixtureMonkey
+import com.navercorp.fixturemonkey.api.property.PropertySelector
 import com.navercorp.fixturemonkey.api.type.TypeReference
 import com.navercorp.fixturemonkey.api.type.Types
 import com.navercorp.fixturemonkey.kotlin.giveMeBuilder
 import com.navercorp.fixturemonkey.kotlin.giveMeOne
+import com.navercorp.fixturemonkey.kotlin.property
 import io.kotest.property.Arb
 import io.kotest.property.arbitrary.arbitrary
+import io.kotest.property.arbitrary.single
 import java.lang.reflect.AnnotatedType
 import java.lang.reflect.Type
+import java.util.function.Supplier
+import kotlin.reflect.KProperty1
 import kotlin.reflect.full.isSubtypeOf
 import kotlin.reflect.jvm.javaType
 import kotlin.reflect.typeOf
@@ -62,7 +67,21 @@ inline fun <reified T> FixtureMonkey.giveMeArb(): Arb<T> {
     }
 }
 
-inline fun <reified T> FixtureMonkey.giveMeArb(crossinline applyBuilder: (ArbitraryBuilder<T>) -> ArbitraryBuilder<T>): Arb<T> =
+inline fun <reified T> FixtureMonkey.giveMeArb(crossinline applyBuilder: ArbitraryBuilder<T>.() -> ArbitraryBuilder<T>): Arb<T> =
     arbitrary {
         applyBuilder.invoke(this@giveMeArb.giveMeBuilder()).sample()
     }
+
+fun <T : Any?> ArbitraryBuilder<T>.setArb(expression: String, arb: Arb<Any>): ArbitraryBuilder<T> = this.set(
+    expression,
+    Supplier { arb.single() }
+)
+
+fun <T : Any?> ArbitraryBuilder<T>.setArb(propertySelector: PropertySelector, arb: Arb<Any>): ArbitraryBuilder<T> =
+    this.set(
+        propertySelector,
+        Supplier { arb.single() }
+    )
+
+fun <T : Any?> ArbitraryBuilder<T>.setArb(p: KProperty1<T, Any?>, arb: Arb<Any>): ArbitraryBuilder<T> =
+    this.set(property(p), Supplier { arb.single() })
diff --git a/...-monkey-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/ExpressionGenerators.kt b/...-monkey-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/ExpressionGenerators.kt
@@ -295,10 +295,10 @@ private class EmptyExpressionGenerator : ExpressionGenerator {
     override fun generate(propertyNameResolver: PropertyNameResolver): String = ""
 }
 
-internal fun <R, E> property(property: KProperty1<R, E?>): ExpressionGenerator =
+fun <R, E> property(property: KProperty1<R, E?>): ExpressionGenerator =
     PropertyExpressionGenerator(KotlinProperty(property))
 
-internal fun <R, E> property(function: KFunction1<R, E?>): ExpressionGenerator =
+fun <R, E> property(function: KFunction1<R, E?>): ExpressionGenerator =
     PropertyExpressionGenerator(KotlinGetterProperty(function))
 
 @JvmName("collection")

diff --git a/fixture-monkey-tests/kotlin-tests/build.gradle.kts b/fixture-monkey-tests/kotlin-tests/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     testImplementation(project(":fixture-monkey-javax-validation"))
     testImplementation("io.kotest:kotest-runner-junit5:${Versions.KOTEST}")
     testImplementation("io.kotest:kotest-assertions-core:${Versions.KOTEST}")
+    testImplementation("io.kotest.extensions:kotest-property-arbs:2.1.2")
     testImplementation("org.projectlombok:lombok:${Versions.LOMBOK}")
     testAnnotationProcessor("org.projectlombok:lombok:${Versions.LOMBOK}")
 }
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
@@ -21,11 +21,16 @@ package com.navercorp.fixturemonkey.tests.kotlin
 import com.navercorp.fixturemonkey.FixtureMonkey
 import com.navercorp.fixturemonkey.javax.validation.plugin.JavaxValidationPlugin
 import com.navercorp.fixturemonkey.kotest.KotestPlugin
+import com.navercorp.fixturemonkey.kotest.giveMeArb
+import com.navercorp.fixturemonkey.kotest.setArb
 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 io.kotest.property.Arb
+import io.kotest.property.arbitrary.single
+import io.kotest.property.arbs.geo.zipcodes
 import org.assertj.core.api.BDDAssertions.then
 import org.junit.jupiter.api.RepeatedTest
 import java.math.BigDecimal
@@ -747,6 +752,17 @@ class KotestInJunitTest {
         then(actual).isGreaterThanOrEqualTo(0.0)
     }
 
+    @RepeatedTest(TEST_COUNT)
+    fun sampleSetArb() {
+        class StringObject(val string: String)
+
+        val actual = SUT.giveMeArb<StringObject> { setArb(StringObject::string, Arb.zipcodes()) }
+            .single()
+            .string
+
+        then(actual).hasSize(5)
+    }
+
     companion object {
         private val SUT: FixtureMonkey = FixtureMonkey.builder()
             .plugin(JavaxValidationPlugin())

diff --git a/...tlin-tests/src/test/kotlin/com/navercorp/fixturemonkey/tests/kotlin/KotestInKotestTest.kt b/...tlin-tests/src/test/kotlin/com/navercorp/fixturemonkey/tests/kotlin/KotestInKotestTest.kt
@@ -51,7 +51,7 @@ class KotestInKotestTest : StringSpec({
         }
     }
     "forAll" {
-        forAll(SUT.giveMeArb<String> { it.set("test") }) { a ->
+        forAll(SUT.giveMeArb<String> { set("test") }) { a ->
             a == "test"
         }
     }