diff --git a/pom.xml b/pom.xml index 7ba7bfdf54..16ac171a4a 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ - false + true 1.17.6 @@ -151,7 +151,7 @@ default-testCompile - false + ${vertx.surefire.useModulePath} @@ -314,4 +314,4 @@ - \ No newline at end of file + diff --git a/vertx-db2-client/pom.xml b/vertx-db2-client/pom.xml index 56d55d40e4..d7c843ddc1 100644 --- a/vertx-db2-client/pom.xml +++ b/vertx-db2-client/pom.xml @@ -33,6 +33,7 @@ ${project.basedir}/src/main/asciidoc/*.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc + false diff --git a/vertx-db2-client/src/main/java/module-info.java b/vertx-db2-client/src/main/java/module-info.java index 855207704f..8a111b09d9 100644 --- a/vertx-db2-client/src/main/java/module-info.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2ConnectionUriParserTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2ConnectionUriParserTest.java similarity index 99% rename from vertx-db2-client/src/test/java/io/vertx/db2client/DB2ConnectionUriParserTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2ConnectionUriParserTest.java index b76f0db3dd..87ec283559 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2ConnectionUriParserTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2DataTypeTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2DataTypeTest.java similarity index 99% rename from vertx-db2-client/src/test/java/io/vertx/db2client/DB2DataTypeTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2DataTypeTest.java index 3bc2054af6..c4861f8863 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2DataTypeTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2ErrorMessageTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2ErrorMessageTest.java similarity index 98% rename from vertx-db2-client/src/test/java/io/vertx/db2client/DB2ErrorMessageTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2ErrorMessageTest.java index 33bdd04d57..13cf40980a 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2ErrorMessageTest.java +++ b/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 { diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2PingTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2PingTest.java similarity index 93% rename from vertx-db2-client/src/test/java/io/vertx/db2client/DB2PingTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2PingTest.java index cc91ff4afc..78dbf06d1c 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2PingTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2QueriesTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2QueriesTest.java similarity index 93% rename from vertx-db2-client/src/test/java/io/vertx/db2client/DB2QueriesTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2QueriesTest.java index ff739a1e8c..45b75129e0 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2QueriesTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/impl/DB2RowImplTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2RowImplTest.java similarity index 88% rename from vertx-db2-client/src/test/java/io/vertx/db2client/impl/DB2RowImplTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2RowImplTest.java index 2a908385e6..511a6a16c6 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/impl/DB2RowImplTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2SecureTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2SecureTest.java similarity index 86% rename from vertx-db2-client/src/test/java/io/vertx/db2client/DB2SecureTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2SecureTest.java index 1014e69155..94adcd80a6 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2SecureTest.java +++ b/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 diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2SimpleQueryUriTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2SimpleQueryUriTest.java similarity index 91% rename from vertx-db2-client/src/test/java/io/vertx/db2client/DB2SimpleQueryUriTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2SimpleQueryUriTest.java index 478a0c69f9..06802345c7 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2SimpleQueryUriTest.java +++ b/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. diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2TestBase.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2TestBase.java similarity index 90% rename from vertx-db2-client/src/test/java/io/vertx/db2client/DB2TestBase.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2TestBase.java index 6fa3ca5c07..1bafe341bc 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/DB2TestBase.java +++ b/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 { diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/GeneratedKeysTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/GeneratedKeysTest.java similarity index 98% rename from vertx-db2-client/src/test/java/io/vertx/db2client/GeneratedKeysTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/GeneratedKeysTest.java index fc85b88ab0..3605375c19 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/GeneratedKeysTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/QueryVariationsTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/QueryVariationsTest.java similarity index 99% rename from vertx-db2-client/src/test/java/io/vertx/db2client/QueryVariationsTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/QueryVariationsTest.java index 2e3798758e..2c5314b149 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/QueryVariationsTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/TableJoinTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/TableJoinTest.java similarity index 99% rename from vertx-db2-client/src/test/java/io/vertx/db2client/TableJoinTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/TableJoinTest.java index 95c42d9d53..7db7723e6b 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/TableJoinTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/junit/DB2Resource.java similarity index 99% rename from vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/junit/DB2Resource.java index 4efd195c8f..d5811a8cf4 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/junit/TestUtil.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/junit/TestUtil.java similarity index 94% rename from vertx-db2-client/src/test/java/io/vertx/db2client/junit/TestUtil.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/junit/TestUtil.java index 9317b9424d..b98846343f 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/junit/TestUtil.java +++ b/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"); diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/ClientConfig.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/ClientConfig.java similarity index 96% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/ClientConfig.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/ClientConfig.java index c0c9b0ab03..c4885b5278 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/ClientConfig.java +++ b/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 { diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeDecodeTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2BinaryDataTypeDecodeTest.java similarity index 95% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeDecodeTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2BinaryDataTypeDecodeTest.java index c94ebb72c6..375b84049b 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeDecodeTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeEncodeTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2BinaryDataTypeEncodeTest.java similarity index 95% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeEncodeTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2BinaryDataTypeEncodeTest.java index 29ccfa6a01..d593f8d332 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2BinaryDataTypeEncodeTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2CollectorTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2CollectorTest.java similarity index 83% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2CollectorTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2CollectorTest.java index ba9c809417..1cea3cb6b0 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2CollectorTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2CollectorTest.java @@ -1,4 +1,4 @@ -package io.vertx.db2client.tck; +package io.vertx.tests.db2client.tck; import org.junit.Before; import org.junit.ClassRule; @@ -6,10 +6,10 @@ 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 { diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionAutoRetryTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2ConnectionAutoRetryTest.java similarity index 90% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionAutoRetryTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2ConnectionAutoRetryTest.java index d228df9b0d..9c1b6d79f1 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionAutoRetryTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2ConnectionTest.java similarity index 93% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2ConnectionTest.java index 75fb82b7c9..fee09c8e9d 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2ConnectionTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2DriverTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2DriverTest.java similarity index 90% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2DriverTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2DriverTest.java index ca0ce2a7ef..28b60771cf 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2DriverTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2DriverTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.db2client.tck; +package io.vertx.tests.db2client.tck; import org.junit.Before; import org.junit.ClassRule; @@ -22,17 +22,17 @@ 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(); diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedBatchTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedBatchTest.java similarity index 89% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedBatchTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedBatchTest.java index b1db78903c..57f2532165 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedBatchTest.java +++ b/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; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryCachedTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryCachedTest.java similarity index 94% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryCachedTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryCachedTest.java index 167e72804d..f361dbf1c3 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryCachedTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryCachedTest.java @@ -1,4 +1,4 @@ -package io.vertx.db2client.tck; +package io.vertx.tests.db2client.tck; import org.junit.Before; import org.junit.ClassRule; @@ -7,10 +7,10 @@ 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.PreparedQueryCachedTestBase; +import io.vertx.tests.sqlclient.tck.PreparedQueryCachedTestBase; @RunWith(VertxUnitRunner.class) public class DB2PreparedQueryCachedTest extends PreparedQueryCachedTestBase { diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryPooledTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryPooledTest.java similarity index 89% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryPooledTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryPooledTest.java index 359d376ec2..bc6ef495b0 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryPooledTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryPooledTest.java @@ -1,4 +1,4 @@ -package io.vertx.db2client.tck; +package io.vertx.tests.db2client.tck; import org.junit.runner.RunWith; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryTest.java similarity index 96% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryTest.java index 6b4371262d..1877571987 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.db2client.tck; +package io.vertx.tests.db2client.tck; import org.junit.runner.RunWith; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryTestBase.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryTestBase.java similarity index 93% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryTestBase.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryTestBase.java index 726442d2ec..28d08d345d 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2PreparedQueryTestBase.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2PreparedQueryTestBase.java @@ -1,8 +1,8 @@ -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.sqlclient.tck.PreparedQueryTestBase; +import io.vertx.tests.sqlclient.tck.PreparedQueryTestBase; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2SimpleQueryPooledTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2SimpleQueryPooledTest.java similarity index 86% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2SimpleQueryPooledTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2SimpleQueryPooledTest.java index 982091526a..55522b6494 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2SimpleQueryPooledTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2SimpleQueryPooledTest.java @@ -1,17 +1,15 @@ -package io.vertx.db2client.tck; +package io.vertx.tests.db2client.tck; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; -import org.junit.Test; 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.SimpleQueryTestBase; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; @RunWith(VertxUnitRunner.class) public class DB2SimpleQueryPooledTest extends SimpleQueryTestBase { diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2SimpleQueryTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2SimpleQueryTest.java similarity index 92% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2SimpleQueryTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2SimpleQueryTest.java index 754c834b24..4111f94b1a 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2SimpleQueryTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2SimpleQueryTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.db2client.tck; +package io.vertx.tests.db2client.tck; import org.junit.Before; import org.junit.ClassRule; @@ -22,10 +22,10 @@ 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.SimpleQueryTestBase; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; @RunWith(VertxUnitRunner.class) public class DB2SimpleQueryTest extends SimpleQueryTestBase { diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TextDataTypeDecodeTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TextDataTypeDecodeTest.java similarity index 94% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TextDataTypeDecodeTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TextDataTypeDecodeTest.java index dca3e05734..4d62640625 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TextDataTypeDecodeTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TextDataTypeDecodeTest.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.Async; 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.tck.TextDataTypeDecodeTestBase; +import io.vertx.tests.sqlclient.tck.TextDataTypeDecodeTestBase; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TracingTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TracingTest.java similarity index 89% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TracingTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TracingTest.java index 9920e7e064..9f10944626 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TracingTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TracingTest.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.core.Vertx; import io.vertx.db2client.DB2Builder; -import io.vertx.db2client.junit.DB2Resource; +import io.vertx.tests.db2client.junit.DB2Resource; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.sqlclient.Pool; -import io.vertx.sqlclient.tck.TracingTestBase; +import io.vertx.tests.sqlclient.tck.TracingTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TransactionTest.java b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TransactionTest.java similarity index 94% rename from vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TransactionTest.java rename to vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TransactionTest.java index f27c1f91e2..56bebd5cc6 100644 --- a/vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2TransactionTest.java +++ b/vertx-db2-client/src/test/java/io/vertx/tests/db2client/tck/DB2TransactionTest.java @@ -13,7 +13,7 @@ * 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 org.junit.Assume.assumeFalse; @@ -26,12 +26,12 @@ import org.junit.runner.RunWith; 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.Pool; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.tck.TransactionTestBase; +import io.vertx.tests.sqlclient.tck.TransactionTestBase; @RunWith(VertxUnitRunner.class) public class DB2TransactionTest extends TransactionTestBase { diff --git a/vertx-mssql-client/src/main/java/module-info.java b/vertx-mssql-client/src/main/java/module-info.java index 41a21cda2e..1e9f6e193a 100644 --- a/vertx-mssql-client/src/main/java/module-info.java +++ b/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; diff --git a/vertx-mssql-client/src/test/java/MSSQLConnectOptionsProviderTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLConnectOptionsProviderTest.java similarity index 99% rename from vertx-mssql-client/src/test/java/MSSQLConnectOptionsProviderTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLConnectOptionsProviderTest.java index e60c9589f7..af8fdf1add 100644 --- a/vertx-mssql-client/src/test/java/MSSQLConnectOptionsProviderTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLConnectOptionsProviderTest.java @@ -1,4 +1,4 @@ -/* +package io.vertx.tests.mssqlclient;/* * Copyright (c) 2011-2020 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLConnectionTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLConnectionTest.java similarity index 93% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLConnectionTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLConnectionTest.java index 55825dd834..1c9667712e 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLConnectionTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLConnectionTest.java @@ -9,11 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mssqlclient.MSSQLConnectOptions; +import io.vertx.mssqlclient.MSSQLConnection; +import io.vertx.mssqlclient.MSSQLException; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.SqlConnection; import org.junit.After; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLEncryptionTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLEncryptionTest.java similarity index 92% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLEncryptionTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLEncryptionTest.java index 463e6d80f9..6b475db6c3 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLEncryptionTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLEncryptionTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; import io.vertx.core.net.ClientSSLOptions; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import io.vertx.sqlclient.Tuple; import org.junit.ClassRule; import org.junit.Test; @@ -22,7 +22,7 @@ import java.util.Arrays; -import static io.vertx.mssqlclient.junit.MSSQLRule.Config.TLS; +import static io.vertx.tests.mssqlclient.junit.MSSQLRule.Config.TLS; /** * Encryption tests for a server that does not force encryption. diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLEncryptionTestBase.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLEncryptionTestBase.java similarity index 94% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLEncryptionTestBase.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLEncryptionTestBase.java index 05e074e72d..467ac85910 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLEncryptionTestBase.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLEncryptionTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; @@ -18,7 +18,9 @@ import io.vertx.core.net.ClientSSLOptions; import io.vertx.core.net.PemTrustOptions; import io.vertx.ext.unit.TestContext; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.mssqlclient.MSSQLConnectOptions; +import io.vertx.mssqlclient.MSSQLConnection; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import io.vertx.sqlclient.Row; import org.junit.After; import org.junit.Before; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLExceptionTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLExceptionTest.java similarity index 95% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLExceptionTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLExceptionTest.java index 3ddb582ff1..f2d5b012e4 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLExceptionTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLExceptionTest.java @@ -1,8 +1,9 @@ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; import java.util.Arrays; import java.util.Collection; +import io.vertx.mssqlclient.MSSQLException; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLForcedEncryptionTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLForcedEncryptionTest.java similarity index 87% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLForcedEncryptionTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLForcedEncryptionTest.java index c5b4fcc5e1..a206b114c0 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLForcedEncryptionTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLForcedEncryptionTest.java @@ -9,16 +9,16 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; -import static io.vertx.mssqlclient.junit.MSSQLRule.Config.FORCE_ENCRYPTION; +import static io.vertx.tests.mssqlclient.junit.MSSQLRule.Config.FORCE_ENCRYPTION; /** * Encryption tests for a server that forces encryption. diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLInfoTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLInfoTest.java similarity index 92% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLInfoTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLInfoTest.java index b01ca881e1..c2552b28d0 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLInfoTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLInfoTest.java @@ -14,12 +14,15 @@ * limitations under the License. * */ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mssqlclient.MSSQLConnectOptions; +import io.vertx.mssqlclient.MSSQLConnection; +import io.vertx.mssqlclient.MSSQLInfo; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLMultipleTdsPacketsTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLMultipleTdsPacketsTest.java similarity index 94% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLMultipleTdsPacketsTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLMultipleTdsPacketsTest.java index 5d5262c1c3..b9aa171fd4 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLMultipleTdsPacketsTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLMultipleTdsPacketsTest.java @@ -9,11 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mssqlclient.MSSQLConnectOptions; +import io.vertx.mssqlclient.MSSQLConnection; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.After; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLQueriesTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLQueriesTest.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLQueriesTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLQueriesTest.java index 560ef1d2e9..07b645cab7 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLQueriesTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLQueriesTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; import io.vertx.core.Future; import io.vertx.core.Vertx; @@ -18,6 +18,9 @@ import io.vertx.ext.unit.junit.Repeat; import io.vertx.ext.unit.junit.RepeatRule; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mssqlclient.MSSQLConnectOptions; +import io.vertx.mssqlclient.MSSQLConnection; +import io.vertx.mssqlclient.MSSQLException; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; import io.vertx.sqlclient.Tuple; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLTestBase.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLTestBase.java similarity index 84% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLTestBase.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLTestBase.java index 299971e317..87aca5598f 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLTestBase.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/MSSQLTestBase.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient; +package io.vertx.tests.mssqlclient; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.mssqlclient.MSSQLConnectOptions; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import org.junit.BeforeClass; import org.junit.ClassRule; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLBigStringTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLBigStringTypeTest.java similarity index 93% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLBigStringTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLBigStringTypeTest.java index 9b36c332ee..990545a91d 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLBigStringTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLBigStringTypeTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDataTypeTestBase.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDataTypeTestBase.java similarity index 96% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDataTypeTestBase.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDataTypeTestBase.java index 08f2f14d23..292bcaaace 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDataTypeTestBase.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDataTypeTestBase.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; import io.vertx.mssqlclient.MSSQLConnectOptions; import io.vertx.mssqlclient.MSSQLConnection; -import io.vertx.mssqlclient.MSSQLTestBase; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.mssqlclient.MSSQLTestBase; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.After; @@ -27,8 +27,8 @@ import java.util.List; import java.util.function.Consumer; -import static io.vertx.sqlclient.ColumnChecker.getByIndex; -import static io.vertx.sqlclient.ColumnChecker.getByName; +import static io.vertx.tests.sqlclient.ColumnChecker.getByIndex; +import static io.vertx.tests.sqlclient.ColumnChecker.getByName; public abstract class MSSQLDataTypeTestBase extends MSSQLTestBase { Vertx vertx; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTime2DataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTime2DataTypeTest.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTime2DataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTime2DataTypeTest.java index 0876a37867..d930aa6b6f 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTime2DataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTime2DataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTimeDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTimeDataTypeTest.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTimeDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTimeDataTypeTest.java index a9e63de5f3..96b5057852 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTimeDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTimeDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTimeOffsetDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTimeOffsetDataTypeTest.java similarity index 98% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTimeOffsetDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTimeOffsetDataTypeTest.java index 45f60898b7..52d78761f1 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDateTimeOffsetDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDateTimeOffsetDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDecimalDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDecimalDataTypeTest.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDecimalDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDecimalDataTypeTest.java index 04db06b2a7..de8f9ff9fa 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLDecimalDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLDecimalDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLEnumDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLEnumDataTypeTest.java similarity index 96% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLEnumDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLEnumDataTypeTest.java index 702ea80247..5ef4583ace 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLEnumDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLEnumDataTypeTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLFullDataTypeTestBase.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLFullDataTypeTestBase.java similarity index 99% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLFullDataTypeTestBase.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLFullDataTypeTestBase.java index fa3e4797b4..b9d066abb0 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLFullDataTypeTestBase.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLFullDataTypeTestBase.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.TestContext; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLGuidDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLGuidDataTypeTest.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLGuidDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLGuidDataTypeTest.java index 5f14380eb5..21cc91e184 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLGuidDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLGuidDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLMoneyDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLMoneyDataTypeTest.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLMoneyDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLMoneyDataTypeTest.java index 849f736fa3..2e376ffe6d 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLMoneyDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLMoneyDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLNotNullableDataTypeTestBase.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLNotNullableDataTypeTestBase.java similarity index 69% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLNotNullableDataTypeTestBase.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLNotNullableDataTypeTestBase.java index e6c90fc032..0297efb122 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLNotNullableDataTypeTestBase.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLNotNullableDataTypeTestBase.java @@ -1,4 +1,4 @@ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; public abstract class MSSQLNotNullableDataTypeTestBase extends MSSQLFullDataTypeTestBase { } diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLNullableDataTypeTestBase.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLNullableDataTypeTestBase.java similarity index 98% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLNullableDataTypeTestBase.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLNullableDataTypeTestBase.java index f9c1838581..332c257e67 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLNullableDataTypeTestBase.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLNullableDataTypeTestBase.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.TestContext; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLPreparedQueryNotNullableDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLPreparedQueryNotNullableDataTypeTest.java similarity index 99% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLPreparedQueryNotNullableDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLPreparedQueryNotNullableDataTypeTest.java index 74b8e124c2..0a4c28adc3 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLPreparedQueryNotNullableDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLPreparedQueryNotNullableDataTypeTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.Repeat; import io.vertx.ext.unit.junit.RepeatRule; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Rule; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLPreparedQueryNullableDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLPreparedQueryNullableDataTypeTest.java similarity index 99% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLPreparedQueryNullableDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLPreparedQueryNullableDataTypeTest.java index 7afab90d5d..d5da959729 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLPreparedQueryNullableDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLPreparedQueryNullableDataTypeTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.sqlclient.data.NullValue; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLQueryNotNullableDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLQueryNotNullableDataTypeTest.java similarity index 92% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLQueryNotNullableDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLQueryNotNullableDataTypeTest.java index a64f82ce74..4f042b4ebf 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLQueryNotNullableDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLQueryNotNullableDataTypeTest.java @@ -1,4 +1,4 @@ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLQueryNullableDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLQueryNullableDataTypeTest.java similarity index 96% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLQueryNullableDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLQueryNullableDataTypeTest.java index 78b373068e..5397c78fb3 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLQueryNullableDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLQueryNullableDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLSmallDateTimeDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLSmallDateTimeDataTypeTest.java similarity index 98% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLSmallDateTimeDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLSmallDateTimeDataTypeTest.java index 63f8def2a6..963545015e 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLSmallDateTimeDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLSmallDateTimeDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLSmallMoneyDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLSmallMoneyDataTypeTest.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLSmallMoneyDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLSmallMoneyDataTypeTest.java index 5be7a4bcb9..918a161659 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLSmallMoneyDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLSmallMoneyDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLTimeDataTypeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLTimeDataTypeTest.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLTimeDataTypeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLTimeDataTypeTest.java index 433482a2ee..d3313768c0 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/data/MSSQLTimeDataTypeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/data/MSSQLTimeDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.data; +package io.vertx.tests.mssqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/impl/MSSQLConnectionUriParserTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/impl/MSSQLConnectionUriParserTest.java similarity index 98% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/impl/MSSQLConnectionUriParserTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/impl/MSSQLConnectionUriParserTest.java index c7069c39b6..5416dc8c20 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/impl/MSSQLConnectionUriParserTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/impl/MSSQLConnectionUriParserTest.java @@ -9,14 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.impl; +package io.vertx.tests.mssqlclient.impl; import io.vertx.core.json.JsonObject; import org.junit.Test; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - import static io.vertx.mssqlclient.impl.MSSQLConnectionUriParser.parse; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/impl/MSSQLRowImplTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/impl/MSSQLRowImplTest.java similarity index 87% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/impl/MSSQLRowImplTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/impl/MSSQLRowImplTest.java index 0f61d2bd52..e49b1cc452 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/impl/MSSQLRowImplTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/impl/MSSQLRowImplTest.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.impl; +package io.vertx.tests.mssqlclient.impl; -import io.vertx.sqlclient.impl.TestRowDesc; +import io.vertx.mssqlclient.impl.MSSQLRowImpl; +import io.vertx.tests.sqlclient.TestRowDesc; import org.junit.Test; import java.time.LocalDate; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/junit/MSSQLRule.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/junit/MSSQLRule.java similarity index 97% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/junit/MSSQLRule.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/junit/MSSQLRule.java index a289077360..4491959d42 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/junit/MSSQLRule.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/junit/MSSQLRule.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.junit; +package io.vertx.tests.mssqlclient.junit; import io.vertx.mssqlclient.MSSQLConnectOptions; import org.junit.rules.ExternalResource; @@ -22,7 +22,7 @@ import java.util.Objects; import static io.vertx.mssqlclient.MSSQLConnectOptions.DEFAULT_PORT; -import static io.vertx.mssqlclient.junit.MSSQLRule.Config.STANDARD; +import static io.vertx.tests.mssqlclient.junit.MSSQLRule.Config.STANDARD; import static org.testcontainers.containers.BindMode.READ_ONLY; public class MSSQLRule extends ExternalResource { diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/ClientConfig.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/ClientConfig.java similarity index 96% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/ClientConfig.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/ClientConfig.java index 63cc9defc4..55a29f21c1 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/ClientConfig.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/ClientConfig.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.mssqlclient.MSSQLBuilder; import io.vertx.mssqlclient.MSSQLConnectOptions; @@ -19,7 +19,7 @@ import io.vertx.core.Handler; import io.vertx.core.Vertx; import io.vertx.sqlclient.*; -import io.vertx.sqlclient.tck.Connector; +import io.vertx.tests.sqlclient.tck.Connector; public enum ClientConfig { CONNECT() { diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBatchPooledTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBatchPooledTest.java similarity index 84% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBatchPooledTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBatchPooledTest.java index 5294f8211c..22d63174a2 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBatchPooledTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBatchPooledTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.sqlclient.tck.SimpleQueryTestBase; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBatchTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBatchTest.java similarity index 84% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBatchTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBatchTest.java index 5178fe977c..66e94191b2 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBatchTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBatchTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.sqlclient.tck.SimpleQueryTestBase; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBinaryDataTypeDecodeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBinaryDataTypeDecodeTest.java similarity index 90% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBinaryDataTypeDecodeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBinaryDataTypeDecodeTest.java index d66c1c72fc..b7891a15af 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBinaryDataTypeDecodeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBinaryDataTypeDecodeTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; -import io.vertx.sqlclient.tck.BinaryDataTypeDecodeTestBase; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.sqlclient.tck.BinaryDataTypeDecodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBinaryDataTypeEncodeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBinaryDataTypeEncodeTest.java similarity index 90% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBinaryDataTypeEncodeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBinaryDataTypeEncodeTest.java index 88dd3247d9..fcd3fa3d5a 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLBinaryDataTypeEncodeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLBinaryDataTypeEncodeTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; -import io.vertx.sqlclient.tck.BinaryDataTypeEncodeTestBase; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.sqlclient.tck.BinaryDataTypeEncodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLCollectorTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLCollectorTest.java similarity index 84% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLCollectorTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLCollectorTest.java index 8f2f0b9a70..5469ee8d34 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLCollectorTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLCollectorTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; -import io.vertx.sqlclient.tck.CollectorTestBase; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.sqlclient.tck.CollectorTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLConnectionAutoRetryTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLConnectionAutoRetryTest.java similarity index 90% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLConnectionAutoRetryTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLConnectionAutoRetryTest.java index 90a76036b8..eab4e7829f 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLConnectionAutoRetryTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLConnectionAutoRetryTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.mssqlclient.MSSQLConnectOptions; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; 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; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLConnectionTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLConnectionTest.java similarity index 90% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLConnectionTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLConnectionTest.java index 6ff3b1169c..a734a0d048 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLConnectionTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLConnectionTest.java @@ -9,13 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import io.vertx.sqlclient.spi.DatabaseMetadata; -import io.vertx.sqlclient.tck.ConnectionTestBase; +import io.vertx.tests.sqlclient.tck.ConnectionTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLDriverTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLDriverTest.java similarity index 87% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLDriverTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLDriverTest.java index 7c903a06df..6d79ed01f0 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLDriverTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLDriverTest.java @@ -14,12 +14,12 @@ * limitations under the License. * */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.sqlclient.SqlConnectOptions; -import io.vertx.sqlclient.tck.DriverTestBase; +import io.vertx.tests.sqlclient.tck.DriverTestBase; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLMetricsTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLMetricsTest.java similarity index 89% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLMetricsTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLMetricsTest.java index d8d9c3b5e5..ab84af4305 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLMetricsTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLMetricsTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.mssqlclient.MSSQLBuilder; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import io.vertx.sqlclient.ClientBuilder; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.SqlConnectOptions; -import io.vertx.sqlclient.tck.MetricsTestBase; +import io.vertx.tests.sqlclient.tck.MetricsTestBase; import org.junit.ClassRule; public class MSSQLMetricsTest extends MetricsTestBase { diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLNullValueEncodeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLNullValueEncodeTest.java similarity index 95% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLNullValueEncodeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLNullValueEncodeTest.java index 8c3d09d284..d69f383f4f 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLNullValueEncodeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLNullValueEncodeTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; -import io.vertx.sqlclient.tck.NullValueEncodeTestBase; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.sqlclient.tck.NullValueEncodeTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedBatchTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedBatchTest.java similarity index 85% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedBatchTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedBatchTest.java index d3be89f73e..046edf80c1 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedBatchTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedBatchTest.java @@ -1,9 +1,9 @@ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; -import io.vertx.sqlclient.tck.PreparedBatchTestBase; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.sqlclient.tck.PreparedBatchTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryPooledTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryPooledTest.java similarity index 96% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryPooledTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryPooledTest.java index 85eb64760c..8483bf860e 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryPooledTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryPooledTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryTest.java similarity index 98% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryTest.java index e8b71cfbc6..4ea47912e6 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryTestBase.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryTestBase.java similarity index 95% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryTestBase.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryTestBase.java index b50aa60d6b..eb7a6b8de9 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLPreparedQueryTestBase.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLPreparedQueryTestBase.java @@ -9,13 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.mssqlclient.MSSQLException; -import io.vertx.mssqlclient.junit.MSSQLRule; -import io.vertx.sqlclient.tck.PreparedQueryTestBase; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.sqlclient.tck.PreparedQueryTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTextDataTypeDecodeTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTextDataTypeDecodeTest.java similarity index 89% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTextDataTypeDecodeTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTextDataTypeDecodeTest.java index af7050bcd4..38cf285b88 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTextDataTypeDecodeTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTextDataTypeDecodeTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mssqlclient.junit.MSSQLRule; -import io.vertx.sqlclient.tck.TextDataTypeDecodeTestBase; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.sqlclient.tck.TextDataTypeDecodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTracingTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTracingTest.java similarity index 90% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTracingTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTracingTest.java index 751ee54355..aff59fdee6 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTracingTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTracingTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.core.Vertx; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.mssqlclient.MSSQLBuilder; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import io.vertx.sqlclient.Pool; -import io.vertx.sqlclient.tck.TracingTestBase; +import io.vertx.tests.sqlclient.tck.TracingTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTransactionTest.java b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTransactionTest.java similarity index 92% rename from vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTransactionTest.java rename to vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTransactionTest.java index e8ac5d6997..f08608821e 100644 --- a/vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLTransactionTest.java +++ b/vertx-mssql-client/src/test/java/io/vertx/tests/mssqlclient/tck/MSSQLTransactionTest.java @@ -8,16 +8,16 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mssqlclient.tck; +package io.vertx.tests.mssqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.mssqlclient.MSSQLBuilder; import io.vertx.mssqlclient.MSSQLConnectOptions; -import io.vertx.mssqlclient.junit.MSSQLRule; +import io.vertx.tests.mssqlclient.junit.MSSQLRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.tck.TransactionTestBase; +import io.vertx.tests.sqlclient.tck.TransactionTestBase; import org.junit.AssumptionViolatedException; import org.junit.ClassRule; import org.junit.Test; diff --git a/vertx-mssql-client/src/test/java/module-info.java b/vertx-mssql-client/src/test/java/module-info.java new file mode 100644 index 0000000000..dc697fade9 --- /dev/null +++ b/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; + +} diff --git a/vertx-mysql-client/src/main/java/module-info.java b/vertx-mysql-client/src/main/java/module-info.java index 546be6f7d1..bf2627e566 100644 --- a/vertx-mysql-client/src/main/java/module-info.java +++ b/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; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLAuthenticationPluginTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLAuthenticationPluginTest.java similarity index 93% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLAuthenticationPluginTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLAuthenticationPluginTest.java index cc9835222b..9f159ccf4c 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLAuthenticationPluginTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLAuthenticationPluginTest.java @@ -9,11 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLAuthenticationPlugin; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.Row; import org.junit.After; import org.junit.Before; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLBatchInsertExceptionTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLBatchInsertExceptionTest.java similarity index 94% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLBatchInsertExceptionTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLBatchInsertExceptionTest.java index 2da38f347f..8150d6a795 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLBatchInsertExceptionTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLBatchInsertExceptionTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLBatchInsertExceptionTestBase.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLBatchInsertExceptionTestBase.java similarity index 94% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLBatchInsertExceptionTestBase.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLBatchInsertExceptionTestBase.java index 819a60a955..259c77f0c8 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLBatchInsertExceptionTestBase.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLBatchInsertExceptionTestBase.java @@ -9,10 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; +import io.vertx.mysqlclient.MySQLBatchException; +import io.vertx.mysqlclient.MySQLBuilder; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.PoolOptions; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.SqlClient; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLClientCapabilitiesTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLClientCapabilitiesTest.java similarity index 94% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLClientCapabilitiesTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLClientCapabilitiesTest.java index 165218291d..a5b87dafad 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLClientCapabilitiesTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLClientCapabilitiesTest.java @@ -9,11 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLCollationTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLCollationTest.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLCollationTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLCollationTest.java index 090c22824d..45482ed398 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLCollationTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLCollationTest.java @@ -9,11 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowIterator; import io.vertx.sqlclient.Tuple; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectOptionsProviderTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectOptionsProviderTest.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectOptionsProviderTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectOptionsProviderTest.java index 2af3c29be9..5b28df4a31 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectOptionsProviderTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectOptionsProviderTest.java @@ -9,8 +9,9 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; +import io.vertx.mysqlclient.MySQLConnectOptions; import org.junit.Assert; import org.junit.Test; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectionTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectionTest.java similarity index 96% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectionTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectionTest.java index c4106f2393..49c6078e32 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectionTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectionTest.java @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.ClosedConnectionException; import io.vertx.sqlclient.Row; import org.junit.After; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectionTestBase.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectionTestBase.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectionTestBase.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectionTestBase.java index 41977182ec..e567492cbf 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLConnectionTestBase.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLConnectionTestBase.java @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.TransactionRollbackException; import org.junit.After; import org.junit.Before; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPipelinedBatchInsertExceptionTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPipelinedBatchInsertExceptionTest.java similarity index 89% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPipelinedBatchInsertExceptionTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPipelinedBatchInsertExceptionTest.java index 89c0fccf92..16068276bc 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPipelinedBatchInsertExceptionTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPipelinedBatchInsertExceptionTest.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLConnectOptions; import org.junit.runner.RunWith; @RunWith(VertxUnitRunner.class) diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPoolTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPoolTest.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPoolTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPoolTest.java index 8e81125ad7..fdbf7c2ad3 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPoolTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPoolTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.CompositeFuture; import io.vertx.core.Future; @@ -19,6 +19,9 @@ import io.vertx.ext.unit.junit.Repeat; import io.vertx.ext.unit.junit.RepeatRule; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLBuilder; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; import io.vertx.sqlclient.Row; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPooledConnectionTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPooledConnectionTest.java similarity index 96% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPooledConnectionTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPooledConnectionTest.java index 2f92a07fa3..89290d3fa2 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPooledConnectionTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPooledConnectionTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; @@ -17,6 +17,8 @@ import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLBuilder; +import io.vertx.mysqlclient.MySQLConnectOptions; import io.vertx.sqlclient.*; import org.junit.After; import org.junit.Before; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPreparedStatementTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPreparedStatementTest.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPreparedStatementTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPreparedStatementTest.java index 457491c61f..007ec03f67 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPreparedStatementTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLPreparedStatementTest.java @@ -9,12 +9,15 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; +import io.vertx.mysqlclient.MySQLException; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.After; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLQueryTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLQueryTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLQueryTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLQueryTest.java index 22480201b3..5a34ed8e07 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLQueryTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLQueryTest.java @@ -9,13 +9,16 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.core.file.FileSystem; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLClient; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.*; import org.junit.After; import org.junit.Assume; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLServerVersionParserTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLServerVersionParserTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLServerVersionParserTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLServerVersionParserTest.java index 399fd177d6..0f9328a86c 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLServerVersionParserTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLServerVersionParserTest.java @@ -1,4 +1,4 @@ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.mysqlclient.impl.MySQLDatabaseMetadata; import org.junit.Assert; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLStoredProgramsTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLStoredProgramsTest.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLStoredProgramsTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLStoredProgramsTest.java index bb2f9b493c..6535de26c7 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLStoredProgramsTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLStoredProgramsTest.java @@ -9,11 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowIterator; import io.vertx.sqlclient.RowSet; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLTLSTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTLSTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLTLSTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTLSTest.java index 7da378be48..3a748f6265 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLTLSTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTLSTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Future; import io.vertx.core.Vertx; @@ -21,7 +21,8 @@ import io.vertx.core.net.PemTrustOptions; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.mysqlclient.*; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; import io.vertx.sqlclient.Row; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLTestBase.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTestBase.java similarity index 88% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLTestBase.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTestBase.java index a213d06cfa..916b9518d5 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLTestBase.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLTestBase.java @@ -9,10 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.ext.unit.TestContext; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import io.vertx.sqlclient.SqlClient; import org.junit.BeforeClass; import org.junit.ClassRule; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLUnixDomainSocketTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLUnixDomainSocketTest.java similarity index 92% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLUnixDomainSocketTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLUnixDomainSocketTest.java index a740961e14..1825c53a8e 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLUnixDomainSocketTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLUnixDomainSocketTest.java @@ -8,13 +8,16 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLBuilder; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.SslMode; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.SqlClient; import org.junit.After; @@ -53,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 diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLUtilityCommandTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLUtilityCommandTest.java similarity index 97% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLUtilityCommandTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLUtilityCommandTest.java index b41dd5159f..052dab80f2 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLUtilityCommandTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/MySQLUtilityCommandTest.java @@ -9,12 +9,16 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.mysqlclient.MySQLAuthOptions; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.mysqlclient.MySQLConnection; +import io.vertx.mysqlclient.MySQLSetOption; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; import io.vertx.sqlclient.Tuple; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/ProxySQLBatchInsertExceptionTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/ProxySQLBatchInsertExceptionTest.java similarity index 85% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/ProxySQLBatchInsertExceptionTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/ProxySQLBatchInsertExceptionTest.java index 43afe5eeed..ff2b7c12b8 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/ProxySQLBatchInsertExceptionTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/ProxySQLBatchInsertExceptionTest.java @@ -9,10 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient; +package io.vertx.tests.mysqlclient; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.ProxySQLRule; +import io.vertx.mysqlclient.MySQLConnectOptions; +import io.vertx.tests.mysqlclient.junit.ProxySQLRule; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/BitCodecTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/BitCodecTest.java similarity index 94% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/BitCodecTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/BitCodecTest.java index ae4b45231f..bc843d8bcb 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/BitCodecTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/BitCodecTest.java @@ -9,12 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.MySQLConnection; -import io.vertx.sqlclient.Row; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeBinaryCodecTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeBinaryCodecTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeBinaryCodecTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeBinaryCodecTest.java index 7b5d52858d..c7dfa51b57 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeBinaryCodecTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeBinaryCodecTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeCodecTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeCodecTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeCodecTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeCodecTest.java index f1b10943f8..062e21ef22 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeCodecTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeCodecTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.sqlclient.Row; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeTextCodecTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeTextCodecTest.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeTextCodecTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeTextCodecTest.java index 5b96d92f8f..4506acdc7e 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/DateTimeTextCodecTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeTextCodecTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonBinaryCodecTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonBinaryCodecTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonBinaryCodecTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonBinaryCodecTest.java index 24bef4351b..3a396d4dc3 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonBinaryCodecTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonBinaryCodecTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonDataTypeTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonDataTypeTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonDataTypeTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonDataTypeTest.java index 6ced695beb..7420a7e766 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonDataTypeTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonTextCodecTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonTextCodecTest.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonTextCodecTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonTextCodecTest.java index 348e9e9a67..b184cce09b 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/JsonTextCodecTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/JsonTextCodecTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.TestContext; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/MySQLDataTypeTestBase.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/MySQLDataTypeTestBase.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/MySQLDataTypeTestBase.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/MySQLDataTypeTestBase.java index 17e62e8e8b..d288ac1949 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/MySQLDataTypeTestBase.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/MySQLDataTypeTestBase.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.mysqlclient.MySQLConnectOptions; import io.vertx.mysqlclient.MySQLConnection; -import io.vertx.mysqlclient.MySQLTestBase; +import io.vertx.tests.mysqlclient.MySQLTestBase; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; import io.vertx.sqlclient.Tuple; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/NumericDataTypeTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/NumericDataTypeTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/NumericDataTypeTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/NumericDataTypeTest.java index bc240f2453..81bc10e837 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/NumericDataTypeTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/NumericDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialBinaryCodecTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialBinaryCodecTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialBinaryCodecTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialBinaryCodecTest.java index 645de8c424..e49c044371 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialBinaryCodecTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialBinaryCodecTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialDataTypeCodecTestBase.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialDataTypeCodecTestBase.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialDataTypeCodecTestBase.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialDataTypeCodecTestBase.java index 987ece60ce..c55986cf99 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialDataTypeCodecTestBase.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialDataTypeCodecTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.mysqlclient.data.spatial.*; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialTextCodecTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialTextCodecTest.java similarity index 95% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialTextCodecTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialTextCodecTest.java index c77c28b23c..de9e88599f 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/SpatialTextCodecTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/SpatialTextCodecTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/StringDataTypeTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/StringDataTypeTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/StringDataTypeTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/StringDataTypeTest.java index 669e766e37..e0efa2c4f8 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/data/StringDataTypeTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/StringDataTypeTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.data; +package io.vertx.tests.mysqlclient.data; import io.vertx.core.internal.buffer.BufferInternal; import io.vertx.mysqlclient.MySQLConnection; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/util/CachingSha2AuthenticatorTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/CachingSha2AuthenticatorTest.java similarity index 93% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/util/CachingSha2AuthenticatorTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/CachingSha2AuthenticatorTest.java index d31504394e..77475618a6 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/util/CachingSha2AuthenticatorTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/CachingSha2AuthenticatorTest.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.impl.util; +package io.vertx.tests.mysqlclient.impl; import io.netty.util.internal.StringUtil; +import io.vertx.mysqlclient.impl.util.CachingSha2Authenticator; import org.junit.Assert; import org.junit.Test; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/MySQLConnectionUriParserTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/MySQLConnectionUriParserTest.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/MySQLConnectionUriParserTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/MySQLConnectionUriParserTest.java index 5bbc4d2d9f..51752500ba 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/MySQLConnectionUriParserTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/MySQLConnectionUriParserTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.impl; +package io.vertx.tests.mysqlclient.impl; import io.vertx.core.json.JsonObject; import org.junit.Test; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/MySQLRowImplTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/MySQLRowImplTest.java similarity index 88% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/MySQLRowImplTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/MySQLRowImplTest.java index 1a8d0cba04..de6a3f8507 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/MySQLRowImplTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/MySQLRowImplTest.java @@ -9,8 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.impl; +package io.vertx.tests.mysqlclient.impl; +import io.vertx.mysqlclient.impl.MySQLRowDesc; +import io.vertx.mysqlclient.impl.MySQLRowImpl; import io.vertx.mysqlclient.impl.protocol.ColumnDefinition; import org.junit.Test; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/util/Native41AuthenticatorTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/Native41AuthenticatorTest.java similarity index 93% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/util/Native41AuthenticatorTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/Native41AuthenticatorTest.java index 09e9066902..dcd9f5c405 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/impl/util/Native41AuthenticatorTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/impl/Native41AuthenticatorTest.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.impl.util; +package io.vertx.tests.mysqlclient.impl; import io.netty.util.internal.StringUtil; +import io.vertx.mysqlclient.impl.util.Native41Authenticator; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/MySQLRule.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/junit/MySQLRule.java similarity index 99% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/MySQLRule.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/junit/MySQLRule.java index 938f0150da..c56b477f15 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/MySQLRule.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/junit/MySQLRule.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.mysqlclient.junit; +package io.vertx.tests.mysqlclient.junit; import com.github.dockerjava.api.model.Ulimit; import io.vertx.mysqlclient.MySQLConnectOptions; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/ProxySQLRule.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/junit/ProxySQLRule.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/ProxySQLRule.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/junit/ProxySQLRule.java index e9732a3971..4c0bdd414a 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/ProxySQLRule.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/junit/ProxySQLRule.java @@ -1,4 +1,4 @@ -package io.vertx.mysqlclient.junit; +package io.vertx.tests.mysqlclient.junit; import io.vertx.mysqlclient.MySQLConnectOptions; import org.junit.rules.ExternalResource; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ClientConfig.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ClientConfig.java similarity index 96% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ClientConfig.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ClientConfig.java index 3f6c85fbf7..8771825545 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ClientConfig.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ClientConfig.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Future; @@ -24,7 +24,7 @@ import io.vertx.mysqlclient.MySQLConnectOptions; import io.vertx.mysqlclient.MySQLConnection; import io.vertx.sqlclient.*; -import io.vertx.sqlclient.tck.Connector; +import io.vertx.tests.sqlclient.tck.Connector; public enum ClientConfig { diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLBinaryDataTypeDecodeTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLBinaryDataTypeDecodeTest.java similarity index 98% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLBinaryDataTypeDecodeTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLBinaryDataTypeDecodeTest.java index 22f6e5dc2f..116d825c7d 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLBinaryDataTypeDecodeTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLBinaryDataTypeDecodeTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.data.Numeric; -import io.vertx.sqlclient.tck.BinaryDataTypeDecodeTestBase; +import io.vertx.tests.sqlclient.tck.BinaryDataTypeDecodeTestBase; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLBinaryDataTypeEncodeTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLBinaryDataTypeEncodeTest.java similarity index 94% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLBinaryDataTypeEncodeTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLBinaryDataTypeEncodeTest.java index 5667a0ac7a..9eace6ffb5 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLBinaryDataTypeEncodeTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLBinaryDataTypeEncodeTest.java @@ -9,15 +9,15 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; 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.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLCollectorTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLCollectorTest.java similarity index 84% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLCollectorTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLCollectorTest.java index 716c342ce1..b436198cf3 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLCollectorTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLCollectorTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; -import io.vertx.sqlclient.tck.CollectorTestBase; +import io.vertx.tests.mysqlclient.junit.MySQLRule; +import io.vertx.tests.sqlclient.tck.CollectorTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLConnectionAutoRetryTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLConnectionAutoRetryTest.java similarity index 90% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLConnectionAutoRetryTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLConnectionAutoRetryTest.java index c2fa4aee33..21843fb83d 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLConnectionAutoRetryTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLConnectionAutoRetryTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.mysqlclient.MySQLConnectOptions; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; 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; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLConnectionTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLConnectionTest.java similarity index 92% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLConnectionTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLConnectionTest.java index 14b015a0b2..74c17c9fa2 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLConnectionTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLConnectionTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import io.vertx.sqlclient.spi.DatabaseMetadata; -import io.vertx.sqlclient.tck.ConnectionTestBase; +import io.vertx.tests.sqlclient.tck.ConnectionTestBase; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.ClassRule; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLDriverTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLDriverTest.java similarity index 87% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLDriverTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLDriverTest.java index 916d58c015..10eb85ee56 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLDriverTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLDriverTest.java @@ -14,12 +14,12 @@ * limitations under the License. * */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.sqlclient.SqlConnectOptions; -import io.vertx.sqlclient.tck.DriverTestBase; +import io.vertx.tests.sqlclient.tck.DriverTestBase; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLNullValueEncodeTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLNullValueEncodeTest.java similarity index 85% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLNullValueEncodeTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLNullValueEncodeTest.java index 5161c5cb55..a1eef29780 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLNullValueEncodeTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLNullValueEncodeTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; -import io.vertx.sqlclient.tck.NullValueEncodeTestBase; +import io.vertx.tests.mysqlclient.junit.MySQLRule; +import io.vertx.tests.sqlclient.tck.NullValueEncodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPipeliningQueryTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPipeliningQueryTest.java similarity index 86% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPipeliningQueryTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPipeliningQueryTest.java index 5dacf737a6..35f5dd5ae2 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPipeliningQueryTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPipeliningQueryTest.java @@ -1,11 +1,11 @@ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.mysqlclient.MySQLBuilder; import io.vertx.mysqlclient.MySQLConnectOptions; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.tck.PipeliningQueryTestBase; +import io.vertx.tests.sqlclient.tck.PipeliningQueryTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedBatchTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedBatchTest.java similarity index 86% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedBatchTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedBatchTest.java index dc6c29195d..6154315f32 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedBatchTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedBatchTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; -import io.vertx.sqlclient.tck.PreparedBatchTestBase; +import io.vertx.tests.mysqlclient.junit.MySQLRule; +import io.vertx.tests.sqlclient.tck.PreparedBatchTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryCachedTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryCachedTest.java similarity index 89% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryCachedTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryCachedTest.java index 4156eb86c1..c696c3618d 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryCachedTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryCachedTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; -import io.vertx.sqlclient.tck.PreparedQueryCachedTestBase; +import io.vertx.tests.mysqlclient.junit.MySQLRule; +import io.vertx.tests.sqlclient.tck.PreparedQueryCachedTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryPooledTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryPooledTest.java similarity index 94% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryPooledTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryPooledTest.java index 9da7130230..70fe782285 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryPooledTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryPooledTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryTest.java similarity index 96% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryTest.java index 0eefad146b..0498ba543b 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryTestBase.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryTestBase.java similarity index 87% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryTestBase.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryTestBase.java index 8ed6be74b2..4e9654641e 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLPreparedQueryTestBase.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLPreparedQueryTestBase.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.TestContext; -import io.vertx.mysqlclient.junit.MySQLRule; -import io.vertx.sqlclient.tck.PreparedQueryTestBase; +import io.vertx.tests.mysqlclient.junit.MySQLRule; +import io.vertx.tests.sqlclient.tck.PreparedQueryTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLSimpleQueryPooledTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLSimpleQueryPooledTest.java similarity index 84% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLSimpleQueryPooledTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLSimpleQueryPooledTest.java index ad5a29d62e..e04559f728 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLSimpleQueryPooledTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLSimpleQueryPooledTest.java @@ -9,10 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; -import io.vertx.mysqlclient.junit.MySQLRule; -import io.vertx.sqlclient.tck.SimpleQueryTestBase; +import io.vertx.tests.mysqlclient.junit.MySQLRule; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLSimpleQueryTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLSimpleQueryTest.java similarity index 87% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLSimpleQueryTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLSimpleQueryTest.java index 7e559ee7d9..314db7a560 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLSimpleQueryTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLSimpleQueryTest.java @@ -14,10 +14,10 @@ * limitations under the License. * */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; -import io.vertx.mysqlclient.junit.MySQLRule; -import io.vertx.sqlclient.tck.SimpleQueryTestBase; +import io.vertx.tests.mysqlclient.junit.MySQLRule; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTextDataTypeDecodeTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTextDataTypeDecodeTest.java similarity index 97% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTextDataTypeDecodeTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTextDataTypeDecodeTest.java index 459b845307..d62b027c7d 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTextDataTypeDecodeTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTextDataTypeDecodeTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.data.Numeric; -import io.vertx.sqlclient.tck.TextDataTypeDecodeTestBase; +import io.vertx.tests.sqlclient.tck.TextDataTypeDecodeTestBase; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTracingTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTracingTest.java similarity index 89% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTracingTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTracingTest.java index 9f1b21604d..c893d4a85b 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTracingTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTracingTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.core.Vertx; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.mysqlclient.MySQLBuilder; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import io.vertx.sqlclient.Pool; -import io.vertx.sqlclient.tck.TracingTestBase; +import io.vertx.tests.sqlclient.tck.TracingTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTransactionTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTransactionTest.java similarity index 90% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTransactionTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTransactionTest.java index 791cd07e63..ccef02cfd0 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/MySQLTransactionTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/MySQLTransactionTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.mysqlclient.MySQLBuilder; -import io.vertx.mysqlclient.junit.MySQLRule; +import io.vertx.tests.mysqlclient.junit.MySQLRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.tck.TransactionTestBase; +import io.vertx.tests.sqlclient.tck.TransactionTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ProxySQLPreparedBatchTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ProxySQLPreparedBatchTest.java similarity index 90% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ProxySQLPreparedBatchTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ProxySQLPreparedBatchTest.java index f7f0ede185..67f2149103 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ProxySQLPreparedBatchTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ProxySQLPreparedBatchTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.mysqlclient.MySQLConnectOptions; -import io.vertx.mysqlclient.junit.ProxySQLRule; +import io.vertx.tests.mysqlclient.junit.ProxySQLRule; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ProxySQLPreparedQueryTest.java b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ProxySQLPreparedQueryTest.java similarity index 95% rename from vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ProxySQLPreparedQueryTest.java rename to vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ProxySQLPreparedQueryTest.java index 0cee678ad0..8cc6fcf0d0 100644 --- a/vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ProxySQLPreparedQueryTest.java +++ b/vertx-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ProxySQLPreparedQueryTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.mysqlclient.tck; +package io.vertx.tests.mysqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.mysqlclient.junit.ProxySQLRule; +import io.vertx.tests.mysqlclient.junit.ProxySQLRule; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-mysql-client/src/test/java/module-info.java b/vertx-mysql-client/src/test/java/module-info.java new file mode 100644 index 0000000000..2cfcc843eb --- /dev/null +++ b/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; + +} diff --git a/vertx-oracle-client/src/main/java/module-info.java b/vertx-oracle-client/src/main/java/module-info.java index d234108943..8dfc0b3a00 100644 --- a/vertx-oracle-client/src/main/java/module-info.java +++ b/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; diff --git a/vertx-oracle-client/src/test/java/module-info.java b/vertx-oracle-client/src/test/java/module-info.java new file mode 100644 index 0000000000..f6e49a89f1 --- /dev/null +++ b/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; + +} diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleBinaryDataTypesTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleBinaryDataTypesTest.java similarity index 98% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleBinaryDataTypesTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleBinaryDataTypesTest.java index 831c429a5b..5d01fed0fd 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleBinaryDataTypesTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleBinaryDataTypesTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; import io.vertx.oracleclient.data.Blob; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleBrokenPooledConnectionTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleBrokenPooledConnectionTest.java similarity index 95% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleBrokenPooledConnectionTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleBrokenPooledConnectionTest.java index d37c045d62..9876453f74 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleBrokenPooledConnectionTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleBrokenPooledConnectionTest.java @@ -9,17 +9,17 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; import io.vertx.oracleclient.OracleConnectOptions; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.ProxyServer; +import io.vertx.tests.sqlclient.ProxyServer; import org.junit.After; import org.junit.ClassRule; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleColumnDescriptorTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleColumnDescriptorTest.java similarity index 95% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleColumnDescriptorTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleColumnDescriptorTest.java index 1aa8c85c31..7c144b897e 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleColumnDescriptorTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleColumnDescriptorTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Pool; import org.junit.After; import org.junit.Before; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleErrorSimpleTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleErrorSimpleTest.java similarity index 95% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleErrorSimpleTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleErrorSimpleTest.java index 6def5f0bc7..a359575f84 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleErrorSimpleTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleErrorSimpleTest.java @@ -9,13 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; import io.vertx.oracleclient.OracleException; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Pool; import org.junit.After; import org.junit.Before; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysPooledTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysPooledTest.java similarity index 95% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysPooledTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysPooledTest.java index f434d15d91..dc98d248f4 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysPooledTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysPooledTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.core.AsyncResult; import io.vertx.core.Future; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysTest.java similarity index 95% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysTest.java index 661b5f91fc..8cb579b2a6 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.core.AsyncResult; import io.vertx.core.Future; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysTestBase.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysTestBase.java similarity index 98% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysTestBase.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysTestBase.java index a0cf03e807..7efee6ba2e 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleGeneratedKeysTestBase.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleGeneratedKeysTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.core.AsyncResult; import io.vertx.core.Future; @@ -20,7 +20,7 @@ import io.vertx.oracleclient.OracleBuilder; import io.vertx.oracleclient.OracleClient; import io.vertx.oracleclient.OraclePrepareOptions; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.*; import org.junit.After; import org.junit.Before; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OraclePoolTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OraclePoolTest.java similarity index 99% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OraclePoolTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OraclePoolTest.java index 7ee3a93751..c614df5621 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OraclePoolTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OraclePoolTest.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.core.Future; import io.vertx.core.Handler; @@ -19,7 +19,7 @@ import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; import io.vertx.oracleclient.OracleConnectOptions; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.*; import org.junit.After; import org.junit.Before; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleQueriesTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleQueriesTest.java similarity index 96% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleQueriesTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleQueriesTest.java index ecf36536c1..afb06431ed 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleQueriesTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleQueriesTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.Tuple; import io.vertx.sqlclient.desc.ColumnDescriptor; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleTemporalDataTypesTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleTemporalDataTypesTest.java similarity index 98% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleTemporalDataTypesTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleTemporalDataTypesTest.java index 7a403ab63b..91e99f2bb8 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleTemporalDataTypesTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleTemporalDataTypesTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleTestBase.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleTestBase.java similarity index 97% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleTestBase.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/OracleTestBase.java index 7b9e8758e2..1eb35a3229 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleTestBase.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleTestBase.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test; +package tests.oracleclient; import io.vertx.core.Future; import io.vertx.core.Vertx; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/impl/InvalidOracleConnectionUriParsingTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/impl/InvalidOracleConnectionUriParsingTest.java similarity index 98% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/impl/InvalidOracleConnectionUriParsingTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/impl/InvalidOracleConnectionUriParsingTest.java index f184664d8d..ac9e6c78f9 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/impl/InvalidOracleConnectionUriParsingTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/impl/InvalidOracleConnectionUriParsingTest.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.impl; +package tests.oracleclient.impl; import io.vertx.core.json.JsonObject; +import io.vertx.oracleclient.impl.OracleConnectionUriParser; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/impl/ValidOracleConnectionUriParsingTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/impl/ValidOracleConnectionUriParsingTest.java similarity index 96% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/impl/ValidOracleConnectionUriParsingTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/impl/ValidOracleConnectionUriParsingTest.java index 957a043e06..b93330424c 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/impl/ValidOracleConnectionUriParsingTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/impl/ValidOracleConnectionUriParsingTest.java @@ -9,9 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.impl; +package tests.oracleclient.impl; import io.vertx.core.json.JsonObject; +import io.vertx.oracleclient.impl.OracleConnectionUriParser; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -139,6 +141,6 @@ public ValidOracleConnectionUriParsingTest(@SuppressWarnings("unused") String na @Test public void shouldParseValidUri() { - assertEquals(expected, OracleConnectionUriParser.parse(connectionUri)); + Assert.assertEquals(expected, OracleConnectionUriParser.parse(connectionUri)); } } diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/junit/OracleRule.java b/vertx-oracle-client/src/test/java/tests/oracleclient/junit/OracleRule.java similarity index 98% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/junit/OracleRule.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/junit/OracleRule.java index 7302b77602..0bc33f4391 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/junit/OracleRule.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/junit/OracleRule.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.junit; +package tests.oracleclient.junit; import io.vertx.oracleclient.OracleConnectOptions; import org.junit.rules.ExternalResource; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/ClientConfig.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/ClientConfig.java similarity index 96% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/ClientConfig.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/ClientConfig.java index 4a4615bb16..060bff0ffa 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/ClientConfig.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/ClientConfig.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Future; @@ -18,7 +18,7 @@ import io.vertx.oracleclient.OracleConnectOptions; import io.vertx.oracleclient.OracleConnection; import io.vertx.sqlclient.*; -import io.vertx.sqlclient.tck.Connector; +import io.vertx.tests.sqlclient.tck.Connector; public enum ClientConfig { diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleBinaryDataTypeDecodeTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeDecodeTest.java similarity index 95% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleBinaryDataTypeDecodeTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeDecodeTest.java index c416390ba1..3a431f3c35 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleBinaryDataTypeDecodeTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeDecodeTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; -import io.vertx.sqlclient.tck.BinaryDataTypeDecodeTestBase; +import tests.oracleclient.junit.OracleRule; +import io.vertx.tests.sqlclient.tck.BinaryDataTypeDecodeTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleBinaryDataTypeEncodeTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeEncodeTest.java similarity index 96% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleBinaryDataTypeEncodeTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeEncodeTest.java index c503d594c5..99df3fd69b 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleBinaryDataTypeEncodeTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeEncodeTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.tck.BinaryDataTypeEncodeTestBase; +import io.vertx.tests.sqlclient.tck.BinaryDataTypeEncodeTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleCollectorTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleCollectorTest.java similarity index 98% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleCollectorTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleCollectorTest.java index b5d3bd6626..c6aa3fc9e8 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleCollectorTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleCollectorTest.java @@ -8,14 +8,14 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.tck.CollectorTestBase; +import io.vertx.tests.sqlclient.tck.CollectorTestBase; import org.junit.Assume; import org.junit.ClassRule; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleConnectionAutoRetryTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionAutoRetryTest.java similarity index 90% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleConnectionAutoRetryTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionAutoRetryTest.java index bfbccd041c..c3577a5e04 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleConnectionAutoRetryTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionAutoRetryTest.java @@ -8,13 +8,13 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleConnectOptions; -import io.vertx.oracleclient.test.junit.OracleRule; -import io.vertx.sqlclient.tck.ConnectionAutoRetryTestBase; +import tests.oracleclient.junit.OracleRule; +import io.vertx.tests.sqlclient.tck.ConnectionAutoRetryTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleConnectionTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionTest.java similarity index 89% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleConnectionTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionTest.java index 7ce9a5da7a..a176c5ef38 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleConnectionTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionTest.java @@ -8,13 +8,13 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.spi.DatabaseMetadata; -import io.vertx.sqlclient.tck.ConnectionTestBase; +import io.vertx.tests.sqlclient.tck.ConnectionTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleDriverTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleDriverTest.java similarity index 85% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleDriverTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleDriverTest.java index c36efd42b4..63e6b1209a 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleDriverTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleDriverTest.java @@ -8,12 +8,12 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.SqlConnectOptions; -import io.vertx.sqlclient.tck.DriverTestBase; +import io.vertx.tests.sqlclient.tck.DriverTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleMetricsTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleMetricsTest.java similarity index 91% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleMetricsTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleMetricsTest.java index 4c4294e7fd..784abe934b 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleMetricsTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleMetricsTest.java @@ -9,15 +9,15 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.oracleclient.OracleBuilder; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.ClientBuilder; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.SqlConnectOptions; -import io.vertx.sqlclient.tck.MetricsTestBase; +import io.vertx.tests.sqlclient.tck.MetricsTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleNullValueEncodeTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleNullValueEncodeTest.java similarity index 86% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleNullValueEncodeTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleNullValueEncodeTest.java index e36905a5c6..055a86a873 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleNullValueEncodeTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleNullValueEncodeTest.java @@ -8,11 +8,11 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; -import io.vertx.sqlclient.tck.NullValueEncodeTestBase; +import tests.oracleclient.junit.OracleRule; +import io.vertx.tests.sqlclient.tck.NullValueEncodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OraclePreparedBatchTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedBatchTest.java similarity index 96% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OraclePreparedBatchTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedBatchTest.java index 854f29fcbd..84443fab60 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OraclePreparedBatchTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedBatchTest.java @@ -8,17 +8,17 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.core.Future; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.tck.PreparedBatchTestBase; +import io.vertx.tests.sqlclient.tck.PreparedBatchTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OraclePreparedQueryTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedQueryTest.java similarity index 91% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OraclePreparedQueryTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedQueryTest.java index 1aaeb4cf15..ace6b8efeb 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OraclePreparedQueryTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedQueryTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; -import io.vertx.sqlclient.tck.PreparedQueryTestBase; +import tests.oracleclient.junit.OracleRule; +import io.vertx.tests.sqlclient.tck.PreparedQueryTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleSimpleQueryTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleSimpleQueryTest.java similarity index 77% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleSimpleQueryTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleSimpleQueryTest.java index e4495bd753..968d7e830d 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleSimpleQueryTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleSimpleQueryTest.java @@ -8,15 +8,12 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; -import io.vertx.ext.unit.Async; -import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; -import io.vertx.sqlclient.tck.SimpleQueryTestBase; +import tests.oracleclient.junit.OracleRule; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; import org.junit.ClassRule; -import org.junit.Test; import org.junit.runner.RunWith; @RunWith(VertxUnitRunner.class) diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTextDataTypeDecodeTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTextDataTypeDecodeTest.java similarity index 95% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTextDataTypeDecodeTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTextDataTypeDecodeTest.java index 4acaed175f..ff6e1e35e9 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTextDataTypeDecodeTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTextDataTypeDecodeTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.oracleclient.test.junit.OracleRule; -import io.vertx.sqlclient.tck.TextDataTypeDecodeTestBase; +import tests.oracleclient.junit.OracleRule; +import io.vertx.tests.sqlclient.tck.TextDataTypeDecodeTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTracingTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTracingTest.java similarity index 91% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTracingTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTracingTest.java index 6dcdba5bb8..8fd7d78142 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTracingTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTracingTest.java @@ -9,15 +9,15 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Pool; -import io.vertx.sqlclient.tck.TracingTestBase; +import io.vertx.tests.sqlclient.tck.TracingTestBase; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; diff --git a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTransactionTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTransactionTest.java similarity index 95% rename from vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTransactionTest.java rename to vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTransactionTest.java index 9b95c6fb68..9f089d3557 100644 --- a/vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/OracleTransactionTest.java +++ b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTransactionTest.java @@ -8,17 +8,17 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.oracleclient.test.tck; +package tests.oracleclient.tck; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.oracleclient.OracleBuilder; import io.vertx.oracleclient.OraclePrepareOptions; -import io.vertx.oracleclient.test.junit.OracleRule; +import tests.oracleclient.junit.OracleRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.tck.TransactionTestBase; +import io.vertx.tests.sqlclient.tck.TransactionTestBase; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/pom.xml b/vertx-pg-client/pom.xml index 81fd97d1a2..d1aa27f73f 100644 --- a/vertx-pg-client/pom.xml +++ b/vertx-pg-client/pom.xml @@ -58,12 +58,6 @@ - - ru.yandex.qatools.embed - postgresql-embedded - 2.10 - test - net.java.dev.jna jna @@ -121,7 +115,7 @@ ${unix.socket.port} - io/vertx/pgclient/it/** + io/vertx/tests/pgclient/it/** @@ -140,7 +134,7 @@ integration-test - io/vertx/pgclient/it/EnvTest.java + io/vertx/tests/pgclient/it/EnvTest.java test_host @@ -160,7 +154,7 @@ integration-test - io/vertx/pgclient/it/MissingScramTest.java + io/vertx/tests/pgclient/it/MissingScramTest.java com.ongres.scram:scram-client diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ErrorResponse.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ErrorResponse.java index 7bd15b0a84..51605c6163 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ErrorResponse.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ErrorResponse.java @@ -23,9 +23,9 @@ * @author Emad Alblueshi */ -class ErrorResponse extends Response { +public class ErrorResponse extends Response { - PgException toException() { + public PgException toException() { return new PgException(getMessage(), getSeverity(), getCode(), getDetail(), getHint(), getPosition(), getInternalPosition(), getInternalQuery(), getWhere(), getFile(), getLine(), getRoutine(), getSchema(), getTable(), getColumn(), getDataType(), getConstraint()); diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/Response.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/Response.java index f1ad394fca..d13ce05194 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/Response.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/Response.java @@ -50,7 +50,7 @@ public String getSeverity() { return severity; } - void setSeverity(String severity) { + public void setSeverity(String severity) { this.severity = severity; } @@ -58,7 +58,7 @@ public String getCode() { return code; } - void setCode(String code) { + public void setCode(String code) { this.code = code; } @@ -66,7 +66,7 @@ public String getMessage() { return message; } - void setMessage(String message) { + public void setMessage(String message) { this.message = message; } @@ -74,7 +74,7 @@ public String getDetail() { return detail; } - void setDetail(String detail) { + public void setDetail(String detail) { this.detail = detail; } @@ -82,7 +82,7 @@ public String getHint() { return hint; } - void setHint(String hint) { + public void setHint(String hint) { this.hint = hint; } @@ -90,7 +90,7 @@ public String getPosition() { return position; } - void setPosition(String position) { + public void setPosition(String position) { this.position = position; } @@ -98,7 +98,7 @@ public String getWhere() { return where; } - void setWhere(String where) { + public void setWhere(String where) { this.where = where; } @@ -106,7 +106,7 @@ public String getFile() { return file; } - void setFile(String file) { + public void setFile(String file) { this.file = file; } @@ -114,7 +114,7 @@ public String getLine() { return line; } - void setLine(String line) { + public void setLine(String line) { this.line = line; } @@ -122,7 +122,7 @@ public String getRoutine() { return routine; } - void setRoutine(String routine) { + public void setRoutine(String routine) { this.routine = routine; } @@ -130,7 +130,7 @@ public String getSchema() { return schema; } - void setSchema(String schema) { + public void setSchema(String schema) { this.schema = schema; } @@ -138,7 +138,7 @@ public String getTable() { return table; } - void setTable(String table) { + public void setTable(String table) { this.table = table; } @@ -146,7 +146,7 @@ public String getColumn() { return column; } - void setColumn(String column) { + public void setColumn(String column) { this.column = column; } @@ -154,7 +154,7 @@ public String getDataType() { return dataType; } - void setDataType(String dataType) { + public void setDataType(String dataType) { this.dataType = dataType; } @@ -162,7 +162,7 @@ public String getConstraint() { return constraint; } - void setConstraint(String constraint) { + public void setConstraint(String constraint) { this.constraint = constraint; } @@ -170,7 +170,7 @@ public String getInternalPosition() { return internalPosition; } - void setInternalPosition(String internalPosition) { + public void setInternalPosition(String internalPosition) { this.internalPosition = internalPosition; } @@ -178,7 +178,7 @@ public String getInternalQuery() { return internalQuery; } - void setInternalQuery(String internalQuery) { + public void setInternalQuery(String internalQuery) { this.internalQuery = internalQuery; } diff --git a/vertx-pg-client/src/main/java/module-info.java b/vertx-pg-client/src/main/java/module-info.java index 03b4694efd..c2094eeb05 100644 --- a/vertx-pg-client/src/main/java/module-info.java +++ b/vertx-pg-client/src/main/java/module-info.java @@ -13,11 +13,18 @@ requires static com.ongres.scram.client; requires static com.ongres.scram.common; + provides io.vertx.sqlclient.spi.Driver with io.vertx.pgclient.spi.PgDriver; + exports io.vertx.pgclient; exports io.vertx.pgclient.spi; exports io.vertx.pgclient.data; exports io.vertx.pgclient.pubsub; + exports io.vertx.pgclient.impl to io.vertx.tests.sql.client.pg; + exports io.vertx.pgclient.impl.util to io.vertx.tests.sql.client.pg; + exports io.vertx.pgclient.impl.codec to io.vertx.tests.sql.client.pg; + exports io.vertx.pgclient.impl.pubsub to io.vertx.tests.sql.client.pg; + requires static io.vertx.docgen; requires static io.vertx.codegen.api; requires static io.vertx.codegen.json; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/impl/codec/ResponseHelper.java b/vertx-pg-client/src/test/java/io/vertx/pgclient/impl/codec/ResponseHelper.java deleted file mode 100644 index 2c3fa13b39..0000000000 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/impl/codec/ResponseHelper.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2020 Contributors to the Eclipse Foundation - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 - * which is available at https://www.apache.org/licenses/LICENSE-2.0. - * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 - */ - -package io.vertx.pgclient.impl.codec; - -import io.vertx.pgclient.PgException; - -public final class ResponseHelper { - - public static PgException getCompletePgException() { - ErrorResponse errorResponse = new ErrorResponse(); - errorResponse.setMessage("myMessage"); - errorResponse.setSeverity("mySeverity"); - errorResponse.setCode("myCode"); - errorResponse.setDetail("myDetail"); - errorResponse.setHint("myHint"); - errorResponse.setPosition("myPosition"); - errorResponse.setHint("myHint"); - errorResponse.setPosition("myPosition"); - errorResponse.setInternalPosition("myInternalPosition"); - errorResponse.setInternalQuery("myInternalQuery"); - errorResponse.setWhere("myWhere"); - errorResponse.setFile("myFile"); - errorResponse.setLine("myLine"); - errorResponse.setRoutine("myRoutine"); - errorResponse.setSchema("mySchema"); - errorResponse.setTable("myTable"); - errorResponse.setColumn("myColumn"); - errorResponse.setDataType("myDataType"); - errorResponse.setConstraint("myConstraint"); - return errorResponse.toException(); - } - - public static PgException getEmptyPgException() { - return new ErrorResponse().toException(); - } -} diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/junit/PgRule.java b/vertx-pg-client/src/test/java/io/vertx/pgclient/junit/PgRule.java deleted file mode 100644 index 2a48f54c1c..0000000000 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/junit/PgRule.java +++ /dev/null @@ -1,272 +0,0 @@ -/* - * Copyright (C) 2017 Julien Viet - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package io.vertx.pgclient.junit; - -import de.flapdoodle.embed.process.config.IRuntimeConfig; -import de.flapdoodle.embed.process.config.io.ProcessOutput; -import de.flapdoodle.embed.process.runtime.ICommandLinePostProcessor; -import de.flapdoodle.embed.process.runtime.ProcessControl; -import de.flapdoodle.embed.process.store.IArtifactStore; -import io.vertx.pgclient.PgConnectOptions; -import org.junit.AssumptionViolatedException; -import org.junit.rules.ExternalResource; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; -import ru.yandex.qatools.embed.postgresql.EmbeddedPostgres; -import ru.yandex.qatools.embed.postgresql.PostgresProcess; -import ru.yandex.qatools.embed.postgresql.distribution.Version; - -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.reflect.Field; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; -import java.nio.file.attribute.PosixFilePermission; -import java.util.*; - -import static org.junit.Assert.assertTrue; -import static ru.yandex.qatools.embed.postgresql.distribution.Version.V10_6; -import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_6_11; - - -/** - * @deprecated EmbeddedPostgres is not maintained any more (must be kept until the unix domain socket tests migration) - */ -@Deprecated -public class PgRule extends ExternalResource { - - private static final String connectionUri = System.getProperty("connection.uri"); - private static EmbeddedPostgres postgres; - - public synchronized static PgConnectOptions startPg() throws Exception { - return startPg(false); - } - - public synchronized static PgConnectOptions startPg(boolean domainSockets) throws Exception { - - if (connectionUri != null && !connectionUri.isEmpty()) { - return PgConnectOptions.fromUri(connectionUri); - } - if (postgres != null) { - throw new IllegalStateException(); - } - IRuntimeConfig config; - String a = System.getProperty("target.dir", "target"); - File targetDir = new File(a); - if (targetDir.exists() && targetDir.isDirectory()) { - config = EmbeddedPostgres.cachedRuntimeConfig(targetDir.toPath()); - } else { - throw new AssertionError("Cannot access target dir"); - } - - // Domain sockets - File sock; - if (domainSockets) { - // Create temp file, length must be < 107 chars (Linux limitation) - sock = Files.createTempFile("pg_", ".sock").toFile(); - assertTrue(sock.delete()); - assertTrue(sock.mkdir()); - sock.deleteOnExit(); - Files.setPosixFilePermissions(sock.toPath(), new HashSet<>(Arrays.asList( - PosixFilePermission.OWNER_EXECUTE, - PosixFilePermission.OWNER_READ, - PosixFilePermission.OWNER_WRITE, - PosixFilePermission.GROUP_EXECUTE, - PosixFilePermission.GROUP_READ, - PosixFilePermission.GROUP_WRITE - ))); - config = useDomainSocketRunTimeConfig(config, sock); - } else { - sock = null; - } - - File dataDir = Files.createTempFile(targetDir.toPath(), "pg_", ".data").toFile(); - assertTrue(dataDir.delete()); - assertTrue(dataDir.mkdir()); - - postgres = new EmbeddedPostgres(getPostgresVersion(), dataDir.getAbsolutePath()); - postgres.start(config, - "localhost", - 8081, - "postgres", - "postgres", - "postgres", - Collections.emptyList()); - File setupFile = getTestResource("create-postgres.sql"); - postgres.getProcess().get().importFromFile(setupFile); - - PgConnectOptions options = new PgConnectOptions(); - options.setHost(domainSockets ? sock.getAbsolutePath() : "localhost"); - options.setPort(8081); - options.setUser("postgres"); - options.setPassword("postgres"); - options.setDatabase("postgres"); - - // Get the real error log from PG that is never considered otherwise - if (!new File(dataDir, "postmaster.pid").exists()) { - PostgresProcess process = postgres.getProcess().get(); - Field f = de.flapdoodle.embed.process.runtime.AbstractProcess.class.getDeclaredField("process"); - f.setAccessible(true); - ProcessControl ctrl = (ProcessControl) f.get(process); - InputStreamReader reader = ctrl.getError(); - char[] buff = new char[1024]; - int amount; - while ((amount = reader.read(buff)) != -1) { - String s = new String(buff, 0, amount); - System.out.println(s); - } - } - return options; - } - - public synchronized static void stopPg() { - if (postgres != null) { - try { - postgres.stop(); - } finally { - postgres = null; - } - } - } - - private static File getTestResource(String name) throws Exception { - try (InputStream in = PgRule.class.getClassLoader().getResourceAsStream(name)) { - Path path = Files.createTempFile("pg-client", ".tmp"); - Files.copy(in, path, StandardCopyOption.REPLACE_EXISTING); - File file = path.toFile(); - file.deleteOnExit(); - return file; - } - } - - private static IRuntimeConfig useDomainSocketRunTimeConfig(IRuntimeConfig config, File sock) throws Exception { - return new RunTimeConfigBase(config) { - @Override - public ICommandLinePostProcessor getCommandLinePostProcessor() { - ICommandLinePostProcessor commandLinePostProcessor = config.getCommandLinePostProcessor(); - return (distribution, args) -> { - List result = commandLinePostProcessor.process(distribution, args); - if (result.get(0).endsWith("postgres")) { - result = new ArrayList<>(result); - result.add("-k"); - result.add(sock.getAbsolutePath()); - } - return result; - }; - } - }; - } - - private static Version getPostgresVersion() { - String specifiedVersion = System.getProperty("embedded.postgres.version"); - Version version; - if (specifiedVersion == null || specifiedVersion.isEmpty()) { - // if version is not specified then V10 will be used by default - version = V10_6; - } else { - version = supportedPgVersions.get(specifiedVersion); - } - if (version == null) { - throw new IllegalArgumentException("embedded postgres only supports the following versions: " + supportedPgVersions.keySet().toString() + "instead of " + specifiedVersion); - } - return version; - } - - private static abstract class RunTimeConfigBase implements IRuntimeConfig { - private final IRuntimeConfig config; - - private RunTimeConfigBase(IRuntimeConfig config) { - this.config = config; - } - - @Override - public ProcessOutput getProcessOutput() { - return config.getProcessOutput(); - } - - @Override - public IArtifactStore getArtifactStore() { - return config.getArtifactStore(); - } - - @Override - public boolean isDaemonProcess() { - return config.isDaemonProcess(); - } - } - - private static final Map supportedPgVersions = new HashMap<>(); - - static { - supportedPgVersions.put("9.6", V9_6_11); - supportedPgVersions.put("10.6", V10_6); - } - - private boolean domainSockets; - private PgConnectOptions options; - - public PgConnectOptions options() { - return new PgConnectOptions(options); - } - - - public PgRule domainSockets(boolean domainSockets) { - this.domainSockets = domainSockets; - return this; - } - - @Override - protected void before() throws Throwable { - options = startPg(domainSockets); - } - - @Override - protected void after() { - if (options != null) { - try { - stopPg(); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - try { - getPostgresVersion(); - } - catch (Exception e) { - throw new AssumptionViolatedException(e.getMessage()); - } - - before(); - try { - base.evaluate(); - } finally { - after(); - } - } - }; - } - -} diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/CloseConnectionTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/CloseConnectionTest.java similarity index 94% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/CloseConnectionTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/CloseConnectionTest.java index 92c7b12619..eaba7d0f01 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/CloseConnectionTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/CloseConnectionTest.java @@ -1,13 +1,15 @@ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.netty.buffer.ByteBufUtil; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgBuilder; +import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.ProxyServer; +import io.vertx.tests.sqlclient.ProxyServer; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/ErrorCodes.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/ErrorCodes.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/ErrorCodes.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/ErrorCodes.java index 4a4d647833..4cf83d75d1 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/ErrorCodes.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/ErrorCodes.java @@ -15,7 +15,7 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; /** * @author Julien Viet diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/NoticeTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/NoticeTest.java similarity index 84% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/NoticeTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/NoticeTest.java index f9300a0461..e81cc97f2c 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/NoticeTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/NoticeTest.java @@ -14,24 +14,19 @@ * limitations under the License. * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; -import io.vertx.pgclient.impl.pubsub.PgSubscriberImpl; -import io.vertx.pgclient.pubsub.PgChannel; -import io.vertx.pgclient.pubsub.PgSubscriber; -import io.vertx.sqlclient.ProxyServer; +import io.vertx.pgclient.PgConnection; +import io.vertx.pgclient.PgNotice; import org.junit.After; import org.junit.Before; import org.junit.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; public class NoticeTest extends PgTestBase { diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgBouncerTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgBouncerTest.java similarity index 97% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgBouncerTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgBouncerTest.java index 37d2bb413b..b5b6c96bdd 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgBouncerTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgBouncerTest.java @@ -1,8 +1,10 @@ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.*; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.Cursor; import io.vertx.sqlclient.Tuple; import org.junit.After; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgClientTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgClientTestBase.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgClientTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgClientTestBase.java index a983df71dd..51ebc602f6 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgClientTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgClientTestBase.java @@ -15,7 +15,7 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; @@ -24,7 +24,9 @@ import io.vertx.core.net.NetSocket; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; -import io.vertx.sqlclient.ProxyServer; +import io.vertx.pgclient.PgException; +import io.vertx.pgclient.SslMode; +import io.vertx.tests.sqlclient.ProxyServer; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; import io.vertx.sqlclient.SqlClient; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectOptionsTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectOptionsTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectOptionsTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectOptionsTest.java index 1002823f77..5fe6942fbf 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectOptionsTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectOptionsTest.java @@ -14,9 +14,11 @@ * limitations under the License. * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.json.JsonObject; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.SslMode; import io.vertx.sqlclient.SqlConnectOptions; import org.junit.Assert; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionTest.java index f584447e10..088cd47bcd 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionTest.java @@ -15,10 +15,11 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.ClosedConnectionException; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionTestBase.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionTestBase.java index 2eb37191c3..6078523c1d 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionTestBase.java @@ -15,13 +15,15 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.AsyncResult; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgException; import io.vertx.sqlclient.*; +import io.vertx.tests.sqlclient.ProxyServer; import org.junit.Test; import java.util.ArrayList; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionUriParserTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionUriParserTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionUriParserTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionUriParserTest.java index dc18b532ff..11b965d3c3 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionUriParserTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgConnectionUriParserTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.json.JsonObject; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgDatabaseMetadataTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgDatabaseMetadataTest.java similarity index 92% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgDatabaseMetadataTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgDatabaseMetadataTest.java index 17c999d59f..136cf12b26 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgDatabaseMetadataTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgDatabaseMetadataTest.java @@ -8,13 +8,15 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgExceptionTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgExceptionTest.java similarity index 54% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgExceptionTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgExceptionTest.java index 37538b3fa9..2e72dd518d 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgExceptionTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgExceptionTest.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; -import io.vertx.pgclient.impl.codec.ResponseHelper; +import io.vertx.pgclient.PgException; +import io.vertx.pgclient.impl.codec.ErrorResponse; import org.junit.Test; import static org.junit.Assert.*; @@ -36,7 +37,7 @@ public void nullFieldConstructor() { @Test public void errorResponseConstructor() { - PgException pgException = ResponseHelper.getCompletePgException(); + PgException pgException = getCompletePgException(); assertEquals("myMessage", pgException.getErrorMessage()); assertEquals("mySeverity", pgException.getSeverity()); assertEquals("myCode", pgException.getSqlState()); @@ -48,6 +49,34 @@ public void errorResponseConstructor() { @Test public void nullErrorResponseConstructor() { - assertEquals("", ResponseHelper.getEmptyPgException().getMessage()); + assertEquals("", getEmptyPgException().getMessage()); + } + + public static PgException getCompletePgException() { + ErrorResponse errorResponse = new ErrorResponse(); + errorResponse.setMessage("myMessage"); + errorResponse.setSeverity("mySeverity"); + errorResponse.setCode("myCode"); + errorResponse.setDetail("myDetail"); + errorResponse.setHint("myHint"); + errorResponse.setPosition("myPosition"); + errorResponse.setHint("myHint"); + errorResponse.setPosition("myPosition"); + errorResponse.setInternalPosition("myInternalPosition"); + errorResponse.setInternalQuery("myInternalQuery"); + errorResponse.setWhere("myWhere"); + errorResponse.setFile("myFile"); + errorResponse.setLine("myLine"); + errorResponse.setRoutine("myRoutine"); + errorResponse.setSchema("mySchema"); + errorResponse.setTable("myTable"); + errorResponse.setColumn("myColumn"); + errorResponse.setDataType("myDataType"); + errorResponse.setConstraint("myConstraint"); + return errorResponse.toException(); + } + + public static PgException getEmptyPgException() { + return new ErrorResponse().toException(); } } diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgMetricsTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgMetricsTest.java similarity index 86% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgMetricsTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgMetricsTest.java index 8ce5c685b6..3d4393b0d8 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgMetricsTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgMetricsTest.java @@ -9,13 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.pgclient.PgBuilder; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.ClientBuilder; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.SqlConnectOptions; -import io.vertx.sqlclient.tck.MetricsTestBase; +import io.vertx.tests.sqlclient.tck.MetricsTestBase; import org.junit.ClassRule; public class PgMetricsTest extends MetricsTestBase { diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPipeliningTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPipeliningTest.java similarity index 94% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgPipeliningTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPipeliningTest.java index 46bba35e2a..29f4041cd9 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPipeliningTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPipeliningTest.java @@ -15,11 +15,13 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.Tuple; import org.junit.Before; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPoolTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPoolTest.java index a19f85e0c0..3cb1c56f0d 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPoolTest.java @@ -15,7 +15,7 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.netty.channel.EventLoop; import io.vertx.core.Handler; @@ -25,9 +25,13 @@ import io.vertx.ext.unit.junit.Repeat; import io.vertx.ext.unit.junit.RepeatRule; import io.vertx.core.internal.ContextInternal; +import io.vertx.pgclient.PgBuilder; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; import io.vertx.pgclient.impl.PgSocketConnection; import io.vertx.sqlclient.*; import io.vertx.sqlclient.internal.SqlConnectionInternal; +import io.vertx.tests.sqlclient.ProxyServer; import org.junit.Rule; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPoolTestBase.java similarity index 97% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPoolTestBase.java index 1b97559ca4..0b51462fbc 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPoolTestBase.java @@ -15,14 +15,17 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.Future; import io.vertx.core.Handler; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.*; +import io.vertx.tests.sqlclient.ProxyServer; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPooledConnectionTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPooledConnectionTest.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgPooledConnectionTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPooledConnectionTest.java index 14ee61e147..efbe1dec24 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPooledConnectionTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgPooledConnectionTest.java @@ -15,10 +15,12 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgBuilder; +import io.vertx.pgclient.PgConnectOptions; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgScramConnectionTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgScramConnectionTest.java similarity index 91% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgScramConnectionTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgScramConnectionTest.java index 3bbd33f23f..a6e995dd5b 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgScramConnectionTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgScramConnectionTest.java @@ -15,10 +15,12 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import static org.junit.Assume.assumeTrue; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -29,7 +31,7 @@ import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; @RunWith(VertxUnitRunner.class) public class PgScramConnectionTest { diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgTestBase.java similarity index 93% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PgTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgTestBase.java index 7d6bbdeffc..dbb375fa69 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgTestBase.java @@ -15,11 +15,13 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgException; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.PoolOptions; import io.vertx.sqlclient.SqlClient; import org.junit.ClassRule; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PoolMultiTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PoolMultiTest.java similarity index 91% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PoolMultiTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PoolMultiTest.java index 68380782f1..cd0f6478c0 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PoolMultiTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PoolMultiTest.java @@ -1,19 +1,16 @@ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; -import io.vertx.core.Context; import io.vertx.core.Future; import io.vertx.core.Vertx; -import io.vertx.core.net.NetClientOptions; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; -import io.vertx.pgclient.spi.PgDriver; +import io.vertx.pgclient.PgBuilder; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; import io.vertx.sqlclient.SqlConnectOptions; import io.vertx.sqlclient.SqlConnection; -import io.vertx.sqlclient.spi.ConnectionFactory; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -24,7 +21,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.function.Function; import java.util.function.Supplier; import static org.junit.Assert.assertEquals; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementCachedTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementCachedTest.java similarity index 97% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementCachedTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementCachedTest.java index 7d71d1bb86..f1c75b6c7d 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementCachedTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementCachedTest.java @@ -15,13 +15,13 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; -import io.vertx.sqlclient.Row; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.Tuple; -import org.junit.Ignore; import org.junit.Test; import java.util.concurrent.atomic.AtomicInteger; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTest.java similarity index 93% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTest.java index 26d4d6df99..e05cc29003 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTest.java @@ -15,9 +15,11 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTestBase.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTestBase.java index 911b7afb94..0f20dc7091 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PreparedStatementTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTestBase.java @@ -15,7 +15,7 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.Handler; import io.vertx.core.Vertx; @@ -24,6 +24,9 @@ import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; +import io.vertx.pgclient.PgException; import io.vertx.pgclient.data.Box; import io.vertx.pgclient.data.Circle; import io.vertx.pgclient.data.Interval; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PubSubTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PubSubTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/PubSubTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PubSubTest.java index a4862da491..751ce9fd79 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PubSubTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PubSubTest.java @@ -14,16 +14,18 @@ * limitations under the License. * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; import io.vertx.pgclient.impl.pubsub.PgSubscriberImpl; import io.vertx.pgclient.pubsub.PgChannel; import io.vertx.pgclient.pubsub.PgSubscriber; -import io.vertx.sqlclient.ProxyServer; +import io.vertx.tests.sqlclient.ProxyServer; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/RowTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/RowTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/RowTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/RowTest.java index 4c241221cd..8dd9d63be8 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/RowTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/RowTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; @@ -22,6 +22,7 @@ import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.PgConnection; import io.vertx.pgclient.data.*; import io.vertx.sqlclient.Row; import org.junit.After; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/SharedPoolTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/SharedPoolTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/SharedPoolTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/SharedPoolTest.java index 85b5158b53..7cc0e869f6 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/SharedPoolTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/SharedPoolTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.AbstractVerticle; import io.vertx.core.DeploymentOptions; @@ -19,6 +19,8 @@ import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import io.vertx.pgclient.PgBuilder; +import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; import io.vertx.sqlclient.SqlConnection; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/TLSTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/TLSTest.java similarity index 97% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/TLSTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/TLSTest.java index d2eef7cb89..550d4cf3bc 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/TLSTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/TLSTest.java @@ -15,7 +15,7 @@ * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; @@ -26,7 +26,10 @@ import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.PgConnection; +import io.vertx.pgclient.SslMode; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.Tuple; import org.junit.After; import org.junit.Before; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/UnixDomainSocketTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/UnixDomainSocketTest.java similarity index 76% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/UnixDomainSocketTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/UnixDomainSocketTest.java index b4df05f71e..2a5bc606f4 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/UnixDomainSocketTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/UnixDomainSocketTest.java @@ -14,9 +14,11 @@ * limitations under the License. * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; -import io.vertx.pgclient.junit.PgRule; +import io.vertx.pgclient.PgBuilder; +import io.vertx.pgclient.PgConnectOptions; +import io.vertx.pgclient.SslMode; import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; import io.vertx.ext.unit.TestContext; @@ -25,9 +27,12 @@ import io.vertx.sqlclient.SqlClient; import io.vertx.sqlclient.SqlConnectOptions; import io.vertx.sqlclient.impl.ConnectionFactoryBase; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import org.junit.*; import org.junit.runner.RunWith; +import java.io.File; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assume.assumeTrue; @@ -35,32 +40,17 @@ @RunWith(VertxUnitRunner.class) public class UnixDomainSocketTest { - private static final String unixSocketDirectory = System.getProperty("unix.socket.directory"); - private static final String unixSocketPort = System.getProperty("unix.socket.port"); - private static final boolean nativeTransportEnabled; - - static { - Vertx vertx = Vertx.vertx(new VertxOptions().setPreferNativeTransport(true)); - nativeTransportEnabled = vertx.isNativeTransportEnabled(); - vertx.close(); - } - @ClassRule - public static PgRule rule = new PgRule().domainSockets(nativeTransportEnabled); + public static ContainerPgRule rule = new ContainerPgRule(); private Pool client; private PgConnectOptions options; private Vertx vertx; @Before public void before() { + Assume.assumeNotNull(rule.domainSocketPath()); vertx = Vertx.vertx(new VertxOptions().setPreferNativeTransport(true)); - options = rule.options(); - if (unixSocketDirectory != null && !unixSocketDirectory.isEmpty()) { - options.setHost(unixSocketDirectory); - } - if (unixSocketPort != null && !unixSocketPort.isEmpty()) { - options.setPort(Integer.parseInt(unixSocketPort)); - } + options = rule.options().setHost(rule.domainSocketPath()).setPort(5432); } @After @@ -75,7 +65,6 @@ public void after(TestContext ctx) { @Test public void uriTest(TestContext context) { - assumeTrue(options.isUsingDomainSocket()); String uri = "postgresql://postgres:postgres@/postgres?host=" + options.getHost() + "&port=" + options.getPort(); client = PgBuilder.pool().connectingTo(uri).using(vertx).build(); client @@ -85,7 +74,6 @@ public void uriTest(TestContext context) { @Test public void simpleConnect(TestContext context) { - assumeTrue(options.isUsingDomainSocket()); client = PgBuilder.pool().connectingTo(new PgConnectOptions(options)).using(vertx).build(); client .getConnection() @@ -94,7 +82,6 @@ public void simpleConnect(TestContext context) { @Test public void connectWithVertxInstance(TestContext context) { - assumeTrue(options.isUsingDomainSocket()); client = PgBuilder.pool().connectingTo(new PgConnectOptions(options)).using(vertx).build(); client .getConnection() @@ -106,7 +93,6 @@ public void connectWithVertxInstance(TestContext context) { @Ignore @Test public void testIgnoreSslMode(TestContext context) { - assumeTrue(options.isUsingDomainSocket()); client = PgBuilder.pool().connectingTo(new PgConnectOptions(options).setSslMode(SslMode.REQUIRE)).using(vertx).build(); client .getConnection() diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/UtilTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/UtilTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/UtilTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/UtilTest.java index 1e37367be9..5bf6905fe6 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/UtilTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/UtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.pgclient; +package io.vertx.tests.pgclient; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/benchmarks/IntervalBenchmarks.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/benchmarks/IntervalBenchmarks.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/benchmarks/IntervalBenchmarks.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/benchmarks/IntervalBenchmarks.java index 55918ae0c8..c56a45e325 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/benchmarks/IntervalBenchmarks.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/benchmarks/IntervalBenchmarks.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.benchmarks; +package io.vertx.tests.pgclient.benchmarks; import io.vertx.pgclient.data.Interval; import org.openjdk.jmh.annotations.*; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/context/ContextTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/ContextTest.java similarity index 97% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/context/ContextTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/ContextTest.java index d1f7bae5f3..bd2f057220 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/context/ContextTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/ContextTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.context; +package io.vertx.tests.pgclient.context; import io.vertx.core.Context; import io.vertx.core.Vertx; @@ -6,7 +6,7 @@ import io.vertx.ext.unit.TestContext; import io.vertx.pgclient.PgBuilder; import io.vertx.pgclient.PgConnection; -import io.vertx.pgclient.PgTestBase; +import io.vertx.tests.pgclient.PgTestBase; import io.vertx.sqlclient.Pool; import org.junit.After; import org.junit.Before; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/context/DuplicateContextTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/DuplicateContextTest.java similarity index 86% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/context/DuplicateContextTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/DuplicateContextTest.java index 200d6fe71b..865769cf6a 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/context/DuplicateContextTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/DuplicateContextTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.context; +package io.vertx.tests.pgclient.context; import io.vertx.core.Context; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/context/EventLoopContextTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/EventLoopContextTest.java similarity index 81% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/context/EventLoopContextTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/EventLoopContextTest.java index f15ce17082..930e120540 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/context/EventLoopContextTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/EventLoopContextTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.context; +package io.vertx.tests.pgclient.context; import io.vertx.core.Context; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/context/WorkerContextTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/WorkerContextTest.java similarity index 85% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/context/WorkerContextTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/WorkerContextTest.java index a102dd45c7..4d1c7aec06 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/context/WorkerContextTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/context/WorkerContextTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.context; +package io.vertx.tests.pgclient.context; import io.vertx.core.Context; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/BinaryDataTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BinaryDataTypesExtendedCodecTest.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/BinaryDataTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BinaryDataTypesExtendedCodecTest.java index 590748c66d..2385ef918e 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/BinaryDataTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BinaryDataTypesExtendedCodecTest.java @@ -1,11 +1,11 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import io.vertx.core.internal.buffer.BufferInternal; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.core.buffer.Buffer; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/BinaryDataTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BinaryDataTypesSimpleCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/BinaryDataTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BinaryDataTypesSimpleCodecTest.java index a8fb6e6be7..52f8eb147b 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/BinaryDataTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BinaryDataTypesSimpleCodecTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.TestContext; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/BooleanTypeExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BooleanTypeExtendedCodecTest.java similarity index 97% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/BooleanTypeExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BooleanTypeExtendedCodecTest.java index a1e452044c..8bf3c360ba 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/BooleanTypeExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BooleanTypeExtendedCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/BooleanTypeSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BooleanTypeSimpleCodecTest.java similarity index 95% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/BooleanTypeSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BooleanTypeSimpleCodecTest.java index 0411a54d1d..420545d0f4 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/BooleanTypeSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/BooleanTypeSimpleCodecTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CharacterTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CharacterTypesExtendedCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/CharacterTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CharacterTypesExtendedCodecTest.java index b30d10cf4e..85f523ca59 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CharacterTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CharacterTypesExtendedCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CharacterTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CharacterTypesSimpleCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/CharacterTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CharacterTypesSimpleCodecTest.java index cb5882919c..b5b81f8a49 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CharacterTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CharacterTypesSimpleCodecTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CidrCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CidrCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/CidrCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CidrCodecTest.java index c35c693093..5e2cc1e63a 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CidrCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CidrCodecTest.java @@ -1,7 +1,8 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.pgclient.PgConnection; +import io.vertx.pgclient.data.Cidr; import io.vertx.sqlclient.*; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CustomTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CustomTypesExtendedCodecTest.java similarity index 93% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/CustomTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CustomTypesExtendedCodecTest.java index 2822e15c92..c3b5d65e5e 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CustomTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CustomTypesExtendedCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CustomTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CustomTypesSimpleCodecTest.java similarity index 93% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/CustomTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CustomTypesSimpleCodecTest.java index b50a01adf8..1b37265a30 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/CustomTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/CustomTypesSimpleCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/DataTypeCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DataTypeCodecTest.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/DataTypeCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DataTypeCodecTest.java index 579bcb91d1..7c063cc4a0 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/DataTypeCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DataTypeCodecTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/DataTypeTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DataTypeTestBase.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/DataTypeTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DataTypeTestBase.java index ec1827f0d0..61e0b56fc2 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/DataTypeTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DataTypeTestBase.java @@ -1,9 +1,10 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; -import io.vertx.pgclient.PgTestBase; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.pgclient.data.*; +import io.vertx.tests.pgclient.PgTestBase; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.After; @@ -18,7 +19,7 @@ import java.util.List; import java.util.UUID; -import static io.vertx.sqlclient.ColumnChecker.*; +import static io.vertx.tests.sqlclient.ColumnChecker.*; /** * @author Emad Alblueshi diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/DateTimeTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DateTimeTypesExtendedCodecTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/DateTimeTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DateTimeTypesExtendedCodecTest.java index 21084bd226..2b66e9f722 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/DateTimeTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DateTimeTypesExtendedCodecTest.java @@ -1,9 +1,10 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.pgclient.data.Interval; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/DateTimeTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DateTimeTypesSimpleCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/DateTimeTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DateTimeTypesSimpleCodecTest.java index 8fde450938..25fbefae61 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/DateTimeTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/DateTimeTypesSimpleCodecTest.java @@ -1,9 +1,10 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.pgclient.data.Interval; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/EnumeratedTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/EnumeratedTypesExtendedCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/EnumeratedTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/EnumeratedTypesExtendedCodecTest.java index 17ed768cfd..0a1a5fad96 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/EnumeratedTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/EnumeratedTypesExtendedCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/EnumeratedTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/EnumeratedTypesSimpleCodecTest.java similarity index 93% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/EnumeratedTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/EnumeratedTypesSimpleCodecTest.java index 3d17ba887a..18263c95f5 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/EnumeratedTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/EnumeratedTypesSimpleCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/ExtendedQueryDataTypeCodecTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/ExtendedQueryDataTypeCodecTestBase.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/ExtendedQueryDataTypeCodecTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/ExtendedQueryDataTypeCodecTestBase.java index 5be9ad7b39..9d72275023 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/ExtendedQueryDataTypeCodecTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/ExtendedQueryDataTypeCodecTestBase.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.Row; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/GeometricTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/GeometricTypesExtendedCodecTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/GeometricTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/GeometricTypesExtendedCodecTest.java index e01f4d534e..59480b5a01 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/GeometricTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/GeometricTypesExtendedCodecTest.java @@ -1,7 +1,8 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.pgclient.data.*; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/GeometricTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/GeometricTypesSimpleCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/GeometricTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/GeometricTypesSimpleCodecTest.java index 16c2f9357c..dee70e1d96 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/GeometricTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/GeometricTypesSimpleCodecTest.java @@ -1,6 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.data.*; import org.junit.Test; import java.util.Arrays; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/InetCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/InetCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/InetCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/InetCodecTest.java index bc43109ada..935a24eb18 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/InetCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/InetCodecTest.java @@ -1,7 +1,8 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.pgclient.PgConnection; +import io.vertx.pgclient.data.Inet; import io.vertx.sqlclient.Query; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/IntervalTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/IntervalTest.java similarity index 91% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/IntervalTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/IntervalTest.java index bf7a89dbde..8e8ec311d1 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/IntervalTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/IntervalTest.java @@ -9,8 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; +import io.vertx.pgclient.data.Interval; +import org.junit.Assert; import org.junit.Test; import java.time.Duration; @@ -23,7 +25,7 @@ public class IntervalTest { @Test public void testFromDuration() { - assertEquals(Interval.of(), Interval.of(Duration.ZERO)); + Assert.assertEquals(Interval.of(), Interval.of(Duration.ZERO)); assertEquals( Interval.of(0, 0, 0, 0, 0, -1, 999999), diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/JavaEnumTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JavaEnumTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/JavaEnumTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JavaEnumTest.java index f1cfcbf555..e6cffde476 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/JavaEnumTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JavaEnumTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.TestContext; import io.vertx.pgclient.PgConnection; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/JsonTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JsonTypesExtendedCodecTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/JsonTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JsonTypesExtendedCodecTest.java index 50a73a9707..1fdbe21d41 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/JsonTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JsonTypesExtendedCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.core.json.JsonArray; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/JsonTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JsonTypesSimpleCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/JsonTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JsonTypesSimpleCodecTest.java index 0e6568b12a..f248699d26 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/JsonTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/JsonTypesSimpleCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.core.json.JsonArray; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/MonetaryTypeExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/MonetaryTypeExtendedCodecTest.java similarity index 95% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/MonetaryTypeExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/MonetaryTypeExtendedCodecTest.java index f2b04e3182..e76b4564fe 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/MonetaryTypeExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/MonetaryTypeExtendedCodecTest.java @@ -8,9 +8,10 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.data.Money; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/MonetaryTypeSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/MonetaryTypeSimpleCodecTest.java similarity index 94% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/MonetaryTypeSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/MonetaryTypeSimpleCodecTest.java index 46ac4a0ab8..de6ab1ad08 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/MonetaryTypeSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/MonetaryTypeSimpleCodecTest.java @@ -8,9 +8,10 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.TestContext; +import io.vertx.pgclient.data.Money; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/NullSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NullSimpleCodecTest.java similarity index 89% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/NullSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NullSimpleCodecTest.java index ef0075c1fd..abdbb4f6d1 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/NullSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NullSimpleCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/NumericTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NumericTypesExtendedCodecTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/NumericTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NumericTypesExtendedCodecTest.java index b1104c2ebf..b64b0adc7d 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/NumericTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NumericTypesExtendedCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/NumericTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NumericTypesSimpleCodecTest.java similarity index 99% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/NumericTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NumericTypesSimpleCodecTest.java index e0c995c71c..d735fe3874 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/NumericTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/NumericTypesSimpleCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/PreparedStatementParamCoercionTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/PreparedStatementParamCoercionTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/PreparedStatementParamCoercionTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/PreparedStatementParamCoercionTest.java index 041bbe6121..71a073011d 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/PreparedStatementParamCoercionTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/PreparedStatementParamCoercionTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/SimpleQueryDataTypeCodecTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/SimpleQueryDataTypeCodecTestBase.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/SimpleQueryDataTypeCodecTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/SimpleQueryDataTypeCodecTestBase.java index 5c0f9b4afb..d34050b70d 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/SimpleQueryDataTypeCodecTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/SimpleQueryDataTypeCodecTestBase.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/TsTypesExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/TsTypesExtendedCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/TsTypesExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/TsTypesExtendedCodecTest.java index ffa53bcd12..9c2a48585e 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/TsTypesExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/TsTypesExtendedCodecTest.java @@ -1,9 +1,9 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/TsTypesSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/TsTypesSimpleCodecTest.java similarity index 98% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/TsTypesSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/TsTypesSimpleCodecTest.java index 347384dc8d..2e357cd939 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/TsTypesSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/TsTypesSimpleCodecTest.java @@ -1,9 +1,9 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/UUIDTypeExtendedCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/UUIDTypeExtendedCodecTest.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/UUIDTypeExtendedCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/UUIDTypeExtendedCodecTest.java index 0b05c0ee0d..bc37d774f2 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/UUIDTypeExtendedCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/UUIDTypeExtendedCodecTest.java @@ -1,7 +1,7 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.pgclient.PgConnection; -import io.vertx.sqlclient.ColumnChecker; +import io.vertx.tests.sqlclient.ColumnChecker; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.ext.unit.Async; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/UUIDTypeSimpleCodecTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/UUIDTypeSimpleCodecTest.java similarity index 94% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/data/UUIDTypeSimpleCodecTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/UUIDTypeSimpleCodecTest.java index 43d561863a..58cb18a46f 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/data/UUIDTypeSimpleCodecTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/data/UUIDTypeSimpleCodecTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.data; +package io.vertx.tests.pgclient.data; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/impl/util/MD5AuthenticationTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/impl/MD5AuthenticationTest.java similarity index 67% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/impl/util/MD5AuthenticationTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/impl/MD5AuthenticationTest.java index ba9fab7cea..663c5d0e4c 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/impl/util/MD5AuthenticationTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/impl/MD5AuthenticationTest.java @@ -1,16 +1,16 @@ -package io.vertx.pgclient.impl.util; +package io.vertx.tests.pgclient.impl; +import io.vertx.pgclient.impl.util.MD5Authentication; +import org.junit.Assert; import org.junit.Test; import java.nio.charset.StandardCharsets; -import static org.junit.Assert.*; - public class MD5AuthenticationTest { @Test public void encodeTest() { - assertEquals( + Assert.assertEquals( "md54cd35160716308e3e571bbba12bb7591", MD5Authentication.encode("scott", "tiger", "salt'n'pepper".getBytes(StandardCharsets.UTF_8))); } diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/impl/RowImplTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/impl/RowImplTest.java similarity index 88% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/impl/RowImplTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/impl/RowImplTest.java index 3db660b9c9..db1bdfad2d 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/impl/RowImplTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/impl/RowImplTest.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.impl; +package io.vertx.tests.pgclient.impl; -import io.vertx.sqlclient.impl.TestRowDesc; +import io.vertx.pgclient.impl.RowImpl; +import io.vertx.tests.sqlclient.TestRowDesc; import org.junit.Test; import java.time.LocalDate; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/it/EnvTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/it/EnvTest.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/it/EnvTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/it/EnvTest.java index 3480d1b2eb..5e85f68a98 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/it/EnvTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/it/EnvTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.pgclient.it; +package io.vertx.tests.pgclient.it; import io.vertx.pgclient.PgConnectOptions; import io.vertx.pgclient.SslMode; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/it/MissingScramTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/it/MissingScramTest.java similarity index 88% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/it/MissingScramTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/it/MissingScramTest.java index f938a07163..929a449c82 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/it/MissingScramTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/it/MissingScramTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.it; +package io.vertx.tests.pgclient.it; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; @@ -6,7 +6,7 @@ import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.pgclient.PgConnectOptions; import io.vertx.pgclient.PgConnection; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -36,7 +36,7 @@ private PgConnectOptions options() { } @Test - public void testSaslConnectionFails(TestContext ctx) throws InterruptedException { + public void testSaslConnectionFails(TestContext ctx) { assumeTrue(ContainerPgRule.isAtLeastPg10()); Async async = ctx.async(); PgConnectOptions options = new PgConnectOptions(options()); diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/junit/ContainerPgRule.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/junit/ContainerPgRule.java similarity index 85% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/junit/ContainerPgRule.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/junit/ContainerPgRule.java index 911bebe50d..7418bad9a7 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/junit/ContainerPgRule.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/junit/ContainerPgRule.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.pgclient.junit; +package io.vertx.tests.pgclient.junit; import io.vertx.pgclient.PgConnectOptions; import io.vertx.sqlclient.PoolOptions; @@ -24,10 +24,15 @@ import org.testcontainers.containers.InternetProtocol; import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy; +import java.io.File; +import java.nio.file.Files; import java.time.Duration; import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.List; import static io.vertx.pgclient.PgConnectOptions.DEFAULT_PORT; +import static org.junit.Assert.assertTrue; /** * Postgresql test database based on https://www.testcontainers.org @@ -48,6 +53,7 @@ public class ContainerPgRule extends ExternalResource { private boolean ssl; private boolean forceSsl; private String user = "postgres"; + private File domainSocketMount; public ContainerPgRule ssl(boolean ssl) { this.ssl = ssl; @@ -76,6 +82,18 @@ public ContainerPgRule user(String user) { } private void initServer(String version) throws Exception { + + // Domain socket on Linux + String osName = System.getProperty("os.name"); + if (osName != null && (osName.startsWith("Linux") || osName.startsWith("LINUX"))) { + // Create temp file, length must be < 107 chars (Linux limitation) + domainSocketMount = Files.createTempDirectory("postgresql_var_run").toFile(); + domainSocketMount.deleteOnExit(); + domainSocketMount.setReadable(true, false); + domainSocketMount.setWritable(true, false); + domainSocketMount.setExecutable(true, false); + } + server = new ServerContainer<>("postgres:" + version) .withEnv("POSTGRES_DB", "postgres") .withEnv("POSTGRES_USER", user) @@ -86,6 +104,11 @@ private void initServer(String version) throws Exception { .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))) .withCommand("postgres", "-c", "fsync=off") .withClasspathResourceMapping("create-postgres.sql", "/docker-entrypoint-initdb.d/create-postgres.sql", BindMode.READ_ONLY); + + if (domainSocketMount != null) { + server = server.withFileSystemBind(domainSocketMount.getAbsolutePath(), "/var/run/postgresql"); + } + if (ssl) { server .withClasspathResourceMapping("tls/server.crt", "/server.crt", BindMode.READ_ONLY) @@ -104,6 +127,10 @@ private void initServer(String version) throws Exception { } } + public String domainSocketPath() { + return domainSocketMount != null ? domainSocketMount.getAbsolutePath() : null; + } + public static boolean isTestingWithExternalDatabase() { return isSystemPropertyValid(connectionUri) || isSystemPropertyValid(tlsConnectionUri) || isSystemPropertyValid(tlsForceConnectionUri); } @@ -124,7 +151,6 @@ public synchronized PgConnectOptions startServer(String databaseVersion) throws .setPassword("postgres"); } - private static String getPostgresVersion() { String specifiedVersion = System.getProperty("embedded.postgres.version"); String version; @@ -138,7 +164,7 @@ private static String getPostgresVersion() { return version; } - public synchronized void stopServer() throws Exception { + public synchronized void stopServer() { if (server != null) { try { server.stop(); diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/ClientConfig.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/ClientConfig.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/ClientConfig.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/ClientConfig.java index f1bd45cfe6..a35f61d7dc 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/ClientConfig.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/ClientConfig.java @@ -14,14 +14,14 @@ * limitations under the License. * */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.pgclient.PgBuilder; import io.vertx.pgclient.PgConnectOptions; import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.tck.Connector; +import io.vertx.tests.sqlclient.tck.Connector; import io.vertx.sqlclient.SqlClient; import io.vertx.core.AsyncResult; import io.vertx.core.Future; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgBinaryDataTypeDecodeTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgBinaryDataTypeDecodeTest.java similarity index 89% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgBinaryDataTypeDecodeTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgBinaryDataTypeDecodeTest.java index 415068a26e..dafb473539 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgBinaryDataTypeDecodeTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgBinaryDataTypeDecodeTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.data.Numeric; -import io.vertx.sqlclient.tck.BinaryDataTypeDecodeTestBase; +import io.vertx.tests.sqlclient.tck.BinaryDataTypeDecodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgBinaryDataTypeEncodeTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgBinaryDataTypeEncodeTest.java similarity index 90% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgBinaryDataTypeEncodeTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgBinaryDataTypeEncodeTest.java index b671e1ade3..e64a805a86 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgBinaryDataTypeEncodeTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgBinaryDataTypeEncodeTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.data.Numeric; -import io.vertx.sqlclient.tck.BinaryDataTypeEncodeTestBase; +import io.vertx.tests.sqlclient.tck.BinaryDataTypeEncodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgCollectorTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgCollectorTest.java similarity index 73% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgCollectorTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgCollectorTest.java index 32720d3c2d..e0bfd31406 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgCollectorTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgCollectorTest.java @@ -1,11 +1,11 @@ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import org.junit.ClassRule; import org.junit.runner.RunWith; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; -import io.vertx.sqlclient.tck.CollectorTestBase; +import io.vertx.tests.pgclient.junit.ContainerPgRule; +import io.vertx.tests.sqlclient.tck.CollectorTestBase; @RunWith(VertxUnitRunner.class) public class PgCollectorTest extends CollectorTestBase { diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgConnectionAutoRetryTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgConnectionAutoRetryTest.java similarity index 90% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgConnectionAutoRetryTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgConnectionAutoRetryTest.java index 802c90fd67..68354bc28f 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgConnectionAutoRetryTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgConnectionAutoRetryTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.pgclient.PgConnectOptions; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; 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; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgConnectionTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgConnectionTest.java similarity index 85% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgConnectionTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgConnectionTest.java index 1b17d20819..0abcf40f44 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgConnectionTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgConnectionTest.java @@ -1,8 +1,8 @@ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.spi.DatabaseMetadata; -import io.vertx.sqlclient.tck.ConnectionTestBase; +import io.vertx.tests.sqlclient.tck.ConnectionTestBase; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.ClassRule; @@ -25,7 +25,7 @@ public void tearDown(TestContext ctx) { connector.close(); super.tearDown(ctx); } - + @Override protected void validateDatabaseMetaData(TestContext ctx, DatabaseMetadata md) { ctx.assertTrue(md.majorVersion() >= 9); diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgDriverTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgDriverTest.java similarity index 87% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgDriverTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgDriverTest.java index 1f4c395de7..f843815c89 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgDriverTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgDriverTest.java @@ -14,11 +14,11 @@ * limitations under the License. * */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.SqlConnectOptions; -import io.vertx.sqlclient.tck.DriverTestBase; +import io.vertx.tests.sqlclient.tck.DriverTestBase; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgNullValueEncodeTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgNullValueEncodeTest.java similarity index 87% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgNullValueEncodeTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgNullValueEncodeTest.java index caa1522112..f8e86f1430 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgNullValueEncodeTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgNullValueEncodeTest.java @@ -9,11 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; -import io.vertx.sqlclient.tck.NullValueEncodeTestBase; +import io.vertx.tests.pgclient.junit.ContainerPgRule; +import io.vertx.tests.sqlclient.tck.NullValueEncodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPipeliningQueryTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPipeliningQueryTest.java similarity index 89% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPipeliningQueryTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPipeliningQueryTest.java index dada0b7a60..57ae2f27ed 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPipeliningQueryTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPipeliningQueryTest.java @@ -1,11 +1,11 @@ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.pgclient.PgBuilder; import io.vertx.pgclient.PgConnectOptions; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.tck.PipeliningQueryTestBase; +import io.vertx.tests.sqlclient.tck.PipeliningQueryTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedBatchTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedBatchTest.java similarity index 81% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedBatchTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedBatchTest.java index 336545fad5..049df2f107 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedBatchTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedBatchTest.java @@ -1,8 +1,8 @@ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; -import io.vertx.sqlclient.tck.PreparedBatchTestBase; +import io.vertx.tests.pgclient.junit.ContainerPgRule; +import io.vertx.tests.sqlclient.tck.PreparedBatchTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryCachedTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryCachedTest.java similarity index 82% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryCachedTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryCachedTest.java index 7730b096ca..3c5f84b133 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryCachedTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryCachedTest.java @@ -1,8 +1,8 @@ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; -import io.vertx.sqlclient.tck.PreparedQueryCachedTestBase; +import io.vertx.tests.pgclient.junit.ContainerPgRule; +import io.vertx.tests.sqlclient.tck.PreparedQueryCachedTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryPooledTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryPooledTest.java similarity index 89% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryPooledTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryPooledTest.java index bf0756ad1c..d62ee343b2 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryPooledTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryPooledTest.java @@ -1,4 +1,4 @@ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryTest.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryTest.java index 8a50d81ed9..f13fdde442 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryTestBase.java similarity index 90% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryTestBase.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryTestBase.java index b9198765ed..2b3871e1ea 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgPreparedQueryTestBase.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgPreparedQueryTestBase.java @@ -1,9 +1,9 @@ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.TestContext; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.tck.PreparedQueryTestBase; +import io.vertx.tests.sqlclient.tck.PreparedQueryTestBase; import org.junit.ClassRule; import org.junit.Test; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgSimpleQueryPooledTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgSimpleQueryPooledTest.java similarity index 87% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgSimpleQueryPooledTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgSimpleQueryPooledTest.java index e28712a560..a7faf30f00 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgSimpleQueryPooledTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgSimpleQueryPooledTest.java @@ -14,10 +14,10 @@ * limitations under the License. * */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; -import io.vertx.pgclient.junit.ContainerPgRule; -import io.vertx.sqlclient.tck.SimpleQueryTestBase; +import io.vertx.tests.pgclient.junit.ContainerPgRule; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgSimpleQueryTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgSimpleQueryTest.java similarity index 87% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgSimpleQueryTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgSimpleQueryTest.java index f5ed054dc1..69be6e7b59 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgSimpleQueryTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgSimpleQueryTest.java @@ -14,10 +14,10 @@ * limitations under the License. * */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; -import io.vertx.pgclient.junit.ContainerPgRule; -import io.vertx.sqlclient.tck.SimpleQueryTestBase; +import io.vertx.tests.pgclient.junit.ContainerPgRule; +import io.vertx.tests.sqlclient.tck.SimpleQueryTestBase; import io.vertx.ext.unit.junit.VertxUnitRunner; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTextDataTypeDecodeTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTextDataTypeDecodeTest.java similarity index 89% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTextDataTypeDecodeTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTextDataTypeDecodeTest.java index 2f570e7ede..84fb4ae84c 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTextDataTypeDecodeTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTextDataTypeDecodeTest.java @@ -9,12 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.data.Numeric; -import io.vertx.sqlclient.tck.TextDataTypeDecodeTestBase; +import io.vertx.tests.sqlclient.tck.TextDataTypeDecodeTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTracingTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTracingTest.java similarity index 90% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTracingTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTracingTest.java index acc14be2cd..48eb634054 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTracingTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTracingTest.java @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.core.Vertx; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.pgclient.PgBuilder; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.Pool; -import io.vertx.sqlclient.tck.TracingTestBase; +import io.vertx.tests.sqlclient.tck.TracingTestBase; import org.junit.ClassRule; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTransactionTest.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTransactionTest.java similarity index 96% rename from vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTransactionTest.java rename to vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTransactionTest.java index ccaccd6e7f..da9b109c8b 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/tck/PgTransactionTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/tck/PgTransactionTest.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.vertx.pgclient.tck; +package io.vertx.tests.pgclient.tck; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.pgclient.PgBuilder; import io.vertx.pgclient.PgException; -import io.vertx.pgclient.junit.ContainerPgRule; +import io.vertx.tests.pgclient.junit.ContainerPgRule; import io.vertx.sqlclient.Pool; import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.tck.TransactionTestBase; +import io.vertx.tests.sqlclient.tck.TransactionTestBase; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/vertx-pg-client/src/test/java/module-info.java b/vertx-pg-client/src/test/java/module-info.java new file mode 100644 index 0000000000..9173677e91 --- /dev/null +++ b/vertx-pg-client/src/test/java/module-info.java @@ -0,0 +1,16 @@ +open module io.vertx.tests.sql.client.pg { + + requires io.netty.buffer; + requires io.netty.transport; + requires io.vertx.core; + requires io.vertx.sql.client; + requires io.vertx.sql.client.pg; + requires io.vertx.tests.sql.client; + requires java.sql; + requires jmh.core; + requires io.vertx.testing.unit; + requires junit; + requires testcontainers; + requires static org.slf4j; + +} diff --git a/vertx-sql-client-templates/pom.xml b/vertx-sql-client-templates/pom.xml index b74bef49ef..e2eb9c5f33 100644 --- a/vertx-sql-client-templates/pom.xml +++ b/vertx-sql-client-templates/pom.xml @@ -31,6 +31,10 @@ https://github.com/eclipse-vertx/vertx-sql-client Vert.x SQL Client Templates + + ${path.separator} + + @@ -66,13 +70,6 @@ vertx-mysql-client test - - io.vertx - vertx-pg-client - 5.0.0-SNAPSHOT - test-jar - test - @@ -87,12 +84,29 @@ io.vertx.codegen.processor.Processor + + ${project.build.directory}/classes${s}${io.vertx:vertx-codegen-api:jar}${s}${io.vertx:vertx-codegen-processor:jar}${s}${io.vertx:vertx-core:jar} + + + + org.apache.maven.plugins + maven-dependency-plugin + + + initialize + + properties + + + + + diff --git a/vertx-sql-client-templates/src/main/java/module-info.java b/vertx-sql-client-templates/src/main/java/module-info.java index 12c98a180f..c3bfff588f 100644 --- a/vertx-sql-client-templates/src/main/java/module-info.java +++ b/vertx-sql-client-templates/src/main/java/module-info.java @@ -1,4 +1,5 @@ module io.vertx.sql.client.templates { + requires io.vertx.sql.client; requires io.vertx.codegen.processor; requires io.vertx.codegen.api; @@ -9,4 +10,6 @@ exports io.vertx.sqlclient.templates; exports io.vertx.sqlclient.templates.annotations; + exports io.vertx.sqlclient.templates.impl to io.vertx.tests.sql.client.templates; + } diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectMapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectMapper.java similarity index 71% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectMapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectMapper.java index 301e3ce0df..f1a4988246 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectMapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectMapper.java @@ -1,16 +1,16 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; -import io.vertx.sqlclient.templates.wrappers.BooleanWrapper; -import io.vertx.sqlclient.templates.wrappers.DoubleWrapper; -import io.vertx.sqlclient.templates.wrappers.FloatWrapper; -import io.vertx.sqlclient.templates.wrappers.IntegerWrapper; -import io.vertx.sqlclient.templates.wrappers.JsonArrayWrapper; -import io.vertx.sqlclient.templates.wrappers.JsonObjectWrapper; -import io.vertx.sqlclient.templates.wrappers.LongWrapper; -import io.vertx.sqlclient.templates.wrappers.ShortWrapper; -import io.vertx.sqlclient.templates.wrappers.StringWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.BooleanWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.DoubleWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.FloatWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.IntegerWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.JsonArrayWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.JsonObjectWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.LongWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.ShortWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.StringWrapper; public class DataObjectMapper { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectParamsTest.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectParamsTest.java similarity index 98% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectParamsTest.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectParamsTest.java index c75575e5a7..c17ea8c1d9 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectParamsTest.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectParamsTest.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectTypesTest.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectTypesTest.java similarity index 97% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectTypesTest.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectTypesTest.java index e3f145b517..d718cc79dd 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectTypesTest.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/DataObjectTypesTest.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; @@ -23,15 +23,17 @@ import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.sqlclient.RowSet; -import io.vertx.sqlclient.templates.wrappers.BooleanWrapper; -import io.vertx.sqlclient.templates.wrappers.DoubleWrapper; -import io.vertx.sqlclient.templates.wrappers.FloatWrapper; -import io.vertx.sqlclient.templates.wrappers.IntegerWrapper; -import io.vertx.sqlclient.templates.wrappers.JsonArrayWrapper; -import io.vertx.sqlclient.templates.wrappers.JsonObjectWrapper; -import io.vertx.sqlclient.templates.wrappers.LongWrapper; -import io.vertx.sqlclient.templates.wrappers.ShortWrapper; -import io.vertx.sqlclient.templates.wrappers.StringWrapper; +import io.vertx.sqlclient.templates.SqlTemplate; +import io.vertx.sqlclient.templates.TupleMapper; +import io.vertx.tests.sqlclient.templates.wrappers.BooleanWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.DoubleWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.FloatWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.IntegerWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.JsonArrayWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.JsonObjectWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.LongWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.ShortWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.StringWrapper; import org.junit.Test; import java.time.LocalDate; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/JsonObjectDataObject.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/JsonObjectDataObject.java similarity index 93% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/JsonObjectDataObject.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/JsonObjectDataObject.java index d3347bac84..ac5e7d08c6 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/JsonObjectDataObject.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/JsonObjectDataObject.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.codegen.annotations.DataObject; import io.vertx.core.json.JsonObject; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/LocalDateTimeDataObject.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/LocalDateTimeDataObject.java similarity index 90% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/LocalDateTimeDataObject.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/LocalDateTimeDataObject.java index 68694b8773..b43f118602 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/LocalDateTimeDataObject.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/LocalDateTimeDataObject.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.codegen.annotations.DataObject; import io.vertx.sqlclient.templates.annotations.RowMapped; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/LocalDateTimePojo.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/LocalDateTimePojo.java similarity index 71% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/LocalDateTimePojo.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/LocalDateTimePojo.java index 20d4698d75..c57f5727e8 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/LocalDateTimePojo.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/LocalDateTimePojo.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import java.time.LocalDateTime; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/MySQLDataObject.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/MySQLDataObject.java similarity index 93% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/MySQLDataObject.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/MySQLDataObject.java index 3561553637..fe71db2ab9 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/MySQLDataObject.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/MySQLDataObject.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.codegen.annotations.DataObject; import io.vertx.core.json.JsonObject; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/MySQLTest.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/MySQLTest.java similarity index 95% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/MySQLTest.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/MySQLTest.java index 2221221bbd..c362193e4f 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/MySQLTest.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/MySQLTest.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.core.Vertx; import io.vertx.ext.unit.TestContext; @@ -6,6 +6,7 @@ import io.vertx.mysqlclient.MySQLBuilder; import io.vertx.mysqlclient.MySQLConnectOptions; import io.vertx.sqlclient.Pool; +import io.vertx.sqlclient.templates.SqlTemplate; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PgClientTest.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PgClientTest.java similarity index 98% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PgClientTest.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PgClientTest.java index 58481b76ce..b6a92336f9 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PgClientTest.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PgClientTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import io.vertx.core.json.JsonObject; @@ -20,6 +20,8 @@ import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; import io.vertx.sqlclient.SqlResult; +import io.vertx.sqlclient.templates.SqlTemplate; +import io.vertx.sqlclient.templates.TupleMapper; import org.junit.Test; import java.time.Instant; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PgTemplateTestBase.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PgTemplateTestBase.java similarity index 94% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PgTemplateTestBase.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PgTemplateTestBase.java index 8780483fdc..b21c847d69 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PgTemplateTestBase.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PgTemplateTestBase.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; @@ -7,6 +7,9 @@ import io.vertx.pgclient.PgConnectOptions; import io.vertx.pgclient.PgConnection; import io.vertx.sqlclient.RowSet; +import io.vertx.sqlclient.templates.RowMapper; +import io.vertx.sqlclient.templates.SqlTemplate; +import io.vertx.sqlclient.templates.TupleMapper; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PostgreSQLDataObject.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PostgreSQLDataObject.java similarity index 97% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PostgreSQLDataObject.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PostgreSQLDataObject.java index f3b8427d2b..2a94ca66a9 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PostgreSQLDataObject.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/PostgreSQLDataObject.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.codegen.annotations.DataObject; import io.vertx.core.json.JsonObject; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/TemplateBuilderTest.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/TemplateBuilderTest.java similarity index 99% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/TemplateBuilderTest.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/TemplateBuilderTest.java index 3c775cc2fe..cce82a6099 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/TemplateBuilderTest.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/TemplateBuilderTest.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.core.Future; import io.vertx.core.Handler; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/TestDataObject.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/TestDataObject.java similarity index 97% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/TestDataObject.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/TestDataObject.java index 5f008a407f..e562f82a89 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/TestDataObject.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/TestDataObject.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.codegen.annotations.DataObject; import io.vertx.core.buffer.Buffer; @@ -7,15 +7,15 @@ import io.vertx.sqlclient.templates.annotations.ParametersMapped; import io.vertx.sqlclient.templates.annotations.RowMapped; import io.vertx.sqlclient.templates.annotations.TemplateParameter; -import io.vertx.sqlclient.templates.wrappers.BooleanWrapper; -import io.vertx.sqlclient.templates.wrappers.DoubleWrapper; -import io.vertx.sqlclient.templates.wrappers.FloatWrapper; -import io.vertx.sqlclient.templates.wrappers.IntegerWrapper; -import io.vertx.sqlclient.templates.wrappers.JsonArrayWrapper; -import io.vertx.sqlclient.templates.wrappers.JsonObjectWrapper; -import io.vertx.sqlclient.templates.wrappers.LongWrapper; -import io.vertx.sqlclient.templates.wrappers.ShortWrapper; -import io.vertx.sqlclient.templates.wrappers.StringWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.BooleanWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.DoubleWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.FloatWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.IntegerWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.JsonArrayWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.JsonObjectWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.LongWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.ShortWrapper; +import io.vertx.tests.sqlclient.templates.wrappers.StringWrapper; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/UserDataObject.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/UserDataObject.java similarity index 95% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/UserDataObject.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/UserDataObject.java index dbe97906f5..b8cf7950e5 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/UserDataObject.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/UserDataObject.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; import io.vertx.codegen.format.SnakeCase; import io.vertx.codegen.annotations.DataObject; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/World.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/World.java similarity index 81% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/World.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/World.java index b7d0700363..f265dda7b0 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/World.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/World.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates; +package io.vertx.tests.sqlclient.templates; public class World { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/package-info.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/package-info.java new file mode 100644 index 0000000000..eac4af3dd9 --- /dev/null +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/package-info.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2017 Julien Viet + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +@ModuleGen(name = "vertx-sql-templates", groupPackage = "io.vertx") +package io.vertx.tests.sqlclient.templates; + +import io.vertx.codegen.annotations.ModuleGen; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/BooleanWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/BooleanWrapper.java similarity index 70% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/BooleanWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/BooleanWrapper.java index cdfa30ac33..8bd7136482 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/BooleanWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/BooleanWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; public class BooleanWrapper extends WrapperBase { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/DoubleWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/DoubleWrapper.java similarity index 69% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/DoubleWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/DoubleWrapper.java index 4c232d3d50..42d6f2352e 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/DoubleWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/DoubleWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; public class DoubleWrapper extends WrapperBase { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/FloatWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/FloatWrapper.java similarity index 69% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/FloatWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/FloatWrapper.java index 51a35fb7c4..ba84ad121d 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/FloatWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/FloatWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; public class FloatWrapper extends WrapperBase { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/IntegerWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/IntegerWrapper.java similarity index 70% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/IntegerWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/IntegerWrapper.java index d5cab262ca..da8e062ce8 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/IntegerWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/IntegerWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; public class IntegerWrapper extends WrapperBase { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/JsonArrayWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/JsonArrayWrapper.java similarity index 76% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/JsonArrayWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/JsonArrayWrapper.java index 06a1587d00..12be41d012 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/JsonArrayWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/JsonArrayWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; import io.vertx.core.json.JsonArray; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/JsonObjectWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/JsonObjectWrapper.java similarity index 76% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/JsonObjectWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/JsonObjectWrapper.java index a9d302e118..f02131f9f1 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/JsonObjectWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/JsonObjectWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; import io.vertx.core.json.JsonObject; diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/LongWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/LongWrapper.java similarity index 68% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/LongWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/LongWrapper.java index 494d3f28db..fa75333d67 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/LongWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/LongWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; public class LongWrapper extends WrapperBase { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/ShortWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/ShortWrapper.java similarity index 69% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/ShortWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/ShortWrapper.java index c9b75dcf3e..1d24dbb7f1 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/ShortWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/ShortWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; public class ShortWrapper extends WrapperBase { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/StringWrapper.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/StringWrapper.java similarity index 69% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/StringWrapper.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/StringWrapper.java index d3cae822f7..a4bc7f2523 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/StringWrapper.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/StringWrapper.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; public class StringWrapper extends WrapperBase { diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/WrapperBase.java b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/WrapperBase.java similarity index 91% rename from vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/WrapperBase.java rename to vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/WrapperBase.java index 899146911b..4805c536f3 100644 --- a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/wrappers/WrapperBase.java +++ b/vertx-sql-client-templates/src/test/java/io/vertx/tests/sqlclient/templates/wrappers/WrapperBase.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.templates.wrappers; +package io.vertx.tests.sqlclient.templates.wrappers; import java.util.Objects; diff --git a/vertx-sql-client-templates/src/test/java/module-info.java b/vertx-sql-client-templates/src/test/java/module-info.java new file mode 100644 index 0000000000..7be80522f4 --- /dev/null +++ b/vertx-sql-client-templates/src/test/java/module-info.java @@ -0,0 +1,13 @@ +open module io.vertx.tests.sql.client.templates { + requires com.fasterxml.jackson.databind; + requires com.fasterxml.jackson.datatype.jsr310; + requires io.vertx.codegen.api; + requires io.vertx.core; + requires io.vertx.sql.client; + requires io.vertx.sql.client.mysql; + requires io.vertx.sql.client.pg; + requires io.vertx.sql.client.templates; + requires io.vertx.testing.unit; + requires junit; + requires testcontainers; +} diff --git a/vertx-sql-client-templates/src/test/resources/META-INF/vertx/json-mappers.properties b/vertx-sql-client-templates/src/test/resources/META-INF/vertx/json-mappers.properties index e2298f5cd0..e060c175e2 100644 --- a/vertx-sql-client-templates/src/test/resources/META-INF/vertx/json-mappers.properties +++ b/vertx-sql-client-templates/src/test/resources/META-INF/vertx/json-mappers.properties @@ -1,18 +1,18 @@ -io.vertx.sqlclient.templates.wrappers.BooleanWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromBoolean -io.vertx.sqlclient.templates.wrappers.BooleanWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toBoolean -io.vertx.sqlclient.templates.wrappers.ShortWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromShort -io.vertx.sqlclient.templates.wrappers.ShortWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toShort -io.vertx.sqlclient.templates.wrappers.IntegerWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromInteger -io.vertx.sqlclient.templates.wrappers.IntegerWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toInteger -io.vertx.sqlclient.templates.wrappers.LongWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromLong -io.vertx.sqlclient.templates.wrappers.LongWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toLong -io.vertx.sqlclient.templates.wrappers.FloatWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromFloat -io.vertx.sqlclient.templates.wrappers.FloatWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toFloat -io.vertx.sqlclient.templates.wrappers.DoubleWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromDouble -io.vertx.sqlclient.templates.wrappers.DoubleWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toDouble -io.vertx.sqlclient.templates.wrappers.StringWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromString -io.vertx.sqlclient.templates.wrappers.StringWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toString -io.vertx.sqlclient.templates.wrappers.JsonObjectWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromJsonObject -io.vertx.sqlclient.templates.wrappers.JsonObjectWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toJsonObject -io.vertx.sqlclient.templates.wrappers.JsonArrayWrapper.serializer=io.vertx.sqlclient.templates.DataObjectMapper#fromJsonArray -io.vertx.sqlclient.templates.wrappers.JsonArrayWrapper.deserializer=io.vertx.sqlclient.templates.DataObjectMapper#toJsonArray +io.vertx.tests.sqlclient.templates.wrappers.BooleanWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromBoolean +io.vertx.tests.sqlclient.templates.wrappers.BooleanWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toBoolean +io.vertx.tests.sqlclient.templates.wrappers.ShortWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromShort +io.vertx.tests.sqlclient.templates.wrappers.ShortWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toShort +io.vertx.tests.sqlclient.templates.wrappers.IntegerWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromInteger +io.vertx.tests.sqlclient.templates.wrappers.IntegerWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toInteger +io.vertx.tests.sqlclient.templates.wrappers.LongWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromLong +io.vertx.tests.sqlclient.templates.wrappers.LongWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toLong +io.vertx.tests.sqlclient.templates.wrappers.FloatWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromFloat +io.vertx.tests.sqlclient.templates.wrappers.FloatWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toFloat +io.vertx.tests.sqlclient.templates.wrappers.DoubleWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromDouble +io.vertx.tests.sqlclient.templates.wrappers.DoubleWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toDouble +io.vertx.tests.sqlclient.templates.wrappers.StringWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromString +io.vertx.tests.sqlclient.templates.wrappers.StringWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toString +io.vertx.tests.sqlclient.templates.wrappers.JsonObjectWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromJsonObject +io.vertx.tests.sqlclient.templates.wrappers.JsonObjectWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toJsonObject +io.vertx.tests.sqlclient.templates.wrappers.JsonArrayWrapper.serializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#fromJsonArray +io.vertx.tests.sqlclient.templates.wrappers.JsonArrayWrapper.deserializer=io.vertx.tests.sqlclient.templates.DataObjectMapper#toJsonArray diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PropertyKindMap.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PropertyKindMap.java index c6b149fd88..ec60a4e4f7 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PropertyKindMap.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PropertyKindMap.java @@ -40,14 +40,14 @@ public Object get(PropertyKind property) { return null; } - public void put(PropertyKind property, Object value) { + public PropertyKindMap put(PropertyKind property, Object value) { Objects.requireNonNull(property, "property is null"); Objects.requireNonNull(value, "value is null"); for (int i = 0; i < elements.length; i += 2) { Object key = elements[i]; if (key == property || key.equals(property)) { elements[i + 1] = value; - return; + return this; } } if (elements == EMPTY_ELEMENTS) { @@ -57,10 +57,11 @@ public void put(PropertyKind property, Object value) { } elements[elements.length - 2] = property; elements[elements.length - 1] = value; + return this; } // visible for testing - int count() { + public int count() { return elements.length >> 1; } } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlResultBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlResultBase.java index 05f9d1d19a..19cf81b760 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlResultBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlResultBase.java @@ -30,7 +30,7 @@ public abstract class SqlResultBase implements SqlResult { List columnDescriptors; int size; SqlResult next; - PropertyKindMap properties; + protected PropertyKindMap properties; @Override public List columnsNames() { @@ -77,4 +77,5 @@ public V property(PropertyKind property) { public SqlResult next() { return next; } + } diff --git a/vertx-sql-client/src/main/java/module-info.java b/vertx-sql-client/src/main/java/module-info.java index 5afc4bd197..a223770395 100644 --- a/vertx-sql-client/src/main/java/module-info.java +++ b/vertx-sql-client/src/main/java/module-info.java @@ -16,6 +16,8 @@ exports io.vertx.sqlclient.desc; exports io.vertx.sqlclient.spi; + uses io.vertx.sqlclient.spi.Driver; + // Expose enough for implementing a client back-end on top of this API (e.g. vertx-jdbc-client) exports io.vertx.sqlclient.internal; @@ -25,9 +27,12 @@ // Expose impl to our own implementation, this actually would deserve to be in another module since it is not // related to the API or the internal API - exports io.vertx.sqlclient.impl to io.vertx.sql.client.pg, io.vertx.sql.client.mysql, io.vertx.sql.client.mssql, io.vertx.sql.client.db2, io.vertx.sql.client.oracle, io.vertx.sql.client.templates; - exports io.vertx.sqlclient.impl.codec to io.vertx.sql.client.pg, io.vertx.sql.client.mysql, io.vertx.sql.client.mssql, io.vertx.sql.client.db2; - exports io.vertx.sqlclient.impl.cache to io.vertx.sql.client.mysql, io.vertx.sql.client.mssql, io.vertx.sql.client.db2; + exports io.vertx.sqlclient.impl to + io.vertx.tests.sql.client, io.vertx.tests.sql.client.pg, io.vertx.tests.sql.client.mysql, io.vertx.tests.sql.client.templates, + io.vertx.sql.client.pg, io.vertx.sql.client.mysql, io.vertx.sql.client.mssql, io.vertx.sql.client.db2, io.vertx.sql.client.oracle, io.vertx.sql.client.templates; + exports io.vertx.sqlclient.impl.codec to io.vertx.sql.client.pg, io.vertx.tests.sql.client.pg, io.vertx.sql.client.mysql, io.vertx.sql.client.mssql, io.vertx.sql.client.db2; + exports io.vertx.sqlclient.impl.cache to io.vertx.tests.sql.client, io.vertx.sql.client.mysql, io.vertx.sql.client.mssql, io.vertx.sql.client.db2; + exports io.vertx.sqlclient.impl.tracing to io.vertx.tests.sql.client; exports io.vertx.sqlclient.impl.pool; } diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/ArrayTupleTest.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ArrayTupleTest.java similarity index 96% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/ArrayTupleTest.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ArrayTupleTest.java index bb217eff97..59947b8a6a 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/ArrayTupleTest.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ArrayTupleTest.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.tests.sqlclient; import io.vertx.sqlclient.Tuple; import io.vertx.sqlclient.internal.ArrayTuple; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/ColumnChecker.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ColumnChecker.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/ColumnChecker.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ColumnChecker.java index c96e354659..fe323147e9 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/ColumnChecker.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ColumnChecker.java @@ -1,5 +1,7 @@ -package io.vertx.sqlclient; +package io.vertx.tests.sqlclient; +import io.vertx.sqlclient.Row; +import io.vertx.sqlclient.Tuple; import junit.framework.AssertionFailedError; import java.io.Serializable; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/HexSequenceTest.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/HexSequenceTest.java similarity index 97% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/HexSequenceTest.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/HexSequenceTest.java index f6f6acaf21..92a1248dbf 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/HexSequenceTest.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/HexSequenceTest.java @@ -9,8 +9,9 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.impl; +package io.vertx.tests.sqlclient; +import io.vertx.sqlclient.impl.HexSequence; import org.junit.Assert; import org.junit.Test; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/LruCacheTest.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/LruCacheTest.java similarity index 97% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/LruCacheTest.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/LruCacheTest.java index fccb3427c8..314dc37b68 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/LruCacheTest.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/LruCacheTest.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.impl; +package io.vertx.tests.sqlclient; import io.vertx.sqlclient.impl.cache.LruCache; import org.junit.Test; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/PropertyKindMapTest.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/PropertyKindMapTest.java similarity index 95% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/PropertyKindMapTest.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/PropertyKindMapTest.java index f1b4f9ed11..2118dfa3cb 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/PropertyKindMapTest.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/PropertyKindMapTest.java @@ -9,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.impl; +package io.vertx.tests.sqlclient; import io.vertx.sqlclient.PropertyKind; +import io.vertx.sqlclient.impl.PropertyKindMap; import org.junit.Test; import java.util.UUID; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/ProxyServer.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ProxyServer.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/ProxyServer.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ProxyServer.java index 0ffd41a8c4..1a95ede8d4 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/ProxyServer.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/ProxyServer.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient; +package io.vertx.tests.sqlclient; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/SqlResultTest.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/SqlResultTest.java similarity index 75% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/SqlResultTest.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/SqlResultTest.java index 233cb87618..80339eff4e 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/SqlResultTest.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/SqlResultTest.java @@ -9,18 +9,28 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.impl; +package io.vertx.tests.sqlclient; import io.vertx.sqlclient.PropertyKind; +import io.vertx.sqlclient.impl.PropertyKindMap; +import io.vertx.sqlclient.impl.RowSetImpl; import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.fail; public class SqlResultTest { + + static class TestRowSet extends RowSetImpl { + + void properties(PropertyKindMap props) { + this.properties = props; + } + } + @Test public void testNullPropertyKind() { - RowSetImpl rowSet = new RowSetImpl<>(); + TestRowSet rowSet = new TestRowSet(); try { rowSet.property(null); } catch (IllegalArgumentException e) { @@ -30,16 +40,16 @@ public void testNullPropertyKind() { @Test public void testNullProperties() { - RowSetImpl rowSet = new RowSetImpl<>(); - rowSet.properties = null; + TestRowSet rowSet = new TestRowSet(); + rowSet.properties(null); PropertyKind propertyKind = PropertyKind.create("test", String.class); Assert.assertNull(rowSet.property(propertyKind)); } @Test public void testPropertyKindNullType() { - RowSetImpl rowSet = new RowSetImpl<>(); - rowSet.properties = new PropertyKindMap(); + TestRowSet rowSet = new TestRowSet(); + rowSet.properties(new PropertyKindMap()); PropertyKind nullTypePropertyKind = new PropertyKind() { @Override public String name() { @@ -60,11 +70,10 @@ public Class type() { @Test public void testUnknownPropertyKind() { - RowSetImpl rowSet = new RowSetImpl<>(); + TestRowSet rowSet = new TestRowSet(); PropertyKind knownPropertyKind = PropertyKind.create("test-1", Integer.class); PropertyKind unknownPropertyKind = PropertyKind.create("test-2", String.class); - rowSet.properties = new PropertyKindMap(); - rowSet.properties.put(knownPropertyKind, 1234); + rowSet.properties(new PropertyKindMap().put(knownPropertyKind, 1234)); Assert.assertEquals(Integer.valueOf(1234), rowSet.property(knownPropertyKind)); Assert.assertNull(rowSet.property(unknownPropertyKind)); @@ -72,11 +81,10 @@ public void testUnknownPropertyKind() { @Test public void testInvalidPropertyType() { - RowSetImpl rowSet = new RowSetImpl<>(); + TestRowSet rowSet = new TestRowSet(); PropertyKind propertyKind1 = PropertyKind.create("test", Integer.class); PropertyKind propertyKind2 = PropertyKind.create("test", String.class); - rowSet.properties = new PropertyKindMap(); - rowSet.properties.put(propertyKind1, 1234); + rowSet.properties(new PropertyKindMap().put(propertyKind1, 1234)); Assert.assertEquals(Integer.valueOf(1234), rowSet.property(propertyKind1)); try { diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TestRowDesc.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/TestRowDesc.java similarity index 97% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TestRowDesc.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/TestRowDesc.java index 71ba8af675..693caf2124 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TestRowDesc.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/TestRowDesc.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.impl; +package io.vertx.tests.sqlclient; import io.vertx.sqlclient.desc.ColumnDescriptor; import io.vertx.sqlclient.internal.RowDesc; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TupleTest.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/TupleTest.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TupleTest.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/TupleTest.java index 5daf1dc71a..18c12d023d 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TupleTest.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/TupleTest.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.tests.sqlclient; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/data/NumericTest.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/data/NumericTest.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/data/NumericTest.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/data/NumericTest.java index 4ca16a8434..cc22003927 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/data/NumericTest.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/data/NumericTest.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.sqlclient.data; +package io.vertx.tests.sqlclient.data; import io.vertx.sqlclient.data.Numeric; import org.junit.Test; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/BinaryDataTypeDecodeTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/BinaryDataTypeDecodeTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/BinaryDataTypeDecodeTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/BinaryDataTypeDecodeTestBase.java index 8c9ee5a809..c251935b23 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/BinaryDataTypeDecodeTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/BinaryDataTypeDecodeTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.TestContext; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/BinaryDataTypeEncodeTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/BinaryDataTypeEncodeTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/BinaryDataTypeEncodeTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/BinaryDataTypeEncodeTestBase.java index c7b2797dbf..482ea98243 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/BinaryDataTypeEncodeTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/BinaryDataTypeEncodeTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.ext.unit.TestContext; import io.vertx.sqlclient.Row; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/CollectorTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/CollectorTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/CollectorTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/CollectorTestBase.java index edbc5fe1a0..eab3b4769d 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/CollectorTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/CollectorTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionAutoRetryTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/ConnectionAutoRetryTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionAutoRetryTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/ConnectionAutoRetryTestBase.java index 1986e832bf..5ac895c90d 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionAutoRetryTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/ConnectionAutoRetryTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Future; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/ConnectionTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/ConnectionTestBase.java index 2fe7c52482..2f36423d03 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/ConnectionTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.*; import io.vertx.ext.unit.Async; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/Connector.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/Connector.java similarity index 95% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/Connector.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/Connector.java index f93d92bc4d..252638da56 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/Connector.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/Connector.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/DataTypeTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/DataTypeTestBase.java similarity index 97% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/DataTypeTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/DataTypeTestBase.java index 61a1c09251..44490baf09 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/DataTypeTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/DataTypeTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/DriverTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/DriverTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/DriverTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/DriverTestBase.java index 13d15d1516..3be19b0cb8 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/DriverTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/DriverTestBase.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/MetricsTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/MetricsTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/MetricsTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/MetricsTestBase.java index 8819e63cbb..8b9675591c 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/MetricsTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/MetricsTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.Future; import io.vertx.core.Vertx; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/NullValueEncodeTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/NullValueEncodeTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/NullValueEncodeTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/NullValueEncodeTestBase.java index 7f3274880d..4f56b62d49 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/NullValueEncodeTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/NullValueEncodeTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PipeliningQueryTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PipeliningQueryTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PipeliningQueryTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PipeliningQueryTestBase.java index 77b669bf0e..bbad7f1d81 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PipeliningQueryTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PipeliningQueryTestBase.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.Future; import io.vertx.core.Vertx; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedBatchTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedBatchTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedBatchTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedBatchTestBase.java index cf0d16542e..1a355a9bcb 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedBatchTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedBatchTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedQueryCachedTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedQueryCachedTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedQueryCachedTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedQueryCachedTestBase.java index addeaa1449..1a75139480 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedQueryCachedTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedQueryCachedTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedQueryTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedQueryTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedQueryTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedQueryTestBase.java index 5b624b1687..c073708855 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/PreparedQueryTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedQueryTestBase.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/SimpleQueryTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/SimpleQueryTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/SimpleQueryTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/SimpleQueryTestBase.java index b09d6f0332..95779aa06b 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/SimpleQueryTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/SimpleQueryTestBase.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TextDataTypeDecodeTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TextDataTypeDecodeTestBase.java similarity index 98% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TextDataTypeDecodeTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TextDataTypeDecodeTestBase.java index 5f977bc536..c795b51923 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TextDataTypeDecodeTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TextDataTypeDecodeTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TracingTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TracingTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TracingTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TracingTestBase.java index f1c07a570c..5749b019bb 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TracingTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TracingTestBase.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.Context; import io.vertx.core.Future; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TransactionTestBase.java b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TransactionTestBase.java similarity index 99% rename from vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TransactionTestBase.java rename to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TransactionTestBase.java index 67eb465a21..886dffe522 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TransactionTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/TransactionTestBase.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.tck; +package io.vertx.tests.sqlclient.tck; import io.vertx.core.AsyncResult; import io.vertx.core.Future; diff --git a/vertx-sql-client/src/test/java/module-info.java b/vertx-sql-client/src/test/java/module-info.java new file mode 100644 index 0000000000..f797c9d5b5 --- /dev/null +++ b/vertx-sql-client/src/test/java/module-info.java @@ -0,0 +1,15 @@ +open module io.vertx.tests.sql.client { + + requires io.vertx.core; + requires io.vertx.core.logging; + requires io.vertx.sql.client; + requires io.vertx.testing.unit; + requires java.sql; + requires junit; + + uses io.vertx.sqlclient.spi.Driver; + + exports io.vertx.tests.sqlclient; + exports io.vertx.tests.sqlclient.tck; + +}