Merge pull request #31394 from johnaohara/QUARKUS-31393

Fix afterEach callback for integration tests
quarkusio · Feb 24, 2023 · 7adfaa9 · 7adfaa9
2 parents 2a0d688 + 8371983
commit 7adfaa9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...mework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java b/...mework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java
@@ -80,14 +80,18 @@ protected void invokeAfterEachCallbacks(QuarkusTestMethodContext testMethodConte
         invokeAfterEachCallbacks(QuarkusTestMethodContext.class, testMethodContext);
     }
 
-    protected boolean isAfterAllCallbacksEmpty() {
-        return afterAllCallbacks == null || afterAllCallbacks.isEmpty();
+    protected boolean isAfterEachCallbacksEmpty() {
+        return afterEachCallbacks == null || afterEachCallbacks.isEmpty();
     }
 
     protected void invokeAfterEachCallbacks(Class<?> clazz, Object classInstance) throws Exception {
         invokeCallbacks(afterEachCallbacks, "afterEach", clazz, classInstance);
     }
 
+    protected boolean isAfterAllCallbacksEmpty() {
+        return afterAllCallbacks == null || afterAllCallbacks.isEmpty();
+    }
+
     protected void invokeAfterAllCallbacks(QuarkusTestContext testContext) throws Exception {
         invokeAfterAllCallbacks(QuarkusTestContext.class, testContext);
     }

diff --git a/...framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java b/...framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
@@ -82,7 +82,7 @@ public void afterTestExecution(ExtensionContext context) throws Exception {
     @Override
     public void afterEach(ExtensionContext context) throws Exception {
         if (!failedBoot) {
-            if (!isAfterAllCallbacksEmpty()) {
+            if (!isAfterEachCallbacksEmpty()) {
                 invokeAfterEachCallbacks(createQuarkusTestMethodContext(context));
             }