[quarkusio#36582] Add UnwrappableUniAsserter interface

The goal is to extract the `asUni()` method from `UniAsserter`
DavideD · Nov 2, 2023 · c44eab7 · c44eab7
1 parent a29061e
commit c44eab7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/test-framework/vertx/src/main/java/io/quarkus/test/vertx/DefaultUniAsserter.java b/test-framework/vertx/src/main/java/io/quarkus/test/vertx/DefaultUniAsserter.java
@@ -10,7 +10,7 @@
 
 import io.smallrye.mutiny.Uni;
 
-public final class DefaultUniAsserter implements UniAsserter {
+public final class DefaultUniAsserter implements UnwrappableUniAsserter {
 
     private final ConcurrentMap<String, Object> data;
 

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
@@ -156,7 +156,7 @@ public void run() {
         private final Object testInstance;
         private final Method targetMethod;
         private final List<Object> methodArgs;
-        private final UniAsserter uniAsserter;
+        private final UnwrappableUniAsserter uniAsserter;
         private final CompletableFuture<Object> future;
 
         public RunTestMethodOnVertxEventLoopContextHandler(Object testInstance, Method targetMethod, List<Object> methodArgs,
@@ -165,7 +165,7 @@ public RunTestMethodOnVertxEventLoopContextHandler(Object testInstance, Method t
             this.future = future;
             this.targetMethod = targetMethod;
             this.methodArgs = methodArgs;
-            this.uniAsserter = uniAsserter;
+            this.uniAsserter = (UnwrappableUniAsserter) uniAsserter;
         }
 
         @Override
@@ -219,14 +219,14 @@ public static class RunTestMethodOnVertxBlockingContextHandler implements Handle
         private final Object testInstance;
         private final Method targetMethod;
         private final List<Object> methodArgs;
-        private final UniAsserter uniAsserter;
+        private final UnwrappableUniAsserter uniAsserter;
 
         public RunTestMethodOnVertxBlockingContextHandler(Object testInstance, Method targetMethod, List<Object> methodArgs,
                 UniAsserter uniAsserter) {
             this.testInstance = testInstance;
             this.targetMethod = targetMethod;
             this.methodArgs = methodArgs;
-            this.uniAsserter = uniAsserter;
+            this.uniAsserter = (UnwrappableUniAsserter) uniAsserter;
         }
 
         @Override

diff --git a/test-framework/vertx/src/main/java/io/quarkus/test/vertx/UniAsserter.java b/test-framework/vertx/src/main/java/io/quarkus/test/vertx/UniAsserter.java
@@ -144,9 +144,4 @@ public interface UniAsserter {
      * Clear the test data.
      */
     void clearData();
-
-    /**
-     * @return a {@link Uni} representing the operations pipeline up to this point
-     */
-    Uni<?> asUni();
 }
diff --git a/test-framework/vertx/src/main/java/io/quarkus/test/vertx/UniAsserterInterceptor.java b/test-framework/vertx/src/main/java/io/quarkus/test/vertx/UniAsserterInterceptor.java
@@ -65,7 +65,7 @@
  * </pre>
  *
  */
-public abstract class UniAsserterInterceptor implements UniAsserter {
+public abstract class UniAsserterInterceptor implements UnwrappableUniAsserter {
 
     private final UniAsserter delegate;
 
@@ -192,6 +192,6 @@ public void clearData() {
 
     @Override
     public Uni<?> asUni() {
-        return delegate.asUni();
+        return ((UnwrappableUniAsserter) delegate).asUni();
     }
 }
diff --git a/test-framework/vertx/src/main/java/io/quarkus/test/vertx/UnwrappableUniAsserter.java b/test-framework/vertx/src/main/java/io/quarkus/test/vertx/UnwrappableUniAsserter.java
@@ -0,0 +1,17 @@
+package io.quarkus.test.vertx;
+
+import io.smallrye.mutiny.Uni;
+
+/**
+ * A {@link UniAsserter} that exposes the internal {@link Uni}.
+ * <p>
+ * We've added this interface so that we don't expose the method {@link #asUni()} to the user
+ * </p>
+ */
+interface UnwrappableUniAsserter extends UniAsserter {
+
+    /**
+     * @return a {@link Uni} representing the operations pipeline up to this point
+     */
+    Uni<?> asUni();
+}