prevent spock2 uuid reuse (#1251)

skuznetsov-al · web-flow · commit 4e596326d367 · 2026-03-23T16:47:11.000+03:00
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java
@@ -82,12 +82,7 @@
  */
 public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension {
 
-    private final ThreadLocal<String> testResults = new InheritableThreadLocal<String>() {
-        @Override
-        protected String initialValue() {
-            return UUID.randomUUID().toString();
-        }
-    };
+    private final ThreadLocal<String> testResults = new ThreadLocal<>();
 
     private final AllureLifecycle lifecycle;
 
@@ -142,7 +137,7 @@ public void visitSpec(final SpecInfo spec) {
 
     @Override
     public void beforeIteration(final IterationInfo iteration) {
-        final String uuid = testResults.get();
+        final String uuid = UUID.randomUUID().toString();
 
         final FeatureInfo feature = iteration.getFeature();
         final MethodInfo methodInfo = feature.getFeatureMethod();
@@ -222,6 +217,7 @@ public void beforeIteration(final IterationInfo iteration) {
                 result::setDescriptionHtml
         );
 
+        testResults.set(uuid);
         getLifecycle().scheduleTestCase(result);
         getLifecycle().startTestCase(uuid);
 
@@ -285,6 +281,9 @@ private boolean match(final TestPlanV1_0.TestCase tc, final String allureId, fin
     @Override
     public void error(final ErrorInfo error) {
         final String uuid = testResults.get();
+        if (Objects.isNull(uuid)) {
+            return;
+        }
         getLifecycle().updateTestCase(uuid, testResult -> testResult
                 .setStatus(getStatus(error.getException()).orElse(null))
                 .setStatusDetails(getStatusDetails(error.getException()).orElse(null))
@@ -294,15 +293,22 @@ public void error(final ErrorInfo error) {
     @Override
     public void afterIteration(final IterationInfo iteration) {
         final String uuid = testResults.get();
-        testResults.remove();
+        if (Objects.isNull(uuid)) {
+            testResults.remove();
+            return;
+        }
 
-        getLifecycle().updateTestCase(uuid, testResult -> {
-            if (Objects.isNull(testResult.getStatus())) {
-                testResult.setStatus(Status.PASSED);
-            }
-        });
-        getLifecycle().stopTestCase(uuid);
-        getLifecycle().writeTestCase(uuid);
+        try {
+            getLifecycle().updateTestCase(uuid, testResult -> {
+                if (Objects.isNull(testResult.getStatus())) {
+                    testResult.setStatus(Status.PASSED);
+                }
+            });
+            getLifecycle().stopTestCase(uuid);
+            getLifecycle().writeTestCase(uuid);
+        } finally {
+            testResults.remove();
+        }
     }
 
     private List<Parameter> getParameters(final List<String> names, final Object... values) {
diff --git a/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java b/allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java
@@ -61,7 +61,9 @@
 import org.spockframework.runtime.GlobalExtensionRegistry;
 import org.spockframework.runtime.RunContext;
 import org.spockframework.runtime.SpockEngine;
+import org.mockito.ArgumentCaptor;
 
+import java.lang.reflect.Method;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collection;
@@ -73,12 +75,77 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
 
 /**
  * @author charlie (Dmitry Baev).
  */
 class AllureSpock2Test {
 
+    @Test
+    void shouldCreateNewUuidForEachIteration() throws Exception {
+        final io.qameta.allure.AllureLifecycle lifecycle = mock(io.qameta.allure.AllureLifecycle.class);
+        final AllureSpock2 allureSpock2 = new AllureSpock2(lifecycle);
+
+        final org.spockframework.runtime.model.SpecInfo specInfo = mock(org.spockframework.runtime.model.SpecInfo.class);
+        final org.spockframework.runtime.model.FeatureInfo featureInfo = mock(org.spockframework.runtime.model.FeatureInfo.class);
+        final org.spockframework.runtime.model.MethodInfo methodInfo = mock(org.spockframework.runtime.model.MethodInfo.class);
+        final org.spockframework.runtime.model.IterationInfo iterationInfo = mock(org.spockframework.runtime.model.IterationInfo.class);
+
+        final Method method = DummySpec.class.getMethod("dummy");
+        when(methodInfo.getReflection()).thenReturn(method);
+
+        when(specInfo.getReflection()).thenReturn((Class) DummySpec.class);
+        when(specInfo.getPackage()).thenReturn(DummySpec.class.getPackage().getName());
+        when(specInfo.getName()).thenReturn(DummySpec.class.getSimpleName());
+        when(specInfo.getSubSpec()).thenReturn(null);
+        when(specInfo.getSuperSpec()).thenReturn(null);
+
+        when(featureInfo.getFeatureMethod()).thenReturn(methodInfo);
+        when(featureInfo.getSpec()).thenReturn(specInfo);
+        when(featureInfo.getDataVariables()).thenReturn(Collections.emptyList());
+        when(featureInfo.getTestTags()).thenReturn(Collections.emptySet());
+
+        when(iterationInfo.getFeature()).thenReturn(featureInfo);
+        when(iterationInfo.getDataValues()).thenReturn(new Object[0]);
+        when(iterationInfo.getDisplayName()).thenReturn("dummy");
+        when(iterationInfo.getName()).thenReturn("dummy");
+
+        final ArgumentCaptor<TestResult> scheduled = ArgumentCaptor.forClass(TestResult.class);
+
+        allureSpock2.beforeIteration(iterationInfo);
+        allureSpock2.beforeIteration(iterationInfo);
+
+        verify(lifecycle, times(2)).scheduleTestCase(scheduled.capture());
+        final List<TestResult> captured = scheduled.getAllValues();
+        assertThat(captured)
+                .hasSize(2)
+                .extracting(TestResult::getUuid)
+                .doesNotContainNull();
+        assertThat(captured.get(0).getUuid()).isNotEqualTo(captured.get(1).getUuid());
+    }
+
+    @Test
+    void shouldIgnoreErrorAndAfterIterationWhenUuidMissing() {
+        final io.qameta.allure.AllureLifecycle lifecycle = mock(io.qameta.allure.AllureLifecycle.class);
+        final AllureSpock2 allureSpock2 = new AllureSpock2(lifecycle);
+
+        allureSpock2.error(mock(org.spockframework.runtime.model.ErrorInfo.class));
+        allureSpock2.afterIteration(mock(org.spockframework.runtime.model.IterationInfo.class));
+
+        verifyNoInteractions(lifecycle);
+    }
+
+    private static final class DummySpec {
+        public void dummy() {
+            // noop
+        }
+    }
+
     @Test
     void shouldStoreTestsInformation() {
         final AllureResults results = runClasses(OneTest.class);
