Skip to content

Commit de3185c

Browse files
baevbaev
authored
add support for test fixtures for junit5 (fixes allure-framework#227, fixes allure-framework#399, via allure-framework#402)
1 parent 1726289 commit de3185c

19 files changed

Lines changed: 1037 additions & 96 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ schema
44
build
55
/*/allure-results/
66
out
7+
.gradletasknamecache
78

89
#IDEA Files
910
.idea

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.qameta.allure.jaxrs.AllureJaxRs;
2323
import org.junit.jupiter.api.AfterEach;
2424
import org.junit.jupiter.api.BeforeEach;
25+
import org.junit.jupiter.api.Disabled;
2526
import org.junit.jupiter.api.Test;
2627
import org.mockito.ArgumentCaptor;
2728

@@ -48,6 +49,7 @@
4849
/**
4950
* @author charlie (Dmitry Baev).
5051
*/
52+
@Disabled("failures due to closed stream")
5153
class AllureJaxRsTest {
5254

5355
private static final String URL = "http://localhost/hello";

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

Lines changed: 283 additions & 94 deletions
Large diffs are not rendered by default.

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import io.qameta.allure.aspects.AttachmentsAspects;
2424
import io.qameta.allure.aspects.StepsAspects;
2525
import io.qameta.allure.junitplatform.features.AllureIdAnnotationSupport;
26+
import io.qameta.allure.junitplatform.features.BrokenInAfterAllTests;
27+
import io.qameta.allure.junitplatform.features.BrokenInBeforeAllTests;
2628
import io.qameta.allure.junitplatform.features.BrokenTests;
2729
import io.qameta.allure.junitplatform.features.DescriptionJavadocTest;
2830
import io.qameta.allure.junitplatform.features.DisabledRepeatedTests;
@@ -37,6 +39,7 @@
3739
import io.qameta.allure.junitplatform.features.PassedTests;
3840
import io.qameta.allure.junitplatform.features.RepeatedTests;
3941
import io.qameta.allure.junitplatform.features.SeverityTest;
42+
import io.qameta.allure.junitplatform.features.SkippedInBeforeAllTests;
4043
import io.qameta.allure.junitplatform.features.SkippedTests;
4144
import io.qameta.allure.junitplatform.features.TaggedTests;
4245
import io.qameta.allure.junitplatform.features.TestClassDisabled;
@@ -56,6 +59,7 @@
5659
import io.qameta.allure.model.Link;
5760
import io.qameta.allure.model.Stage;
5861
import io.qameta.allure.model.Status;
62+
import io.qameta.allure.model.StatusDetails;
5963
import io.qameta.allure.model.StepResult;
6064
import io.qameta.allure.model.TestResult;
6165
import io.qameta.allure.test.AllureFeatures;
@@ -76,6 +80,7 @@
7680
import java.util.Collection;
7781
import java.util.List;
7882
import java.util.Map;
83+
import java.util.Optional;
7984
import java.util.stream.Collectors;
8085
import java.util.stream.Stream;
8186

@@ -184,6 +189,45 @@ void shouldProcessBrokenTests() {
184189
.hasFieldOrProperty("trace");
185190
}
186191

192+
@Test
193+
@AllureFeatures.BrokenTests
194+
void shouldProcessBrokenInBeforeAllTests() {
195+
final AllureResults results = runClasses(BrokenInBeforeAllTests.class);
196+
197+
final List<TestResult> testResults = results.getTestResults();
198+
199+
assertThat(testResults)
200+
.extracting(
201+
TestResult::getName,
202+
TestResult::getStatus,
203+
tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
204+
.containsExactlyInAnyOrder(
205+
tuple("BrokenInBeforeAllTests", Status.BROKEN, "Exception in @BeforeAll")
206+
);
207+
}
208+
209+
@Test
210+
@AllureFeatures.BrokenTests
211+
void shouldProcessBrokenInAfterAllTests() {
212+
final AllureResults results = runClasses(BrokenInAfterAllTests.class);
213+
214+
final List<TestResult> testResults = results.getTestResults();
215+
216+
assertThat(testResults)
217+
.extracting(
218+
TestResult::getName,
219+
TestResult::getStatus,
220+
tr -> Optional.of(tr).map(TestResult::getStatusDetails).map(StatusDetails::getMessage).orElse(null))
221+
.containsExactlyInAnyOrder(
222+
tuple("BrokenInAfterAllTests", Status.BROKEN, "Exception in @AfterAll"),
223+
tuple("[1] a", Status.PASSED, null),
224+
tuple("[2] b", Status.PASSED, null),
225+
tuple("[3] c", Status.PASSED, null),
226+
tuple("test1()", Status.PASSED, null),
227+
tuple("test2()", Status.PASSED, null)
228+
);
229+
}
230+
187231
@Test
188232
@AllureFeatures.SkippedTests
189233
void shouldProcessSkippedTests() {
@@ -204,6 +248,26 @@ void shouldProcessSkippedTests() {
204248
.hasFieldOrProperty("trace");
205249
}
206250

251+
@Test
252+
@AllureFeatures.SkippedTests
253+
void shouldProcessSkippedInBeforeAllTests() {
254+
final AllureResults results = runClasses(SkippedInBeforeAllTests.class);
255+
256+
final List<TestResult> testResults = results.getTestResults();
257+
assertThat(testResults)
258+
.hasSize(1);
259+
260+
final TestResult testResult = testResults.get(0);
261+
assertThat(testResult)
262+
.isNotNull()
263+
.hasFieldOrPropertyWithValue("name", "SkippedInBeforeAllTests")
264+
.hasFieldOrPropertyWithValue("status", Status.SKIPPED);
265+
266+
assertThat(testResult.getStatusDetails())
267+
.hasFieldOrPropertyWithValue("message", "Assumption failed: Skip in @BeforeAll")
268+
.hasFieldOrProperty("trace");
269+
}
270+
207271
@Test
208272
@AllureFeatures.DisplayName
209273
void shouldProcessDisplayName() {

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright 2019 Qameta Software OÜ
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package io.qameta.allure.junitplatform.features;
17+
18+
import org.junit.jupiter.api.AfterAll;
19+
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.params.ParameterizedTest;
21+
import org.junit.jupiter.params.provider.ValueSource;
22+
23+
public class BrokenInAfterAllTests {
24+
25+
@AfterAll
26+
static void exception() {
27+
throw new RuntimeException("Exception in @AfterAll");
28+
}
29+
30+
@Test
31+
void test1() {
32+
}
33+
34+
@Test
35+
void test2() {
36+
}
37+
38+
@ValueSource(strings = {"a", "b", "c"})
39+
@ParameterizedTest
40+
void parameterisedTest(final String value) {
41+
}
42+
}

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright 2019 Qameta Software OÜ
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package io.qameta.allure.junitplatform.features;
17+
18+
import org.junit.jupiter.api.BeforeAll;
19+
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.params.ParameterizedTest;
21+
import org.junit.jupiter.params.provider.ValueSource;
22+
23+
public class BrokenInBeforeAllTests {
24+
25+
@BeforeAll
26+
static void exception() {
27+
throw new RuntimeException("Exception in @BeforeAll");
28+
}
29+
30+
@Test
31+
void test1() {
32+
}
33+
34+
@Test
35+
void test2() {
36+
}
37+
38+
@ValueSource(strings = {"a", "b", "c"})
39+
@ParameterizedTest
40+
void parameterisedTest(final String value) {
41+
}
42+
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,19 @@
1515
*/
1616
package io.qameta.allure.junitplatform.features;
1717

18+
import org.junit.jupiter.api.BeforeAll;
1819
import org.junit.jupiter.api.Test;
1920

2021
/**
2122
* @author charlie (Dmitry Baev).
2223
*/
2324
public class PassedTests {
2425

26+
@BeforeAll
27+
static void doNothing(){
28+
29+
}
30+
2531
@Test
2632
void first() {
2733
}

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright 2019 Qameta Software OÜ
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package io.qameta.allure.junitplatform.features;
17+
18+
import org.junit.jupiter.api.Assumptions;
19+
import org.junit.jupiter.api.BeforeAll;
20+
import org.junit.jupiter.api.Test;
21+
22+
public class SkippedInBeforeAllTests {
23+
24+
@BeforeAll
25+
static void skip(){
26+
Assumptions.assumeTrue(false,"Skip in @BeforeAll");
27+
}
28+
@Test
29+
void test() {
30+
31+
}
32+
}

‎allure-junit5/build.gradle.kts‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,52 @@
11
description = "Allure JUnit 5 Integration"
22

3+
val agent: Configuration by configurations.creating
4+
35
dependencies {
6+
agent("org.aspectj:aspectjweaver")
47
api(project(":allure-junit-platform"))
8+
implementation("org.junit.jupiter:junit-jupiter-api")
9+
implementation("org.junit.platform:junit-platform-launcher")
10+
testAnnotationProcessor(project(":allure-descriptions-javadoc"))
11+
testImplementation("io.github.glytching:junit-extensions")
12+
testImplementation("org.assertj:assertj-core")
13+
testImplementation("org.junit.jupiter:junit-jupiter-api")
14+
testImplementation("org.junit.jupiter:junit-jupiter-params")
15+
testImplementation("org.slf4j:slf4j-simple")
16+
testImplementation(project(":allure-assertj"))
17+
testImplementation(project(":allure-java-commons-test"))
18+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
19+
}
20+
21+
tasks.jar {
22+
manifest {
23+
attributes(mapOf(
24+
"Automatic-Module-Name" to "io.qameta.allure.junit5"
25+
))
26+
}
27+
from("src/main/services") {
28+
into("META-INF/services")
29+
}
530
}
31+
32+
tasks.test {
33+
systemProperty("junit.jupiter.execution.parallel.enabled", "false")
34+
useJUnitPlatform()
35+
exclude("**/features/*")
36+
doFirst {
37+
jvmArgs("-javaagent:${agent.singleFile}")
38+
}
39+
}
40+
41+
val spiOffJar by tasks.creating(Jar::class) {
42+
from(sourceSets.getByName("main").output)
43+
archiveClassifier.set("spi-off")
44+
}
45+
46+
val spiOff by configurations.creating {
47+
extendsFrom(configurations.getByName("compile"))
48+
}
49+
50+
artifacts.add("archives", spiOffJar)
51+
artifacts.add("spiOff", spiOffJar)
52+

0 commit comments

Comments
 (0)