You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/11/27 06:06:18 UTC
[shardingsphere] branch master updated: Add fixture-jdbc module (#22454)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 97a9bf6228b Add fixture-jdbc module (#22454)
97a9bf6228b is described below
commit 97a9bf6228b56adf77c4b6384ecc4842075aa633
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Nov 27 14:06:05 2022 +0800
Add fixture-jdbc module (#22454)
* Format for pom
* Add fixture-infra module
* Add fixture-jdbc module
---
features/db-discovery/core/pom.xml | 2 +-
.../route/DatabaseDiscoverySQLRouterTest.java | 2 +-
.../dbdiscovery/rule/DatabaseDiscoveryRuleTest.java | 2 +-
...rithmProvidedDatabaseDiscoveryRuleBuilderTest.java | 2 +-
.../builder/DatabaseDiscoveryRuleBuilderTest.java | 2 +-
.../src/test/resources/yaml/db-discovery-rule.yaml | 12 ++++++------
features/db-discovery/provider/mysql/pom.xml | 2 +-
...icationDatabaseDiscoveryProviderAlgorithmTest.java | 2 +-
features/encrypt/core/pom.xml | 2 +-
features/readwrite-splitting/core/pom.xml | 2 +-
.../test/resources/yaml/readwrite-splitting-rule.yaml | 12 ++++++------
features/shadow/core/pom.xml | 2 +-
.../core/src/test/resources/yaml/shadow-rule.yaml | 4 ++--
features/sharding/core/pom.xml | 2 +-
.../engine/fixture/AbstractRoutingEngineTest.java | 2 +-
.../core/src/test/resources/yaml/sharding-rule.yaml | 6 +++---
features/sharding/distsql/handler/pom.xml | 2 +-
.../checker/ShardingRuleStatementCheckerTest.java | 2 +-
.../AlterShardingTableRuleStatementUpdaterTest.java | 4 ++--
.../CreateShardingTableRuleStatementUpdaterTest.java | 4 ++--
infra/common/pom.xml | 2 +-
.../infra/database/type/DatabaseTypeEngineTest.java | 2 +-
.../pool/creator/DataSourcePoolCreatorTest.java | 2 +-
.../creator/type/DBCPDataSourcePoolCreatorTest.java | 2 +-
.../creator/type/HikariDataSourcePoolCreatorTest.java | 2 +-
.../pool/destroyer/DataSourcePoolDestroyerTest.java | 2 +-
.../DataSourcePoolActiveDetectorFactoryTest.java | 2 +-
.../type/DefaultDataSourcePoolActiveDetectorTest.java | 2 +-
.../metadata/DataSourcePoolMetaDataFactoryTest.java | 2 +-
.../fixture/MockedDataSourcePoolMetaData.java | 2 +-
.../props/DataSourcePropertiesCreatorTest.java | 2 +-
.../datasource/props/DataSourcePropertiesTest.java | 2 +-
.../infra/metadata/ShardingSphereMetaDataTest.java | 2 +-
.../metadata/database/ShardingSphereDatabaseTest.java | 2 +-
.../database/resource/ShardingSphereResourceTest.java | 2 +-
.../database/schema/util/SchemaMetaDataUtilTest.java | 2 +-
.../resource/YamlDataSourcePropertiesSwapperTest.java | 2 +-
infra/context/pom.xml | 2 +-
.../type/RenameTableStatementSchemaRefresherTest.java | 2 +-
jdbc/core/pom.xml | 2 +-
.../api/ShardingSphereDataSourceFactoryTest.java | 2 +-
.../yaml/YamlShardingSphereDataSourceFactoryTest.java | 2 +-
.../jdbc/adapter/AbstractDataSourceAdapterTest.java | 2 +-
.../driver/jdbc/adapter/WrapperAdapterTest.java | 2 +-
.../jdbc/core/connection/ConnectionManagerTest.java | 2 +-
.../core/datasource/ShardingSphereDataSourceTest.java | 2 +-
.../config/factory/config-for-factory-test.yaml | 4 ++--
jdbc/spring/core/spring-boot-starter/pom.xml | 2 +-
.../boot/jndi/SpringBootJNDIDataSourceTest.java | 2 +-
.../test/resources/application-no-rules.properties | 6 +++---
.../src/test/resources/application.properties | 6 +++---
jdbc/spring/core/spring-namespace/pom.xml | 2 +-
.../spring/included/data-sources-context.xml | 12 ++++++------
jdbc/spring/infra/spring-boot-starter/pom.xml | 2 +-
.../boot/datasource/DataSourceMapSetterTest.java | 2 +-
kernel/data-pipeline/api/pom.xml | 2 +-
kernel/data-pipeline/distsql/handler/pom.xml | 2 +-
kernel/single-table/core/pom.xml | 2 +-
.../datanode/SingleTableDataNodeLoaderTest.java | 4 ++--
.../singletable/route/SingleTableSQLRouterTest.java | 2 +-
.../SingleTableDatabaseBroadcastRouteEngineTest.java | 2 +-
.../engine/SingleTableStandardRouteEngineTest.java | 2 +-
.../singletable/rule/SingleTableRuleTest.java | 4 ++--
kernel/transaction/core/pom.xml | 2 +-
.../transaction/core/ResourceDataSourceTest.java | 2 +-
.../transaction/rule/TransactionRuleTest.java | 2 +-
.../rule/builder/TransactionRuleBuilderTest.java | 2 +-
kernel/transaction/type/base/seata-at/pom.xml | 2 +-
.../SeataATShardingSphereTransactionManagerTest.java | 2 +-
kernel/transaction/type/xa/core/pom.xml | 2 +-
.../DataSourcePropertyProviderFactoryTest.java | 2 +-
.../jta/datasource/swapper/DataSourceSwapperTest.java | 2 +-
mode/core/pom.xml | 2 +-
.../mode/manager/ContextManagerTest.java | 2 +-
.../manager/switcher/ResourceSwitchManagerTest.java | 2 +-
.../mode/manager/switcher/SwitchingResourceTest.java | 2 +-
.../mode/metadata/MetaDataContextsFactoryTest.java | 2 +-
.../metadata/persist/MetaDataPersistServiceTest.java | 2 +-
.../config/database/DataSourcePersistServiceTest.java | 2 +-
.../test/resources/yaml/persist/data-source-foo.yaml | 2 +-
.../src/test/resources/yaml/persist/data-source.yaml | 4 ++--
mode/type/cluster/core/pom.xml | 2 +-
.../ConfigurationChangedSubscriberTest.java | 2 +-
.../ResourceMetaDataChangedSubscriberTest.java | 2 +-
mode/type/standalone/core/pom.xml | 2 +-
.../StandaloneContextManagerBuilderTextTest.java | 2 +-
proxy/backend/pom.xml | 2 +-
.../executor/DefaultDatabaseMetadataExecutorTest.java | 2 +-
.../admin/mysql/MySQLAdminExecutorCreatorTest.java | 2 +-
.../SelectInformationSchemataExecutorTest.java | 2 +-
.../executor/SelectDatabaseExecutorTest.java | 2 +-
.../postgresql/executor/SelectTableExecutorTest.java | 2 +-
.../ExportDatabaseConfigurationHandlerTest.java | 2 +-
.../ImportDatabaseConfigurationHandlerTest.java | 2 +-
.../updatable/RefreshTableMetadataHandlerTest.java | 2 +-
.../SetDefaultSingleTableStorageUnitUpdaterTest.java | 2 +-
.../rql/RulesUsedStorageUnitQueryResultSetTest.java | 2 +-
.../distsql/rql/StorageUnitQueryResultSetTest.java | 2 +-
.../pool/metadata/MockedDataSourcePoolMetaData.java | 2 +-
test/fixture/{ => jdbc}/pom.xml | 19 +++++++++++++------
.../test/fixture/jdbc}/MockedDataSource.java | 2 +-
.../test/fixture/jdbc}/MockedDriver.java | 2 +-
test/fixture/pom.xml | 1 +
test/pipeline/pom.xml | 5 +++++
.../StandardPipelineTableMetaDataLoaderTest.java | 2 +-
test/rewrite/pom.xml | 5 +++++
.../scenario/EncryptSQLRewriterParameterizedTest.java | 2 +-
.../scenario/encrypt/config/query-with-cipher.yaml | 2 +-
.../scenario/encrypt/config/query-with-plain.yaml | 2 +-
.../scenario/mix/config/query-with-cipher.yaml | 2 +-
.../scenario/mix/config/query-with-plain.yaml | 2 +-
.../scenario/sharding/config/sharding-rule.yaml | 2 +-
112 files changed, 160 insertions(+), 142 deletions(-)
diff --git a/features/db-discovery/core/pom.xml b/features/db-discovery/core/pom.xml
index bc9dbacd105..476cedadfa3 100644
--- a/features/db-discovery/core/pom.xml
+++ b/features/db-discovery/core/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java
index 7dcd4a8c0e6..0a3685dccf3 100644
--- a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java
+++ b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java
@@ -40,7 +40,7 @@ import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.schedule.core.ScheduleContextFactory;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
index 7d53f4aa0b5..79a13fd033a 100644
--- a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
+++ b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguratio
import org.apache.shardingsphere.infra.distsql.constant.ExportableConstants;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.schedule.core.ScheduleContextFactory;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java
index e5e1f567403..02c0ea17414 100644
--- a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java
+++ b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilder;
import org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilderFactory;
import org.apache.shardingsphere.schedule.core.ScheduleContextFactory;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.Collections;
diff --git a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilderTest.java b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilderTest.java
index 0f3ad679d2c..b2e661e516c 100644
--- a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilderTest.java
+++ b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilderTest.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilder;
import org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilderFactory;
import org.apache.shardingsphere.schedule.core.ScheduleContextFactory;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.Collections;
diff --git a/features/db-discovery/core/src/test/resources/yaml/db-discovery-rule.yaml b/features/db-discovery/core/src/test/resources/yaml/db-discovery-rule.yaml
index 0433d01dec5..3002943739d 100644
--- a/features/db-discovery/core/src/test/resources/yaml/db-discovery-rule.yaml
+++ b/features/db-discovery/core/src/test/resources/yaml/db-discovery-rule.yaml
@@ -17,17 +17,17 @@
dataSources:
primary_ds_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
primary_ds_0_replica_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
primary_ds_0_replica_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
primary_ds_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
primary_ds_1_replica_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
primary_ds_1_replica_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !DB_DISCOVERY
diff --git a/features/db-discovery/provider/mysql/pom.xml b/features/db-discovery/provider/mysql/pom.xml
index 3cee03da04e..203c44ab465 100644
--- a/features/db-discovery/provider/mysql/pom.xml
+++ b/features/db-discovery/provider/mysql/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java b/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
index 10a56b1a888..826e2190927 100644
--- a/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
+++ b/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.dbdiscovery.mysql.type;
import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/features/encrypt/core/pom.xml b/features/encrypt/core/pom.xml
index 6bc898ef28a..1d8509ec5e6 100644
--- a/features/encrypt/core/pom.xml
+++ b/features/encrypt/core/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</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 fdef5b2b147..ec02ecd9627 100644
--- a/features/readwrite-splitting/core/pom.xml
+++ b/features/readwrite-splitting/core/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/readwrite-splitting/core/src/test/resources/yaml/readwrite-splitting-rule.yaml b/features/readwrite-splitting/core/src/test/resources/yaml/readwrite-splitting-rule.yaml
index b706f35d8b7..4d6386c0488 100644
--- a/features/readwrite-splitting/core/src/test/resources/yaml/readwrite-splitting-rule.yaml
+++ b/features/readwrite-splitting/core/src/test/resources/yaml/readwrite-splitting-rule.yaml
@@ -17,17 +17,17 @@
dataSources:
write_ds_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
write_ds_0_read_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
write_ds_0_read_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
write_ds_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
write_ds_1_read_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
write_ds_1_read_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !READWRITE_SPLITTING
diff --git a/features/shadow/core/pom.xml b/features/shadow/core/pom.xml
index d6ce3254247..dd0258b30d1 100644
--- a/features/shadow/core/pom.xml
+++ b/features/shadow/core/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/shadow/core/src/test/resources/yaml/shadow-rule.yaml b/features/shadow/core/src/test/resources/yaml/shadow-rule.yaml
index 50267c0f500..05efe5365d3 100644
--- a/features/shadow/core/src/test/resources/yaml/shadow-rule.yaml
+++ b/features/shadow/core/src/test/resources/yaml/shadow-rule.yaml
@@ -17,9 +17,9 @@
dataSources:
ds:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
shadow_ds:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !SHADOW
diff --git a/features/sharding/core/pom.xml b/features/sharding/core/pom.xml
index 8257bbcdf69..cf773664332 100644
--- a/features/sharding/core/pom.xml
+++ b/features/sharding/core/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java
index 31e9ab1bf96..84e2997c99c 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/AbstractRoutingEngineTest.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.sharding.route.engine.condition.value.ShardingC
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.singletable.config.SingleTableRuleConfiguration;
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git a/features/sharding/core/src/test/resources/yaml/sharding-rule.yaml b/features/sharding/core/src/test/resources/yaml/sharding-rule.yaml
index ab7f26766b3..f6f5e074b36 100644
--- a/features/sharding/core/src/test/resources/yaml/sharding-rule.yaml
+++ b/features/sharding/core/src/test/resources/yaml/sharding-rule.yaml
@@ -17,11 +17,11 @@
dataSources:
ds_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
ds_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
default_ds:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !SHARDING
diff --git a/features/sharding/distsql/handler/pom.xml b/features/sharding/distsql/handler/pom.xml
index ed48da4ea6d..280114d2a24 100644
--- a/features/sharding/distsql/handler/pom.xml
+++ b/features/sharding/distsql/handler/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
index 814f36dc675..5fc2b7b5277 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
@@ -39,7 +39,7 @@ import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.Shardi
import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment;
import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment;
import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
index 76f97f00e95..62a21da1726 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
@@ -28,12 +28,12 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfi
import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
import org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingTableRuleStatementUpdater;
-import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment;
import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment;
import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment;
+import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment;
import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment;
import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableRuleStatement;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
index 51d815d89ba..fe25dc01e06 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
@@ -36,15 +36,15 @@ import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerate
import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
import org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingTableRuleStatementUpdater;
import org.apache.shardingsphere.sharding.distsql.parser.facade.ShardingDistSQLStatementParserFacade;
-import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment;
import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment;
import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment;
+import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment;
import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment;
import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableRuleStatement;
import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
import org.apache.shardingsphere.sql.parser.core.SQLParserFactory;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/infra/common/pom.xml b/infra/common/pom.xml
index a1697ef2098..965f6185443 100644
--- a/infra/common/pom.xml
+++ b/infra/common/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngineTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngineTest.java
index a24ea175835..f0f22e15ee0 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngineTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngineTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.wrapper.SQLWrapperException;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreatorTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreatorTest.java
index 4949ced8728..3acf6cfaa79 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreatorTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreatorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.datasource.pool.creator;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/type/DBCPDataSourcePoolCreatorTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/type/DBCPDataSourcePoolCreatorTest.java
index bab4bec175a..6f59ec83725 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/type/DBCPDataSourcePoolCreatorTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/type/DBCPDataSourcePoolCreatorTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.lang.reflect.Field;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/type/HikariDataSourcePoolCreatorTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/type/HikariDataSourcePoolCreatorTest.java
index 24607fa92e2..bb5b34252ed 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/type/HikariDataSourcePoolCreatorTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/type/HikariDataSourcePoolCreatorTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.datasource.pool.creator.type;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.HashMap;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/DataSourcePoolDestroyerTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/DataSourcePoolDestroyerTest.java
index d33e6b59e27..3d5396ccf8b 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/DataSourcePoolDestroyerTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/DataSourcePoolDestroyerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.datasource.pool.destroyer;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.sql.Connection;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/detector/DataSourcePoolActiveDetectorFactoryTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/detector/DataSourcePoolActiveDetectorFactoryTest.java
index 0e548f679b2..50197132e3e 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/detector/DataSourcePoolActiveDetectorFactoryTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/detector/DataSourcePoolActiveDetectorFactoryTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.datasource.pool.destroyer.detector;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.shardingsphere.infra.datasource.pool.destroyer.detector.type.DefaultDataSourcePoolActiveDetector;
import org.apache.shardingsphere.infra.datasource.pool.destroyer.detector.type.HikariDataSourcePoolActiveDetector;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/detector/type/DefaultDataSourcePoolActiveDetectorTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/detector/type/DefaultDataSourcePoolActiveDetectorTest.java
index 96ae04fab4d..9cd62db2927 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/detector/type/DefaultDataSourcePoolActiveDetectorTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/detector/type/DefaultDataSourcePoolActiveDetectorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.datasource.pool.destroyer.detector.type;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataFactoryTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataFactoryTest.java
index 859f24e0a07..479340f8098 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataFactoryTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataFactoryTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.datasource.pool.metadata;
import org.apache.shardingsphere.infra.datasource.pool.metadata.fixture.MockedDataSourcePoolMetaData;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.Optional;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/fixture/MockedDataSourcePoolMetaData.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/fixture/MockedDataSourcePoolMetaData.java
index ddd991059ef..e79ed992c52 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/fixture/MockedDataSourcePoolMetaData.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/fixture/MockedDataSourcePoolMetaData.java
@@ -66,6 +66,6 @@ public final class MockedDataSourcePoolMetaData implements DataSourcePoolMetaDat
@Override
public String getType() {
- return "org.apache.shardingsphere.test.mock.MockedDataSource";
+ return "org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource";
}
}
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesCreatorTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesCreatorTest.java
index 8d975c1992c..bcd44436511 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesCreatorTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesCreatorTest.java
@@ -21,7 +21,7 @@ import com.zaxxer.hikari.HikariDataSource;
import org.apache.shardingsphere.infra.datasource.config.ConnectionConfiguration;
import org.apache.shardingsphere.infra.datasource.config.DataSourceConfiguration;
import org.apache.shardingsphere.infra.datasource.config.PoolConfiguration;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
index f902bd5eb4c..a311714d9bb 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.datasource.props;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.Arrays;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
index fe33c161864..52b8e728ed3 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.rule.identifier.type.ResourceHeldRule;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import org.mockito.MockedStatic;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
index 1bc8d2f75c1..dd963434229 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
import org.apache.shardingsphere.infra.rule.identifier.type.MutableDataNodeRule;
import org.apache.shardingsphere.infra.rule.identifier.type.TableContainedRule;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.Collection;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResourceTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResourceTest.java
index 6043d033618..eb9edb6dc2d 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResourceTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResourceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.metadata.database.resource;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.Collections;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilTest.java
index fe7e7214e18..cb3273b86b2 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericS
import org.apache.shardingsphere.infra.metadata.database.schema.loader.SchemaMetaDataLoaderMaterial;
import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/resource/YamlDataSourcePropertiesSwapperTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/resource/YamlDataSourcePropertiesSwapperTest.java
index 7d201907f33..2238580b665 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/resource/YamlDataSourcePropertiesSwapperTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/resource/YamlDataSourcePropertiesSwapperTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.yaml.config.swapper.resource;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/infra/context/pom.xml b/infra/context/pom.xml
index 8ad4044132c..7185bab3a41 100644
--- a/infra/context/pom.xml
+++ b/infra/context/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/infra/context/src/test/java/org/apache/shardingsphere/infra/context/refresher/type/RenameTableStatementSchemaRefresherTest.java b/infra/context/src/test/java/org/apache/shardingsphere/infra/context/refresher/type/RenameTableStatementSchemaRefresherTest.java
index 722f424fab9..3d9be987682 100644
--- a/infra/context/src/test/java/org/apache/shardingsphere/infra/context/refresher/type/RenameTableStatementSchemaRefresherTest.java
+++ b/infra/context/src/test/java/org/apache/shardingsphere/infra/context/refresher/type/RenameTableStatementSchemaRefresherTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.Sim
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.RenameTableStatement;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.sql.SQLException;
diff --git a/jdbc/core/pom.xml b/jdbc/core/pom.xml
index 019c68b1883..1d67bab8fe2 100644
--- a/jdbc/core/pom.xml
+++ b/jdbc/core/pom.xml
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
index cd1b4fec509..685b4c8c268 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/api/yaml/YamlShardingSphereDataSourceFactoryTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/api/yaml/YamlShardingSphereDataSourceFactoryTest.java
index d87332ad4d5..e98cd5acacb 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/api/yaml/YamlShardingSphereDataSourceFactoryTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/api/yaml/YamlShardingSphereDataSourceFactoryTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.driver.api.yaml;
import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractDataSourceAdapterTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractDataSourceAdapterTest.java
index 1470060c978..314e362f9f0 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractDataSourceAdapterTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractDataSourceAdapterTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/WrapperAdapterTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/WrapperAdapterTest.java
index 86e7aa93b63..16ee780f889 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/WrapperAdapterTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/WrapperAdapterTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.driver.jdbc.adapter;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
index 50fa9bd2053..3c6438a522d 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.traffic.rule.TrafficRule;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
index 04c92d330fc..9010abc004a 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import org.junit.After;
import org.junit.Test;
diff --git a/jdbc/core/src/test/resources/config/factory/config-for-factory-test.yaml b/jdbc/core/src/test/resources/config/factory/config-for-factory-test.yaml
index b819bb3f53a..68eb1479f86 100644
--- a/jdbc/core/src/test/resources/config/factory/config-for-factory-test.yaml
+++ b/jdbc/core/src/test/resources/config/factory/config-for-factory-test.yaml
@@ -19,10 +19,10 @@ databaseName: logic_db
dataSources:
ds_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
url: jdbc:mock:://localhost:3306/logic_ds_01
ds_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
url: jdbc:mock:://localhost:3306/logic_ds_02
rules:
diff --git a/jdbc/spring/core/spring-boot-starter/pom.xml b/jdbc/spring/core/spring-boot-starter/pom.xml
index 6f1412a28c3..8bd0f1e9a86 100644
--- a/jdbc/spring/core/spring-boot-starter/pom.xml
+++ b/jdbc/spring/core/spring-boot-starter/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/jdbc/spring/core/spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/jndi/SpringBootJNDIDataSourceTest.java b/jdbc/spring/core/spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/jndi/SpringBootJNDIDataSourceTest.java
index b591d764e50..f8721664829 100644
--- a/jdbc/spring/core/spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/jndi/SpringBootJNDIDataSourceTest.java
+++ b/jdbc/spring/core/spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/jndi/SpringBootJNDIDataSourceTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.spring.boot.jndi.fixture.InitialDataSourceInitialContextFactory;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/jdbc/spring/core/spring-boot-starter/src/test/resources/application-no-rules.properties b/jdbc/spring/core/spring-boot-starter/src/test/resources/application-no-rules.properties
index 99f4cd18c2b..096d8ed4aee 100644
--- a/jdbc/spring/core/spring-boot-starter/src/test/resources/application-no-rules.properties
+++ b/jdbc/spring/core/spring-boot-starter/src/test/resources/application-no-rules.properties
@@ -19,9 +19,9 @@ spring.shardingsphere.database.name=foo_db
spring.shardingsphere.datasource.names=read_ds_${0..1},write_ds
-spring.shardingsphere.datasource.read_ds_0.type=org.apache.shardingsphere.test.mock.MockedDataSource
-spring.shardingsphere.datasource.read_ds_1.type=org.apache.shardingsphere.test.mock.MockedDataSource
-spring.shardingsphere.datasource.write_ds.type=org.apache.shardingsphere.test.mock.MockedDataSource
+spring.shardingsphere.datasource.read_ds_0.type=org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
+spring.shardingsphere.datasource.read_ds_1.type=org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
+spring.shardingsphere.datasource.write_ds.type=org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
spring.shardingsphere.props.sql-show=true
spring.shardingsphere.props.kernel-executor-size=10
diff --git a/jdbc/spring/core/spring-boot-starter/src/test/resources/application.properties b/jdbc/spring/core/spring-boot-starter/src/test/resources/application.properties
index 52007af6b4c..e4e7f6cce7d 100644
--- a/jdbc/spring/core/spring-boot-starter/src/test/resources/application.properties
+++ b/jdbc/spring/core/spring-boot-starter/src/test/resources/application.properties
@@ -19,9 +19,9 @@ spring.shardingsphere.database.name=foo_db
spring.shardingsphere.datasource.names=read_ds_${0..1},write_ds
-spring.shardingsphere.datasource.read_ds_0.type=org.apache.shardingsphere.test.mock.MockedDataSource
-spring.shardingsphere.datasource.read_ds_1.type=org.apache.shardingsphere.test.mock.MockedDataSource
-spring.shardingsphere.datasource.write_ds.type=org.apache.shardingsphere.test.mock.MockedDataSource
+spring.shardingsphere.datasource.read_ds_0.type=org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
+spring.shardingsphere.datasource.read_ds_1.type=org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
+spring.shardingsphere.datasource.write_ds.type=org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
spring.shardingsphere.rules.readwrite-splitting.load-balancers.random.type=RANDOM
diff --git a/jdbc/spring/core/spring-namespace/pom.xml b/jdbc/spring/core/spring-namespace/pom.xml
index 7ce184d3125..d41b815c4ba 100644
--- a/jdbc/spring/core/spring-namespace/pom.xml
+++ b/jdbc/spring/core/spring-namespace/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/jdbc/spring/core/spring-namespace/src/test/resources/spring/included/data-sources-context.xml b/jdbc/spring/core/spring-namespace/src/test/resources/spring/included/data-sources-context.xml
index f5ddf28bdd0..4a6a18ff443 100644
--- a/jdbc/spring/core/spring-namespace/src/test/resources/spring/included/data-sources-context.xml
+++ b/jdbc/spring/core/spring-namespace/src/test/resources/spring/included/data-sources-context.xml
@@ -19,10 +19,10 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
">
- <bean id="ds_0_write" class="org.apache.shardingsphere.test.mock.MockedDataSource" />
- <bean id="ds_0_read_0" class="org.apache.shardingsphere.test.mock.MockedDataSource" />
- <bean id="ds_0_read_1" class="org.apache.shardingsphere.test.mock.MockedDataSource" />
- <bean id="ds_1_write" class="org.apache.shardingsphere.test.mock.MockedDataSource" />
- <bean id="ds_1_read_0" class="org.apache.shardingsphere.test.mock.MockedDataSource" />
- <bean id="ds_1_read_1" class="org.apache.shardingsphere.test.mock.MockedDataSource" />
+ <bean id="ds_0_write" class="org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource" />
+ <bean id="ds_0_read_0" class="org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource" />
+ <bean id="ds_0_read_1" class="org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource" />
+ <bean id="ds_1_write" class="org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource" />
+ <bean id="ds_1_read_0" class="org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource" />
+ <bean id="ds_1_read_1" class="org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource" />
</beans>
diff --git a/jdbc/spring/infra/spring-boot-starter/pom.xml b/jdbc/spring/infra/spring-boot-starter/pom.xml
index 801d63841d1..e64d02f6ea6 100644
--- a/jdbc/spring/infra/spring-boot-starter/pom.xml
+++ b/jdbc/spring/infra/spring-boot-starter/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/jdbc/spring/infra/spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetterTest.java b/jdbc/spring/infra/spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetterTest.java
index a40b70ddfa9..f3e2b1100d8 100644
--- a/jdbc/spring/infra/spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetterTest.java
+++ b/jdbc/spring/infra/spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.spring.boot.datasource;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.mock.env.MockEnvironment;
diff --git a/kernel/data-pipeline/api/pom.xml b/kernel/data-pipeline/api/pom.xml
index f68a918299c..93bce178785 100644
--- a/kernel/data-pipeline/api/pom.xml
+++ b/kernel/data-pipeline/api/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/data-pipeline/distsql/handler/pom.xml b/kernel/data-pipeline/distsql/handler/pom.xml
index cc28720131f..febab712679 100644
--- a/kernel/data-pipeline/distsql/handler/pom.xml
+++ b/kernel/data-pipeline/distsql/handler/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/single-table/core/pom.xml b/kernel/single-table/core/pom.xml
index b98637b50de..aa52273463a 100644
--- a/kernel/single-table/core/pom.xml
+++ b/kernel/single-table/core/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/datanode/SingleTableDataNodeLoaderTest.java b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/datanode/SingleTableDataNodeLoaderTest.java
index 333bb7c1198..01816c07402 100644
--- a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/datanode/SingleTableDataNodeLoaderTest.java
+++ b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/datanode/SingleTableDataNodeLoaderTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.singletable.datanode;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
@@ -37,8 +37,8 @@ import java.util.Map;
import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
diff --git a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouterTest.java b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouterTest.java
index c0963fba2d9..fac6db24bc4 100644
--- a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouterTest.java
+++ b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouterTest.java
@@ -38,7 +38,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.Tab
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.ddl.MySQLCreateTableStatement;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java
index 70149c36593..46cce083528 100644
--- a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java
+++ b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableDatabaseBroadcastRouteEngineTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.singletable.config.SingleTableRuleConfiguration;
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableStandardRouteEngineTest.java b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableStandardRouteEngineTest.java
index d4a4d3ce0e3..cec13c2d9ba 100644
--- a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableStandardRouteEngineTest.java
+++ b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableStandardRouteEngineTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.Tab
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.ddl.MySQLCreateTableStatement;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/rule/SingleTableRuleTest.java b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/rule/SingleTableRuleTest.java
index 5d6a35b9127..4d029a20435 100644
--- a/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/rule/SingleTableRuleTest.java
+++ b/kernel/single-table/core/src/test/java/org/apache/shardingsphere/singletable/rule/SingleTableRuleTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import org.apache.shardingsphere.singletable.config.SingleTableRuleConfiguration;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
@@ -43,8 +43,8 @@ import java.util.Optional;
import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
diff --git a/kernel/transaction/core/pom.xml b/kernel/transaction/core/pom.xml
index fffebd03b6d..56d3ccc4701 100644
--- a/kernel/transaction/core/pom.xml
+++ b/kernel/transaction/core/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/ResourceDataSourceTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/ResourceDataSourceTest.java
index fc95581510d..ca51fb9fced 100644
--- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/ResourceDataSourceTest.java
+++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/ResourceDataSourceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.transaction.core;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
index 07a0c689152..15c937b6ccc 100644
--- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
+++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseTy
import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.fixture.ShardingSphereTransactionManagerFixture;
diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilderTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilderTest.java
index 98f72bcb992..811631c9636 100644
--- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilderTest.java
+++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilderTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.Test;
diff --git a/kernel/transaction/type/base/seata-at/pom.xml b/kernel/transaction/type/base/seata-at/pom.xml
index 3a436842e6d..e6c86e7c7da 100644
--- a/kernel/transaction/type/base/seata-at/pom.xml
+++ b/kernel/transaction/type/base/seata-at/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
index a6835ebc538..9eb0a522b62 100644
--- a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
+++ b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
@@ -32,7 +32,7 @@ import io.seata.tm.api.GlobalTransactionContext;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.base.seata.at.fixture.MockSeataServer;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
import org.apache.shardingsphere.transaction.core.TransactionType;
diff --git a/kernel/transaction/type/xa/core/pom.xml b/kernel/transaction/type/xa/core/pom.xml
index e0b57350391..5728caf58cc 100644
--- a/kernel/transaction/type/xa/core/pom.xml
+++ b/kernel/transaction/type/xa/core/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourcePropertyProviderFactoryTest.java b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourcePropertyProviderFactoryTest.java
index 60f3a5b7d06..354c8fc43dd 100644
--- a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourcePropertyProviderFactoryTest.java
+++ b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourcePropertyProviderFactoryTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.transaction.xa.jta.datasource.swapper;
import com.zaxxer.hikari.HikariDataSource;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.xa.jta.datasource.swapper.impl.DefaultDataSourcePropertyProvider;
import org.apache.shardingsphere.transaction.xa.jta.datasource.swapper.impl.HikariCPPropertyProvider;
import org.junit.Test;
diff --git a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapperTest.java b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapperTest.java
index 7852e5a795a..e92b2ab66b7 100644
--- a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapperTest.java
+++ b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.transaction.xa.jta.datasource.swapper;
import com.google.common.collect.ImmutableList;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.xa.jta.datasource.properties.XADataSourceDefinition;
import org.h2.jdbcx.JdbcDataSource;
import org.junit.Before;
diff --git a/mode/core/pom.xml b/mode/core/pom.xml
index a07aefb383c..bada1b2b2f3 100644
--- a/mode/core/pom.xml
+++ b/mode/core/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index ee0cb862d15..0dc0e33dcb5 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -37,7 +37,7 @@ import org.apache.shardingsphere.infra.rule.identifier.type.MutableDataNodeRule;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManagerTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManagerTest.java
index f9d9a6cf812..4371572b31c 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManagerTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManagerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.manager.switcher;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/switcher/SwitchingResourceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/switcher/SwitchingResourceTest.java
index c1834e35b08..00c49e59a90 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/switcher/SwitchingResourceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/switcher/SwitchingResourceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.switcher;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.Collections;
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
index d22d3feada8..ba6ab5a6adf 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.mode.metadata.persist.service.config.global.Glo
import org.apache.shardingsphere.mode.metadata.persist.service.config.global.PropertiesPersistService;
import org.apache.shardingsphere.test.fixture.infra.rule.MockedRule;
import org.apache.shardingsphere.test.fixture.infra.rule.MockedRuleConfiguration;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
index f8f27f6ab1a..c869f7571b5 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.mode.metadata.persist.service.config.database.D
import org.apache.shardingsphere.mode.metadata.persist.service.config.global.GlobalRulePersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.global.PropertiesPersistService;
import org.apache.shardingsphere.mode.persist.PersistRepository;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistServiceTest.java
index 8208931a85a..a598b37c6ea 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistServiceTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.datasource.props.DataSourcePropertiesCreator;
import org.apache.shardingsphere.mode.persist.PersistRepository;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
diff --git a/mode/core/src/test/resources/yaml/persist/data-source-foo.yaml b/mode/core/src/test/resources/yaml/persist/data-source-foo.yaml
index 09aa2a6a8e8..00e18cb08db 100644
--- a/mode/core/src/test/resources/yaml/persist/data-source-foo.yaml
+++ b/mode/core/src/test/resources/yaml/persist/data-source-foo.yaml
@@ -17,7 +17,7 @@
foo_ds:
password: root
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
connectionInitSqls:
# No spaces after conversion
- set names utf8mb4;
diff --git a/mode/core/src/test/resources/yaml/persist/data-source.yaml b/mode/core/src/test/resources/yaml/persist/data-source.yaml
index 5378bad95a1..59f2b431318 100644
--- a/mode/core/src/test/resources/yaml/persist/data-source.yaml
+++ b/mode/core/src/test/resources/yaml/persist/data-source.yaml
@@ -16,7 +16,7 @@
#
ds_0:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/ds_0
username: root
@@ -25,7 +25,7 @@ ds_0:
- set names utf8mb4;
- set names utf8;
ds_1:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/ds_1
username: root
diff --git a/mode/type/cluster/core/pom.xml b/mode/type/cluster/core/pom.xml
index 924f45201ca..f5ac326fd21 100644
--- a/mode/type/cluster/core/pom.xml
+++ b/mode/type/cluster/core/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
index a9df46a4e70..836f6ce237d 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
@@ -51,7 +51,7 @@ import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.sqltranslator.rule.SQLTranslatorRule;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.Before;
import org.junit.Test;
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
index 43097de6d25..c1777e19543 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
@@ -42,7 +42,7 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metad
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/mode/type/standalone/core/pom.xml b/mode/type/standalone/core/pom.xml
index 97d9ffd93ba..c0da10e606d 100644
--- a/mode/type/standalone/core/pom.xml
+++ b/mode/type/standalone/core/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
index dd0f61ee974..4504c865481 100644
--- a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
+++ b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.metadata.persist.node.GlobalNode;
import org.apache.shardingsphere.mode.persist.PersistRepository;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.sql.SQLException;
diff --git a/proxy/backend/pom.xml b/proxy/backend/pom.xml
index 369af03ee50..a13b32afc14 100644
--- a/proxy/backend/pom.xml
+++ b/proxy/backend/pom.xml
@@ -216,7 +216,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java
index 68eba75ae8d..4e753e684b5 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetadataExecutorTest.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetadataExecutor.DefaultDatabaseMetadataExecutor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
index abd8b4f7d81..7486d4b8298 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/MySQLAdminExecutorCreatorTest.java
@@ -62,7 +62,7 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQ
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLUseStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQLDeleteStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQLSelectStatement;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutorTest.java
index 7ce2b290399..cc847f114ba 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/information/SelectInformationSchemataExecutorTest.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutorTest.java
index b08e3131a79..c402383cb14 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectDatabaseExecutorTest.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutorTest.java
index ab9e1966099..77999d1b7ba 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutorTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/postgresql/executor/SelectTableExecutorTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationHandlerTest.java
index 2af9b5890a4..a126c1db2ff 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationHandlerTest.java
@@ -40,7 +40,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShard
import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandlerTest.java
index d451dcbd13e..2abb54e352f 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationHandlerTest.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.checke
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.checker.ReadwriteSplittingRuleConfigurationImportChecker;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.checker.ShardingRuleConfigurationImportChecker;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
index d66a279f2fb..f0dd890b1cc 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/SetDefaultSingleTableStorageUnitUpdaterTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/SetDefaultSingleTableStorageUnitUpdaterTest.java
index 2001c2467f1..c1c5e54400b 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/SetDefaultSingleTableStorageUnitUpdaterTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/SetDefaultSingleTableStorageUnitUpdaterTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.parser.statement.rdl.create.SetDefaultS
import org.apache.shardingsphere.infra.distsql.exception.resource.MissingRequiredResourcesException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.singletable.config.SingleTableRuleConfiguration;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RulesUsedStorageUnitQueryResultSetTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RulesUsedStorageUnitQueryResultSetTest.java
index 101f5756e08..573ab5942ed 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RulesUsedStorageUnitQueryResultSetTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RulesUsedStorageUnitQueryResultSetTest.java
@@ -41,7 +41,7 @@ import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Test;
import java.util.Arrays;
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/StorageUnitQueryResultSetTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/StorageUnitQueryResultSetTest.java
index 46784ff0ba9..2c50517fc61 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/StorageUnitQueryResultSetTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/StorageUnitQueryResultSetTest.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerate
import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/datasource/pool/metadata/MockedDataSourcePoolMetaData.java b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/datasource/pool/metadata/MockedDataSourcePoolMetaData.java
index 88bdb57617a..8068499261a 100644
--- a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/datasource/pool/metadata/MockedDataSourcePoolMetaData.java
+++ b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/datasource/pool/metadata/MockedDataSourcePoolMetaData.java
@@ -70,6 +70,6 @@ public final class MockedDataSourcePoolMetaData implements DataSourcePoolMetaDat
@Override
public String getType() {
- return "org.apache.shardingsphere.test.mock.MockedDataSource";
+ return "org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource";
}
}
diff --git a/test/fixture/pom.xml b/test/fixture/jdbc/pom.xml
similarity index 75%
copy from test/fixture/pom.xml
copy to test/fixture/jdbc/pom.xml
index e7a00b0a08c..ae423bf6e10 100644
--- a/test/fixture/pom.xml
+++ b/test/fixture/jdbc/pom.xml
@@ -21,14 +21,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test</artifactId>
+ <artifactId>shardingsphere-test-fixture</artifactId>
<version>5.2.2-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-test-fixture</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>infra</module>
- </modules>
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/test/common/src/main/java/org/apache/shardingsphere/test/mock/MockedDataSource.java b/test/fixture/jdbc/src/main/java/org/apache/shardingsphere/test/fixture/jdbc/MockedDataSource.java
similarity index 98%
rename from test/common/src/main/java/org/apache/shardingsphere/test/mock/MockedDataSource.java
rename to test/fixture/jdbc/src/main/java/org/apache/shardingsphere/test/fixture/jdbc/MockedDataSource.java
index 7bc27e3f2be..9425e34fc94 100644
--- a/test/common/src/main/java/org/apache/shardingsphere/test/mock/MockedDataSource.java
+++ b/test/fixture/jdbc/src/main/java/org/apache/shardingsphere/test/fixture/jdbc/MockedDataSource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.mock;
+package org.apache.shardingsphere.test.fixture.jdbc;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/test/common/src/main/java/org/apache/shardingsphere/test/mock/MockedDriver.java b/test/fixture/jdbc/src/main/java/org/apache/shardingsphere/test/fixture/jdbc/MockedDriver.java
similarity index 97%
rename from test/common/src/main/java/org/apache/shardingsphere/test/mock/MockedDriver.java
rename to test/fixture/jdbc/src/main/java/org/apache/shardingsphere/test/fixture/jdbc/MockedDriver.java
index 6c0abaf43bb..10927e5abc2 100644
--- a/test/common/src/main/java/org/apache/shardingsphere/test/mock/MockedDriver.java
+++ b/test/fixture/jdbc/src/main/java/org/apache/shardingsphere/test/fixture/jdbc/MockedDriver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.mock;
+package org.apache.shardingsphere.test.fixture.jdbc;
import java.sql.Connection;
import java.sql.Driver;
diff --git a/test/fixture/pom.xml b/test/fixture/pom.xml
index e7a00b0a08c..f66ac3a86fb 100644
--- a/test/fixture/pom.xml
+++ b/test/fixture/pom.xml
@@ -29,6 +29,7 @@
<name>${project.artifactId}</name>
<modules>
+ <module>jdbc</module>
<module>infra</module>
</modules>
</project>
diff --git a/test/pipeline/pom.xml b/test/pipeline/pom.xml
index 642eb748de2..beabe3c7a97 100644
--- a/test/pipeline/pom.xml
+++ b/test/pipeline/pom.xml
@@ -68,6 +68,11 @@
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-common</artifactId>
<version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
index 6d4038a4e31..9094c2a5f1e 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumn
import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineIndexMetaData;
import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineTableMetaData;
import org.apache.shardingsphere.infra.database.type.dialect.H2DatabaseType;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/test/rewrite/pom.xml b/test/rewrite/pom.xml
index c90d8e4bfd0..1c15c092437 100644
--- a/test/rewrite/pom.xml
+++ b/test/rewrite/pom.xml
@@ -32,6 +32,11 @@
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-common</artifactId>
<version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-fixture-jdbc</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
index 9b3e3c37af5..2f10f30e619 100644
--- a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
+++ b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.runners.Parameterized.Parameters;
import javax.sql.DataSource;
diff --git a/test/rewrite/src/test/resources/scenario/encrypt/config/query-with-cipher.yaml b/test/rewrite/src/test/resources/scenario/encrypt/config/query-with-cipher.yaml
index 6f7b3924611..e9d184e44d6 100644
--- a/test/rewrite/src/test/resources/scenario/encrypt/config/query-with-cipher.yaml
+++ b/test/rewrite/src/test/resources/scenario/encrypt/config/query-with-cipher.yaml
@@ -17,7 +17,7 @@
dataSources:
encrypt_ds:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !ENCRYPT
diff --git a/test/rewrite/src/test/resources/scenario/encrypt/config/query-with-plain.yaml b/test/rewrite/src/test/resources/scenario/encrypt/config/query-with-plain.yaml
index cc0d766e6af..5bdfd41c291 100644
--- a/test/rewrite/src/test/resources/scenario/encrypt/config/query-with-plain.yaml
+++ b/test/rewrite/src/test/resources/scenario/encrypt/config/query-with-plain.yaml
@@ -17,7 +17,7 @@
dataSources:
encrypt_ds:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !ENCRYPT
diff --git a/test/rewrite/src/test/resources/scenario/mix/config/query-with-cipher.yaml b/test/rewrite/src/test/resources/scenario/mix/config/query-with-cipher.yaml
index 9492fedb24f..297a8b632d0 100644
--- a/test/rewrite/src/test/resources/scenario/mix/config/query-with-cipher.yaml
+++ b/test/rewrite/src/test/resources/scenario/mix/config/query-with-cipher.yaml
@@ -17,7 +17,7 @@
dataSources:
db:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !SHARDING
diff --git a/test/rewrite/src/test/resources/scenario/mix/config/query-with-plain.yaml b/test/rewrite/src/test/resources/scenario/mix/config/query-with-plain.yaml
index 63c9b4b2f2b..252cdfdebb0 100644
--- a/test/rewrite/src/test/resources/scenario/mix/config/query-with-plain.yaml
+++ b/test/rewrite/src/test/resources/scenario/mix/config/query-with-plain.yaml
@@ -17,7 +17,7 @@
dataSources:
db:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !SHARDING
diff --git a/test/rewrite/src/test/resources/scenario/sharding/config/sharding-rule.yaml b/test/rewrite/src/test/resources/scenario/sharding/config/sharding-rule.yaml
index e953b8e3cd6..5eb3424ec10 100644
--- a/test/rewrite/src/test/resources/scenario/sharding/config/sharding-rule.yaml
+++ b/test/rewrite/src/test/resources/scenario/sharding/config/sharding-rule.yaml
@@ -17,7 +17,7 @@
dataSources:
db:
- dataSourceClassName: org.apache.shardingsphere.test.mock.MockedDataSource
+ dataSourceClassName: org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
rules:
- !SHARDING