From 9360a3390ced88a06a31c7cd6a167fa323f11f08 Mon Sep 17 00:00:00 2001
From: Sergey Shatunov <me@aur.rocks>
Date: Tue, 9 Jan 2024 20:56:21 +0800
Subject: [PATCH] test: split unit & integration tests

---
 .github/workflows/build-and-test.yml          |   8 +-
 .../Run_integration_tests.xml                 |  24 ++++
 .../{Run_tests.xml => Run_unit_tests.xml}     |   2 +-
 build.gradle.kts                              | 122 ++++++++++++------
 gradle/libs.versions.toml                     |   9 +-
 settings.gradle.kts                           |   4 +
 .../publish/test/GradleBuildScriptSpec.kt     |   4 +-
 .../aur/cursed/publish/CursedPublishSpec.kt   |   4 +-
 .../cursed/publish/test/internal/container.kt |  79 ------------
 .../aur/cursed/publish/test/internal/test.kt  | 105 ---------------
 .../test/models/GameVersionTypesSpec.kt       |   8 +-
 .../publish/test/models/GameVersionsSpec.kt   |   8 +-
 testlib/build.gradle.kts                      |  20 +++
 .../aur/cursed/publish/test/KotestConfig.kt   |   0
 .../publish/test/models/ModelFixtures.kt      |  12 ++
 .../publish/test/models/version-types.json    |   0
 .../cursed/publish/test/models/versions.json  |   0
 17 files changed, 160 insertions(+), 249 deletions(-)
 create mode 100644 .idea/runConfigurations/Run_integration_tests.xml
 rename .idea/runConfigurations/{Run_tests.xml => Run_unit_tests.xml} (88%)
 rename src/{test => integrationTest}/kotlin/rocks/aur/cursed/publish/test/GradleBuildScriptSpec.kt (97%)
 delete mode 100644 src/test/kotlin/rocks/aur/cursed/publish/test/internal/container.kt
 delete mode 100644 src/test/kotlin/rocks/aur/cursed/publish/test/internal/test.kt
 create mode 100644 testlib/build.gradle.kts
 rename {src/test => testlib/src/main}/kotlin/rocks/aur/cursed/publish/test/KotestConfig.kt (100%)
 create mode 100644 testlib/src/main/kotlin/rocks/aur/cursed/publish/test/models/ModelFixtures.kt
 rename {src/test => testlib/src/main}/resources/rocks/aur/cursed/publish/test/models/version-types.json (100%)
 rename {src/test => testlib/src/main}/resources/rocks/aur/cursed/publish/test/models/versions.json (100%)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 87b4fab..c7e712e 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   build:
-    name: Build
+    name: Build & Unit tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
@@ -29,9 +29,9 @@ jobs:
         with:
           gradle-version: wrapper
       - name: Build
-        run: gradle -s assemble
+        run: gradle -s :build
   test:
-    name: Test
+    name: Integration tests
     runs-on: ubuntu-latest
     needs: build
     strategy:
@@ -62,7 +62,7 @@ jobs:
         with:
           gradle-version: wrapper
       - name: Check
-        run: gradle -s check
+        run: gradle -s :test :integrationTest
         env:
           CURSED_PUBLISH_TEST_GRADLE_VERSION: "${{ matrix.gradle }}"
           CURSED_PUBLISH_TEST_JAVA_VERSION: "${{ matrix.java }}"
