Merge branch 'master' into more-to-build-logic

Author: leonard84

.github/renovate.json5

@@ -11,19 +11,29 @@
     // as we want to keep one for each major version.
     // The same applies for mockito as we test with both 4 and 5
     {
-      matchPackagePrefixes: ["org.codehaus.groovy:"],
+      matchPackageNames: ["/^org.codehaus.groovy:/"],
       matchCurrentValue: "/^2\\./",
       allowedVersions: "(,3.0)"
     },
     {
-      matchPackagePrefixes: ["org.apache.groovy:"],
+      matchPackageNames: ["/^org.apache.groovy:/"],
       matchCurrentValue: "/^4\\./",
       allowedVersions: "(,5.0)"
     },
     {
-      matchPackagePrefixes: ["org.mockito:"],
+      matchPackageNames: ["/^org.mockito:/"],
       matchCurrentValue: "/^4\\./",
       allowedVersions: "(,5.0)"
+    },
+    {
+      matchPackageNames: ["/^org.spockframework:spock-/"],
+      matchCurrentVersion: "/-groovy-3\\.0$/",
+      allowedVersions: "/-groovy-3\\.0$/"
+    },
+    {
+      matchPackageNames: ["/^org.spockframework:spock-/"],
+      matchCurrentVersion: "/-groovy-4\\.0$/",
+      allowedVersions: "/-groovy-4\\.0$/"
     }
   ]
 }

docs/release_notes.adoc

@@ -9,6 +9,7 @@ include::include.adoc[]
 
 * Fix ExtensionException in OSGi environment for global extension spockIssue:2076[]
 ** This issue was introduced with spockPull:1995[]
+* Fix `@RestoreSystemProperties` not restoring state between iterations of a data-driven feature spockIssue:2104[]
 
 == 2.4-M5 (2025-01-07)
 

gradle/libs.versions.toml

@@ -2,20 +2,20 @@
 asciidoctorj = '2.5.13'
 groovy2 = '2.5.23'
 groovy3 = '3.0.23'
-groovy4 = '4.0.24'
+groovy4 = '4.0.25'
 jacoco = '0.8.12'
 junit = '5.11.4'
 asm = '9.7.1'
 mockito4 = '4.11.0'
 mockito5 = '5.15.2'
-workflows-kotlin = "2.1.0"
+workflows-kotlin = "2.1.10"
 
 [libraries]
-jetbrains-annotations = "org.jetbrains:annotations:26.0.1"
+jetbrains-annotations = "org.jetbrains:annotations:26.0.2"
 asciidoctorj = { module = "org.asciidoctor:asciidoctorj", version.ref = "asciidoctorj" }
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 asmUtil = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
-bytebuddy = "net.bytebuddy:byte-buddy:1.16.1"
+bytebuddy = "net.bytebuddy:byte-buddy:1.17.0"
 cglib = "cglib:cglib-nodep:3.3.0"
 geantyref = "io.leangen.geantyref:geantyref:1.3.16"
 h2database = "com.h2database:h2:2.2.224"

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -7,12 +7,12 @@ pluginManagement {
   }
 
   plugins {
-    id "com.gradle.develocity" version "3.19"
-    id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0.2"
+    id "com.gradle.develocity" version "3.19.2"
+    id "com.gradle.common-custom-user-data-gradle-plugin" version "2.1"
     id "org.asciidoctor.jvm.convert" version "4.0.4"
     id "net.nemerosa.versioning" version "3.1.0"
     id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
-    id "com.github.ben-manes.versions" version "0.51.0"
+    id "com.github.ben-manes.versions" version "0.52.0"
     id "biz.aQute.bnd.builder" version "7.1.0"
     id "io.spring.nohttp" version "0.0.11"
   }

gradlew

@@ -30,13 +30,13 @@ public class RestoreSystemPropertiesExtension implements IStatelessAnnotationDri
   public void visitSpecAnnotation(RestoreSystemProperties annotation, SpecInfo spec) {
     spec.addExclusiveResource(EXCLUSIVE_RESOURCE);
     for (FeatureInfo feature : spec.getFeatures()) {
-      feature.addInterceptor(RestoreSystemPropertiesInterceptor.INSTANCE);
+      feature.addIterationInterceptor(RestoreSystemPropertiesInterceptor.INSTANCE);
     }
   }
 
   @Override
   public void visitFeatureAnnotation(RestoreSystemProperties annotation, FeatureInfo feature) {
-    feature.addInterceptor(RestoreSystemPropertiesInterceptor.INSTANCE);
+    feature.addIterationInterceptor(RestoreSystemPropertiesInterceptor.INSTANCE);
     feature.addExclusiveResource(EXCLUSIVE_RESOURCE);
   }
 }

