Merge pull request #27275 from luc-rovio/Issue_27212

Take RunOnVertxContext into account when annotated on class
quarkusio · Aug 17, 2022 · 8a5d1df · 8a5d1df
2 parents c3d6891 + 5373e4f
commit 8a5d1df
Showing 1 changed file with 7 additions and 3 deletions.
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
@@ -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 {