Merge pull request #33671 from geoand/#33647

Mark test failure in time for callbacks to know about it
quarkusio · May 29, 2023 · 462755f · 462755f
2 parents 3212b8a + 711336d
commit 462755f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java
@@ -114,6 +114,12 @@ public void testCallbackContextIsFailed() {
         assertTrue(TestContextCheckerBeforeEachCallback.CONTEXT.getTestStatus().isTestFailed());
     }
 
+    @Test
+    @Order(6)
+    public void testCallbackContextIsNotFailedAgain() {
+        assertTrue(TestContextCheckerBeforeEachCallback.CONTEXT.getTestStatus().isTestFailed());
+    }
+
     @Target({ METHOD })
     @Retention(RUNTIME)
     public @interface TestAnnotation {

diff --git a/...k/junit5/src/main/java/io/quarkus/test/junit/AbstractQuarkusTestWithContextExtension.java b/...k/junit5/src/main/java/io/quarkus/test/junit/AbstractQuarkusTestWithContextExtension.java
@@ -4,13 +4,21 @@
 
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.LifecycleMethodExecutionExceptionHandler;
+import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
 import org.junit.jupiter.api.extension.TestWatcher;
 
 public abstract class AbstractQuarkusTestWithContextExtension extends AbstractTestWithCallbacksExtension
-        implements LifecycleMethodExecutionExceptionHandler, TestWatcher {
+        implements TestExecutionExceptionHandler, LifecycleMethodExecutionExceptionHandler, TestWatcher {
 
     public static final String IO_QUARKUS_TESTING_TYPE = "io.quarkus.testing.type";
 
+    @Override
+    public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
+        markTestAsFailed(context, throwable);
+
+        throw throwable;
+    }
+
     @Override
     public void handleAfterAllMethodExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
         markTestAsFailed(context, throwable);