Activate request context on tests annotated with @RunOnVertContext

quarkusio · Jun 11, 2021 · f6f8c15 · f6f8c15
1 parent bbccb99
commit f6f8c15
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/...5-vertx/src/main/java/io/quarkus/test/junit/vertx/RunOnVertxContextTestMethodInvoker.java b/...5-vertx/src/main/java/io/quarkus/test/junit/vertx/RunOnVertxContextTestMethodInvoker.java
@@ -7,6 +7,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ManagedContext;
 import io.quarkus.test.junit.TestMethodInvoker;
 import io.quarkus.vertx.core.runtime.VertxCoreRecorder;
 import io.vertx.core.Handler;
@@ -91,7 +93,17 @@ public RunTestMethodOnContextHandler(Object testInstance, Method targetMethod, L
 
         @Override
         public void handle(Void event) {
-            doRun();
+            ManagedContext requestContext = Arc.container().requestContext();
+            if (requestContext.isActive()) {
+                doRun();
+            } else {
+                try {
+                    requestContext.activate();
+                    doRun();
+                } finally {
+                    requestContext.terminate();
+                }
+            }
         }
 
         private void doRun() {
@@ -108,7 +120,7 @@ public void accept(Object o) {
                     future.complete(testMethodResult);
                 }
             } catch (Throwable t) {
-                future.completeExceptionally(t);
+                future.completeExceptionally(t.getCause());
             }
         }
     }