Fix order-dependent assertion in CrossBuildScriptCachingIntegrationSpec

reinsch82 · reinsch82 · commit ef03f1d41b0a · 2026-03-17T13:00:18.000+01:00
scriptsAreReused() compared scripts by list index, but isolated
projects mode does not guarantee a stable project configuration order
across builds. Match by path instead so the assertion is
order-independent.

Signed-off-by: Reinhold Degenfellner &lt;rdegenfellner@gradle.com&gt;
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/CrossBuildScriptCachingIntegrationSpec.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/CrossBuildScriptCachingIntegrationSpec.groovy
@@ -674,10 +674,13 @@ class CrossBuildScriptCachingIntegrationSpec extends AbstractIntegrationSpec {
     }
 
     void scriptsAreReused(List<ClassDetails> before, List<ClassDetails> after) {
-        assert before.size() == after.size()
-        for (int i = 0; i < before.size(); i++) {
-            def script1 = before[i]
-            def script2 = after[i]
+        def sort = { List<ClassDetails> list -> list.sort(false) { a, b -> a.path <=> b.path ?: a.className <=> b.className } }
+        def sortedBefore = sort(before)
+        def sortedAfter = sort(after)
+        assert sortedBefore.size() == sortedAfter.size()
+        for (int i = 0; i < sortedBefore.size(); i++) {
+            def script1 = sortedBefore[i]
+            def script2 = sortedAfter[i]
             assert script1.path == script2.path
             assert script1.className == script2.className
             assert script1.classpath == script2.classpath
