remove spock2 system out capture (fixes #866, via #951)

Author: baev

allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java

@@ -24,19 +24,15 @@
 import io.qameta.allure.model.Parameter;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StatusDetails;
-import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.model.TestResultContainer;
 import io.qameta.allure.testfilter.FileTestPlanSupplier;
 import io.qameta.allure.testfilter.TestPlan;
-import io.qameta.allure.testfilter.TestPlanUnknown;
 import io.qameta.allure.testfilter.TestPlanV1_0;
 import io.qameta.allure.util.AnnotationUtils;
 import io.qameta.allure.util.ExceptionUtils;
 import io.qameta.allure.util.ResultsUtils;
 import org.spockframework.runtime.AbstractRunListener;
-import org.spockframework.runtime.IStandardStreamsListener;
-import org.spockframework.runtime.StandardStreamsCapturer;
 import org.spockframework.runtime.extension.IGlobalExtension;
 import org.spockframework.runtime.extension.IMethodInterceptor;
 import org.spockframework.runtime.extension.IMethodInvocation;
@@ -86,9 +82,7 @@
 @SuppressWarnings({
         "PMD.NcssCount"
 })
-public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension, IStandardStreamsListener {
-
-    private final StandardStreamsCapturer streamsCapturer = new StandardStreamsCapturer();
+public class AllureSpock2 extends AbstractRunListener implements IGlobalExtension {
 
     private final ThreadLocal<String> testResults = new InheritableThreadLocal<String>() {
         @Override
@@ -107,22 +101,14 @@ public AllureSpock2() {
     }
 
     public AllureSpock2(final AllureLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-        this.streamsCapturer.addStandardStreamsListener(this);
-        this.testPlan = new FileTestPlanSupplier().supply().orElse(new TestPlanUnknown());
+        this(lifecycle, new FileTestPlanSupplier().supply().orElse(null));
     }
 
     public AllureSpock2(final AllureLifecycle lifecycle, final TestPlan plan) {
         this.lifecycle = lifecycle;
-        this.streamsCapturer.addStandardStreamsListener(this);
         this.testPlan = plan;
     }
 
-    @Override
-    public void start() {
-        //do nothing at this point
-    }
-
     @Override
     public void visitSpec(final SpecInfo spec) {
         spec.getAllFeatures().forEach(methodInfo -> methodInfo.setSkipped(this.isSkipped(methodInfo)));
@@ -156,42 +142,6 @@ public void visitSpec(final SpecInfo spec) {
                 }));
     }
 
-    @Override
-    public void stop() {
-        //do nothing at this point
-    }
-
-    @Override
-    public void standardOut(final String message) {
-        logMessage(message, Status.PASSED);
-    }
-
-    @Override
-    public void standardErr(final String message) {
-        logMessage(message, Status.BROKEN);
-    }
-
-    private void logMessage(final String message, final Status status) {
-        if (Objects.isNull(message)) {
-            return;
-        }
-
-        final String trimmed = message.trim();
-        if (trimmed.isEmpty()) {
-            return;
-        }
-
-        getLifecycle().getCurrentTestCaseOrStep().ifPresent(parentUuid -> {
-            final String uuid = UUID.randomUUID().toString();
-            getLifecycle().startStep(
-                    parentUuid, uuid,
-                    new StepResult().setName(trimmed).setStatus(status)
-            );
-            getLifecycle().stopStep(uuid);
-        });
-    }
-
-
     @Override
     public void beforeIteration(final IterationInfo iteration) {
         final String uuid = testResults.get();
@@ -299,12 +249,19 @@ private String getHistoryId(final String name, final List<Parameter> parameters)
     }
 
     private boolean isSkipped(final FeatureInfo featureInfo) {
+        if (Objects.isNull(this.testPlan)) {
+            return false;
+        }
         if (this.testPlan instanceof TestPlanV1_0) {
             final TestPlanV1_0 tp = (TestPlanV1_0) testPlan;
             return !Objects.isNull(tp.getTests()) && tp.getTests()
                     .stream()
                     .filter(Objects::nonNull)
-                    .noneMatch(tc -> this.match(tc, this.getAllureId(featureInfo), this.getQualifiedName(featureInfo)));
+                    .noneMatch(tc -> this.match(
+                            tc,
+                            this.getAllureId(featureInfo),
+                            this.getQualifiedName(featureInfo))
+                    );
         }
         return false;
     }
@@ -344,16 +301,6 @@ public void afterIteration(final IterationInfo iteration) {
         getLifecycle().writeTestCase(uuid);
     }
 
-    @Override
-    public void beforeSpec(final SpecInfo spec) {
-        streamsCapturer.start();
-    }
-
-    @Override
-    public void afterSpec(final SpecInfo spec) {
-        streamsCapturer.stop();
-    }
-
     private List<Parameter> getParameters(final List<String> names, final Object... values) {
         return IntStream.range(0, Math.min(names.size(), values.length))
                 .mapToObj(index -> createParameter(names.get(index), values[index]))

allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java

@@ -40,7 +40,6 @@
 import io.qameta.allure.spock2.samples.ParametersTest;
 import io.qameta.allure.spock2.samples.SpecFixtures;
 import io.qameta.allure.spock2.samples.StepsAndBlocks;
-import io.qameta.allure.spock2.samples.StreamsListener;
 import io.qameta.allure.spock2.samples.TestWithAnnotations;
 import io.qameta.allure.spock2.samples.TestWithAnnotationsOnClass;
 import io.qameta.allure.spock2.samples.TestWithCustomAnnotations;
@@ -90,16 +89,6 @@ void shouldStoreTestsInformation() {
                 .hasSize(1);
     }
 
-    @Test
-    void shouldCaptureSystemStreams() {
-        final AllureResults results = runClasses(StreamsListener.class);
-        assertThat(results.getTestResults())
-                .extracting(TestResult::getName, this::printSteps)
-                .containsExactlyInAnyOrder(
-                        tuple("Streams Test", "step1, error step, expect")
-                );
-    }
-
     @Test
     void shouldSupportTestsWithStepsAndBlocks() {
         final AllureResults results = runClasses(StepsAndBlocks.class);

allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/OneTest.groovy

@@ -17,13 +17,15 @@ package io.qameta.allure.spock2.samples
 
 import spock.lang.Specification
 
+import static io.qameta.allure.Allure.step
+
 /**
  * @author charlie (Dmitry Baev).
  */
 class OneTest extends Specification {
 
     def setup() {
-        println "OneTest#setup"
+        step "OneTest#setup"
     }
 
     def "Simple Test"() {

allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecFixtures.groovy

@@ -17,17 +17,19 @@ package io.qameta.allure.spock2.samples
 
 import spock.lang.Specification
 
+import static io.qameta.allure.Allure.step
+
 /**
  * @author charlie (Dmitry Baev).
  */
 class SpecFixtures extends Specification {
 
     def setupSpec() {
-        println "SpecFixtures#setupSpec"
+        step "SpecFixtures#setupSpec"
     }
 
     def cleanupSpec() {
-        println "SpecFixtures#cleanupSpec"
+        step "SpecFixtures#cleanupSpec"
     }
 
     def "test with spec fixtures"() {

allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/SpecInheritanceSpec.groovy

@@ -17,22 +17,34 @@ package io.qameta.allure.spock2.samples
 
 import spock.lang.Specification
 
+import static io.qameta.allure.Allure.step
+
 abstract class BaseSpec extends Specification {
-  def setupSpec() { println 'base setupSpec()' }
-  def cleanupSpec() { println 'base cleanupSpec()' }
+    def setupSpec() { step 'base setupSpec()' }
+
+    def cleanupSpec() { step 'base cleanupSpec()' }
+
+    def setup() { step 'base setup()' }
 
-  def setup() { println 'base setup()' }
-  def cleanup() { println 'base cleanup()' }
+    def cleanup() { step 'base cleanup()' }
 
-  def baseSpecMethod() { setup: println 'base spec method' }
+    def baseSpecMethod() {
+        setup:
+        step 'base spec method'
+    }
 }
 
 class DerivedSpec extends BaseSpec {
-  def setupSpec() { println 'derived setupSpec()' }
-  def cleanupSpec() { println 'derived cleanupSpec()' }
+    def setupSpec() { step 'derived setupSpec()' }
+
+    def cleanupSpec() { step 'derived cleanupSpec()' }
+
+    def setup() { step 'derived setup()' }
 
-  def setup() { println 'derived setup()' }
-  def cleanup() { println 'derived cleanup()' }
+    def cleanup() { step 'derived cleanup()' }
 
-  def derivedSpecMethod() { setup: println 'derived spec method' }
+    def derivedSpecMethod() {
+        setup:
+        step 'derived spec method'
+    }
 }

allure-spock2/src/test/groovy/io/qameta/allure/spock2/samples/StepsAndBlocks.groovy

@@ -41,6 +41,6 @@ class StepsAndBlocks extends Specification {
 
     @Step
     def "step some"() {
-        println "yaaa"
+        step "yaaa"
     }
 }