preserve manually assigned step statuses (fixes #1133, via #1337)

Author: baev

allure-java-commons/src/main/java/io/qameta/allure/Allure.java

@@ -175,7 +175,11 @@ public static <T> T step(final ThrowableContextRunnable<T, StepContext> runnable
 
         try {
             final T result = runnable.run(new DefaultStepContext(key));
-            getLifecycle().updateStep(key, step -> step.setStatus(Status.PASSED));
+            getLifecycle().updateStep(key, step -> {
+                if (Objects.isNull(step.getStatus())) {
+                    step.setStatus(Status.PASSED);
+                }
+            });
             return result;
         } catch (Throwable throwable) {
             getLifecycle().updateStep(

allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java

@@ -130,7 +130,11 @@ public void stepStop() {
         if (Objects.isNull(key)) {
             return;
         }
-        getLifecycle().updateStep(key, s -> s.setStatus(Status.PASSED));
+        getLifecycle().updateStep(key, step -> {
+            if (Objects.isNull(step.getStatus())) {
+                step.setStatus(Status.PASSED);
+            }
+        });
         getLifecycle().stopStep();
     }
 

allure-java-commons/src/test/java/io/qameta/allure/AllureTest.java

@@ -109,6 +109,38 @@ void shouldCreateStepsFromLambdas() {
                 );
     }
 
+    @Issue("1133")
+    @Test
+    void shouldPreserveManuallySetStatusWhenLambdaStepReturns() {
+        final AllureResults results = runWithinTestContext(
+                () -> step(
+                        "step with manually set status",
+                        () -> getLifecycle().updateStep(step -> step.setStatus(Status.FAILED))
+                )
+        );
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getStatus)
+                .containsExactly(Status.FAILED);
+    }
+
+    @Issue("1133")
+    @Test
+    void shouldOverrideManuallySetStatusWhenLambdaStepThrows() {
+        final AllureResults results = runWithinTestContext(
+                () -> step("failing step with manually set status", () -> {
+                    getLifecycle().updateStep(step -> step.setStatus(Status.SKIPPED));
+                    throw new AssertionError("some assertion");
+                })
+        );
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getStatus)
+                .containsExactly(Status.FAILED);
+    }
+
     void doSomething() {
     }
 

allure-java-commons/src/test/java/io/qameta/allure/aspects/StepsAspectsTest.java

@@ -55,6 +55,28 @@ void shouldCreateSteps() {
                 .containsExactly("Simple step", "Simple step");
     }
 
+    @Issue("1133")
+    @Test
+    void shouldPreserveManuallySetStatusWhenAnnotatedStepReturns() {
+        final AllureResults results = runWithinTestContext(this::stepWithManuallySetStatus);
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getStatus)
+                .containsExactly(Status.FAILED);
+    }
+
+    @Issue("1133")
+    @Test
+    void shouldOverrideManuallySetStatusWhenAnnotatedStepThrows() {
+        final AllureResults results = runWithinTestContext(this::failingStepWithManuallySetStatus);
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getStatus)
+                .containsExactly(Status.FAILED);
+    }
+
     @Test
     void shouldKeepStepStatusWithTrailingOpenStage() {
         final AllureResults results = runWithinTestContext(() -> stepWithTrailingStage());
@@ -354,6 +376,17 @@ void stepWithDefaultName() {
     void simpleStep() {
     }
 
+    @Step
+    void stepWithManuallySetStatus() {
+        Allure.getLifecycle().updateStep(step -> step.setStatus(Status.FAILED));
+    }
+
+    @Step
+    void failingStepWithManuallySetStatus() {
+        Allure.getLifecycle().updateStep(step -> step.setStatus(Status.SKIPPED));
+        throw new AssertionError("some assertion");
+    }
+
     @Step("Method {method}")
     void stepWithMethodPlaceholder() {
     }