Rename quarkus-junit5-vertx to quarkus-test-vertx and remove quarkus-…

…junit5 dependency

bom/application/pom.xml

@@ -2613,7 +2613,7 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit5-vertx</artifactId>
+                <artifactId>quarkus-test-vertx</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptorBase.java

@@ -17,7 +17,7 @@ public abstract class ReactiveTransactionalInterceptorBase {
     private static final String JUNIT_TEST_ANN = "org.junit.jupiter.api.Test";
     private static final String JUNIT_BEFORE_EACH_ANN = "org.junit.jupiter.api.BeforeEach";
     private static final String JUNIT_AFTER_EACH_ANN = "org.junit.jupiter.api.AfterEach";
-    private static final String UNI_ASSERTER_CLASS = "io.quarkus.test.junit.vertx.UniAsserter";
+    private static final String UNI_ASSERTER_CLASS = "io.quarkus.test.vertx.UniAsserter";
 
     @SuppressWarnings("unchecked")
     @AroundInvoke

integration-tests/hibernate-reactive-panache/pom.xml

@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-vertx</artifactId>
+            <artifactId>quarkus-test-vertx</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityTest.java

@@ -22,8 +22,8 @@
 import io.quarkus.test.TestReactiveTransaction;
 import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.vertx.RunOnVertxContext;
-import io.quarkus.test.junit.vertx.UniAsserter;
+import io.quarkus.test.vertx.RunOnVertxContext;
+import io.quarkus.test.vertx.UniAsserter;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.smallrye.mutiny.Uni;

integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/TestReactiveTransactionTest.java

@@ -6,7 +6,7 @@
 import io.quarkus.hibernate.reactive.panache.Panache;
 import io.quarkus.test.TestReactiveTransaction;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.vertx.UniAsserter;
+import io.quarkus.test.vertx.UniAsserter;
 
 @QuarkusTest
 public class TestReactiveTransactionTest {

test-framework/pom.xml

@@ -29,7 +29,7 @@
         <module>junit5</module>
         <module>junit5-mockito</module>
         <module>junit5-mockito-config</module>
-        <module>junit5-vertx</module>
+        <module>vertx</module>
         <module>amazon-lambda</module>
         <module>arquillian</module>
         <module>devmode-test-utils</module>

test-framework/junit5-vertx/pom.xml → test-framework/vertx/pom.xml

@@ -10,13 +10,13 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-junit5-vertx</artifactId>
-    <name>Quarkus - Test framework - JUnit 5 - Vert.x</name>
+    <artifactId>quarkus-test-vertx</artifactId>
+    <name>Quarkus - Test framework - Vert.x</name>
 
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-test-common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

test-framework/junit5-vertx/src/main/java/io/quarkus/test/junit/vertx/DefaultUniAsserter.java → test-framework/vertx/src/main/java/io/quarkus/test/vertx/DefaultUniAsserter.java

@@ -1,4 +1,4 @@
-package io.quarkus.test.junit.vertx;
+package io.quarkus.test.vertx;
 
 import java.util.function.Consumer;
 import java.util.function.Function;

test-framework/junit5-vertx/src/main/java/io/quarkus/test/junit/vertx/RunOnVertxContext.java → test-framework/vertx/src/main/java/io/quarkus/test/vertx/RunOnVertxContext.java

@@ -1,4 +1,4 @@
-package io.quarkus.test.junit.vertx;
+package io.quarkus.test.vertx;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

test-framework/junit5-vertx/src/main/java/io/quarkus/test/junit/vertx/RunOnVertxContextTestMethodInvoker.java → test-framework/vertx/src/main/java/io/quarkus/test/vertx/RunOnVertxContextTestMethodInvoker.java

@@ -1,4 +1,4 @@
-package io.quarkus.test.junit.vertx;
+package io.quarkus.test.vertx;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;

test-framework/junit5-vertx/src/main/java/io/quarkus/test/junit/vertx/UniAsserter.java → test-framework/vertx/src/main/java/io/quarkus/test/vertx/UniAsserter.java

@@ -1,4 +1,4 @@
-package io.quarkus.test.junit.vertx;
+package io.quarkus.test.vertx;
 
 import java.util.function.Consumer;
 import java.util.function.Function;

test-framework/vertx/src/main/resources/META-INF/services/io.quarkus.test.TestMethodInvoker

@@ -0,0 +1 @@
+io.quarkus.test.vertx.RunOnVertxContextTestMethodInvoker