Make test consume modularity

Author: vietj

pom.xml

@@ -52,7 +52,7 @@
     <tls.connection.uri/>
     <unix.socket.directory/>
     <unix.socket.port/>
-    <vertx.surefire.useModulePath>false</vertx.surefire.useModulePath>
+    <vertx.surefire.useModulePath>true</vertx.surefire.useModulePath>
     <testcontainers.version>1.17.6</testcontainers.version>
   </properties>
 
@@ -151,7 +151,7 @@
             <execution>
               <id>default-testCompile</id>
               <configuration>
-                <useModulePath>false</useModulePath>
+                <useModulePath>${vertx.surefire.useModulePath}</useModulePath>
               </configuration>
             </execution>
           </executions>

vertx-db2-client/pom.xml

@@ -33,6 +33,7 @@
 
   <properties>
     <vertx.asciidoc.sources.dir>${project.basedir}/src/main/asciidoc/*.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc</vertx.asciidoc.sources.dir>
+    <vertx.surefire.useModulePath>false</vertx.surefire.useModulePath>
   </properties>
 
   <dependencies>

vertx-db2-client/src/main/java/module-info.java

@@ -10,6 +10,8 @@
   requires io.vertx.core.logging;
   requires java.sql;
 
+  provides io.vertx.sqlclient.spi.Driver with io.vertx.db2client.spi.DB2Driver; // Un-tested
+
   exports io.vertx.db2client;
   exports io.vertx.db2client.spi;
 

vertx-mssql-client/src/main/java/module-info.java

@@ -10,9 +10,13 @@
   requires io.vertx.core.logging;
   requires java.sql;
 
+  provides io.vertx.sqlclient.spi.Driver with io.vertx.mssqlclient.spi.MSSQLDriver;
+
   exports io.vertx.mssqlclient;
   exports io.vertx.mssqlclient.spi;
 
+  exports io.vertx.mssqlclient.impl to io.vertx.tests.sql.client.mssql;
+
   requires static io.vertx.docgen;
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;

vertx-mssql-client/src/test/java/module-info.java

@@ -0,0 +1,12 @@
+open module io.vertx.tests.sql.client.mssql {
+
+  requires io.vertx.core;
+  requires io.vertx.sql.client;
+  requires io.vertx.sql.client.mssql;
+  requires io.vertx.tests.sql.client;
+  requires java.sql;
+  requires io.vertx.testing.unit;
+  requires junit;
+  requires testcontainers;
+
+}

vertx-mysql-client/src/main/java/module-info.java

@@ -10,10 +10,16 @@
   requires io.vertx.core.logging;
   requires java.sql;
 
+  provides io.vertx.sqlclient.spi.Driver with io.vertx.mysqlclient.spi.MySQLDriver;
+
   exports io.vertx.mysqlclient;
   exports io.vertx.mysqlclient.spi;
   exports io.vertx.mysqlclient.data.spatial;
 
+  exports io.vertx.mysqlclient.impl to io.vertx.tests.sql.client.mysql;
+  exports io.vertx.mysqlclient.impl.util to io.vertx.tests.sql.client.mysql;
+  exports io.vertx.mysqlclient.impl.protocol to io.vertx.tests.sql.client.mysql;
+
   requires static io.vertx.docgen;
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;

vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLUnixDomainSocketTest.java

@@ -56,8 +56,12 @@ public void setUp() {
 
   @After
   public void after() {
-    client.close().await();
-    vertx.close().await();
+    if (client != null) {
+      client.close().await();
+    }
+    if (vertx != null) {
+      vertx.close().await();
+    }
   }
 
   @Test

vertx-mysql-client/src/test/java/module-info.java

@@ -0,0 +1,14 @@
+open module io.vertx.tests.sql.client.mysql {
+
+  requires io.netty.common;
+  requires io.netty.buffer;
+  requires io.vertx.core;
+  requires io.vertx.sql.client;
+  requires io.vertx.sql.client.mysql;
+  requires io.vertx.tests.sql.client;
+  requires java.sql;
+  requires io.vertx.testing.unit;
+  requires junit;
+  requires testcontainers;
+
+}

vertx-oracle-client/src/main/java/module-info.java

@@ -11,10 +11,14 @@
   requires io.vertx.core.logging;
   requires java.sql;
 
+  provides io.vertx.sqlclient.spi.Driver with io.vertx.oracleclient.spi.OracleDriver;
+
   exports io.vertx.oracleclient;
   exports io.vertx.oracleclient.data;
   exports io.vertx.oracleclient.spi;
 
+  exports io.vertx.oracleclient.impl to io.vertx.tests.sql.client.oracle;
+
   requires static io.vertx.docgen;
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;

vertx-oracle-client/src/test/java/module-info.java

@@ -0,0 +1,12 @@
+open module io.vertx.tests.sql.client.oracle {
+
+  requires io.vertx.core;
+  requires io.vertx.sql.client;
+  requires io.vertx.sql.client.oracle;
+  requires io.vertx.tests.sql.client;
+  requires java.sql;
+  requires io.vertx.testing.unit;
+  requires junit;
+  requires testcontainers;
+
+}