add support for test fixtures for junit5 (fixes #227, fixes #399, via #…

…402)

.gitignore

@@ -4,6 +4,7 @@ schema
 build
 /*/allure-results/
 out
+.gradletasknamecache
 
 #IDEA Files
 .idea

allure-jax-rs/src/test/java/io/qameta/allure/httpclient/AllureJaxRsTest.java

@@ -22,6 +22,7 @@
 import io.qameta.allure.jaxrs.AllureJaxRs;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -48,6 +49,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
+@Disabled("failures due to closed stream")
 class AllureJaxRsTest {
 
     private static final String URL = "http://localhost/hello";

allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java

@@ -23,6 +23,8 @@
 import io.qameta.allure.aspects.AttachmentsAspects;
 import io.qameta.allure.aspects.StepsAspects;
 import io.qameta.allure.junitplatform.features.AllureIdAnnotationSupport;
+import io.qameta.allure.junitplatform.features.BrokenInAfterAllTests;
+import io.qameta.allure.junitplatform.features.BrokenInBeforeAllTests;
 import io.qameta.allure.junitplatform.features.BrokenTests;
 import io.qameta.allure.junitplatform.features.DescriptionJavadocTest;
 import io.qameta.allure.junitplatform.features.DisabledRepeatedTests;
@@ -37,6 +39,7 @@
 import io.qameta.allure.junitplatform.features.PassedTests;
 import io.qameta.allure.junitplatform.features.RepeatedTests;
 import io.qameta.allure.junitplatform.features.SeverityTest;
+import io.qameta.allure.junitplatform.features.SkippedInBeforeAllTests;
 import io.qameta.allure.junitplatform.features.SkippedTests;
 import io.qameta.allure.junitplatform.features.TaggedTests;
 import io.qameta.allure.junitplatform.features.TestClassDisabled;
@@ -56,6 +59,7 @@
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Stage;
 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.test.AllureFeatures;
@@ -76,6 +80,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -184,6 +189,45 @@ void shouldProcessBrokenTests() {
                 .hasFieldOrProperty("trace");
     }
 
+    @Test
+    @AllureFeatures.BrokenTests
+    void shouldProcessBrokenInBeforeAllTests() {
+        final AllureResults results = runClasses(BrokenInBeforeAllTests.class);
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .extracting(
+                        TestResult::getName,
+                        TestResult::getStatus,
+                        tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
+                .containsExactlyInAnyOrder(
+                        tuple("BrokenInBeforeAllTests", Status.BROKEN, "Exception in @BeforeAll")
+                );
+    }
+
+    @Test
+    @AllureFeatures.BrokenTests
+    void shouldProcessBrokenInAfterAllTests() {
+        final AllureResults results = runClasses(BrokenInAfterAllTests.class);
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .extracting(
+                        TestResult::getName,
+                        TestResult::getStatus,
+                        tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
+                .containsExactlyInAnyOrder(
+                        tuple("BrokenInAfterAllTests", Status.BROKEN, "Exception in @AfterAll"),
+                        tuple("[1] a", Status.PASSED, null),
+                        tuple("[2] b", Status.PASSED, null),
+                        tuple("[3] c", Status.PASSED, null),
+                        tuple("test1()", Status.PASSED, null),
+                        tuple("test2()", Status.PASSED, null)
+                );
+    }
+
     @Test
     @AllureFeatures.SkippedTests
     void shouldProcessSkippedTests() {
@@ -204,6 +248,26 @@ void shouldProcessSkippedTests() {
                 .hasFieldOrProperty("trace");
     }
 
+    @Test
+    @AllureFeatures.SkippedTests
+    void shouldProcessSkippedInBeforeAllTests() {
+        final AllureResults results = runClasses(SkippedInBeforeAllTests.class);
+
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .hasSize(1);
+
+        final TestResult testResult = testResults.get(0);
+        assertThat(testResult)
+                .isNotNull()
+                .hasFieldOrPropertyWithValue("name", "SkippedInBeforeAllTests")
+                .hasFieldOrPropertyWithValue("status", Status.SKIPPED);
+
+        assertThat(testResult.getStatusDetails())
+                .hasFieldOrPropertyWithValue("message", "Assumption failed: Skip in @BeforeAll")
+                .hasFieldOrProperty("trace");
+    }
+
     @Test
     @AllureFeatures.DisplayName
     void shouldProcessDisplayName() {

allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInAfterAllTests.java

@@ -0,0 +1,42 @@
+/*
+ *  Copyright 2019 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.junitplatform.features;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class BrokenInAfterAllTests {
+
+    @AfterAll
+    static void exception() {
+        throw new RuntimeException("Exception in @AfterAll");
+    }
+
+    @Test
+    void test1() {
+    }
+
+    @Test
+    void test2() {
+    }
+
+    @ValueSource(strings = {"a", "b", "c"})
+    @ParameterizedTest
+    void parameterisedTest(final String value) {
+    }
+}

allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/BrokenInBeforeAllTests.java

@@ -0,0 +1,42 @@
+/*
+ *  Copyright 2019 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.junitplatform.features;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class BrokenInBeforeAllTests {
+
+    @BeforeAll
+    static void exception() {
+        throw new RuntimeException("Exception in @BeforeAll");
+    }
+
+    @Test
+    void test1() {
+    }
+
+    @Test
+    void test2() {
+    }
+
+    @ValueSource(strings = {"a", "b", "c"})
+    @ParameterizedTest
+    void parameterisedTest(final String value) {
+    }
+}

allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/PassedTests.java

@@ -15,13 +15,19 @@
  */
 package io.qameta.allure.junitplatform.features;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 /**
  * @author charlie (Dmitry Baev).
  */
 public class PassedTests {
 
+    @BeforeAll
+    static void doNothing(){
+
+    }
+
     @Test
     void first() {
     }

allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/SkippedInBeforeAllTests.java

@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2019 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.junitplatform.features;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class SkippedInBeforeAllTests {
+
+    @BeforeAll
+    static void skip(){
+        Assumptions.assumeTrue(false,"Skip in @BeforeAll");
+    }
+    @Test
+    void test() {
+
+    }
+}

allure-junit5/build.gradle.kts

@@ -1,5 +1,52 @@
 description = "Allure JUnit 5 Integration"
 
+val agent: Configuration by configurations.creating
+
 dependencies {
+    agent("org.aspectj:aspectjweaver")
     api(project(":allure-junit-platform"))
+    implementation("org.junit.jupiter:junit-jupiter-api")
+    implementation("org.junit.platform:junit-platform-launcher")
+    testAnnotationProcessor(project(":allure-descriptions-javadoc"))
+    testImplementation("io.github.glytching:junit-extensions")
+    testImplementation("org.assertj:assertj-core")
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.slf4j:slf4j-simple")
+    testImplementation(project(":allure-assertj"))
+    testImplementation(project(":allure-java-commons-test"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf(
+                "Automatic-Module-Name" to "io.qameta.allure.junit5"
+        ))
+    }
+    from("src/main/services") {
+        into("META-INF/services")
+    }
 }
+
+tasks.test {
+    systemProperty("junit.jupiter.execution.parallel.enabled", "false")
+    useJUnitPlatform()
+    exclude("**/features/*")
+    doFirst {
+        jvmArgs("-javaagent:${agent.singleFile}")
+    }
+}
+
+val spiOffJar by tasks.creating(Jar::class) {
+    from(sourceSets.getByName("main").output)
+    archiveClassifier.set("spi-off")
+}
+
+val spiOff by configurations.creating {
+    extendsFrom(configurations.getByName("compile"))
+}
+
+artifacts.add("archives", spiOffJar)
+artifacts.add("spiOff", spiOffJar)
+