Restore the ability to use @TestReactiveTransaction on a test class

Fixes: quarkusio#32650
holly-cummins · Apr 20, 2023 · 909a774 · 909a774
1 parent b7dcabc
commit 909a774
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
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
@@ -6,21 +6,17 @@
 import io.quarkus.hibernate.reactive.panache.Panache;
 import io.quarkus.test.TestReactiveTransaction;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.vertx.RunOnVertxContext;
 import io.quarkus.test.vertx.UniAsserter;
 
 @QuarkusTest
+@TestReactiveTransaction
 public class TestReactiveTransactionTest {
 
-    @RunOnVertxContext
-    @TestReactiveTransaction
     @Test
     public void testTestTransaction(UniAsserter asserter) {
         asserter.assertNotNull(() -> Panache.currentTransaction());
     }
 
-    @RunOnVertxContext
-    @TestReactiveTransaction
     @BeforeEach
     public void beforeEach(UniAsserter asserter) {
         asserter.assertNotNull(() -> Panache.currentTransaction());

diff --git a/...amework/vertx/src/main/java/io/quarkus/test/vertx/RunOnVertxContextTestMethodInvoker.java b/...amework/vertx/src/main/java/io/quarkus/test/vertx/RunOnVertxContextTestMethodInvoker.java
@@ -99,7 +99,8 @@ private boolean shouldContextBeDuplicated(Class<?> c, Method m) {
         }
         if (runOnVertxContext == null) {
             // Use duplicated context if @TestReactiveTransaction is present
-            return m.isAnnotationPresent(TestReactiveTransaction.class);
+            return m.isAnnotationPresent(TestReactiveTransaction.class)
+                    || m.getDeclaringClass().isAnnotationPresent(TestReactiveTransaction.class);
         } else {
             return runOnVertxContext.duplicateContext();
         }