merge tests into single source set

whyoleg · Jan 18, 2025 · 7bfbc64 · 7bfbc64
1 parent e8fee9a
commit 7bfbc64
Show file tree

Hide file tree

Showing 30 changed files with 27 additions and 55 deletions.
diff --git a/sweetspi-tests/build.gradle.kts b/sweetspi-tests/build.gradle.kts
@@ -4,11 +4,9 @@
 
 @file:Suppress("UnstableApiUsage", "HasPlatformType")
 
-import org.jetbrains.kotlin.gradle.*
 import sweetbuild.*
 
 plugins {
-    `jvm-test-suite`
     id("sweetbuild.kotlin-base")
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.kotlin.plugin.powerAssert)
@@ -22,9 +20,9 @@ kotlin {
 }
 
 dependencies {
-    api(gradleTestKit())
-    api(kotlin("test-junit5"))
-    api(libs.junit.params)
+    testImplementation(gradleTestKit())
+    testImplementation(kotlin("test-junit5"))
+    testImplementation(libs.junit.params)
 }
 
 // Dev artifacts for tests resolution - inspired by https://github.com/adamko-dev/dev-publish-plugin
@@ -43,43 +41,17 @@ dependencies {
     devArtifacts(projects.sweetspiGradlePlugin)
 }
 
