move tests to junit parameterised tests

Author: imanushin

gradle-plugin-utils/build.gradle.kts

@@ -6,10 +6,11 @@ plugins {
 dependencies {
     compileOnly(gradleApi())
 
-    "testImplementation"(gradleApi())
-    "testImplementation"(project(":gradle-plugin-test-utils"))
-    "testImplementation"(libs.kotest.runner)
-    "testImplementation"(libs.kotest.property)
-    "testImplementation"(libs.assertk.core)
-    "testImplementation"(libs.mockk)
+    testImplementation(gradleApi())
+    testImplementation(project(":gradle-plugin-test-utils"))
+    testImplementation(libs.junit.jupiter.params)
+    testImplementation(libs.kotest.runner)
+    testImplementation(libs.kotest.property)
+    testImplementation(libs.assertk.core)
+    testImplementation(libs.mockk)
 }

gradle-plugin-utils/gradle.lockfile

@@ -63,15 +63,15 @@ org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.0=testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.7.0=testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.0=testRuntimeClasspath
 org.jetbrains:annotations:23.0.0=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.8.2=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.8.2=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.8.2=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter:5.8.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.8.2=testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.8.2=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.8.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.8.2=testRuntimeClasspath
-org.junit:junit-bom:5.8.2=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.10.0=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.10.0=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter:5.10.0=testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.10.0=testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.10.0=testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.10.0=testRuntimeClasspath
+org.junit.platform:junit-platform-suite-api:1.10.0=testRuntimeClasspath
+org.junit:junit-bom:5.10.0=testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testRuntimeClasspath
 org.reflections:reflections:0.10.2=testRuntimeClasspath

gradle-plugin-utils/src/test/kotlin/org/unbrokendome/gradle/pluginutils/GradleVersionsTest.kt

@@ -10,45 +10,50 @@ import io.kotest.data.forAll
 import io.mockk.mockk
 import io.mockk.verify
 import org.gradle.util.GradleVersion
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import org.junit.jupiter.params.provider.ValueSource
 import kotlin.reflect.full.memberProperties
 
+class GradleVersionsTest {
+
+    data class VersionInput(val major: Int, val minor: Int)
+
+    companion object {
+        @JvmStatic
+        fun versionsInput() : List<VersionInput> {
+            return listOf(
+                4 to 0..10,
+                5 to 0..6,
+                6 to 0..8
+            ).flatMap { (majorVersion, minorRange) ->
+                minorRange
+                    .map { minorVersion ->
+                        VersionInput(majorVersion, minorVersion)
+                    }
+            }
+        }
+    }
 
-class GradleVersionsTest : DescribeSpec({
-
-    describe("Version constant properties") {
-
+    @ParameterizedTest
+    @MethodSource("versionsInput")
+    fun `GradleVersions object should have a version property`(input: VersionInput) {
         val allVersionProperties = GradleVersions::class.memberProperties.associateBy { it.name }
 
-        val rows = sequenceOf(
-            4 to 0..10,
-            5 to 0..6,
-            6 to 0..8
-        ).flatMap { (majorVersion, minorRange) ->
-            minorRange.asSequence()
-                .map { minorVersion ->
-                    Row2(majorVersion, minorVersion)
-                }
-        }.toList()
-
-        val dataTable = Table2(Headers2("major", "minor"), rows)
+        val versionPropertyName = "Version_${input.major}_${input.minor}"
+        val version = GradleVersion.version("${input.major}.${input.minor}")
 
-        forAll(dataTable) { major, minor ->
+        val versionProperty = allVersionProperties[versionPropertyName]
 
-            it("GradleVersions object should have a version property for $major.$minor") {
-
-                val versionPropertyName = "Version_${major}_${minor}"
-                val version = GradleVersion.version("$major.$minor")
-
-                val versionProperty = allVersionProperties[versionPropertyName]
-
-                assertThat(versionProperty, name = "Version property").isNotNull()
-                    .transform { it.get(GradleVersions) }
-                    .isEqualTo(version)
-            }
-        }
+        assertThat(versionProperty, name = "Version property").isNotNull()
+            .transform { it.get(GradleVersions) }
+            .isEqualTo(version)
     }
+}
 
 
+class GradleVersionsTestOld : DescribeSpec({
     val veryHighVersion = GradleVersion.version("9999.99")
 
 

gradle/libs.versions.toml

@@ -10,6 +10,7 @@ spek2 = "2.0.19"
 assertk-core = { module = "com.willowtreeapps.assertk:assertk", version.ref = "assertk" }
 
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
+junit-jupiter-params= { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
 
 kotest-api = { module = "io.kotest:kotest-framework-api", version.ref = "kotest" }
 kotest-runner = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }