Skip to content

Commit af6c72e

Browse files
vietjvietj
authored
Merge pull request #1492 from eclipse-vertx/use-jpms-for-testing
Use JPMS for testing
2 parents d2e4a23 + 943c280 commit af6c72e

File tree

339 files changed

+1026
-1030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

339 files changed

+1026
-1030
lines changed

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<tls.connection.uri/>
5353
<unix.socket.directory/>
5454
<unix.socket.port/>
55-
<vertx.surefire.useModulePath>false</vertx.surefire.useModulePath>
55+
<vertx.surefire.useModulePath>true</vertx.surefire.useModulePath>
5656
<testcontainers.version>1.17.6</testcontainers.version>
5757
</properties>
5858

@@ -151,7 +151,7 @@
151151
<execution>
152152
<id>default-testCompile</id>
153153
<configuration>
154-
<useModulePath>false</useModulePath>
154+
<useModulePath>${vertx.surefire.useModulePath}</useModulePath>
155155
</configuration>
156156
</execution>
157157
</executions>
@@ -314,4 +314,4 @@
314314
</profile>
315315
</profiles>
316316

317-
</project>
317+
</project>

‎vertx-db2-client/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
<properties>
3535
<vertx.asciidoc.sources.dir>${project.basedir}/src/main/asciidoc/*.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc</vertx.asciidoc.sources.dir>
36+
<vertx.surefire.useModulePath>false</vertx.surefire.useModulePath>
3637
</properties>
3738

3839
<dependencies>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
requires io.vertx.core.logging;
1111
requires java.sql;
1212

13+
provides io.vertx.sqlclient.spi.Driver with io.vertx.db2client.spi.DB2Driver; // Un-tested
14+
1315
exports io.vertx.db2client;
1416
exports io.vertx.db2client.spi;
1517

‎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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
1010
*/
1111

12-
package io.vertx.db2client;
12+
package io.vertx.tests.db2client;
1313

1414
import io.vertx.core.json.JsonObject;
1515
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.vertx.db2client;
16+
package io.vertx.tests.db2client;
1717

1818
import io.vertx.core.buffer.Buffer;
1919
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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.vertx.db2client;
16+
package io.vertx.tests.db2client;
1717

18+
import io.vertx.db2client.DB2Connection;
19+
import io.vertx.db2client.DB2Exception;
1820
import io.vertx.db2client.impl.drda.SQLState;
1921
import io.vertx.db2client.impl.drda.SqlCode;
2022
import io.vertx.ext.unit.TestContext;
@@ -23,7 +25,7 @@
2325
import org.junit.Test;
2426
import org.junit.runner.RunWith;
2527

26-
import static io.vertx.db2client.junit.TestUtil.*;
28+
import static io.vertx.tests.db2client.junit.TestUtil.assertContains;
2729

2830
@RunWith(VertxUnitRunner.class)
2931
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.vertx.db2client;
16+
package io.vertx.tests.db2client;
1717

18+
import io.vertx.db2client.DB2Connection;
1819
import org.junit.Test;
1920
import org.junit.runner.RunWith;
2021

‎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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package io.vertx.db2client;
1+
package io.vertx.tests.db2client;
22

33
import io.vertx.ext.unit.TestContext;
44
import io.vertx.ext.unit.junit.VertxUnitRunner;
5-
import io.vertx.sqlclient.Row;
65
import io.vertx.sqlclient.Tuple;
76
import org.junit.Test;
87
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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
1010
*/
1111

12-
package io.vertx.db2client.impl;
12+
package io.vertx.tests.db2client;
1313

14-
import io.vertx.sqlclient.impl.TestRowDesc;
14+
import io.vertx.db2client.impl.DB2RowImpl;
15+
import io.vertx.tests.sqlclient.TestRowDesc;
1516
import org.junit.Test;
1617

1718
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.vertx.db2client;
1+
package io.vertx.tests.db2client;
22

33
import org.junit.Before;
44
import org.junit.ClassRule;
@@ -7,11 +7,11 @@
77
import org.junit.rules.TestName;
88
import org.junit.runner.RunWith;
99

10-
import io.vertx.db2client.junit.DB2Resource;
11-
import io.vertx.db2client.tck.ClientConfig;
10+
import io.vertx.tests.db2client.junit.DB2Resource;
11+
import io.vertx.tests.db2client.tck.ClientConfig;
1212
import io.vertx.ext.unit.TestContext;
1313
import io.vertx.ext.unit.junit.VertxUnitRunner;
14-
import io.vertx.sqlclient.tck.SimpleQueryTestBase;
14+
import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase;
1515

1616
@RunWith(VertxUnitRunner.class)
1717
@Ignore

‎vertx-db2-client/src/test/java/io/vertx/db2client/DB2SimpleQueryUriTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2SimpleQueryUriTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.vertx.db2client;
16+
package io.vertx.tests.db2client;
1717

18+
import io.vertx.db2client.DB2Connection;
1819
import org.junit.runner.RunWith;
1920

2021
import io.vertx.core.AsyncResult;
2122
import io.vertx.core.Future;
2223
import io.vertx.core.Handler;
23-
import io.vertx.db2client.tck.DB2SimpleQueryTest;
24+
import io.vertx.tests.db2client.tck.DB2SimpleQueryTest;
2425
import io.vertx.ext.unit.junit.VertxUnitRunner;
2526
import io.vertx.sqlclient.SqlConnection;
26-
import io.vertx.sqlclient.tck.Connector;
27+
import io.vertx.tests.sqlclient.tck.Connector;
2728

2829
/*
2930
* Runs the tck SimpleQueryTest, but with a uri instead of connection properties.

‎vertx-db2-client/src/test/java/io/vertx/db2client/DB2TestBase.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2TestBase.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.vertx.db2client;
16+
package io.vertx.tests.db2client;
1717

1818
import java.util.Collections;
1919
import java.util.List;
2020

21+
import io.vertx.db2client.DB2ConnectOptions;
2122
import org.junit.After;
2223
import org.junit.Before;
2324
import org.junit.ClassRule;
@@ -27,11 +28,11 @@
2728
import io.vertx.core.AsyncResult;
2829
import io.vertx.core.Handler;
2930
import io.vertx.core.Vertx;
30-
import io.vertx.db2client.junit.DB2Resource;
31-
import io.vertx.db2client.tck.ClientConfig;
31+
import io.vertx.tests.db2client.junit.DB2Resource;
32+
import io.vertx.tests.db2client.tck.ClientConfig;
3233
import io.vertx.ext.unit.TestContext;
3334
import io.vertx.sqlclient.SqlConnection;
34-
import io.vertx.sqlclient.tck.Connector;
35+
import io.vertx.tests.sqlclient.tck.Connector;
3536

3637
public abstract class DB2TestBase {
3738

‎vertx-db2-client/src/test/java/io/vertx/db2client/GeneratedKeysTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/GeneratedKeysTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.vertx.db2client;
1+
package io.vertx.tests.db2client;
22

33
import org.junit.Test;
44
import org.junit.runner.RunWith;

‎vertx-db2-client/src/test/java/io/vertx/db2client/QueryVariationsTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/QueryVariationsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.vertx.db2client;
1+
package io.vertx.tests.db2client;
22

33
import static org.junit.Assume.assumeFalse;
44

‎vertx-db2-client/src/test/java/io/vertx/db2client/TableJoinTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/TableJoinTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.vertx.db2client;
1+
package io.vertx.tests.db2client;
22

33
import static org.junit.Assume.assumeFalse;
44

‎vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/junit/DB2Resource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.vertx.db2client.junit;
16+
package io.vertx.tests.db2client.junit;
1717

1818
import io.vertx.core.net.ClientSSLOptions;
1919
import io.vertx.core.net.JksOptions;

‎vertx-db2-client/src/test/java/io/vertx/db2client/junit/TestUtil.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/junit/TestUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package io.vertx.db2client.junit;
1+
package io.vertx.tests.db2client.junit;
22

33
import java.util.Arrays;
44

55
import io.vertx.ext.unit.TestContext;
66

77
public class TestUtil {
8-
8+
99
public static void assertContains(TestContext ctx, String fullString, String... lookFor) {
1010
if (lookFor == null || lookFor.length == 0)
1111
throw new IllegalArgumentException("Must look for at least 1 token");

‎vertx-db2-client/src/test/java/io/vertx/db2client/tck/ClientConfig.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/ClientConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
package io.vertx.db2client.tck;
17+
package io.vertx.tests.db2client.tck;
1818

1919
import io.vertx.core.AsyncResult;
2020
import io.vertx.core.Future;
@@ -24,7 +24,7 @@
2424
import io.vertx.db2client.DB2ConnectOptions;
2525
import io.vertx.db2client.DB2Connection;
2626
import io.vertx.sqlclient.*;
27-
import io.vertx.sqlclient.tck.Connector;
27+
import io.vertx.tests.sqlclient.tck.Connector;
2828

2929
@SuppressWarnings("unchecked")
3030
public enum ClientConfig {

‎vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeDecodeTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2BinaryDataTypeDecodeTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
1010
*/
1111

12-
package io.vertx.db2client.tck;
12+
package io.vertx.tests.db2client.tck;
1313

14-
import io.vertx.db2client.junit.DB2Resource;
14+
import io.vertx.tests.db2client.junit.DB2Resource;
1515
import io.vertx.ext.unit.TestContext;
1616
import io.vertx.ext.unit.junit.VertxUnitRunner;
1717
import io.vertx.sqlclient.Row;
1818
import io.vertx.sqlclient.data.Numeric;
1919
import io.vertx.sqlclient.desc.ColumnDescriptor;
20-
import io.vertx.sqlclient.tck.BinaryDataTypeDecodeTestBase;
20+
import io.vertx.tests.sqlclient.tck.BinaryDataTypeDecodeTestBase;
2121
import org.junit.*;
2222
import org.junit.rules.TestName;
2323
import org.junit.runner.RunWith;

‎vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeEncodeTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2BinaryDataTypeEncodeTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
1010
*/
1111

12-
package io.vertx.db2client.tck;
12+
package io.vertx.tests.db2client.tck;
1313

14-
import io.vertx.db2client.junit.DB2Resource;
14+
import io.vertx.tests.db2client.junit.DB2Resource;
1515
import io.vertx.ext.unit.TestContext;
1616
import io.vertx.ext.unit.junit.VertxUnitRunner;
1717
import io.vertx.sqlclient.Row;
1818
import io.vertx.sqlclient.Tuple;
1919
import io.vertx.sqlclient.data.Numeric;
20-
import io.vertx.sqlclient.tck.BinaryDataTypeEncodeTestBase;
20+
import io.vertx.tests.sqlclient.tck.BinaryDataTypeEncodeTestBase;
2121
import org.junit.Before;
2222
import org.junit.ClassRule;
2323
import org.junit.Rule;

‎vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2CollectorTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2CollectorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package io.vertx.db2client.tck;
1+
package io.vertx.tests.db2client.tck;
22

33
import org.junit.Before;
44
import org.junit.ClassRule;
55
import org.junit.Rule;
66
import org.junit.rules.TestName;
77
import org.junit.runner.RunWith;
88

9-
import io.vertx.db2client.junit.DB2Resource;
9+
import io.vertx.tests.db2client.junit.DB2Resource;
1010
import io.vertx.ext.unit.TestContext;
1111
import io.vertx.ext.unit.junit.VertxUnitRunner;
12-
import io.vertx.sqlclient.tck.CollectorTestBase;
12+
import io.vertx.tests.sqlclient.tck.CollectorTestBase;
1313

1414
@RunWith(VertxUnitRunner.class)
1515
public class DB2CollectorTest extends CollectorTestBase {

‎vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionAutoRetryTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2ConnectionAutoRetryTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
1010
*/
1111

12-
package io.vertx.db2client.tck;
12+
package io.vertx.tests.db2client.tck;
1313

1414
import io.vertx.db2client.DB2ConnectOptions;
15-
import io.vertx.db2client.junit.DB2Resource;
15+
import io.vertx.tests.db2client.junit.DB2Resource;
1616
import io.vertx.ext.unit.TestContext;
1717
import io.vertx.ext.unit.junit.VertxUnitRunner;
1818
import io.vertx.sqlclient.SqlConnectOptions;
19-
import io.vertx.sqlclient.tck.ConnectionAutoRetryTestBase;
19+
import io.vertx.tests.sqlclient.tck.ConnectionAutoRetryTestBase;
2020
import org.junit.ClassRule;
2121
import org.junit.runner.RunWith;
2222

‎vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2ConnectionTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.vertx.db2client.tck;
16+
package io.vertx.tests.db2client.tck;
1717

18-
import static io.vertx.db2client.junit.TestUtil.assertContains;
18+
import static io.vertx.tests.db2client.junit.TestUtil.assertContains;
1919

2020
import io.vertx.sqlclient.spi.DatabaseMetadata;
21-
import io.vertx.sqlclient.tck.ConnectionTestBase;
21+
import io.vertx.tests.sqlclient.tck.ConnectionTestBase;
2222
import io.vertx.db2client.DB2Exception;
2323
import io.vertx.db2client.impl.drda.SQLState;
2424
import io.vertx.db2client.impl.drda.SqlCode;
25-
import io.vertx.db2client.junit.DB2Resource;
25+
import io.vertx.tests.db2client.junit.DB2Resource;
2626
import io.vertx.ext.unit.TestContext;
2727
import io.vertx.ext.unit.junit.VertxUnitRunner;
2828

‎vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2DriverTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2DriverTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
package io.vertx.db2client.tck;
17+
package io.vertx.tests.db2client.tck;
1818

1919
import org.junit.Before;
2020
import org.junit.ClassRule;
2121
import org.junit.Rule;
2222
import org.junit.rules.TestName;
2323
import org.junit.runner.RunWith;
2424

25-
import io.vertx.db2client.junit.DB2Resource;
25+
import io.vertx.tests.db2client.junit.DB2Resource;
2626
import io.vertx.ext.unit.TestContext;
2727
import io.vertx.ext.unit.junit.VertxUnitRunner;
2828
import io.vertx.sqlclient.SqlConnectOptions;
29-
import io.vertx.sqlclient.tck.DriverTestBase;
29+
import io.vertx.tests.sqlclient.tck.DriverTestBase;
3030

3131
@RunWith(VertxUnitRunner.class)
3232
public class DB2DriverTest extends DriverTestBase {
3333
@ClassRule
3434
public static DB2Resource rule = DB2Resource.SHARED_INSTANCE;
35-
35+
3636
@Rule
3737
public TestName testName = new TestName();
3838

‎vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedBatchTest.java renamed to ‎vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedBatchTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package io.vertx.db2client.tck;
1+
package io.vertx.tests.db2client.tck;
22

3-
import io.vertx.db2client.junit.DB2Resource;
3+
import io.vertx.tests.db2client.junit.DB2Resource;
44
import io.vertx.ext.unit.TestContext;
55
import io.vertx.ext.unit.junit.VertxUnitRunner;
6-
import io.vertx.sqlclient.tck.PreparedBatchTestBase;
6+
import io.vertx.tests.sqlclient.tck.PreparedBatchTestBase;
77

88
import org.junit.Before;
99
import org.junit.ClassRule;

0 commit comments

Comments
 (0)