You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ch...@apache.org on 2023/07/22 21:44:12 UTC
[shardingsphere] branch master updated: Add shardingsphere-test-fixture-database module (#27375)
This is an automated email from the ASF dual-hosted git repository.
chengzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 041f23a95fd Add shardingsphere-test-fixture-database module (#27375)
041f23a95fd is described below
commit 041f23a95fd79b98cb0119164568ea299200c805
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Jul 23 05:44:06 2023 +0800
Add shardingsphere-test-fixture-database module (#27375)
* Add shardingsphere-test-fixture-database module
* Add shardingsphere-test-fixture-database module
* Add shardingsphere-test-fixture-database module
* Add shardingsphere-test-fixture-database module
---
db-protocol/core/pom.xml | 3 ++-
features/broadcast/core/pom.xml | 4 ++--
features/encrypt/core/pom.xml | 4 ++--
features/readwrite-splitting/core/pom.xml | 4 ++--
features/shadow/core/pom.xml | 4 ++--
features/sharding/distsql/handler/pom.xml | 6 +++---
infra/binder/pom.xml | 2 +-
infra/context/pom.xml | 4 ++--
infra/executor/pom.xml | 4 ++--
infra/merge/pom.xml | 6 ++++++
infra/rewrite/pom.xml | 2 +-
jdbc/core/pom.xml | 4 ++--
kernel/data-pipeline/api/pom.xml | 12 +++++++++---
kernel/data-pipeline/core/pom.xml | 2 +-
kernel/data-pipeline/dialect/mysql/pom.xml | 2 +-
kernel/global-clock/type/tso/core/pom.xml | 12 +++++++-----
kernel/global-clock/type/tso/provider/redis/pom.xml | 4 +++-
kernel/metadata/core/pom.xml | 12 +++++++++---
kernel/single/core/pom.xml | 4 ++--
kernel/time-service/type/database/pom.xml | 18 ++++++++++++------
kernel/transaction/core/pom.xml | 4 ++--
mode/core/pom.xml | 8 +++++++-
mode/type/cluster/core/pom.xml | 6 +++---
mode/type/cluster/repository/provider/consul/pom.xml | 1 +
mode/type/cluster/repository/provider/etcd/pom.xml | 1 +
mode/type/cluster/repository/provider/nacos/pom.xml | 1 +
.../type/cluster/repository/provider/zookeeper/pom.xml | 1 +
mode/type/standalone/core/pom.xml | 6 +++---
proxy/backend/core/pom.xml | 12 +++++++++---
proxy/backend/type/hbase/pom.xml | 1 +
proxy/backend/type/mysql/pom.xml | 6 +++---
proxy/backend/type/postgresql/pom.xml | 6 +++---
proxy/bootstrap/pom.xml | 6 ++++++
proxy/frontend/core/pom.xml | 4 ++--
test/fixture/{jdbc => database}/pom.xml | 11 ++++++-----
.../fixture}/database/type/MockedDatabaseType.java | 2 +-
...ache.shardingsphere.infra.database.spi.DatabaseType | 2 +-
test/fixture/infra/pom.xml | 5 -----
test/fixture/jdbc/pom.xml | 5 -----
test/fixture/pom.xml | 1 +
test/it/parser/pom.xml | 1 +
test/it/pipeline/pom.xml | 2 +-
test/it/rewriter/pom.xml | 4 ++--
43 files changed, 127 insertions(+), 82 deletions(-)
diff --git a/db-protocol/core/pom.xml b/db-protocol/core/pom.xml
index ed98bd2b5e9..fced1f0880f 100644
--- a/db-protocol/core/pom.xml
+++ b/db-protocol/core/pom.xml
@@ -32,9 +32,10 @@
<artifactId>shardingsphere-dialect-exception-core</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/broadcast/core/pom.xml b/features/broadcast/core/pom.xml
index ae7fd206f7b..ccdaf1ba0b9 100644
--- a/features/broadcast/core/pom.xml
+++ b/features/broadcast/core/pom.xml
@@ -61,13 +61,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/encrypt/core/pom.xml b/features/encrypt/core/pom.xml
index 96aab52210b..f4048a2a23a 100644
--- a/features/encrypt/core/pom.xml
+++ b/features/encrypt/core/pom.xml
@@ -50,13 +50,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/readwrite-splitting/core/pom.xml b/features/readwrite-splitting/core/pom.xml
index 754f6a701fa..268a9fe9523 100644
--- a/features/readwrite-splitting/core/pom.xml
+++ b/features/readwrite-splitting/core/pom.xml
@@ -56,13 +56,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/shadow/core/pom.xml b/features/shadow/core/pom.xml
index 4328f89cc0b..b54a91c2b3a 100644
--- a/features/shadow/core/pom.xml
+++ b/features/shadow/core/pom.xml
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/sharding/distsql/handler/pom.xml b/features/sharding/distsql/handler/pom.xml
index c5256f7eafd..eedaa1b4d88 100644
--- a/features/sharding/distsql/handler/pom.xml
+++ b/features/sharding/distsql/handler/pom.xml
@@ -50,19 +50,19 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/infra/binder/pom.xml b/infra/binder/pom.xml
index d9038cff3f2..8ef52555aae 100644
--- a/infra/binder/pom.xml
+++ b/infra/binder/pom.xml
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/infra/context/pom.xml b/infra/context/pom.xml
index 43e08d52bb7..2c478417f2b 100644
--- a/infra/context/pom.xml
+++ b/infra/context/pom.xml
@@ -70,13 +70,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/infra/executor/pom.xml b/infra/executor/pom.xml
index a92ff4f5bc8..ec46e2c990d 100644
--- a/infra/executor/pom.xml
+++ b/infra/executor/pom.xml
@@ -40,13 +40,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/infra/merge/pom.xml b/infra/merge/pom.xml
index 2f760c955e8..e61a28707c7 100644
--- a/infra/merge/pom.xml
+++ b/infra/merge/pom.xml
@@ -38,6 +38,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-fixture-infra</artifactId>
diff --git a/infra/rewrite/pom.xml b/infra/rewrite/pom.xml
index d224ec8410b..1beaf6fa6d3 100644
--- a/infra/rewrite/pom.xml
+++ b/infra/rewrite/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/jdbc/core/pom.xml b/jdbc/core/pom.xml
index 98713ef4abc..2a00fb06368 100644
--- a/jdbc/core/pom.xml
+++ b/jdbc/core/pom.xml
@@ -178,13 +178,13 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/data-pipeline/api/pom.xml b/kernel/data-pipeline/api/pom.xml
index 8446d5cb3da..f31e26ade2a 100644
--- a/kernel/data-pipeline/api/pom.xml
+++ b/kernel/data-pipeline/api/pom.xml
@@ -44,19 +44,25 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-infra</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/data-pipeline/core/pom.xml b/kernel/data-pipeline/core/pom.xml
index 8cb5579f15d..5b19f47d92b 100644
--- a/kernel/data-pipeline/core/pom.xml
+++ b/kernel/data-pipeline/core/pom.xml
@@ -90,7 +90,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/data-pipeline/dialect/mysql/pom.xml b/kernel/data-pipeline/dialect/mysql/pom.xml
index 75427b7ef80..f25c17abccd 100644
--- a/kernel/data-pipeline/dialect/mysql/pom.xml
+++ b/kernel/data-pipeline/dialect/mysql/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/global-clock/type/tso/core/pom.xml b/kernel/global-clock/type/tso/core/pom.xml
index 8ba3a6ed157..9f2c5d5199f 100644
--- a/kernel/global-clock/type/tso/core/pom.xml
+++ b/kernel/global-clock/type/tso/core/pom.xml
@@ -32,22 +32,24 @@
<artifactId>shardingsphere-global-clock-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-global-clock-tso-spi</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-global-clock-tso-spi</artifactId>
+ <artifactId>shardingsphere-global-clock-tso-provider-redis</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-global-clock-tso-provider-redis</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/kernel/global-clock/type/tso/provider/redis/pom.xml b/kernel/global-clock/type/tso/provider/redis/pom.xml
index cf097f357db..980ad81e45b 100644
--- a/kernel/global-clock/type/tso/provider/redis/pom.xml
+++ b/kernel/global-clock/type/tso/provider/redis/pom.xml
@@ -37,12 +37,14 @@
<artifactId>shardingsphere-global-clock-tso-spi</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
diff --git a/kernel/metadata/core/pom.xml b/kernel/metadata/core/pom.xml
index 365aab1df62..cda142ba4fb 100644
--- a/kernel/metadata/core/pom.xml
+++ b/kernel/metadata/core/pom.xml
@@ -45,19 +45,25 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-infra</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/single/core/pom.xml b/kernel/single/core/pom.xml
index 0d3acc5a060..d24d15755bc 100644
--- a/kernel/single/core/pom.xml
+++ b/kernel/single/core/pom.xml
@@ -56,13 +56,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/time-service/type/database/pom.xml b/kernel/time-service/type/database/pom.xml
index cf6d4f07463..c22480dd051 100644
--- a/kernel/time-service/type/database/pom.xml
+++ b/kernel/time-service/type/database/pom.xml
@@ -32,6 +32,18 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-util</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-fixture-infra</artifactId>
@@ -48,11 +60,5 @@
<artifactId>HikariCP</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/kernel/transaction/core/pom.xml b/kernel/transaction/core/pom.xml
index 12006599630..accef318a39 100644
--- a/kernel/transaction/core/pom.xml
+++ b/kernel/transaction/core/pom.xml
@@ -41,13 +41,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
diff --git a/mode/core/pom.xml b/mode/core/pom.xml
index 9ed209a87bb..edb3056b381 100644
--- a/mode/core/pom.xml
+++ b/mode/core/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -61,6 +61,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.awaitility</groupId>
diff --git a/mode/type/cluster/core/pom.xml b/mode/type/cluster/core/pom.xml
index cffdaeb7527..1fc432d5753 100644
--- a/mode/type/cluster/core/pom.xml
+++ b/mode/type/cluster/core/pom.xml
@@ -55,19 +55,19 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml
index ad60724cf35..526214cfcc0 100644
--- a/mode/type/cluster/repository/provider/consul/pom.xml
+++ b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -37,6 +37,7 @@
<artifactId>shardingsphere-cluster-mode-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-util</artifactId>
diff --git a/mode/type/cluster/repository/provider/etcd/pom.xml b/mode/type/cluster/repository/provider/etcd/pom.xml
index b8e1f234b54..50b9ac89329 100644
--- a/mode/type/cluster/repository/provider/etcd/pom.xml
+++ b/mode/type/cluster/repository/provider/etcd/pom.xml
@@ -32,6 +32,7 @@
<artifactId>shardingsphere-cluster-mode-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-util</artifactId>
diff --git a/mode/type/cluster/repository/provider/nacos/pom.xml b/mode/type/cluster/repository/provider/nacos/pom.xml
index ad96e0b0d03..15f90bd3c67 100644
--- a/mode/type/cluster/repository/provider/nacos/pom.xml
+++ b/mode/type/cluster/repository/provider/nacos/pom.xml
@@ -36,6 +36,7 @@
<artifactId>shardingsphere-cluster-mode-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-util</artifactId>
diff --git a/mode/type/cluster/repository/provider/zookeeper/pom.xml b/mode/type/cluster/repository/provider/zookeeper/pom.xml
index 8614d455a62..7487e8139ef 100644
--- a/mode/type/cluster/repository/provider/zookeeper/pom.xml
+++ b/mode/type/cluster/repository/provider/zookeeper/pom.xml
@@ -32,6 +32,7 @@
<artifactId>shardingsphere-cluster-mode-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-util</artifactId>
diff --git a/mode/type/standalone/core/pom.xml b/mode/type/standalone/core/pom.xml
index a8e523ac0cc..a6fdb1640ee 100644
--- a/mode/type/standalone/core/pom.xml
+++ b/mode/type/standalone/core/pom.xml
@@ -40,19 +40,19 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/proxy/backend/core/pom.xml b/proxy/backend/core/pom.xml
index 92ef493bcae..b9292b58249 100644
--- a/proxy/backend/core/pom.xml
+++ b/proxy/backend/core/pom.xml
@@ -220,19 +220,25 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-infra</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/proxy/backend/type/hbase/pom.xml b/proxy/backend/type/hbase/pom.xml
index 124f222956a..231c5163100 100644
--- a/proxy/backend/type/hbase/pom.xml
+++ b/proxy/backend/type/hbase/pom.xml
@@ -43,6 +43,7 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-util</artifactId>
diff --git a/proxy/backend/type/mysql/pom.xml b/proxy/backend/type/mysql/pom.xml
index 597122e9e84..5df771a8f54 100644
--- a/proxy/backend/type/mysql/pom.xml
+++ b/proxy/backend/type/mysql/pom.xml
@@ -35,19 +35,19 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/proxy/backend/type/postgresql/pom.xml b/proxy/backend/type/postgresql/pom.xml
index 002387a8ac1..c44d55ab38c 100644
--- a/proxy/backend/type/postgresql/pom.xml
+++ b/proxy/backend/type/postgresql/pom.xml
@@ -35,19 +35,19 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/proxy/bootstrap/pom.xml b/proxy/bootstrap/pom.xml
index 95fde71b1e9..1f30c4d35b5 100644
--- a/proxy/bootstrap/pom.xml
+++ b/proxy/bootstrap/pom.xml
@@ -104,6 +104,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-fixture-infra</artifactId>
diff --git a/proxy/frontend/core/pom.xml b/proxy/frontend/core/pom.xml
index 3e8a3d42539..fc3fa00a4a8 100644
--- a/proxy/frontend/core/pom.xml
+++ b/proxy/frontend/core/pom.xml
@@ -64,13 +64,13 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/test/fixture/jdbc/pom.xml b/test/fixture/database/pom.xml
similarity index 86%
copy from test/fixture/jdbc/pom.xml
copy to test/fixture/database/pom.xml
index 4138ff0be24..ad8424589cb 100644
--- a/test/fixture/jdbc/pom.xml
+++ b/test/fixture/database/pom.xml
@@ -23,7 +23,7 @@
<artifactId>shardingsphere-test-fixture</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<name>${project.artifactId}</name>
<properties>
@@ -32,13 +32,14 @@
<dependencies>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>compile</scope>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-database-spi</artifactId>
+ <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/database/type/MockedDatabaseType.java b/test/fixture/database/src/main/java/org/apache/shardingsphere/test/fixture/database/type/MockedDatabaseType.java
similarity index 96%
rename from test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/database/type/MockedDatabaseType.java
rename to test/fixture/database/src/main/java/org/apache/shardingsphere/test/fixture/database/type/MockedDatabaseType.java
index 47c851810ba..17cfc5ffc2b 100644
--- a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/database/type/MockedDatabaseType.java
+++ b/test/fixture/database/src/main/java/org/apache/shardingsphere/test/fixture/database/type/MockedDatabaseType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.fixture.infra.database.type;
+package org.apache.shardingsphere.test.fixture.database.type;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
diff --git a/test/fixture/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/test/fixture/database/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 90%
rename from test/fixture/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
rename to test/fixture/database/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index 00894b9b695..f953619a4b3 100644
--- a/test/fixture/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/test/fixture/database/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.fixture.infra.database.type.MockedDatabaseType
+org.apache.shardingsphere.test.fixture.database.type.MockedDatabaseType
diff --git a/test/fixture/infra/pom.xml b/test/fixture/infra/pom.xml
index 3dcff258b94..d560230db54 100644
--- a/test/fixture/infra/pom.xml
+++ b/test/fixture/infra/pom.xml
@@ -42,10 +42,5 @@
<artifactId>mockito-core</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/test/fixture/jdbc/pom.xml b/test/fixture/jdbc/pom.xml
index 4138ff0be24..45dfb4f72f6 100644
--- a/test/fixture/jdbc/pom.xml
+++ b/test/fixture/jdbc/pom.xml
@@ -36,10 +36,5 @@
<artifactId>mockito-core</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/test/fixture/pom.xml b/test/fixture/pom.xml
index be60dacf18b..c005ec5abdd 100644
--- a/test/fixture/pom.xml
+++ b/test/fixture/pom.xml
@@ -29,6 +29,7 @@
<modules>
<module>jdbc</module>
+ <module>database</module>
<module>infra</module>
</modules>
</project>
diff --git a/test/it/parser/pom.xml b/test/it/parser/pom.xml
index 628ee74a689..c779cc12ad7 100644
--- a/test/it/parser/pom.xml
+++ b/test/it/parser/pom.xml
@@ -125,6 +125,7 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
diff --git a/test/it/pipeline/pom.xml b/test/it/pipeline/pom.xml
index 3475c9c06de..dabdb58805a 100644
--- a/test/it/pipeline/pom.xml
+++ b/test/it/pipeline/pom.xml
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/test/it/rewriter/pom.xml b/test/it/rewriter/pom.xml
index 762772d8832..287e5d05894 100644
--- a/test/it/rewriter/pom.xml
+++ b/test/it/rewriter/pom.xml
@@ -29,13 +29,13 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <artifactId>shardingsphere-test-fixture-database</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-infra</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>