Use Gradle text fixtures to replace our custom testkit sourceset

Author: testinfected

Makefile

@@ -16,7 +16,7 @@ test:
 acceptance: ENV=test
 acceptance:
 	@echo "Running acceptance tests of version ${VERSION} in ${ENV} environment..."
-	@./gradlew acceptanceTest -Penv=${ENV}
+	@./gradlew server:acceptanceTest -Penv=${ENV}
 
 build: ENV=test
 build:

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

@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    id("java-test-fixtures")
 }
 
 val buildNumber by extra("0")
@@ -25,29 +26,9 @@ tasks.withType<KotlinCompile> {
     }
 }
 
-sourceSets {
-    create("testkit") {
-        compileClasspath += sourceSets.main.get().output
-        runtimeClasspath += sourceSets.main.get().output
-    }
-}
-
-val testkit by configurations.creating {
-    isCanBeResolved = false
-    isCanBeConsumed = true
-}
-
-val testkitImplementation by configurations.getting { extendsFrom(configurations.implementation.get()) }
-configurations["testImplementation"].extendsFrom(testkitImplementation)
-
-sourceSets.test {
-    compileClasspath += sourceSets["testkit"].output
-    runtimeClasspath += sourceSets["testkit"].output
-}
-
 val acceptance by sourceSets.creating {
-    compileClasspath += sourceSets.main.get().output + sourceSets["testkit"].output
-    runtimeClasspath += sourceSets.main.get().output + sourceSets["testkit"].output
+    compileClasspath += sourceSets.main.get().output + sourceSets["testFixtures"].output
+    runtimeClasspath += sourceSets.main.get().output + sourceSets["testFixtures"].output
 }
 
 val acceptanceImplementation by configurations.getting {
@@ -79,7 +60,7 @@ val acceptanceTest = tasks.register<Test>("acceptanceTest") {
     testClassesDirs = acceptance.output.classesDirs
     classpath = configurations[acceptance.runtimeClasspathConfigurationName] +
             sourceSets.main.get().output +
-            sourceSets["testkit"].output +
+            sourceSets["testFixtures"].output +
             acceptance.output
 
     project.properties["env"]?.let { systemProperty("env.name", it) }
@@ -99,12 +80,11 @@ tasks.check {
 dependencies {
     implementation(kotlin("reflect"))
 
-    testkitImplementation(libs.hamkrest)
-    testkitImplementation(libs.junit.api)
-    testkitImplementation(libs.konstruct)
-    testkitImplementation(libs.faker)
-    testkitImplementation(libs.minutest)
-    testkit(sourceSets["testkit"].output)
+    testFixturesApi(libs.hamkrest)
+    testFixturesApi(libs.junit.api)
+    testFixturesApi(libs.konstruct)
+    testFixturesApi(libs.minutest)
 
     testImplementation(kotlin("test"))
 }
+

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

@@ -7,7 +7,7 @@ class HexEncoder(upperCase: Boolean = true) {
         .let { if (upperCase) it.uppercase(Locale.getDefault()) else it }
         .toCharArray()
 
-    fun toHex(bytes: ByteArray): String {
+    fun encodeToHex(bytes: ByteArray): String {
         val hex = CharArray(bytes.size * 2)
         for (i in bytes.indices) {
             val v = bytes[i].toInt() and 0xFF
@@ -20,13 +20,13 @@ class HexEncoder(upperCase: Boolean = true) {
 
 fun String.toHex(upperCase: Boolean = true) = encodeToByteArray().toHex(upperCase)
 
-fun ByteArray.toHex(upperCase: Boolean = true) = HexEncoder(upperCase).toHex(this)
+fun ByteArray.toHex(upperCase: Boolean = true) = HexEncoder(upperCase).encodeToHex(this)
 
 
 object HexDecoder {
-    fun fromHex(hex: String): ByteArray = fromHex(hex.toCharArray())
+    fun decodeFromHex(hex: String): ByteArray = decode(hex.toCharArray())
 
-    private fun fromHex(hex: CharArray): ByteArray {
+    private fun decode(hex: CharArray): ByteArray {
         val len = hex.size
         require(len and 0x01 == 0) { "odd number of characters" }
         val out = ByteArray(len shr 1)
@@ -42,4 +42,4 @@ object HexDecoder {
     private fun toDigit(c: Char): Int = Character.digit(c, 16)
 }
 
-fun String.fromHex() = HexDecoder.fromHex(this)
+fun String.fromHex() = HexDecoder.decodeFromHex(this)

domain/src/testkit/kotlin/security/InMemoryUsers.kt domain/src/testFixtures/kotlin/security/InMemoryUsers.kt

@@ -10,7 +10,10 @@ dependencies {
     implementation(libs.konfig)
     runtimeOnly(libs.postgres)
 
-    testkitImplementation(project(path = ":domain", configuration = "testkit"))
+    testImplementation(testFixtures(project(":domain")))
+    testFixturesImplementation(project(":domain"))
+    testFixturesImplementation(libs.kabinet)
+    testFixturesImplementation(libs.konfig)
 }
 
 tasks.jar {

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

@@ -1,3 +1,4 @@
+
 plugins {
     id("kickstart")
     application
@@ -9,6 +10,7 @@ application {
     mainClass.set("kickstart.CLI")
 }
 
+
 dependencies {
     implementation(project(":domain"))
     implementation(project(":webapp"))
@@ -17,9 +19,9 @@ dependencies {
 
     runtimeOnly(libs.simple)
 
-    testkitImplementation(libs.mario)
-    testkitImplementation(libs.selenium.api)
-    testkitImplementation(libs.selenium.chromedriver)
+    testFixturesApi(libs.mario)
+    testFixturesApi(libs.selenium.api)
+    testFixturesApi(libs.selenium.chromedriver)
 
     testRuntimeOnly(libs.hamcrest.library)
     testRuntimeOnly(libs.juniversalchardet)

domain/src/testkit/kotlin/security/UserThat.kt domain/src/testFixtures/kotlin/security/UserThat.kt

@@ -9,9 +9,7 @@ import kickstart.tasks.signInAs
 import kickstart.tasks.signOut
 import kickstart.tasks.startUsing
 import kickstart.tasks.stopUsing
-import kotlin.test.AfterTest
-import kotlin.test.BeforeTest
-import kotlin.test.Test
+import kotlin.test.*
 
 class FeatureTest {
 

integration/build.gradle.kts

@@ -11,10 +11,9 @@ dependencies {
     implementation(libs.konfig)
     implementation(libs.molecule)
 
-    testkitImplementation(project(path = ":domain", configuration = "testkit"))
-    testkitImplementation(libs.skrapeit)
-    testkitImplementation(libs.hamkrest)
-
+    testFixturesApi(libs.skrapeit)
+    testFixturesImplementation(libs.molecule)
+    testImplementation(testFixtures(project(":domain")))
     testImplementation(libs.hamcrest.library)
 }