Skip to content

Added @Disabled tests handling #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baev merged 6 commits into from
May 29, 2018
Merged

Added @Disabled tests handling #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5e3bd5
added @Disabled tests handling
sidelnikovmike May 18, 2018
ed3c449
suite and package strings moved to constants in AllureJunit5.java
sidelnikovmike May 18, 2018
c70e672
fix for checkstyle problems
sidelnikovmike May 18, 2018
d1129c9
fix for error in tests
sidelnikovmike May 18, 2018
0723a61
uncommented tests(used for debug a problem)
sidelnikovmike May 18, 2018
95a18d8
removed empty string for rerun build
sidelnikovmike May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions allure-junit-platform/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class AllureJunit5 implements TestExecutionListener {
private static final Logger LOGGER = LoggerFactory.getLogger(AllureJunit5.class);

private static final String TAG = "tag";
private static final String SUITE = "suite";
private static final String PACKAGE = "package";


private final ThreadLocal<String> tests
Expand Down Expand Up @@ -72,15 +74,49 @@ public void executionStarted(final TestIdentifier testIdentifier) {

methodSource.ifPresent(source -> {
result.setDescription(getDescription(source));
result.getLabels().add(new Label().withName("suite").withValue(getSuite(source)));
result.getLabels().add(new Label().withName("package").withValue(source.getClassName()));
result.getLabels().add(new Label().withName(SUITE).withValue(getSuite(source)));
result.getLabels().add(new Label().withName(PACKAGE).withValue(source.getClassName()));
});

getLifecycle().scheduleTestCase(result);
getLifecycle().startTestCase(uuid);
}
}

@Override
public void executionSkipped(final TestIdentifier testIdentifier, final String reason) {
if (testIdentifier.isTest()) {
final String uuid = tests.get();
final TestResult result = new TestResult()
.withUuid(uuid)
.withName(testIdentifier.getDisplayName())
.withLabels(getTags(testIdentifier))
.withHistoryId(getHistoryId(testIdentifier))
.withStage(Stage.RUNNING);

testIdentifier
.getSource()
.filter(MethodSource.class::isInstance)
.map(MethodSource.class::cast)
.ifPresent(source -> {
result.setDescription(getDescription(source));
result.getLabels().add(new Label().withName(SUITE).withValue(getSuite(source)));
result.getLabels().add(new Label().withName(PACKAGE).withValue(source.getClassName()));
});

getLifecycle().scheduleTestCase(result);
getLifecycle().startTestCase(uuid);

tests.remove();
getLifecycle().updateTestCase(uuid, testResult -> {
testResult.setStage(Stage.FINISHED);
testResult.setStatus(SKIPPED);
});
getLifecycle().stopTestCase(uuid);
getLifecycle().writeTestCase(uuid);
}
}

@Override
public void executionFinished(final TestIdentifier testIdentifier, final TestExecutionResult testExecutionResult) {
if (testIdentifier.isTest()) {
Expand Down
11 changes: 11 additions & 0 deletions allure-junit-platform/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,17 @@ void shouldProcessJunit5Description() {
.contains("Test description");
}

@Test
void shouldProcessDisabledTests() {
runClasses(DisabledTests.class);

final List<TestResult> testResults = results.getTestResults();
assertThat(testResults)
.hasSize(1)
.first()
.hasFieldOrPropertyWithValue("status", Status.SKIPPED);
}

private void runClasses(Class<?>... classes) {
final ClassSelector[] classSelectors = Stream.of(classes)
.map(DiscoverySelectors::selectClass)
Expand Down
13 changes: 13 additions & 0 deletions allure-junit-platform/src/test/java/io/qameta/allure/junit5/features/DisabledTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package io.qameta.allure.junit5.features;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

public class DisabledTests {

@Test
@Disabled
void disabledByAnnotation() {

}
}