This is an automated email from the ASF dual-hosted git repository.
panjuan 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 9c74dab Rename package name of shardingsphere-test-common module
(#8755)
9c74dab is described below
commit 9c74dab0a3833b1c769b4a7dfecf6456eac586b9
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Dec 24 17:59:13 2020 +0800
Rename package name of shardingsphere-test-common module (#8755)
---
.../context/metadata/GovernanceMetaDataContextsTest.java | 2 +-
.../infra/context/metadata/MetaDataContextsBuilderTest.java | 2 +-
.../spring/boot/SpringBootJNDIDataSourceTest.java | 2 +-
.../src/test/resources/application-common.properties | 4 ++--
.../test/resources/META-INF/spring/application-context.xml | 12 ++++++------
.../decorator/HikariJDBCParameterDecoratorTest.java | 2 +-
.../proxy/backend/context/ProxyContextTest.java | 2 +-
.../shardingsphere/test/{jdbc => mock}/MockedDataSource.java | 2 +-
.../shardingsphere/test/{jdbc => mock}/MockedDriver.java | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
index a107800..7c1113c 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
@@ -40,7 +40,7 @@ import
org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.event.RuleChangedEvent;
-import org.apache.shardingsphere.test.jdbc.MockedDataSource;
+import org.apache.shardingsphere.test.mock.MockedDataSource;
import org.apache.shardingsphere.replicaquery.rule.ReplicaQueryRule;
import org.junit.Before;
import org.junit.Test;
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilderTest.java
b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilderTest.java
index 5680f1d..71d3a2a 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilderTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilderTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.auth.builtin.DefaultAuthentication;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.context.fixture.FixtureRule;
import
org.apache.shardingsphere.infra.context.fixture.FixtureRuleConfiguration;
-import org.apache.shardingsphere.test.jdbc.MockedDataSource;
+import org.apache.shardingsphere.test.mock.MockedDataSource;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootJNDIDataSourceTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootJNDIDataSourceTest.java
index 0597a0e..0288e12 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootJNDIDataSourceTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootJNDIDataSourceTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.spring.boot;
import
org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import
org.apache.shardingsphere.spring.boot.fixture.TestJndiInitialContextFactory;
-import org.apache.shardingsphere.test.jdbc.MockedDataSource;
+import org.apache.shardingsphere.test.mock.MockedDataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application-common.properties
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application-common.properties
index 94ae740..eb6e4e7 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application-common.properties
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application-common.properties
@@ -17,8 +17,8 @@
spring.shardingsphere.datasource.names=ds_${0..1}
-spring.shardingsphere.datasource.ds_0.type=org.apache.shardingsphere.test.jdbc.MockedDataSource
-spring.shardingsphere.datasource.ds_1.type=org.apache.shardingsphere.test.jdbc.MockedDataSource
+spring.shardingsphere.datasource.ds_0.type=org.apache.shardingsphere.test.mock.MockedDataSource
+spring.shardingsphere.datasource.ds_1.type=org.apache.shardingsphere.test.mock.MockedDataSource
spring.shardingsphere.rules.replica-query.load-balancers.random.type=RANDOM
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml
index dd52ecf..6e58e33 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml
@@ -38,12 +38,12 @@
">
<context:property-placeholder location="classpath:conf/conf.properties" />
- <bean id="ds_0_primary"
class="org.apache.shardingsphere.test.jdbc.MockedDataSource" />
- <bean id="ds_0_replica_0"
class="org.apache.shardingsphere.test.jdbc.MockedDataSource" />
- <bean id="ds_0_replica_1"
class="org.apache.shardingsphere.test.jdbc.MockedDataSource" />
- <bean id="ds_1_primary"
class="org.apache.shardingsphere.test.jdbc.MockedDataSource" />
- <bean id="ds_1_replica_0"
class="org.apache.shardingsphere.test.jdbc.MockedDataSource" />
- <bean id="ds_1_replica_1"
class="org.apache.shardingsphere.test.jdbc.MockedDataSource" />
+ <bean id="ds_0_primary"
class="org.apache.shardingsphere.test.mock.MockedDataSource" />
+ <bean id="ds_0_replica_0"
class="org.apache.shardingsphere.test.mock.MockedDataSource" />
+ <bean id="ds_0_replica_1"
class="org.apache.shardingsphere.test.mock.MockedDataSource" />
+ <bean id="ds_1_primary"
class="org.apache.shardingsphere.test.mock.MockedDataSource" />
+ <bean id="ds_1_replica_0"
class="org.apache.shardingsphere.test.mock.MockedDataSource" />
+ <bean id="ds_1_replica_1"
class="org.apache.shardingsphere.test.mock.MockedDataSource" />
<sharding:sharding-algorithm id="dataSourceShardingAlgorithm"
type="INLINE">
<props>
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/decorator/HikariJDBCParameterDecoratorTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/decorator/HikariJDBCParameterDecoratorTest.java
index 45a56cd..3843892 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/decorator/HikariJDBCParameterDecoratorTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/decorator/HikariJDBCParameterDecoratorTest.java
@@ -36,7 +36,7 @@ public final class HikariJDBCParameterDecoratorTest {
@Test
public void assertDecoratedHikariDataSource() {
HikariDataSource dataSource = new HikariDataSource();
-
dataSource.setDriverClassName("org.apache.shardingsphere.test.jdbc.MockedDriver");
+
dataSource.setDriverClassName("org.apache.shardingsphere.test.mock.MockedDriver");
dataSource.setJdbcUrl("mock:jdbc");
HikariDataSource actual = new
HikariJDBCParameterDecorator().decorate(dataSource);
Properties props = actual.getDataSourceProperties();
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
index ce261ec..311d597 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import
org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
-import org.apache.shardingsphere.test.jdbc.MockedDataSource;
+import org.apache.shardingsphere.test.mock.MockedDataSource;
import
org.apache.shardingsphere.proxy.backend.exception.NoDatabaseSelectedException;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.junit.Test;
diff --git
a/shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/jdbc/MockedDataSource.java
b/shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/mock/MockedDataSource.java
similarity index 98%
rename from
shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/jdbc/MockedDataSource.java
rename to
shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/mock/MockedDataSource.java
index ba9a72a..16065c6 100644
---
a/shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/jdbc/MockedDataSource.java
+++
b/shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/mock/MockedDataSource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.jdbc;
+package org.apache.shardingsphere.test.mock;
import javax.sql.DataSource;
import java.io.PrintWriter;
diff --git
a/shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/jdbc/MockedDriver.java
b/shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/mock/MockedDriver.java
similarity index 97%
rename from
shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/jdbc/MockedDriver.java
rename to
shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/mock/MockedDriver.java
index 414f0b8..6c0abaf 100644
---
a/shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/jdbc/MockedDriver.java
+++
b/shardingsphere-test/shardingsphere-test-common/src/main/java/org/apache/shardingsphere/test/mock/MockedDriver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.jdbc;
+package org.apache.shardingsphere.test.mock;
import java.sql.Connection;
import java.sql.Driver;
