Use JPMS for testing

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>
@@ -314,4 +314,4 @@
     </profile>
   </profiles>
 
-</project>
+</project>

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-db2-client/src/test/java/io/vertx/db2client/DB2ConnectionUriParserTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2ConnectionUriParserTest.java

@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
 import io.vertx.core.json.JsonObject;
 import org.junit.Test;

vertx-db2-client/src/test/java/io/vertx/db2client/DB2DataTypeTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2DataTypeTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
 import io.vertx.core.buffer.Buffer;
 import io.vertx.ext.unit.TestContext;

vertx-db2-client/src/test/java/io/vertx/db2client/DB2ErrorMessageTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2ErrorMessageTest.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
+import io.vertx.db2client.DB2Connection;
+import io.vertx.db2client.DB2Exception;
 import io.vertx.db2client.impl.drda.SQLState;
 import io.vertx.db2client.impl.drda.SqlCode;
 import io.vertx.ext.unit.TestContext;
@@ -23,7 +25,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static io.vertx.db2client.junit.TestUtil.*;
+import static io.vertx.tests.db2client.junit.TestUtil.assertContains;
 
 @RunWith(VertxUnitRunner.class)
 public class DB2ErrorMessageTest extends DB2TestBase {

vertx-db2-client/src/test/java/io/vertx/db2client/DB2PingTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2PingTest.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
+import io.vertx.db2client.DB2Connection;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

vertx-db2-client/src/test/java/io/vertx/db2client/DB2QueriesTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2QueriesTest.java

@@ -1,8 +1,7 @@
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.Tuple;
 import org.junit.Test;
 import org.junit.runner.RunWith;

vertx-db2-client/src/test/java/io/vertx/db2client/impl/DB2RowImplTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2RowImplTest.java

@@ -9,9 +9,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 
-package io.vertx.db2client.impl;
+package io.vertx.tests.db2client;
 
-import io.vertx.sqlclient.impl.TestRowDesc;
+import io.vertx.db2client.impl.DB2RowImpl;
+import io.vertx.tests.sqlclient.TestRowDesc;
 import org.junit.Test;
 
 import java.time.LocalDate;

vertx-db2-client/src/test/java/io/vertx/db2client/DB2SecureTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2SecureTest.java

@@ -1,4 +1,4 @@
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -7,11 +7,11 @@
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 
-import io.vertx.db2client.junit.DB2Resource;
-import io.vertx.db2client.tck.ClientConfig;
+import io.vertx.tests.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.tck.ClientConfig;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import io.vertx.sqlclient.tck.SimpleQueryTestBase;
+import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase;
 
 @RunWith(VertxUnitRunner.class)
 @Ignore

vertx-db2-client/src/test/java/io/vertx/db2client/DB2SimpleQueryUriTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2SimpleQueryUriTest.java

@@ -13,17 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
+import io.vertx.db2client.DB2Connection;
 import org.junit.runner.RunWith;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
-import io.vertx.db2client.tck.DB2SimpleQueryTest;
+import io.vertx.tests.db2client.tck.DB2SimpleQueryTest;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.sqlclient.SqlConnection;
-import io.vertx.sqlclient.tck.Connector;
+import io.vertx.tests.sqlclient.tck.Connector;
 
 /*
  * Runs the tck SimpleQueryTest, but with a uri instead of connection properties.

vertx-db2-client/src/test/java/io/vertx/db2client/DB2TestBase.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2TestBase.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
 import java.util.Collections;
 import java.util.List;
 
+import io.vertx.db2client.DB2ConnectOptions;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -27,11 +28,11 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
-import io.vertx.db2client.junit.DB2Resource;
-import io.vertx.db2client.tck.ClientConfig;
+import io.vertx.tests.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.tck.ClientConfig;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.sqlclient.SqlConnection;
-import io.vertx.sqlclient.tck.Connector;
+import io.vertx.tests.sqlclient.tck.Connector;
 
 public abstract class DB2TestBase {
 

vertx-db2-client/src/test/java/io/vertx/db2client/GeneratedKeysTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/GeneratedKeysTest.java

@@ -1,4 +1,4 @@
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

vertx-db2-client/src/test/java/io/vertx/db2client/QueryVariationsTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/QueryVariationsTest.java

@@ -1,4 +1,4 @@
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
 import static org.junit.Assume.assumeFalse;
 

vertx-db2-client/src/test/java/io/vertx/db2client/TableJoinTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/TableJoinTest.java

@@ -1,4 +1,4 @@
-package io.vertx.db2client;
+package io.vertx.tests.db2client;
 
 import static org.junit.Assume.assumeFalse;
 

vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/junit/DB2Resource.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.db2client.junit;
+package io.vertx.tests.db2client.junit;
 
 import io.vertx.core.net.ClientSSLOptions;
 import io.vertx.core.net.JksOptions;

vertx-db2-client/src/test/java/io/vertx/db2client/junit/TestUtil.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/junit/TestUtil.java

@@ -1,11 +1,11 @@
-package io.vertx.db2client.junit;
+package io.vertx.tests.db2client.junit;
 
 import java.util.Arrays;
 
 import io.vertx.ext.unit.TestContext;
 
 public class TestUtil {
-  
+
   public static void assertContains(TestContext ctx, String fullString, String... lookFor) {
     if (lookFor == null || lookFor.length == 0)
       throw new IllegalArgumentException("Must look for at least 1 token");

vertx-db2-client/src/test/java/io/vertx/db2client/tck/ClientConfig.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/ClientConfig.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package io.vertx.db2client.tck;
+package io.vertx.tests.db2client.tck;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
@@ -24,7 +24,7 @@
 import io.vertx.db2client.DB2ConnectOptions;
 import io.vertx.db2client.DB2Connection;
 import io.vertx.sqlclient.*;
-import io.vertx.sqlclient.tck.Connector;
+import io.vertx.tests.sqlclient.tck.Connector;
 
 @SuppressWarnings("unchecked")
 public enum ClientConfig {

vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeDecodeTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2BinaryDataTypeDecodeTest.java

@@ -9,15 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 
-package io.vertx.db2client.tck;
+package io.vertx.tests.db2client.tck;
 
-import io.vertx.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.junit.DB2Resource;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.data.Numeric;
 import io.vertx.sqlclient.desc.ColumnDescriptor;
-import io.vertx.sqlclient.tck.BinaryDataTypeDecodeTestBase;
+import io.vertx.tests.sqlclient.tck.BinaryDataTypeDecodeTestBase;
 import org.junit.*;
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;

vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeEncodeTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2BinaryDataTypeEncodeTest.java

@@ -9,15 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 
-package io.vertx.db2client.tck;
+package io.vertx.tests.db2client.tck;
 
-import io.vertx.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.junit.DB2Resource;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.Tuple;
 import io.vertx.sqlclient.data.Numeric;
-import io.vertx.sqlclient.tck.BinaryDataTypeEncodeTestBase;
+import io.vertx.tests.sqlclient.tck.BinaryDataTypeEncodeTestBase;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;

vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2CollectorTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2CollectorTest.java

@@ -1,15 +1,15 @@
-package io.vertx.db2client.tck;
+package io.vertx.tests.db2client.tck;
 
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 
-import io.vertx.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.junit.DB2Resource;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import io.vertx.sqlclient.tck.CollectorTestBase;
+import io.vertx.tests.sqlclient.tck.CollectorTestBase;
 
 @RunWith(VertxUnitRunner.class)
 public class DB2CollectorTest extends CollectorTestBase {

vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionAutoRetryTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2ConnectionAutoRetryTest.java

@@ -9,14 +9,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 
-package io.vertx.db2client.tck;
+package io.vertx.tests.db2client.tck;
 
 import io.vertx.db2client.DB2ConnectOptions;
-import io.vertx.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.junit.DB2Resource;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.sqlclient.SqlConnectOptions;
-import io.vertx.sqlclient.tck.ConnectionAutoRetryTestBase;
+import io.vertx.tests.sqlclient.tck.ConnectionAutoRetryTestBase;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 

vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2ConnectionTest.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.db2client.tck;
+package io.vertx.tests.db2client.tck;
 
-import static io.vertx.db2client.junit.TestUtil.assertContains;
+import static io.vertx.tests.db2client.junit.TestUtil.assertContains;
 
 import io.vertx.sqlclient.spi.DatabaseMetadata;
-import io.vertx.sqlclient.tck.ConnectionTestBase;
+import io.vertx.tests.sqlclient.tck.ConnectionTestBase;
 import io.vertx.db2client.DB2Exception;
 import io.vertx.db2client.impl.drda.SQLState;
 import io.vertx.db2client.impl.drda.SqlCode;
-import io.vertx.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.junit.DB2Resource;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 

vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2DriverTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2DriverTest.java

@@ -14,25 +14,25 @@
  * limitations under the License.
  *
  */
-package io.vertx.db2client.tck;
+package io.vertx.tests.db2client.tck;
 
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 
-import io.vertx.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.junit.DB2Resource;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.sqlclient.SqlConnectOptions;
-import io.vertx.sqlclient.tck.DriverTestBase;
+import io.vertx.tests.sqlclient.tck.DriverTestBase;
 
 @RunWith(VertxUnitRunner.class)
 public class DB2DriverTest extends DriverTestBase {
   @ClassRule
   public static DB2Resource rule = DB2Resource.SHARED_INSTANCE;
-  
+
   @Rule
   public TestName testName = new TestName();
 

vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedBatchTest.java → vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedBatchTest.java

@@ -1,9 +1,9 @@
-package io.vertx.db2client.tck;
+package io.vertx.tests.db2client.tck;
 
-import io.vertx.db2client.junit.DB2Resource;
+import io.vertx.tests.db2client.junit.DB2Resource;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import io.vertx.sqlclient.tck.PreparedBatchTestBase;
+import io.vertx.tests.sqlclient.tck.PreparedBatchTestBase;
 
 import org.junit.Before;
 import org.junit.ClassRule;