Use Konstruct to build test data

Author: testinfected

buildSrc/src/main/kotlin/kickstart.gradle.kts

@@ -101,6 +101,7 @@ dependencies {
 
     testkitImplementation(libs.hamkrest)
     testkitImplementation(libs.junit.api)
+    testkitImplementation(libs.konstruct)
     testkitImplementation(libs.faker)
     testkitImplementation(libs.minutest)
     testkit(sourceSets["testkit"].output)

buildSrc/src/main/kotlin/libs.kt

@@ -21,6 +21,8 @@ object libs {
 
     val konfig = "com.natpryce:konfig:1.6.10.0"
 
+    val konstruct = "com.vtence.konstruct:konstruct:0.6.0"
+
     val mario = "com.vtence.mario:mario:0.3.3"
 
     val minutest = "dev.minutest:minutest:2.0.0-rc4"

domain/build.gradle.kts

@@ -2,10 +2,6 @@ plugins {
     id("kickstart")
 }
 
-dependencies {
-    testkitImplementation(libs.hamkrest)
-}
-
 tasks.jar {
     isPreserveFileTimestamps = false
     isReproducibleFileOrder = true

domain/src/main/kotlin/security/User.kt

@@ -7,8 +7,8 @@ value class Username(val value: String): Serializable {
     override fun toString() = value.lowercase()
 }
 
-class User(val username: Username, private val password: PasswordHash) {
 
+data class User(val username: Username, private val password: PasswordHash) {
     val passwordHash: String by password::value
 
     fun checkPassword(secret: String) = password.validate(secret)

domain/src/testkit/kotlin/Builder.kt

@@ -1,14 +1,16 @@
 package kickstart.security
 
-import kickstart.Builder
+import com.vtence.konstruct.Factory
+import com.vtence.konstruct.property
 
-class UserBuilder(
-    var username: String = "john.doe",
-    var password: String = "secret"
-): Builder<User> {
-    override fun build(): User {
-        return User(username, password)
-    }
-}
+object UserMaker {
+    val username = property<User, String>()
+    val password = property<User, String>()
 
-fun user(build: UserBuilder.() -> Unit) = UserBuilder().apply(build)
+    val user = Factory {
+        User(
+            username = it.valueOf(username) ?: "john.doe",
+            password = it.valueOf(password) ?: "secret"
+        )
+    }
+}

domain/src/testkit/kotlin/security/UserBuilder.kt

@@ -11,7 +11,6 @@ dependencies {
     runtimeOnly(libs.postgres)
 
     testkitImplementation(project(path = ":domain", configuration = "testkit"))
-    testkitImplementation(libs.hamkrest)
 }
 
 tasks.jar {

integration/build.gradle.kts

@@ -7,8 +7,9 @@ import kickstart.db.eq
 
 class UsersDatabase(private val db: StatementExecutor) : UserBase {
 
-    fun add(user: User) {
+    fun add(user: User): User {
         Users.insert(user.record).execute(db)
+        return user
     }
 
     override fun findBy(username: Username): User? {

integration/src/main/kotlin/security/UsersDatabase.kt

@@ -2,7 +2,14 @@ package kickstart.security
 
 import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.present
+import com.vtence.konstruct.Provider
+import com.vtence.konstruct.a
+import com.vtence.konstruct.make
+import com.vtence.konstruct.with
 import kickstart.db.AbstractDatabaseTest
+import kickstart.security.UserMaker.password
+import kickstart.security.UserMaker.user
+import kickstart.security.UserMaker.username
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
@@ -21,9 +28,9 @@ class UsersDatabaseTest : AbstractDatabaseTest() {
 
     @Test
     fun `round trips users`() {
-        val samples = listOf(
-            user { username = "[email protected]"; password = "american" },
-            user { username = "[email protected]"; password = "british" }
+        val samples = make(
+            a(user, with(username, "[email protected]"), with(password,"american")),
+            a(user, with(username, "[email protected]"), with(password,"british")),
         )
 
         samples.forEach {  assertCanBePersisted(it) }
@@ -32,9 +39,9 @@ class UsersDatabaseTest : AbstractDatabaseTest() {
     @Test
     fun `finds user by username`() {
         persist(
-            user { username = "[email protected]" },
-            user { username = "[email protected]" },
-            user { username = "[email protected]"}
+            a(user, with(username, "[email protected]")),
+            a(user, with(username, "[email protected]")),
+            a(user, with(username, "[email protected]")),
         )
         val match = db.findBy(Username("[email protected]"))
 
@@ -43,12 +50,12 @@ class UsersDatabaseTest : AbstractDatabaseTest() {
 
     @Test
     fun `refuses to add account if username is already taken`() {
-        persist(user { username = "[email protected]" })
+        persist(a(user, with(username, "[email protected]")),)
 
-        assertThrows<SQLException> { db.add(user { username = "[email protected]" }.build()) }
+        assertThrows<SQLException> { persist(a(user, with(username, "[email protected]"))) }
     }
 
-    private fun assertCanBePersisted(user: UserBuilder) {
+    private fun assertCanBePersisted(user: User) {
         assertReloadsWithSameState(persisted(user))
     }
 
@@ -57,13 +64,13 @@ class UsersDatabaseTest : AbstractDatabaseTest() {
         assertThat("persisted entity", persisted, present(hasSameStateAs(original)))
     }
 
-    private fun persist(vararg users: UserBuilder) {
-        users.forEach { persisted(it) }
+    private fun persist(vararg users: Provider<User>) {
+        users.forEach { persisted(it()) }
     }
 
-    private fun persisted(user: UserBuilder): User {
+    private fun persisted(user: User): User {
         return transaction {
-            user.build().also { db.add(it) }
+            db.add(user)
         }
     }
 }

integration/src/test/kotlin/security/UsersDatabaseTest.kt

@@ -17,7 +17,6 @@ dependencies {
 
     runtimeOnly(libs.simple)
 
-    testkitImplementation(libs.hamkrest)
     testkitImplementation(libs.mario)
     testkitImplementation(libs.selenium.api)
     testkitImplementation(libs.selenium.chromedriver)