settings.gradle

@@ -3,6 +3,7 @@
 import org.spockframework.runtime.GroovyRuntimeUtil;
 
 import java.util.*;
+import java.util.function.Function;
 
 import groovy.lang.Range;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
@@ -52,7 +53,10 @@ public static String toStringOrDump(@Nullable Object value) {
       Wrapper wrapper = (Wrapper) value;
       return String.format("%s as %s", toStringOrDump(wrapper.unwrap()), wrapper.getType().getSimpleName());
     }
-    return dump(value);
+    if (value.getClass().isArray()) {
+      return dumpArrayString((Object[]) value, RenderUtil::toStringOrDump);
+    }
+    return DefaultGroovyMethods.dump(value);
   }
 
   public static String inspectOrDump(@Nullable Object value) {
@@ -63,28 +67,22 @@ public static String inspectOrDump(@Nullable Object value) {
       Wrapper wrapper = (Wrapper) value;
       return String.format("%s as %s", inspectOrDump(wrapper.unwrap()), wrapper.getType().getSimpleName());
     }
-    return dump(value);
-  }
-
-  private static String dump(@Nullable Object value) {
     if (value.getClass().isArray()) {
-      return dumpArrayString((Object[])value);
-    } else {
-      return DefaultGroovyMethods.dump(value);
+      return dumpArrayString((Object[]) value, RenderUtil::inspectOrDump);
     }
+    return DefaultGroovyMethods.dump(value);
   }
 
-
   /*
    * Adapted from org.codehaus.groovy.runtime.InvokerHelper.toArrayString(java.lang.Object[]) to use dump()
    */
-  private static String dumpArrayString(Object[] arguments) {
+  private static String dumpArrayString(Object[] arguments, Function<Object, String> argDumper) {
     StringBuilder argBuf = new StringBuilder("[");
     for (int i = 0; i < arguments.length; i++) {
       if (i > 0) {
         argBuf.append(", ");
       }
-      argBuf.append(DefaultGroovyMethods.dump(arguments[i]));
+      argBuf.append(argDumper.apply(arguments[i]));
     }
     argBuf.append("]");
     return argBuf.toString();

spock-core/src/main/java/org/spockframework/runtime/extension/builtin/RestoreSystemPropertiesExtension.java

@@ -0,0 +1,93 @@
+package org.spockframework.smoke.condition
+
+import static org.spockframework.smoke.condition.ValueRendering.DefaultToString
+
+class ArrayComparisonRendering extends ConditionRenderingSpec {
+
+  def "primitive array value"() {
+    expect:
+    isRendered """
+x == null
+| |
+| false
+[1, 2]
+    """, {
+      def x = [1, 2] as int[]
+      assert x == null
+    }
+  }
+
+  def "object array value"() {
+    expect:
+    isRendered """
+x == null
+| |
+| false
+[one, two]
+    """, {
+      def x = ["one", "two"] as String[]
+      assert x == null
+    }
+  }
+
+  def "arrays of variables with default to string is dump()ed"() {
+    def a = new DefaultToString()
+    def b = new DefaultToString()
+    DefaultToString[] x = [a, b]
+    expect:
+    isRendered """
+x == null
+| |
+| false
+[${a.dump()}, ${b.dump()}]
+    """, {
+      assert x == null
+    }
+  }
+
+  def "primitive two-dimensional array value"() {
+    expect:
+    isRendered """
+x == y
+| |  |
+| |  [[1, 2], [1, 5]]
+| false
+[[1, 2], [2, 5]]
+    """, {
+      def x = [[1, 2], [2, 5]] as int[][]
+      def y = [[1, 2], [1, 5]] as int[][]
+      assert x == y
+    }
+  }
+
+  def "object two-dimensional array value"() {
+    expect:
+    isRendered """
+x == y
+| |  |
+| |  [[one, two], [one, five]]
+| false
+[[one, two], [two, five]]
+    """, {
+      def x = [["one", "two"], ["two", "five"]] as String[][]
+      def y = [["one", "two"], ["one", "five"]] as String[][]
+      assert x == y
+    }
+  }
+
+  def "multidimensional array value with higher cardinality"() {
+    expect:
+    isRendered """
+x == y
+| |  |
+| |  [[[1, 2], [1, 5]], [[1, 2], [1, 5]]]
+| false
+[[[1, 2], [2, 5]], [[1, 2], [2, 5]]]
+    """, {
+      def x = [[[1, 2], [2, 5]], [[1, 2], [2, 5]]] as int[][][]
+      def y = [[[1, 2], [1, 5]], [[1, 2], [1, 5]]] as int[][][]
+      assert x == y
+    }
+  }
+
+}