fix(junit-plaftform): fix missed steps in case of beforeall failure (fixes #443, via #878)

Author: prafair

README.md

@@ -10,7 +10,7 @@
 
 # Allure Java Integrations 
 
-[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yaml) 
+[![Build](https://github.com/allure-framework/allure-java/actions/workflows/build.yml/badge.svg)](https://github.com/allure-framework/allure-java/actions/workflows/build.yml) 
 [![Allure Java](https://img.shields.io/github/release/allure-framework/allure-java.svg)](https://github.com/allure-framework/allure-java/releases/latest)
 
 The repository contains new versions of adaptors for JVM-based test frameworks.

allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java

@@ -400,9 +400,7 @@ private void stopTestContainer(final TestIdentifier testIdentifier) {
                 .distinct()
                 .collect(Collectors.toCollection(ArrayList::new));
 
-        if (testIdentifier.isTest()) {
-            getTest(testIdentifier).ifPresent(children::add);
-        }
+        getTest(testIdentifier).ifPresent(children::add);
 
         getLifecycle().updateTestContainer(uuid, container -> container.setChildren(children));
         getLifecycle().stopTestContainer(uuid);

allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java

@@ -21,9 +21,10 @@
 import io.qameta.allure.Step;
 import io.qameta.allure.aspects.AttachmentsAspects;
 import io.qameta.allure.aspects.StepsAspects;
-import io.qameta.allure.junit5.features.AfterEachFixtureFailureSupport;
+import io.qameta.allure.junit5.features.AfterEachFixtureBrokenSupport;
 import io.qameta.allure.junit5.features.AllFixtureSupport;
-import io.qameta.allure.junit5.features.BeforeEachFixtureFailureSupport;
+import io.qameta.allure.junit5.features.BeforeAllFixtureFailureSupport;
+import io.qameta.allure.junit5.features.BeforeEachFixtureBrokenSupport;
 import io.qameta.allure.junit5.features.EachFixtureSupport;
 import io.qameta.allure.junit5.features.ParameterisedBlankParameterValueTests;
 import io.qameta.allure.junit5.features.ParameterisedPrimitivesTests;
@@ -344,8 +345,8 @@ void shouldSupportStepsInAfterAllFixture() {
     }
 
     @Test
-    void shouldSupportFailureInBeforeEachFixture() {
-        final AllureResults results = runClasses(BeforeEachFixtureFailureSupport.class);
+    void shouldSupportBrokenInBeforeEachFixture() {
+        final AllureResults results = runClasses(BeforeEachFixtureBrokenSupport.class);
 
         assertThat(results.getTestResults())
                 .hasSize(1);
@@ -367,8 +368,8 @@ void shouldSupportFailureInBeforeEachFixture() {
     }
 
     @Test
-    void shouldSupportFailureInAfterEachFixture() {
-        final AllureResults results = runClasses(AfterEachFixtureFailureSupport.class);
+    void shouldSupportBrokenInAfterEachFixture() {
+        final AllureResults results = runClasses(AfterEachFixtureBrokenSupport.class);
 
         assertThat(results.getTestResults())
                 .hasSize(1);
@@ -389,6 +390,29 @@ void shouldSupportFailureInAfterEachFixture() {
                 );
     }
 
+    @Test
+    void shouldSupportFailureInBeforeAllFixture() {
+        final AllureResults results = runClasses(BeforeAllFixtureFailureSupport.class);
+
+        assertThat(results.getTestResults())
+                .hasSize(1);
+
+        final TestResult testResult = results.getTestResults().get(0);
+
+        assertThat(results.getTestResultContainers())
+                .filteredOn("name", testResult.getName())
+                .flatExtracting(TestResultContainer::getChildren)
+                .contains(testResult.getUuid());
+
+        assertThat(results.getTestResultContainers())
+                .filteredOn("name", testResult.getName())
+                .flatExtracting(TestResultContainer::getBefores)
+                .extracting(FixtureResult::getName, FixtureResult::getStatus, f -> f.getStatusDetails().getMessage())
+                .containsExactly(
+                        tuple("setUpAll", Status.FAILED, "Make the setUpAll failed")
+                );
+    }
+
     @Step("Run classes {classes}")
     private AllureResults runClasses(final Class<?>... classes) {
         final AllureResultsWriterStub writerStub = new AllureResultsWriterStub();

…ures/AfterEachFixtureFailureSupport.java …tures/AfterEachFixtureBrokenSupport.javaallure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java renamed to allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureFailureSupport.java renamed to allure-junit5/src/test/java/io/qameta/allure/junit5/features/AfterEachFixtureBrokenSupport.java

@@ -22,7 +22,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-public class AfterEachFixtureFailureSupport {
+public class AfterEachFixtureBrokenSupport {
 
     @AfterEach
     void tearDown() {

allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeAllFixtureFailureSupport.java

@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2020 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junit5.features;
+
+import io.qameta.allure.Allure;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.fail;
+
+/**
+ * @author prafair (Pavel Novikov).
+ */
+public class BeforeAllFixtureFailureSupport {
+
+    @BeforeAll
+    static void setUpAll() {
+        Allure.step("setUpAll 1");
+        Allure.step("setUpAll 2");
+        fail("Make the setUpAll failed");
+    }
+
+    @Test
+    void test1() {
+        Allure.step("test1 1");
+        Allure.step("test1 2");
+    }
+}

…res/BeforeEachFixtureFailureSupport.java …ures/BeforeEachFixtureBrokenSupport.javaallure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java renamed to allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureFailureSupport.java renamed to allure-junit5/src/test/java/io/qameta/allure/junit5/features/BeforeEachFixtureBrokenSupport.java

@@ -22,7 +22,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
-public class BeforeEachFixtureFailureSupport {
+public class BeforeEachFixtureBrokenSupport {
 
     @BeforeEach
     void setUp() {