Merge pull request #1492 from eclipse-vertx/use-jpms-for-testing

Use JPMS for testing

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>
@@ -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 renamed to 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 renamed to 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 renamed to 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 renamed to 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 renamed to 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 renamed to 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 renamed to 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