Allow the use of UniAsserter in @beforeeach and @AfterEach test methods

Fixes: #19109
quarkusio · Aug 2, 2021 · 138eee3 · 138eee3
1 parent 72cc2d6
commit 138eee3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/...arkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptorBase.java b/...arkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptorBase.java
@@ -14,7 +14,9 @@
 import io.smallrye.mutiny.Uni;
 
 public abstract class ReactiveTransactionalInterceptorBase {
-    private static final String JUNIT_TEST_CLASS = "org.junit.jupiter.api.Test";
+    private static final String JUNIT_TEST_ANN = "org.junit.jupiter.api.Test";
+    private static final String JUNIT_BEFORE_EACH_ANN = "org.junit.jupiter.api.BeforeEach";
+    private static final String JUNIT_AFTER_EACH_ANN = "org.junit.jupiter.api.AfterEach";
     private static final String UNI_ASSERTER_CLASS = "io.quarkus.test.junit.vertx.UniAsserter";
 
     @SuppressWarnings("unchecked")
@@ -57,8 +59,10 @@ public Object intercept(InvocationContext ic) throws Exception {
 
     protected boolean isSpecialTestMethod(InvocationContext ic) {
         Method method = ic.getMethod();
-        return hasAnnotation(JUNIT_TEST_CLASS, method)
-                && hasParameter(UNI_ASSERTER_CLASS, method);
+        return hasParameter(UNI_ASSERTER_CLASS, method)
+                && (hasAnnotation(JUNIT_TEST_ANN, method)
+                        || hasAnnotation(JUNIT_BEFORE_EACH_ANN, method)
+                        || hasAnnotation(JUNIT_AFTER_EACH_ANN, method));
     }
 
     protected Object handleSpecialTestMethod(InvocationContext ic) {

diff --git a/...ive-panache/src/test/java/io/quarkus/it/panache/reactive/TestReactiveTransactionTest.java b/...ive-panache/src/test/java/io/quarkus/it/panache/reactive/TestReactiveTransactionTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.it.panache.reactive;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.hibernate.reactive.panache.Panache;
+import io.quarkus.test.TestReactiveTransaction;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.vertx.UniAsserter;
+
+@QuarkusTest
+public class TestReactiveTransactionTest {
+
+    @TestReactiveTransaction
+    @Test
+    public void testTestTransaction(UniAsserter asserter) {
+        asserter.assertNotNull(() -> Panache.currentTransaction());
+    }
+
+    @TestReactiveTransaction
+    @BeforeEach
+    public void beforeEach(UniAsserter asserter) {
+        asserter.assertNotNull(() -> Panache.currentTransaction());
+    }
+}