improve gradle test version handling

hauner · hauner · commit 57e5758edd82 · 2025-11-23T18:32:04.000+01:00
diff --git a/src/testInt/groovy/io/openapiprocessor/gradle/GroovyDslSpec.groovy b/src/testInt/groovy/io/openapiprocessor/gradle/GroovyDslSpec.groovy
@@ -72,7 +72,9 @@ class GroovyDslSpec extends PluginSpec {
         result.output.contains("processor v1 did run !")
 
         where:
-        gradleVersion << Gradle.VERSIONS_8.reverse ()
+        gradleVersion << Gradle.VERSIONS_8
+                .findAll { it.groovy }
+                .collect { it.version }
     }
 
     @Unroll
@@ -85,6 +87,8 @@ class GroovyDslSpec extends PluginSpec {
         result.output.contains("processor v1 did run !")
 
         where:
-        gradleVersion << Gradle.VERSIONS_9.reverse ()
+        gradleVersion << Gradle.VERSIONS_9
+                .findAll { it.groovy }
+                .collect { it.version }
     }
 }
diff --git a/src/testInt/groovy/io/openapiprocessor/gradle/KotlinDslSpec.groovy b/src/testInt/groovy/io/openapiprocessor/gradle/KotlinDslSpec.groovy
@@ -74,7 +74,9 @@ class KotlinDslSpec extends PluginSpec {
         result.output.contains("processor v1 did run !")
 
         where:
-        gradleVersion << Gradle.VERSIONS_8.reverse ()
+        gradleVersion << Gradle.VERSIONS_8
+                .findAll { it.kotlin }
+                .collect { it.version }
     }
 
     @Unroll
@@ -87,6 +89,8 @@ class KotlinDslSpec extends PluginSpec {
         result.output.contains("processor v1 did run !")
 
         where:
-        gradleVersion << Gradle.VERSIONS_9.reverse ()
+        gradleVersion << Gradle.VERSIONS_9
+                .findAll { it.kotlin }
+                .collect { it.version }
     }
 }
diff --git a/src/testInt/groovy/io/openapiprocessor/gradle/MultipleConfigurationsDifferentProcessorsSpec.groovy b/src/testInt/groovy/io/openapiprocessor/gradle/MultipleConfigurationsDifferentProcessorsSpec.groovy
@@ -85,7 +85,9 @@ class MultipleConfigurationsDifferentProcessorsSpec extends PluginSpec {
         assertResult (result)
 
         where:
-        gradleVersion << Gradle.VERSIONS_8.reverse ()
+        gradleVersion << Gradle.VERSIONS_8
+                .findAll { it.groovy }
+                .collect { it.version }
     }
 
     @Unroll
