Refactor package names of vertx-oracle-client

vietj · vietj · commit bf2d4346f381 · 2025-02-25T16:35:26.000+01:00
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/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/tests/oracleclient/OracleBrokenPooledConnectionTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/OracleBrokenPooledConnectionTest.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.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.tests.sqlclient.ProxyServer;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/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/tests/oracleclient/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/tests/oracleclient/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/tests/oracleclient/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/tests/oracleclient/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/tests/oracleclient/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/tests/oracleclient/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/tests/oracleclient/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/tests/oracleclient/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/tests/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/tests/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/tests/oracleclient/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/tests/oracleclient/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;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeDecodeTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeDecodeTest.java
@@ -9,11 +9,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.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import io.vertx.oracleclient.test.junit.OracleRule;
+import tests.oracleclient.junit.OracleRule;
 import io.vertx.tests.sqlclient.tck.BinaryDataTypeDecodeTestBase;
 import org.junit.ClassRule;
 import org.junit.Ignore;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeEncodeTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleBinaryDataTypeEncodeTest.java
@@ -9,11 +9,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.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.tests.sqlclient.tck.BinaryDataTypeEncodeTestBase;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleCollectorTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleCollectorTest.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.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.tests.sqlclient.tck.CollectorTestBase;
 import org.junit.Assume;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionAutoRetryTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionAutoRetryTest.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.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.oracleclient.OracleConnectOptions;
-import io.vertx.oracleclient.test.junit.OracleRule;
+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/tests/oracleclient/tck/OracleConnectionTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleConnectionTest.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.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.tests.sqlclient.tck.ConnectionTestBase;
 import org.junit.ClassRule;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleDriverTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleDriverTest.java
@@ -8,10 +8,10 @@
  *
  * 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.tests.sqlclient.tck.DriverTestBase;
 import org.junit.ClassRule;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleMetricsTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleMetricsTest.java
@@ -9,11 +9,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.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;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleNullValueEncodeTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleNullValueEncodeTest.java
@@ -8,10 +8,10 @@
  *
  * 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.tests.sqlclient.tck.NullValueEncodeTestBase;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedBatchTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedBatchTest.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.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;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedQueryTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OraclePreparedQueryTest.java
@@ -9,11 +9,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.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import io.vertx.oracleclient.test.junit.OracleRule;
+import tests.oracleclient.junit.OracleRule;
 import io.vertx.tests.sqlclient.tck.PreparedQueryTestBase;
 import org.junit.ClassRule;
 import org.junit.Ignore;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleSimpleQueryTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleSimpleQueryTest.java
@@ -8,10 +8,10 @@
  *
  * 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.tests.sqlclient.tck.SimpleQueryTestBase;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTextDataTypeDecodeTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTextDataTypeDecodeTest.java
@@ -9,11 +9,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.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import io.vertx.oracleclient.test.junit.OracleRule;
+import tests.oracleclient.junit.OracleRule;
 import io.vertx.tests.sqlclient.tck.TextDataTypeDecodeTestBase;
 import org.junit.ClassRule;
 import org.junit.Ignore;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTracingTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTracingTest.java
@@ -9,13 +9,13 @@
  * 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.tests.sqlclient.tck.TracingTestBase;
 import org.junit.ClassRule;
diff --git a/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTransactionTest.java b/vertx-oracle-client/src/test/java/tests/oracleclient/tck/OracleTransactionTest.java
