Skip to content

Commit 9e4491b

Browse files
committed
Verify test with failed initialization does not succeed
1 parent 9417dab commit 9e4491b

File tree

3 files changed

+14
-46
lines changed

3 files changed

+14
-46
lines changed

src/test/java/co/helmethair/scalatest/BeforeAfterTest.java

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.junit.platform.engine.EngineDiscoveryRequest;
77
import org.junit.platform.engine.ExecutionRequest;
88
import org.junit.platform.engine.TestDescriptor;
9+
import org.junit.platform.engine.TestExecutionResult;
910

1011
import java.util.HashMap;
1112
import java.util.Map;
@@ -61,6 +62,7 @@ void beforeFailedTest() {
6162
verifyTestExecuteCode(calls, () -> engine.execute(executionRequest));
6263

6364
verifyTestFailReportedWith("[engine:scalatest]/[suite:tests.FailInBeforeTest]", listener, null);
65+
verifyTestSuccessNotReported("[engine:scalatest]/[suite:tests.FailInBeforeTest]", listener);
6466
}
6567

6668
@Test
@@ -78,6 +80,7 @@ void beforeAllFailedTest() {
7880

7981
verifyTestExecuteCode(calls, () -> engine.execute(executionRequest));
8082
verifyTestFailReportedWith("[engine:scalatest]/[suite:tests.FailInBeforeAllTest]", listener, null);
83+
verifyTestSuccessNotReported("[engine:scalatest]/[suite:tests.FailInBeforeAllTest]", listener);
8184
}
8285

8386
@Test
@@ -96,6 +99,7 @@ void afterFailedTest() {
9699

97100
verifyTestSuccessReported("[engine:scalatest]/[suite:tests.FailInAfterTest]/[test:test]", listener);
98101
verifyTestFailReportedWith("[engine:scalatest]/[suite:tests.FailInAfterTest]", listener, null);
102+
verifyTestSuccessNotReported("[engine:scalatest]/[suite:tests.FailInAfterTest]", listener);
99103
}
100104

101105
@Test
@@ -116,23 +120,6 @@ void afterAllFailedTest() {
116120
verifyTestSuccessReported("[engine:scalatest]/[suite:tests.FailInAfterAllTest]/[test:test 1]", listener);
117121
verifyTestSuccessReported("[engine:scalatest]/[suite:tests.FailInAfterAllTest]/[test:test 2]", listener);
118122
verifyTestFailReportedWith("[engine:scalatest]/[suite:tests.FailInAfterAllTest]", listener, null);
119-
}
120-
121-
@Test
122-
void beforeAllThrowsExceptionTest() {
123-
EngineDiscoveryRequest discoveryRequest = createClassDiscoveryRequest("tests.ExceptionBeforeAllTest");
124-
TestDescriptor discoveredTests = engine.discover(discoveryRequest, engineId);
125-
TestEngineExecutionListener listener = spy(new TestEngineExecutionListener());
126-
ExecutionRequest executionRequest = new ExecutionRequest(discoveredTests, listener, null);
127-
128-
Map<String, Integer> calls = new HashMap<String, Integer>() {{
129-
put("beforeAll begin", 1);
130-
put("afterEach", 0);
131-
put("runs", 0);
132-
put("runs again", 0);
133-
}};
134-
135-
verifyTestExecuteCode(calls, () -> engine.execute(executionRequest));
136-
verifyTestFailReportedWith("[engine:scalatest]/[suite:tests.ExceptionBeforeAllTest]", listener, null);
123+
verifyTestSuccessNotReported("[engine:scalatest]/[suite:tests.FailInAfterAllTest]", listener);
137124
}
138125
}

src/test/java/co/helmethair/scalatest/helper/TestHelpers.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,15 @@ default void verifyTestSuccessReported(String testIdsuffix, TestEngineExecutionL
186186
);
187187
}
188188

189+
default void verifyTestSuccessNotReported(String testIdsuffix, TestEngineExecutionListener listener) {
190+
verify(listener, never()).executionFinished(
191+
argThat(a -> a.getUniqueId().toString().endsWith(testIdsuffix)),
192+
argThat(a -> !a.getThrowable().isPresent()
193+
&& a.getStatus() == TestExecutionResult.Status.SUCCESSFUL
194+
)
195+
);
196+
}
197+
189198
default void verifyTestSuccessReported(String testIdsuffix, TestExecutionListener listener) {
190199
verify(listener, atLeastOnce()).executionFinished(
191200
argThat(a -> a.getUniqueId().endsWith(testIdsuffix)),

src/test/scala/tests/ExceptionBeforeAllTest.scala

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)