@@ -97,7 +99,9 @@ class MultipleConfigurationsDifferentProcessorsSpec extends PluginSpec {
         assertResult (result)
 
         where:
-        gradleVersion << Gradle.VERSIONS_9.reverse ()
+        gradleVersion << Gradle.VERSIONS_9
+                .findAll { it.groovy }
+                .collect { it.version }
     }
 
     private void assertResult(BuildResult result) {
diff --git a/src/testInt/groovy/io/openapiprocessor/gradle/MultipleConfigurationsSameProcessorSpec.groovy b/src/testInt/groovy/io/openapiprocessor/gradle/MultipleConfigurationsSameProcessorSpec.groovy
@@ -80,7 +80,9 @@ class MultipleConfigurationsSameProcessorSpec extends PluginSpec {
         assertResult (result)
 
         where:
-        gradleVersion << Gradle.VERSIONS_8.reverse ()
+        gradleVersion << Gradle.VERSIONS_8
+                .findAll { it.groovy }
+                .collect { it.version }
     }
 
     @Unroll
@@ -92,7 +94,9 @@ class MultipleConfigurationsSameProcessorSpec extends PluginSpec {
         assertResult (result)
 
         where:
-        gradleVersion << Gradle.VERSIONS_9.reverse ()
+        gradleVersion << Gradle.VERSIONS_9
+                .findAll { it.groovy }
+                .collect { it.version }
     }
 
     private void assertResult(BuildResult result) {
diff --git a/src/testInt/groovy/io/openapiprocessor/gradle/support/Gradle.groovy b/src/testInt/groovy/io/openapiprocessor/gradle/support/Gradle.groovy
@@ -16,32 +16,33 @@ class Gradle {
         return new Version(version: version, groovy: runsWithGroovy, kotlin: runsWithKotlin)
     }
 
-    static List<String> VERSIONS_9 = [
-        '9.0.0',
-        '9.1.0',
-        /* '9.2.0', */ '9.2.1'
+    static List<Version> VERSIONS_9 = [
+        version('9.2.1', true, true),
+        version('9.1.0', true, true),
+        version('9.0.0', true, true)
     ]
 
-    static List<String> VERSIONS_8 = [
-        /* '8.0', '8.0.1', */ '8.0.2',
-        /* '8.1', */ '8.1.1',
-        /* '8.2', */ '8.2.1',
-        '8.3',
-        '8.4',
-        '8.5',
-        '8.6',
-        '8.7',
-        '8.8',
-        '8.9',
-        /* '8.10', '8.10.1', */ '8.10.2',
-        /* '8.11', */ '8.11.1',
-        /* '8.12', */ '8.12.1',
-        '8.13',
-        /* '8.14', '8.14.1', '8.14.2' */ '8.14.3'
+    static List<Version> VERSIONS_8 = [
+        version('8.14.3', true, true),
+        version('8.13', true, true),
+        version('8.12.1', true, true),
+        version('8.11.1', true, true),
+        version('8.10.2', true, true),
+        version('8.9', true, true),
+        version('8.8', true, true),
+        version('8.7', true, true),
+        version('8.6', true, true),
+        version('8.5', true, true),
+        version('8.4', true, true),
+        version('8.3', true, true),
+        version('8.2.1', true, true),
+        // does not work with kotlin dsl since gradle 9.0.0 (?)
+        version('8.1.1', true, false),
+        version('8.0.2', true, false)
     ]
 
     static List<Version> VERSIONS_7 = [
-        // don't run since 9.2.1 with kotlin
+        // does not work with kotlin dsl since gradle 9.0.0 (?)
         version('7.6.6', true, false),
         version('7.5.1', true, false),
         version('7.4.2', true, false),

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,9 @@ class GroovyDslSpec extends PluginSpec {`
`72`	`72`	`result.output.contains("processor v1 did run !")`
`73`	`73`
`74`	`74`	`where:`
`75`		`- gradleVersion << Gradle.VERSIONS_8.reverse ()`
	`75`	`+ gradleVersion << Gradle.VERSIONS_8`
	`76`	`+ .findAll { it.groovy }`
	`77`	`+ .collect { it.version }`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`@Unroll`
`@@ -85,6 +87,8 @@ class GroovyDslSpec extends PluginSpec {`
`85`	`87`	`result.output.contains("processor v1 did run !")`
`86`	`88`
`87`	`89`	`where:`
`88`		`- gradleVersion << Gradle.VERSIONS_9.reverse ()`
	`90`	`+ gradleVersion << Gradle.VERSIONS_9`
	`91`	`+ .findAll { it.groovy }`
	`92`	`+ .collect { it.version }`
`89`	`93`	`}`
`90`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ class KotlinDslSpec extends PluginSpec {`
`74`	`74`	`result.output.contains("processor v1 did run !")`
`75`	`75`
`76`	`76`	`where:`
`77`		`- gradleVersion << Gradle.VERSIONS_8.reverse ()`
	`77`	`+ gradleVersion << Gradle.VERSIONS_8`
	`78`	`+ .findAll { it.kotlin }`
	`79`	`+ .collect { it.version }`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`@Unroll`
`@@ -87,6 +89,8 @@ class KotlinDslSpec extends PluginSpec {`
`87`	`89`	`result.output.contains("processor v1 did run !")`
`88`	`90`
`89`	`91`	`where:`
`90`		`- gradleVersion << Gradle.VERSIONS_9.reverse ()`
	`92`	`+ gradleVersion << Gradle.VERSIONS_9`
	`93`	`+ .findAll { it.kotlin }`
	`94`	`+ .collect { it.version }`
`91`	`95`	`}`
`92`	`96`	`}`