Fix @RestoreSystemProperties for iterations (#2111)

fixes #2104

Author: leonard84

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)
 

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

@@ -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);
   }
 }

spock-specs/src/test/groovy/org/spockframework/smoke/extension/RestoreSystemPropertiesExtension.groovy

@@ -36,6 +36,22 @@ class RestoreSystemPropertiesExtension extends Specification {
     System.setProperty("RestoreSystemPropertiesExtension.prop2", "new value")
   }
 
+  @Issue("https://github.com/spockframework/spock/issues/2104")
+  @RestoreSystemProperties
+  def "restores properties for each iteration of a data-driven feature method"() {
+    expect:
+    System.getProperty("RestoreSystemPropertiesExtension.iteration") == null
+
+    when:
+    System.setProperty("RestoreSystemPropertiesExtension.iteration", "$i")
+
+    then:
+    System.getProperty("RestoreSystemPropertiesExtension.iteration") == "$i"
+
+    where:
+    i << (1..3)
+  }
+
   def cleanupSpec() {
     assert System.getProperty("RestoreSystemPropertiesExtension.prop1") == "original value"
     assert System.getProperty("RestoreSystemPropertiesExtension.prop2") == "new value"