Move config cache tests into own test package and some cleanup

Author: jjohannes

build.gradle.kts

@@ -73,11 +73,12 @@ testing.suites.named<JvmTestSuite>("test") {
                 description = "Runs tests against Gradle $gradleVersionUnderTest"
                 systemProperty("gradleVersionUnderTest", gradleVersionUnderTest)
                 exclude("**/*SamplesTest.class") // Not yet cross-version ready
+                exclude("**/initialization/**") // Settings plugin only for Gradle 8.8+
                 if (gradleVersionUnderTest == "7.4") {
-                    // affected by long since fixed bugs in gradle
-                    exclude("**/*ConfigurationCacheTest.class")
+                    // Configuration cache only "reliable" since 7.6 (?)
+                    // https://github.com/gradlex-org/java-module-dependencies/issues/129
+                    exclude("**/configcache/**")
                 }
-                exclude("**/initialization/**") // Settings plugin only for Gradle 8.8+
             }
         }
     }

src/main/resources/org/gradlex/javamodule/dependencies/unique_modules.properties

@@ -1151,7 +1151,7 @@ com.github.gv2011.util.gcol=com.github.gv2011:util-gcol
 com.github.gv2011.util.html.imp=com.github.gv2011:util-html
 com.github.gv2011.util.image=com.github.gv2011:util-image
 com.github.gv2011.util.json.imp=com.github.gv2011:util-json
-com.github.gv2011.util.swing=com.github.gv2011:util-swing
+com.github.gv2011.util.swing.imp=com.github.gv2011:util-swing
 com.github.gv2011.util.tika=com.github.gv2011:util-tika
 com.github.gw2toolbelt.gw2ml=com.github.gw2toolbelt.gw2ml:gw2ml
 com.github.hanshsieh.pixivj=com.github.hanshsieh:pixivj

src/test/groovy/org/gradlex/javamodule/dependencies/test/ConfigurationCacheTest.groovy renamed to src/test/groovy/org/gradlex/javamodule/dependencies/test/configcache/ConfigurationCacheTest.groovy

@@ -1,11 +1,13 @@
-package org.gradlex.javamodule.dependencies.test
+package org.gradlex.javamodule.dependencies.test.configcache
 
-import org.gradle.util.GradleVersion
 import org.gradlex.javamodule.dependencies.test.fixture.GradleBuild
 import spock.lang.Specification
 
 class ConfigurationCacheTest extends Specification {
 
+    static final NO_CACHE_MESSAGE =
+            "Calculating task graph as no cached configuration is available for tasks: :app:compileJava"
+
     @Delegate
     GradleBuild build = new GradleBuild()
 
@@ -19,36 +21,18 @@ class ConfigurationCacheTest extends Specification {
             }
         '''
 
-
         def runner = runner('--configuration-cache',':app:compileJava')
         when:
         def result = runner.build()
 
         then:
-        result.getOutput().contains(getNoCacheMessage() )
+        result.output.contains(NO_CACHE_MESSAGE)
 
         when:
         result = runner.build()
 
         then:
-        result.getOutput().contains("Reusing configuration cache.")
-    }
-
-    private String getNoCacheMessage() {
-        if (getVersionTest() >= GradleVersion.version("8.8")) {
-            return "Calculating task graph as no cached configuration is available for tasks: :app:compileJava"
-        } else {
-            return "Calculating task graph as no configuration cache is available for tasks: :app:compileJava"
-        }
-
-
-    }
-
-    private GradleVersion getVersionTest() {
-        if (gradleVersionUnderTest == null) {
-            return GradleVersion.current()
-        }
-        return GradleVersion.version(gradleVersionUnderTest)
+        result.output.contains("Reusing configuration cache.")
     }
 
     def "configurationCacheHitIrrelevantChange"() {
@@ -64,7 +48,7 @@ class ConfigurationCacheTest extends Specification {
         def result = runner.build()
 
         then:
-        result.getOutput().contains(getNoCacheMessage())
+        result.output.contains(NO_CACHE_MESSAGE)
 
         when:
         appModuleInfoFile.write('''
@@ -75,7 +59,7 @@ class ConfigurationCacheTest extends Specification {
         result = runner.build()
 
         then:
-        result.getOutput().contains("Reusing configuration cache.")
+        result.output.contains("Reusing configuration cache.")
     }
 
     def "configurationCacheMissRelevantChange"() {
@@ -92,7 +76,7 @@ class ConfigurationCacheTest extends Specification {
         def result = runner.build()
 
         then:
-        result.getOutput().contains(getNoCacheMessage())
+        result.output.contains(NO_CACHE_MESSAGE)
 
         when:
         appModuleInfoFile.write('''

src/test/groovy/org/gradlex/javamodule/dependencies/test/initialization/SettingsPluginTest.groovy

@@ -1,6 +1,5 @@
 package org.gradlex.javamodule.dependencies.test.initialization
 
-import org.gradle.testkit.runner.GradleRunner
 import org.gradlex.javamodule.dependencies.test.fixture.GradleBuild
 import spock.lang.Specification
 
@@ -91,37 +90,7 @@ class SettingsPluginTest extends Specification {
         result.getOutput().contains("Calculating task graph as no cached configuration is available for tasks: :app:compileJava")
 
         when:
-        result = runner.build() //TODO Thats a big problem with the Settings Plugin AAAAAAAAH
-        result = runner.build()
-
-        then:
-        result.getOutput().contains("Reusing configuration cache.")
-    }
-
-    def "configurationCacheHit"() {
-        given:
-        settingsFile << '''
-            javaModules {
-                directory(".") { plugin("java-library") }
-            }
-        '''
-        libModuleInfoFile << 'module abc.lib { }'
-        appModuleInfoFile << '''
-            module org.gradlex.test.app {
-                requires abc.lib;
-            }
-        '''
-
-
-        def runner = runner(':app:compileJava')
-        when:
-        def result = runner.build()
-
-        then:
-        result.getOutput().contains("Calculating task graph as no cached configuration is available for tasks: :app:compileJava")
-
-        when:
-        result = runner.build() //TODO Thats a big problem with the Settings Plugin AAAAAAAAH
+        runner.build() // https://github.com/gradlex-org/java-module-dependencies/issues/128
         result = runner.build()
 
         then:
@@ -150,7 +119,7 @@ class SettingsPluginTest extends Specification {
         result.getOutput().contains("Calculating task graph as no cached configuration is available for tasks: :app:compileJava")
 
         when:
-        result = runner.build() //TODO Thats a big problem with the Settings Plugin AAAAAAAAH
+        runner.build() // https://github.com/gradlex-org/java-module-dependencies/issues/128
         appModuleInfoFile.write('''
             module org.gradlex.test.app {
                 requires abc.lib; //This is a comment and should not break the configurationCache
@@ -184,7 +153,7 @@ class SettingsPluginTest extends Specification {
         result.getOutput().contains("Calculating task graph as no cached configuration is available for tasks: :app:compileJava")
 
         when:
-        result = runner.build() //TODO Thats a big problem with the Settings Plugin AAAAAAAAH
+        runner.build() // https://github.com/gradlex-org/java-module-dependencies/issues/128
         appModuleInfoFile.write('''
             module org.gradlex.test.app {
                //dependency removed; so thats indeed a configuration change