-@OptIn(ExperimentalKotlinGradlePluginApi::class)
-powerAssert {
-    includedSourceSets.addAll(
-        "testRuntime",
-        "testProcessor",
-        "testPlugin"
+tasks.test {
+    useJUnitPlatform()
+    jvmArgumentProviders.add(
+        TestsArgumentProvider(
+            devArtifactsDirectories = devArtifactsResolver.incoming.files,
+            testKitDirectory = layout.buildDirectory.dir("test-kit"),
+            projectVersion = provider { project.version.toString() }
+        )
     )
 }
 
-testing.suites {
-    register<JvmTestSuite>("testRuntime")
-    register<JvmTestSuite>("testProcessor")
-    register<JvmTestSuite>("testPlugin")
-
-    withType<JvmTestSuite>().configureEach {
-        useJUnitJupiter()
-        dependencies {
-            implementation(project())
-        }
-        targets.configureEach {
-            this.testTask.configure {
-                jvmArgumentProviders.add(
-                    TestsArgumentProvider(
-                        devArtifactsDirectories = devArtifactsResolver.incoming.files,
-                        testKitDirectory = layout.buildDirectory.dir("test-kit"),
-                        projectVersion = provider { project.version.toString() }
-                    )
-                )
-            }
-        }
-    }
-}
-
-tasks.check {
-    dependsOn(testing.suites)
-}
-
 class TestsArgumentProvider(
     private val devArtifactsDirectories: FileCollection,
     private val testKitDirectory: Provider<Directory>,

diff --git a/...spi-tests/src/main/kotlin/AbstractTest.kt → ...spi-tests/src/test/kotlin/AbstractTest.kt b/...spi-tests/src/main/kotlin/AbstractTest.kt → ...spi-tests/src/test/kotlin/AbstractTest.kt
diff --git a/...tests/src/main/kotlin/TestFiles.gradle.kt → ...tests/src/test/kotlin/TestFiles.gradle.kt b/...tests/src/main/kotlin/TestFiles.gradle.kt → ...tests/src/test/kotlin/TestFiles.gradle.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package dev.whyoleg.sweetspi.tests

diff --git a/sweetspi-tests/src/main/kotlin/TestFiles.kt → sweetspi-tests/src/test/kotlin/TestFiles.kt b/sweetspi-tests/src/main/kotlin/TestFiles.kt → sweetspi-tests/src/test/kotlin/TestFiles.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package dev.whyoleg.sweetspi.tests

diff --git a/...rc/main/kotlin/TestFiles.multiplatform.kt → ...rc/test/kotlin/TestFiles.multiplatform.kt b/...rc/main/kotlin/TestFiles.multiplatform.kt → ...rc/test/kotlin/TestFiles.multiplatform.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package dev.whyoleg.sweetspi.tests

diff --git a/...-tests/src/main/kotlin/TestFiles.sweet.kt → ...-tests/src/test/kotlin/TestFiles.sweet.kt b/...-tests/src/main/kotlin/TestFiles.sweet.kt → ...-tests/src/test/kotlin/TestFiles.sweet.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package dev.whyoleg.sweetspi.tests

diff --git a/...tspi-tests/src/main/kotlin/TestProject.kt → ...tspi-tests/src/test/kotlin/TestProject.kt b/...tspi-tests/src/main/kotlin/TestProject.kt → ...tspi-tests/src/test/kotlin/TestProject.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package dev.whyoleg.sweetspi.tests

diff --git a/...spi-tests/src/main/kotlin/TestTemplate.kt → ...spi-tests/src/test/kotlin/TestTemplate.kt b/...spi-tests/src/main/kotlin/TestTemplate.kt → ...spi-tests/src/test/kotlin/TestTemplate.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package dev.whyoleg.sweetspi.tests
@@ -11,7 +11,7 @@ class TestTemplate private constructor(path: String) {
     val templatePath: Path = templates.resolve(path)
 
     companion object {
-        private val templates = Path("src/templates")
+        private val templates = Path("src/test/templates")
 
         val MULTIPLATFORM = TestTemplate("multiplatform")
         val MULTIPLATFORM_MULTIMODULE = TestTemplate("multiplatform-multimodule")

diff --git a/...spi-tests/src/main/kotlin/TestVersions.kt → ...spi-tests/src/test/kotlin/TestVersions.kt b/...spi-tests/src/main/kotlin/TestVersions.kt → ...spi-tests/src/test/kotlin/TestVersions.kt
diff --git a/...i-tests/src/main/kotlin/TestsArguments.kt → ...i-tests/src/test/kotlin/TestsArguments.kt b/...i-tests/src/main/kotlin/TestsArguments.kt → ...i-tests/src/test/kotlin/TestsArguments.kt
diff --git a/...ts/src/testPlugin/kotlin/JvmPluginTest.kt → ...s/src/test/kotlin/plugin/JvmPluginTest.kt b/...ts/src/testPlugin/kotlin/JvmPluginTest.kt → ...s/src/test/kotlin/plugin/JvmPluginTest.kt
diff --git a/...ugin/kotlin/MultiplatformJvmPluginTest.kt → ...tlin/plugin/MultiplatformJvmPluginTest.kt b/...ugin/kotlin/MultiplatformJvmPluginTest.kt → ...tlin/plugin/MultiplatformJvmPluginTest.kt
diff --git a/...tPlugin/kotlin/MultiplatformPluginTest.kt → .../kotlin/plugin/MultiplatformPluginTest.kt b/...tPlugin/kotlin/MultiplatformPluginTest.kt → .../kotlin/plugin/MultiplatformPluginTest.kt
diff --git a/...r/kotlin/MultiplatformJvmProcessorTest.kt → ...rocessor/MultiplatformJvmProcessorTest.kt b/...r/kotlin/MultiplatformJvmProcessorTest.kt → ...rocessor/MultiplatformJvmProcessorTest.kt
diff --git a/.../src/testRuntime/kotlin/JvmRuntimeTest.kt → ...src/test/kotlin/runtime/JvmRuntimeTest.kt b/.../src/testRuntime/kotlin/JvmRuntimeTest.kt → ...src/test/kotlin/runtime/JvmRuntimeTest.kt
diff --git a/...in/MultiplatformCrossModuleRuntimeTest.kt → ...me/MultiplatformCrossModuleRuntimeTest.kt b/...in/MultiplatformCrossModuleRuntimeTest.kt → ...me/MultiplatformCrossModuleRuntimeTest.kt
diff --git a/...ime/kotlin/MultiplatformJvmRuntimeTest.kt → ...in/runtime/MultiplatformJvmRuntimeTest.kt b/...ime/kotlin/MultiplatformJvmRuntimeTest.kt → ...in/runtime/MultiplatformJvmRuntimeTest.kt
diff --git a/...untime/kotlin/MultiplatformRuntimeTest.kt → ...otlin/runtime/MultiplatformRuntimeTest.kt b/...untime/kotlin/MultiplatformRuntimeTest.kt → ...otlin/runtime/MultiplatformRuntimeTest.kt
diff --git a/...-tests/src/templates/jvm/build.gradle.kts → ...s/src/test/templates/jvm/build.gradle.kts b/...-tests/src/templates/jvm/build.gradle.kts → ...s/src/test/templates/jvm/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import dev.whyoleg.sweetspi.gradle.*

diff --git a/...ltiplatform-multimodule/gradle.properties → .../src/test/templates/jvm/gradle.properties b/...ltiplatform-multimodule/gradle.properties → .../src/test/templates/jvm/gradle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+# Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
 #
 
 org.gradle.parallel=true

diff --git a/...c/templates/jvm/gradle/libs.versions.toml → ...t/templates/jvm/gradle/libs.versions.toml b/...c/templates/jvm/gradle/libs.versions.toml → ...t/templates/jvm/gradle/libs.versions.toml
diff --git a/...mplates/multiplatform/settings.gradle.kts → ...rc/test/templates/jvm/settings.gradle.kts b/...mplates/multiplatform/settings.gradle.kts → ...rc/test/templates/jvm/settings.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 pluginManagement {

diff --git a/...ultiplatform-multimodule/build.gradle.kts → ...ultiplatform-multimodule/build.gradle.kts b/...ultiplatform-multimodule/build.gradle.kts → ...ultiplatform-multimodule/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 plugins {

diff --git a/...templates/multiplatform/gradle.properties → ...ltiplatform-multimodule/gradle.properties b/...templates/multiplatform/gradle.properties → ...ltiplatform-multimodule/gradle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+# Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
 #
 
 org.gradle.parallel=true

diff --git a/...orm-multimodule/gradle/libs.versions.toml → ...orm-multimodule/gradle/libs.versions.toml b/...orm-multimodule/gradle/libs.versions.toml → ...orm-multimodule/gradle/libs.versions.toml
diff --git a/...iplatform-multimodule/settings.gradle.kts → ...iplatform-multimodule/settings.gradle.kts b/...iplatform-multimodule/settings.gradle.kts → ...iplatform-multimodule/settings.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 pluginManagement {

diff --git a/.../templates/multiplatform/build.gradle.kts → .../templates/multiplatform/build.gradle.kts b/.../templates/multiplatform/build.gradle.kts → .../templates/multiplatform/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import dev.whyoleg.sweetspi.gradle.*

diff --git a/...tests/src/templates/jvm/gradle.properties → ...templates/multiplatform/gradle.properties b/...tests/src/templates/jvm/gradle.properties → ...templates/multiplatform/gradle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+# Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
 #
 
 org.gradle.parallel=true

diff --git a/...s/multiplatform/gradle/libs.versions.toml → ...s/multiplatform/gradle/libs.versions.toml b/...s/multiplatform/gradle/libs.versions.toml → ...s/multiplatform/gradle/libs.versions.toml
diff --git a/...sts/src/templates/jvm/settings.gradle.kts → ...mplates/multiplatform/settings.gradle.kts b/...sts/src/templates/jvm/settings.gradle.kts → ...mplates/multiplatform/settings.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2024-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 pluginManagement {