Skip to content
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

Jump to bottom

New behaviour for RetryingTest for Assumptions #293

Merged
merged 6 commits into from
Jul 9, 2020
Merged

New behaviour for RetryingTest for Assumptions #293

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2976989
New test and behaviour for RetryingTest for Assumptions
Michael1993 Jul 1, 2020
35c2374
New test and behaviour for RetryingTest for Assumptions
Michael1993 Jul 1, 2020
58040e2
Merge branch 'master' into issue/291-retrying-assumptions
Michael1993 Jul 3, 2020
4332c2d
Update to documentation, adding cause to exception.
Michael1993 Jul 3, 2020
9129c21
Spotless, why art thou spotless.
Michael1993 Jul 3, 2020
75b3ff9
Rewording documentation for better clarity.
Michael1993 Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/org/junitpioneer/jupiter/RetryingTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ static FailedTestRetrier createFor(Method test) {
}

void failed(Throwable exception) {
if (exception instanceof TestAbortedException)
throw new TestAbortedException("Test execution was skipped, possibly because of a failed assumption.");

exceptionsSoFar++;

boolean allRetriesFailed = exceptionsSoFar == maxRetries;
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/org/junitpioneer/jupiter/RetryingTestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.parallel.Execution;
Expand Down Expand Up @@ -74,6 +75,14 @@ void failsAlways_executedThreeTimes_fails() {
assertThat(results.numberOfFailedTests()).isEqualTo(1);
}

@Test
void skipByAssumption_executedOnce_skipped() {
ExecutionResults results = PioneerTestKit.executeTestMethod(RetryingTestTestCase.class, "skipByAssumption");

assertThat(results.numberOfDynamicRegisteredTests()).isEqualTo(1);
assertThat(results.numberOfAbortedTests()).isEqualTo(1);
}

// TEST CASES -------------------------------------------------------------------

static class RetryingTestTestCase {
Expand Down Expand Up @@ -107,6 +116,11 @@ void failsAlways() {
throw new IllegalArgumentException();
}

@RetryingTest(3)
void skipByAssumption() {
Assumptions.assumeFalse(true);
}

}

@Target({ METHOD, ANNOTATION_TYPE })
Expand Down