diff --git a/.idea/runConfigurations/Run_integration_tests.xml b/.idea/runConfigurations/Run_integration_tests.xml
new file mode 100644
index 0000000..c4cd936
--- /dev/null
+++ b/.idea/runConfigurations/Run_integration_tests.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run integration tests" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":integrationTest" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run_tests.xml b/.idea/runConfigurations/Run_unit_tests.xml
similarity index 88%
rename from .idea/runConfigurations/Run_tests.xml
rename to .idea/runConfigurations/Run_unit_tests.xml
index 829a0b0..db89d22 100644
--- a/.idea/runConfigurations/Run_tests.xml
+++ b/.idea/runConfigurations/Run_unit_tests.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run tests" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Run unit tests" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/build.gradle.kts b/build.gradle.kts
index 5bcf90b..46486fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,29 +12,33 @@ plugins {
     alias(libs.plugins.plugin.publish)
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_1_8
-    sourceCompatibility = JavaVersion.VERSION_1_8
-}
+allprojects {
+    pluginManager.withPlugin("org.gradle.java-base") {
+        java {
+            targetCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = JavaVersion.VERSION_1_8
+        }
+    }
 
-tasks.withType<JavaCompile>().configureEach {
-    options.encoding = "UTF-8"
-}
+    tasks.withType<JavaCompile>().configureEach {
+        options.encoding = "UTF-8"
+    }
 
-tasks.withType<KotlinJvmCompile>().configureEach {
-    compilerOptions {
-        apiVersion = KotlinVersion.KOTLIN_1_8
-        languageVersion = KotlinVersion.KOTLIN_1_8
-        jvmTarget = JvmTarget.JVM_1_8
-        javaParameters = true
-        allWarningsAsErrors = true
-        freeCompilerArgs.addAll(
-            "-Xlambdas=indy",
-            "-Xjvm-default=all",
-            "-Xemit-jvm-type-annotations",
-            "-Xnew-inference",
-            "-Xassertions=jvm"
-        )
+    tasks.withType<KotlinJvmCompile>().configureEach {
+        compilerOptions {
+            apiVersion = KotlinVersion.KOTLIN_1_8
+            languageVersion = KotlinVersion.KOTLIN_1_8
+            jvmTarget = JvmTarget.JVM_1_8
+            javaParameters = true
+            allWarningsAsErrors = true
+            freeCompilerArgs.addAll(
+                "-Xlambdas=indy",
+                "-Xjvm-default=all",
+                "-Xemit-jvm-type-annotations",
+                "-Xnew-inference",
+                "-Xassertions=jvm"
+            )
+        }
     }
 }
 
@@ -43,39 +47,56 @@ repositories {
 }
 
 dependencies {
+    constraints {
+        implementation(libs.annotations)
+    }
+
+    implementation(platform(embeddedKotlin("bom")))
+    implementation(platform(libs.kotlinx.coroutines.bom))
+    implementation(platform(libs.slf4j.bom))
     implementation(gradleApi())
     implementation(gradleKotlinDsl())
-    implementation(embeddedKotlin("stdlib"))
+    implementation(embeddedKotlin("stdlib-jdk8"))
+    implementation(libs.ktor.client.cio)
     implementation(libs.ktor.client.content.negotiation)
     implementation(libs.ktor.client.core)
     implementation(libs.ktor.client.encoding)
     implementation(libs.ktor.serialization.kotlinx.json)
-    implementation(libs.ktor.client.apache5)
-
-    compileOnly(libs.annotations)
-}
 
-gradlePlugin {
-    website = "https://github.com/Prototik/CursedPublish"
-    vcsUrl = "https://github.com/Prototik/CursedPublish"
-    plugins {
-        register("cursed-publish") {
-            id = "rocks.aur.cursed.publish"
-            implementationClass = "rocks.aur.cursed.publish.CursedPublishPlugin"
-            description = "Plugin to publish artifacts to the CurseForge portal"
-            displayName = "Cursed Publish plugin"
-            tags.addAll("curseforge", "publish", "publication", "upload", "release")
-        }
-    }
+    compileOnlyApi(libs.annotations)
 }
 
 testing {
     suites {
         val test by getting(JvmTestSuite::class) {
-            useJUnitJupiter()
+            testType = TestSuiteType.UNIT_TEST
+        }
+
+        val integrationTest by registering(JvmTestSuite::class) {
+            testType = TestSuiteType.INTEGRATION_TEST
 
             dependencies {
-                implementation(libs.ktor.client.mock)
+                implementation(project())
+            }
+
+            targets.configureEach {
+                testTask {
+                    shouldRunAfter(test)
+                }
+            }
+        }
+
+        withType<JvmTestSuite>().configureEach {
+            val suiteName = name
+
+            useJUnitJupiter(libs.versions.junit)
+
+            dependencies {
+                implementation(platform("org.jetbrains.kotlin:kotlin-bom:$embeddedKotlinVersion"))
+                implementation(platform(libs.kotlinx.coroutines.bom))
+                implementation(platform(libs.slf4j.bom))
+                implementation(platform(libs.junit.bom))
+                implementation(projects.testlib)
                 implementation.bundle(libs.bundles.kotest)
             }
 
@@ -85,14 +106,13 @@ testing {
                         "kotest.framework.parallelism",
                         Runtime.getRuntime().availableProcessors().coerceAtLeast(2)
                     )
-                    systemProperty("kotest.framework.classpath.scanning.autoscan.disable", "true")
                     systemProperty("kotest.framework.classpath.scanning.config.disable", "true")
                     systemProperty("kotest.framework.config.fqn", "rocks.aur.cursed.publish.test.KotestConfig")
 
                     jvmArgumentProviders += CommandLineArgumentProvider {
                         listOf(
                             "-Dgradle.build.dir=${project.layout.buildDirectory.get().asFile}",
-                            "-Dgradle.test.suite.name=${this@getting.name}"
+                            "-Dgradle.test.suite.name=${suiteName}"
                         )
                     }
 
@@ -113,3 +133,21 @@ testing {
         }
     }
 }
+
+gradlePlugin {
+    website = "https://github.com/Prototik/CursedPublish"
+    vcsUrl = "https://github.com/Prototik/CursedPublish"
+    isAutomatedPublishing = true
+
+    testSourceSets(sourceSets["integrationTest"])
+
+    plugins {
+        register("cursed-publish") {
+            id = "rocks.aur.cursed.publish"
+            implementationClass = "rocks.aur.cursed.publish.CursedPublishPlugin"
+            description = "Plugin to publish artifacts to the CurseForge portal"
+            displayName = "Cursed Publish plugin"
+            tags.addAll("curseforge", "publish", "publication", "upload", "release")
+        }
+    }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2683c4d..e087d3b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,11 +1,15 @@
 [versions]
 annotations = "24.1.0"
+junit = "5.10.1"
 kotest = "5.8.0"
 kotest-extensions-mockserver = "1.3.0"
+kotlinx-coroutines = "1.7.3"
 ktor = "2.3.7"
+slf4j = "2.0.10"
 
 [libraries]
 annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
 kotest-extensions-htmlreporter = { module = "io.kotest:kotest-extensions-htmlreporter", version.ref = "kotest" }
 kotest-extensions-junitxml = { module = "io.kotest:kotest-extensions-junitxml", version.ref = "kotest" }
@@ -13,12 +17,13 @@ kotest-extensions-mockserver = { module = "io.kotest.extensions:kotest-extension
 kotest-framework-datatest = { module = "io.kotest:kotest-framework-datatest-jvm", version.ref = "kotest" }
 kotest-property = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" }
-ktor-client-apache5 = { module = "io.ktor:ktor-client-apache5-jvm", version.ref = "ktor" }
+kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "kotlinx-coroutines" }
+ktor-client-cio = { module = "io.ktor:ktor-client-cio-jvm", version.ref = "ktor" }
 ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation-jvm", version.ref = "ktor" }
 ktor-client-core = { module = "io.ktor:ktor-client-core-jvm", version.ref = "ktor" }
 ktor-client-encoding = { module = "io.ktor:ktor-client-encoding-jvm", version.ref = "ktor" }
-ktor-client-mock = { module = "io.ktor:ktor-client-mock-jvm", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json-jvm", version.ref = "ktor" }
+slf4j-bom = { module = "org.slf4j:slf4j-bom", version.ref = "slf4j" }
 
 [bundles]
 kotest = [
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 15c7dce..2cb92e8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,8 +3,12 @@ plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
 
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
 rootProject.name = "cursed-publish"
 
+include(":testlib")
+
 gradleEnterprise {
     if (System.getenv("CI") != null) {
         buildScan {
diff --git a/src/test/kotlin/rocks/aur/cursed/publish/test/GradleBuildScriptSpec.kt b/src/integrationTest/kotlin/rocks/aur/cursed/publish/test/GradleBuildScriptSpec.kt
similarity index 97%
rename from src/test/kotlin/rocks/aur/cursed/publish/test/GradleBuildScriptSpec.kt
rename to src/integrationTest/kotlin/rocks/aur/cursed/publish/test/GradleBuildScriptSpec.kt
index 1d1c2c9..6faedba 100644
--- a/src/test/kotlin/rocks/aur/cursed/publish/test/GradleBuildScriptSpec.kt
+++ b/src/integrationTest/kotlin/rocks/aur/cursed/publish/test/GradleBuildScriptSpec.kt
@@ -46,7 +46,7 @@ sealed class GradleBuildScriptSpec(
             `when`(gameVersionTypesRequest).respond(
                 HttpResponse.response()
                     .withBody(
-                        GameVersionTypesSpec.stream().bufferedReader().readText(),
+                        ModelFixtures.gameVersionTypes().bufferedReader().readText(),
                         MediaType.APPLICATION_JSON_UTF_8
                     )
             )
@@ -54,7 +54,7 @@ sealed class GradleBuildScriptSpec(
             `when`(gameVersionsRequest).respond(
                 HttpResponse.response()
                     .withBody(
-                        GameVersionsSpec.stream().bufferedReader().readText(),
+                        ModelFixtures.gameVersions().bufferedReader().readText(),
                         MediaType.APPLICATION_JSON_UTF_8
                     )
             )
diff --git a/src/main/kotlin/rocks/aur/cursed/publish/CursedPublishSpec.kt b/src/main/kotlin/rocks/aur/cursed/publish/CursedPublishSpec.kt
index 77f6073..4988106 100644
--- a/src/main/kotlin/rocks/aur/cursed/publish/CursedPublishSpec.kt
+++ b/src/main/kotlin/rocks/aur/cursed/publish/CursedPublishSpec.kt
@@ -2,7 +2,7 @@ package rocks.aur.cursed.publish
 
 import io.ktor.client.*
 import io.ktor.client.engine.*
-import io.ktor.client.engine.apache5.*
+import io.ktor.client.engine.cio.*
 import org.gradle.api.*
 import org.gradle.api.provider.*
 import org.gradle.api.tasks.*
@@ -110,7 +110,7 @@ interface CursedPublishSpec {
 
         object Default : HttpClientInitializer {
             override fun create(config: Action<in HttpClientConfig<*>>): HttpClient {
-                return HttpClient(Apache5) {
+                return HttpClient(CIO) {
                     config.execute(this)
                 }
             }
diff --git a/src/test/kotlin/rocks/aur/cursed/publish/test/internal/container.kt b/src/test/kotlin/rocks/aur/cursed/publish/test/internal/container.kt
deleted file mode 100644
index 2bd9207..0000000
--- a/src/test/kotlin/rocks/aur/cursed/publish/test/internal/container.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-@file:OptIn(ExperimentalTypeInference::class)
-
-package rocks.aur.cursed.publish.test.internal
-
-import io.kotest.core.names.*
-import io.kotest.core.spec.style.scopes.*
-import io.kotest.datatest.*
-import kotlin.experimental.*
-
-suspend fun <T> ContainerScope.withDataContainer(
-    first: T, second: T, vararg rest: T, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer(listOf(first, second) + rest, test)
-
-fun <T> RootScope.withDataContainer(
-    first: T, second: T, vararg rest: T, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer(listOf(first, second) + rest, test)
-
-suspend fun <T> ContainerScope.withDataContainer(
-    ts: Sequence<T>, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer(ts.toList(), test)
-
-fun <T> RootScope.withDataContainer(
-    ts: Sequence<T>, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer(ts.toList(), test)
-
-suspend fun <T> ContainerScope.withDataContainer(
-    ts: Iterable<T>, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer({ getStableIdentifier(it) }, ts, test)
-
-fun <T> RootScope.withDataContainer(
-    ts: Iterable<T>, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer({ getStableIdentifier(it) }, ts, test)
-
-suspend fun <T> ContainerScope.withDataContainer(
-    nameFn: (T) -> String, ts: Sequence<T>, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer(nameFn, ts.toList(), test)
-
-fun <T> RootScope.withDataContainer(
-    nameFn: (T) -> String, ts: Sequence<T>, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer(nameFn, ts.toList(), test)
-
-suspend fun <T> ContainerScope.withDataContainer(
-    nameFn: (T) -> String, first: T, second: T, vararg rest: T, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer(nameFn, listOf(first, second) + rest, test)
-
-fun <T> RootScope.withDataContainer(
-    nameFn: (T) -> String, first: T, second: T, vararg rest: T, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainer(nameFn, listOf(first, second) + rest, test)
-
-suspend fun <T> ContainerScope.withDataContainer(
-    nameFn: (T) -> String, @BuilderInference ts: Iterable<T>, @BuilderInference test: suspend ContainerScope.(T) -> Unit
-) = withDataContainerImpl(ts.asSequence().map { nameFn(it) to it }, test)
-
-@JvmName("withDataContainerMap")
-suspend fun <T> ContainerScope.withDataContainer(data: Map<String, T>, test: suspend ContainerScope.(T) -> Unit) =
-    withDataContainerImpl(data.asSequence().map { (name, t) -> name to t }, test)
-
-
-private suspend inline fun <T> ContainerScope.withDataContainerImpl(
-    data: Sequence<Pair<String, T>>, crossinline test: suspend ContainerScope.(T) -> Unit
-) = data.forEach { (name, t) ->
-    registerContainer(TestName(name), false, null) { AbstractContainerScope(this).test(t) }
-}
-
-fun <T> RootScope.withDataContainer(
-    nameFn: (T) -> String, @BuilderInference ts: Iterable<T>, @BuilderInference test: suspend ContainerScope.(T) -> Unit
-) = withDataContainerImpl(ts.asSequence().map { nameFn(it) to it }, test)
-
-@JvmName("withDataContainerMap")
-fun <T> RootScope.withDataContainer(
-    data: Map<String, T>, test: suspend ContainerScope.(T) -> Unit
-) = withDataContainerImpl(data.asSequence().map { (name, t) -> name to t }, test)
-
-private inline fun <T> RootScope.withDataContainerImpl(
-    data: Sequence<Pair<String, T>>, crossinline test: suspend ContainerScope.(T) -> Unit
-) = data.forEach { (name, t) ->
-    addContainer(TestName(name), false, null) { this.test(t) }
-}
-
diff --git a/src/test/kotlin/rocks/aur/cursed/publish/test/internal/test.kt b/src/test/kotlin/rocks/aur/cursed/publish/test/internal/test.kt
deleted file mode 100644
index 71fd180..0000000
--- a/src/test/kotlin/rocks/aur/cursed/publish/test/internal/test.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-@file:OptIn(ExperimentalTypeInference::class)
-
-package rocks.aur.cursed.publish.test.internal
-
-import io.kotest.core.names.*
-import io.kotest.core.spec.style.scopes.*
-import io.kotest.core.test.*
-import io.kotest.datatest.*
-import kotlin.experimental.*
-
-suspend fun <T> ContainerScope.withDataTest(
-    first: T,
-    second: T,
-    vararg rest: T,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest(listOf(first, second) + rest, test)
-
-fun <T> RootScope.withDataTest(
-    first: T,
-    second: T,
-    vararg rest: T,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest(listOf(first, second) + rest, test)
-
-suspend fun <T> ContainerScope.withDataTest(
-    ts: Sequence<T>,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest(ts.toList(), test)
-
-fun <T> RootScope.withDataTest(
-    ts: Sequence<T>,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest(ts.toList(), test)
-
-suspend fun <T> ContainerScope.withDataTest(
-    ts: Iterable<T>,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest({ getStableIdentifier(it) }, ts, test)
-
-fun <T> RootScope.withDataTest(
-    ts: Iterable<T>,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest({ getStableIdentifier(it) }, ts, test)
-
-suspend fun <T> ContainerScope.withDataTest(
-    nameFn: (T) -> String,
-    ts: Sequence<T>,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest(nameFn, ts.toList(), test)
-
-fun <T> RootScope.withDataTest(
-    nameFn: (T) -> String,
-    ts: Sequence<T>,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest(nameFn, ts.toList(), test)
-
-suspend fun <T> ContainerScope.withDataTest(
-    nameFn: (T) -> String,
-    first: T,
-    second: T,
-    vararg rest: T,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest(nameFn, listOf(first, second) + rest, test)
-
-fun <T> RootScope.withDataTest(
-    nameFn: (T) -> String,
-    first: T,
-    second: T,
-    vararg rest: T,
-    test: suspend TestScope.(T) -> Unit
-) = withDataTest(nameFn, listOf(first, second) + rest, test)
-
-suspend fun <T> ContainerScope.withDataTest(
-    nameFn: (T) -> String,
-    @BuilderInference ts: Iterable<T>,
-    @BuilderInference test: suspend TestScope.(T) -> Unit
-) = withDataTestImpl(ts.asSequence().map { nameFn(it) to it }, test)
-
-fun <T> RootScope.withDataTest(
-    nameFn: (T) -> String,
-    @BuilderInference ts: Iterable<T>,
-    @BuilderInference test: suspend TestScope.(T) -> Unit
-) = withDataTestImpl(ts.asSequence().map { nameFn(it) to it }, test)
-
-@JvmName("withDataTestMap")
-suspend fun <T> ContainerScope.withDataTest(data: Map<String, T>, test: suspend TestScope.(T) -> Unit) =
-    withDataTestImpl(data.asSequence().map { (name, t) -> name to t }, test)
-
-@JvmName("withDataTestMap")
-fun <T> RootScope.withDataTest(data: Map<String, T>, test: suspend TestScope.(T) -> Unit) =
-    withDataTestImpl(data.asSequence().map { (name, t) -> name to t }, test)
-
-private suspend inline fun <T> ContainerScope.withDataTestImpl(
-    data: Sequence<Pair<String, T>>,
-    crossinline test: suspend TestScope.(T) -> Unit
-) = data.forEach { (name, t) ->
-    registerTest(TestName(name), false, null) { this.test(t) }
-}
-
-private inline fun <T> RootScope.withDataTestImpl(
-    data: Sequence<Pair<String, T>>,
-    crossinline test: suspend TestScope.(T) -> Unit
-) = data.forEach { (name, t) ->
-    addTest(TestName(name), false, null) { this.test(t) }
-}
diff --git a/src/test/kotlin/rocks/aur/cursed/publish/test/models/GameVersionTypesSpec.kt b/src/test/kotlin/rocks/aur/cursed/publish/test/models/GameVersionTypesSpec.kt
index 09774df..cc39c9b 100644
--- a/src/test/kotlin/rocks/aur/cursed/publish/test/models/GameVersionTypesSpec.kt
+++ b/src/test/kotlin/rocks/aur/cursed/publish/test/models/GameVersionTypesSpec.kt
@@ -6,12 +6,11 @@ import kotlinx.serialization.json.*
 import rocks.aur.cursed.publish.*
 import rocks.aur.cursed.publish.internal.*
 import rocks.aur.cursed.publish.internal.model.*
-import java.io.*
 
 @OptIn(CursedInternalApi::class)
 object GameVersionTypesSpec : FunSpec({
     test("serialization") {
-        val types = GameVersionTypesSpec.stream().use { stream ->
+        val types = ModelFixtures.gameVersionTypes().use { stream ->
             CursedJson.decodeFromString<JsonArray>(stream.bufferedReader().readText())
         }
 
@@ -20,7 +19,4 @@ object GameVersionTypesSpec : FunSpec({
 
         serialized shouldBe types
     }
-}) {
-    fun stream(): InputStream = GameVersionTypesSpec::class.java.getResourceAsStream("version-types.json")
-        ?: throw AssertionError("no version-types.json was found")
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/src/test/kotlin/rocks/aur/cursed/publish/test/models/GameVersionsSpec.kt b/src/test/kotlin/rocks/aur/cursed/publish/test/models/GameVersionsSpec.kt
index 64dfe1b..a130680 100644
--- a/src/test/kotlin/rocks/aur/cursed/publish/test/models/GameVersionsSpec.kt
+++ b/src/test/kotlin/rocks/aur/cursed/publish/test/models/GameVersionsSpec.kt
@@ -6,12 +6,11 @@ import kotlinx.serialization.json.*
 import rocks.aur.cursed.publish.*
 import rocks.aur.cursed.publish.internal.*
 import rocks.aur.cursed.publish.internal.model.*
-import java.io.*
 
 @OptIn(CursedInternalApi::class)
 object GameVersionsSpec : FunSpec({
     test("serialization") {
-        val types = JsonArray(GameVersionsSpec.stream().use { stream ->
+        val types = JsonArray(ModelFixtures.gameVersions().use { stream ->
             CursedJson.decodeFromString<JsonArray>(stream.bufferedReader().readText())
         }.map {
             when (it) {
@@ -25,7 +24,4 @@ object GameVersionsSpec : FunSpec({
 
         serialized shouldBe types
     }
-}) {
-    fun stream(): InputStream = GameVersionTypesSpec::class.java.getResourceAsStream("versions.json")
-        ?: throw AssertionError("no versions.json was found")
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/testlib/build.gradle.kts b/testlib/build.gradle.kts
new file mode 100644
index 0000000..e90286c
--- /dev/null
+++ b/testlib/build.gradle.kts
@@ -0,0 +1,20 @@
+@file:Suppress("UnstableApiUsage")
+
+plugins {
+    `java-library`
+    embeddedKotlin("jvm")
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:$embeddedKotlinVersion"))
+    implementation(platform(libs.kotlinx.coroutines.bom))
+    implementation(platform(libs.slf4j.bom))
+    implementation(platform(libs.junit.bom))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("org.junit.jupiter:junit-jupiter")
+    implementation(libs.bundles.kotest)
+}
\ No newline at end of file
diff --git a/src/test/kotlin/rocks/aur/cursed/publish/test/KotestConfig.kt b/testlib/src/main/kotlin/rocks/aur/cursed/publish/test/KotestConfig.kt
similarity index 100%
rename from src/test/kotlin/rocks/aur/cursed/publish/test/KotestConfig.kt
rename to testlib/src/main/kotlin/rocks/aur/cursed/publish/test/KotestConfig.kt
diff --git a/testlib/src/main/kotlin/rocks/aur/cursed/publish/test/models/ModelFixtures.kt b/testlib/src/main/kotlin/rocks/aur/cursed/publish/test/models/ModelFixtures.kt
new file mode 100644
index 0000000..8310c60
--- /dev/null
+++ b/testlib/src/main/kotlin/rocks/aur/cursed/publish/test/models/ModelFixtures.kt
@@ -0,0 +1,12 @@
+package rocks.aur.cursed.publish.test.models
+
+import java.io.*
+
+object ModelFixtures {
+    fun gameVersionTypes(): InputStream = ModelFixtures::class.java.getResourceAsStream("version-types.json")
+        ?: throw AssertionError("no version-types.json was found")
+
+    fun gameVersions(): InputStream = ModelFixtures::class.java.getResourceAsStream("versions.json")
+        ?: throw AssertionError("no versions.json was found")
+
+}
\ No newline at end of file
diff --git a/src/test/resources/rocks/aur/cursed/publish/test/models/version-types.json b/testlib/src/main/resources/rocks/aur/cursed/publish/test/models/version-types.json
similarity index 100%
rename from src/test/resources/rocks/aur/cursed/publish/test/models/version-types.json
rename to testlib/src/main/resources/rocks/aur/cursed/publish/test/models/version-types.json
diff --git a/src/test/resources/rocks/aur/cursed/publish/test/models/versions.json b/testlib/src/main/resources/rocks/aur/cursed/publish/test/models/versions.json
similarity index 100%
rename from src/test/resources/rocks/aur/cursed/publish/test/models/versions.json
rename to testlib/src/main/resources/rocks/aur/cursed/publish/test/models/versions.json