From 5373e4fab97aa13e7fe58cdd62b495c507993683 Mon Sep 17 00:00:00 2001
From: Luc Thuot <luc.thuot@rovio.com>
Date: Sat, 13 Aug 2022 10:22:16 -0400
Subject: [PATCH] Take RunOnVertxContext into account when annotated on class

---
 .../test/vertx/RunOnVertxContextTestMethodInvoker.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test-framework/vertx/src/main/java/io/quarkus/test/vertx/RunOnVertxContextTestMethodInvoker.java b/test-framework/vertx/src/main/java/io/quarkus/test/vertx/RunOnVertxContextTestMethodInvoker.java
index 89b2711f61822..597f3dfcd5c5e 100644
--- a/test-framework/vertx/src/main/java/io/quarkus/test/vertx/RunOnVertxContextTestMethodInvoker.java
+++ b/test-framework/vertx/src/main/java/io/quarkus/test/vertx/RunOnVertxContextTestMethodInvoker.java
@@ -78,7 +78,8 @@ public Object invoke(Object actualTestInstance, Method actualTestMethod, List<Ob
         RunTestMethodOnContextHandler handler = new RunTestMethodOnContextHandler(actualTestInstance, actualTestMethod,
                 actualTestMethodArgs, uniAsserter, cf);
         Context context = vertx.getOrCreateContext();
-        boolean shouldDuplicateContext = shouldContextBeDuplicated(actualTestMethod);
+        boolean shouldDuplicateContext = shouldContextBeDuplicated(
+                actualTestInstance != null ? actualTestInstance.getClass() : Object.class, actualTestMethod);
         if (shouldDuplicateContext) {
             context = VertxContext.getOrCreateDuplicatedContext(context);
             VertxContextSafetyToggle.setContextSafe(context, true);
@@ -95,8 +96,11 @@ public Object invoke(Object actualTestInstance, Method actualTestMethod, List<Ob
         }
     }
 
-    private boolean shouldContextBeDuplicated(Method m) {
-        final RunOnVertxContext runOnVertxContext = m.getAnnotation(RunOnVertxContext.class);
+    private boolean shouldContextBeDuplicated(Class<?> c, Method m) {
+        RunOnVertxContext runOnVertxContext = m.getAnnotation(RunOnVertxContext.class);
+        if (runOnVertxContext == null) {
+            runOnVertxContext = c.getAnnotation(RunOnVertxContext.class);
+        }
         if (runOnVertxContext == null) {
             return false;
         } else {