You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/04 15:39:57 UTC
[shardingsphere] branch master updated: Rename package name of discovery test (#22648)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 f4bb2d99032 Rename package name of discovery test (#22648)
f4bb2d99032 is described below
commit f4bb2d990323850e6d127ecc2ca3b4ec14e627b6
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 4 23:39:51 2022 +0800
Rename package name of discovery test (#22648)
---
.../discovery/build/DiscoveryRuleBuilder.java | 12 ++++-----
.../cases/DatabaseClusterEnvironment.java | 2 +-
.../cases/DatabaseClusterEnvironmentFactory.java | 4 +--
.../discovery/cases/base/BaseE2EIT.java} | 31 ++++++++++------------
.../cases/mysql/DiscoveryMGRGeneralE2EIT.java} | 27 +++++++++----------
.../cases/mysql/env/MySQLMGREnvironment.java | 10 +++----
.../discovery/command/DiscoveryDistSQLCommand.java | 2 +-
.../command/MGRPrimaryReplicaCommand.java | 2 +-
.../discovery/env/E2ETestEnvironment.java} | 18 ++++++-------
.../discovery/env/enums/E2EEnvTypeEnum.java} | 4 +--
.../container/compose/BaseContainerComposer.java | 2 +-
.../container/compose/DockerContainerComposer.java | 6 ++---
.../config/MySQLContainerConfigurationFactory.java | 4 +--
.../ProxyClusterContainerConfigurationFactory.java | 2 +-
.../parameter/DiscoveryTestParameter.java} | 6 ++---
.../discovery/util/DiscoveryContainerUtil.java | 2 +-
16 files changed, 64 insertions(+), 70 deletions(-)
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/build/DiscoveryRuleBuilder.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
similarity index 87%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/build/DiscoveryRuleBuilder.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
index 454999f2cef..4d9bfa45da6 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/build/DiscoveryRuleBuilder.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.build;
+package org.apache.shardingsphere.test.e2e.discovery.build;
import org.apache.shardingsphere.data.pipeline.core.util.ThreadUtil;
-import org.apache.shardingsphere.test.integration.discovery.cases.base.BaseITCase;
-import org.apache.shardingsphere.test.integration.discovery.command.DiscoveryDistSQLCommand;
+import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseE2EIT;
+import org.apache.shardingsphere.test.e2e.discovery.command.DiscoveryDistSQLCommand;
import javax.sql.DataSource;
import javax.xml.bind.JAXB;
@@ -30,7 +30,7 @@ import java.util.Objects;
import java.util.concurrent.TimeUnit;
/**
- * Build Discovery Rule.
+ * Build discovery rule.
*/
public final class DiscoveryRuleBuilder {
@@ -38,9 +38,9 @@ public final class DiscoveryRuleBuilder {
private final DataSource proxyDataSource;
- public DiscoveryRuleBuilder(final DataSource proxyDataSource) throws SQLException {
+ public DiscoveryRuleBuilder(final DataSource proxyDataSource) {
this.proxyDataSource = proxyDataSource;
- discoveryDistSQLCommand = JAXB.unmarshal(Objects.requireNonNull(BaseITCase.class.getClassLoader().getResource("env/common/discovery-command.xml")), DiscoveryDistSQLCommand.class);
+ discoveryDistSQLCommand = JAXB.unmarshal(Objects.requireNonNull(BaseE2EIT.class.getClassLoader().getResource("env/common/discovery-command.xml")), DiscoveryDistSQLCommand.class);
}
/**
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/DatabaseClusterEnvironment.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DatabaseClusterEnvironment.java
similarity index 94%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/DatabaseClusterEnvironment.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DatabaseClusterEnvironment.java
index c631abb01cd..70dfdf86386 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/DatabaseClusterEnvironment.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DatabaseClusterEnvironment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.cases;
+package org.apache.shardingsphere.test.e2e.discovery.cases;
import javax.sql.DataSource;
import java.util.Map;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/DatabaseClusterEnvironmentFactory.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DatabaseClusterEnvironmentFactory.java
similarity index 91%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/DatabaseClusterEnvironmentFactory.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DatabaseClusterEnvironmentFactory.java
index d02b7f350ea..c90066c0d23 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/DatabaseClusterEnvironmentFactory.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DatabaseClusterEnvironmentFactory.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.cases;
+package org.apache.shardingsphere.test.e2e.discovery.cases;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.integration.discovery.cases.mysql.env.MySQLMGREnvironment;
+import org.apache.shardingsphere.test.e2e.discovery.cases.mysql.env.MySQLMGREnvironment;
import javax.sql.DataSource;
import java.sql.SQLException;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/base/BaseITCase.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseE2EIT.java
similarity index 86%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/base/BaseITCase.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseE2EIT.java
index bff2243ef9c..31f44c467b4 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/base/BaseITCase.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/base/BaseE2EIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.cases.base;
+package org.apache.shardingsphere.test.e2e.discovery.cases.base;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
@@ -24,12 +24,12 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shardingsphere.data.pipeline.core.util.ThreadUtil;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.discovery.build.DiscoveryRuleBuilder;
-import org.apache.shardingsphere.test.integration.discovery.cases.DatabaseClusterEnvironment;
-import org.apache.shardingsphere.test.integration.discovery.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.discovery.framework.container.compose.BaseContainerComposer;
-import org.apache.shardingsphere.test.integration.discovery.framework.container.compose.DockerContainerComposer;
-import org.apache.shardingsphere.test.integration.discovery.framework.parameter.DiscoveryParameterized;
+import org.apache.shardingsphere.test.e2e.discovery.build.DiscoveryRuleBuilder;
+import org.apache.shardingsphere.test.e2e.discovery.cases.DatabaseClusterEnvironment;
+import org.apache.shardingsphere.test.e2e.discovery.env.E2ETestEnvironment;
+import org.apache.shardingsphere.test.e2e.discovery.framework.container.compose.BaseContainerComposer;
+import org.apache.shardingsphere.test.e2e.discovery.framework.container.compose.DockerContainerComposer;
+import org.apache.shardingsphere.test.e2e.discovery.framework.parameter.DiscoveryTestParameter;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -41,18 +41,15 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertNotEquals;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotEquals;
-/**
- * Base integration test.
- */
-@Slf4j
@Getter(AccessLevel.PROTECTED)
-public abstract class BaseITCase {
+@Slf4j
+public abstract class BaseE2EIT {
- protected static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
+ protected static final E2ETestEnvironment ENV = E2ETestEnvironment.getInstance();
private final BaseContainerComposer containerComposer;
@@ -62,9 +59,9 @@ public abstract class BaseITCase {
private final DataSource proxyDataSource;
- public BaseITCase(final DiscoveryParameterized discoveryParameterized) {
- databaseType = discoveryParameterized.getDatabaseType();
- containerComposer = new DockerContainerComposer(discoveryParameterized.getScenario(), discoveryParameterized.getDatabaseType(), discoveryParameterized.getStorageContainerImage());
+ public BaseE2EIT(final DiscoveryTestParameter testParameter) {
+ databaseType = testParameter.getDatabaseType();
+ containerComposer = new DockerContainerComposer(testParameter.getScenario(), testParameter.getDatabaseType(), testParameter.getStorageContainerImage());
containerComposer.start();
mappedDataSources = containerComposer.getMappedDatasource();
proxyDataSource = containerComposer.getProxyDatasource();
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/mysql/DiscoveryMGRGeneralIT.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/DiscoveryMGRGeneralE2EIT.java
similarity index 68%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/mysql/DiscoveryMGRGeneralIT.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/DiscoveryMGRGeneralE2EIT.java
index 9b746a854d9..d6fc1580948 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/mysql/DiscoveryMGRGeneralIT.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/DiscoveryMGRGeneralE2EIT.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.cases.mysql;
+package org.apache.shardingsphere.test.e2e.discovery.cases.mysql;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.test.integration.discovery.cases.DatabaseClusterEnvironment;
-import org.apache.shardingsphere.test.integration.discovery.cases.DatabaseClusterEnvironmentFactory;
-import org.apache.shardingsphere.test.integration.discovery.cases.base.BaseITCase;
-import org.apache.shardingsphere.test.integration.discovery.framework.parameter.DiscoveryParameterized;
+import org.apache.shardingsphere.test.e2e.discovery.cases.DatabaseClusterEnvironment;
+import org.apache.shardingsphere.test.e2e.discovery.cases.DatabaseClusterEnvironmentFactory;
+import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseE2EIT;
+import org.apache.shardingsphere.test.e2e.discovery.framework.parameter.DiscoveryTestParameter;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -32,23 +32,20 @@ import java.sql.SQLException;
import java.util.Collection;
import java.util.LinkedList;
-/**
- * Discovery MySQL MGR Integration Test.
- */
-@Slf4j
@RunWith(Parameterized.class)
-public final class DiscoveryMGRGeneralIT extends BaseITCase {
+@Slf4j
+public final class DiscoveryMGRGeneralE2EIT extends BaseE2EIT {
- public DiscoveryMGRGeneralIT(final DiscoveryParameterized discoveryParameterized) {
- super(discoveryParameterized);
+ public DiscoveryMGRGeneralE2EIT(final DiscoveryTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<DiscoveryParameterized> getParameters() {
- Collection<DiscoveryParameterized> result = new LinkedList<>();
+ public static Collection<DiscoveryTestParameter> getParameters() {
+ Collection<DiscoveryTestParameter> result = new LinkedList<>();
MySQLDatabaseType databaseType = new MySQLDatabaseType();
for (String each : ENV.listStorageContainerImages(databaseType)) {
- result.add(new DiscoveryParameterized(databaseType, each, "mgr_discovery"));
+ result.add(new DiscoveryTestParameter(databaseType, each, "mgr_discovery"));
}
return result;
}
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/mysql/env/MySQLMGREnvironment.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/env/MySQLMGREnvironment.java
similarity index 90%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/mysql/env/MySQLMGREnvironment.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/env/MySQLMGREnvironment.java
index ed97476df31..057e89f5f4e 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/cases/mysql/env/MySQLMGREnvironment.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/mysql/env/MySQLMGREnvironment.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.cases.mysql.env;
+package org.apache.shardingsphere.test.e2e.discovery.cases.mysql.env;
import com.google.common.base.Splitter;
import lombok.Getter;
-import org.apache.shardingsphere.test.integration.discovery.cases.base.BaseITCase;
-import org.apache.shardingsphere.test.integration.discovery.cases.DatabaseClusterEnvironment;
-import org.apache.shardingsphere.test.integration.discovery.command.MGRPrimaryReplicaCommand;
+import org.apache.shardingsphere.test.e2e.discovery.cases.base.BaseE2EIT;
+import org.apache.shardingsphere.test.e2e.discovery.command.MGRPrimaryReplicaCommand;
+import org.apache.shardingsphere.test.e2e.discovery.cases.DatabaseClusterEnvironment;
import javax.sql.DataSource;
import javax.xml.bind.JAXB;
@@ -51,7 +51,7 @@ public final class MySQLMGREnvironment implements DatabaseClusterEnvironment {
primaryDataSource = dataSources.get(0);
replicationDataSources = dataSources.subList(1, dataSources.size());
this.dataSources = getAllDataSources();
- mgrPrimaryReplicaCommand = JAXB.unmarshal(Objects.requireNonNull(BaseITCase.class.getClassLoader().getResource("env/common/mgr-primary-replica-command.xml")),
+ mgrPrimaryReplicaCommand = JAXB.unmarshal(Objects.requireNonNull(BaseE2EIT.class.getClassLoader().getResource("env/common/mgr-primary-replica-command.xml")),
MGRPrimaryReplicaCommand.class);
buildMGRPrimaryDataSource();
buildMGRReplicaDataSources();
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/command/DiscoveryDistSQLCommand.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/command/DiscoveryDistSQLCommand.java
similarity index 95%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/command/DiscoveryDistSQLCommand.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/command/DiscoveryDistSQLCommand.java
index 546579c0210..b2736549426 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/command/DiscoveryDistSQLCommand.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/command/DiscoveryDistSQLCommand.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.command;
+package org.apache.shardingsphere.test.e2e.discovery.command;
import lombok.Getter;
import lombok.Setter;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/command/MGRPrimaryReplicaCommand.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/command/MGRPrimaryReplicaCommand.java
similarity index 95%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/command/MGRPrimaryReplicaCommand.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/command/MGRPrimaryReplicaCommand.java
index fa68b610806..a5cbb8faf1e 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/command/MGRPrimaryReplicaCommand.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/command/MGRPrimaryReplicaCommand.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.command;
+package org.apache.shardingsphere.test.e2e.discovery.command;
import lombok.Getter;
import lombok.Setter;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/env/IntegrationTestEnvironment.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/E2ETestEnvironment.java
similarity index 77%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/env/IntegrationTestEnvironment.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/E2ETestEnvironment.java
index 8d0b03292a2..b40898b0298 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/env/IntegrationTestEnvironment.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/E2ETestEnvironment.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.env;
+package org.apache.shardingsphere.test.e2e.discovery.env;
import com.google.common.base.Strings;
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.discovery.env.enums.ITEnvTypeEnum;
+import org.apache.shardingsphere.test.e2e.discovery.env.enums.E2EEnvTypeEnum;
import java.io.IOException;
import java.io.InputStream;
@@ -33,26 +33,26 @@ import java.util.stream.Collectors;
@Getter
@Slf4j
-public final class IntegrationTestEnvironment {
+public final class E2ETestEnvironment {
- private static final IntegrationTestEnvironment INSTANCE = new IntegrationTestEnvironment();
+ private static final E2ETestEnvironment INSTANCE = new E2ETestEnvironment();
private final Properties props;
- private final ITEnvTypeEnum itEnvType;
+ private final E2EEnvTypeEnum itEnvType;
private final List<String> mysqlVersions;
- private IntegrationTestEnvironment() {
+ private E2ETestEnvironment() {
props = loadProperties();
- itEnvType = ITEnvTypeEnum.valueOf(props.getProperty("it.env.type", ITEnvTypeEnum.NONE.name()).toUpperCase());
+ itEnvType = E2EEnvTypeEnum.valueOf(props.getProperty("it.env.type", E2EEnvTypeEnum.NONE.name()).toUpperCase());
mysqlVersions = Arrays.stream(props.getOrDefault("it.docker.mysql.version", "").toString().split(",")).filter(each -> !Strings.isNullOrEmpty(each)).collect(Collectors.toList());
}
@SneakyThrows(IOException.class)
private Properties loadProperties() {
Properties result = new Properties();
- try (InputStream inputStream = IntegrationTestEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
+ try (InputStream inputStream = E2ETestEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
result.load(inputStream);
}
for (String each : System.getProperties().stringPropertyNames()) {
@@ -66,7 +66,7 @@ public final class IntegrationTestEnvironment {
*
* @return singleton instance
*/
- public static IntegrationTestEnvironment getInstance() {
+ public static E2ETestEnvironment getInstance() {
return INSTANCE;
}
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/env/enums/ITEnvTypeEnum.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/E2EEnvTypeEnum.java
similarity index 89%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/env/enums/ITEnvTypeEnum.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/E2EEnvTypeEnum.java
index 061a968e6f9..63d92a9c95c 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/env/enums/ITEnvTypeEnum.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/env/enums/E2EEnvTypeEnum.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.env.enums;
+package org.apache.shardingsphere.test.e2e.discovery.env.enums;
-public enum ITEnvTypeEnum {
+public enum E2EEnvTypeEnum {
NONE, DOCKER, NATIVE
}
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/compose/BaseContainerComposer.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/BaseContainerComposer.java
similarity index 95%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/compose/BaseContainerComposer.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/BaseContainerComposer.java
index af30ed6dcce..74c05645209 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/compose/BaseContainerComposer.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/BaseContainerComposer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.framework.container.compose;
+package org.apache.shardingsphere.test.e2e.discovery.framework.container.compose;
import lombok.Getter;
import org.apache.shardingsphere.test.integration.env.container.atomic.ITContainers;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/compose/DockerContainerComposer.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
similarity index 94%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/compose/DockerContainerComposer.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
index 98b0ae66057..44970f62528 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/compose/DockerContainerComposer.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.framework.container.compose;
+package org.apache.shardingsphere.test.e2e.discovery.framework.container.compose;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.discovery.framework.container.config.MySQLContainerConfigurationFactory;
+import org.apache.shardingsphere.test.e2e.discovery.framework.container.config.MySQLContainerConfigurationFactory;
import org.apache.shardingsphere.test.integration.env.container.atomic.adapter.AdapterContainerFactory;
import org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import org.apache.shardingsphere.test.integration.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.test.integration.env.container.atomic.storage.c
import org.apache.shardingsphere.test.integration.env.container.atomic.util.ContainerUtil;
import org.apache.shardingsphere.test.integration.env.container.atomic.util.StorageContainerUtil;
import org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
-import org.apache.shardingsphere.test.integration.discovery.framework.container.config.ProxyClusterContainerConfigurationFactory;
+import org.apache.shardingsphere.test.e2e.discovery.framework.container.config.ProxyClusterContainerConfigurationFactory;
import javax.sql.DataSource;
import java.util.Collections;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/config/MySQLContainerConfigurationFactory.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
similarity index 95%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
index eef0d9155cc..8669c2828e6 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.framework.container.config;
+package org.apache.shardingsphere.test.e2e.discovery.framework.container.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.StorageContainerConstants;
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.config.StorageContainerConfiguration;
import org.apache.shardingsphere.test.integration.env.container.atomic.util.ContainerUtil;
-import org.apache.shardingsphere.test.integration.discovery.util.DiscoveryContainerUtil;
+import org.apache.shardingsphere.test.e2e.discovery.util.DiscoveryContainerUtil;
import java.util.Collections;
import java.util.HashMap;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
similarity index 96%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
index 49762e4efa9..4ed371d464e 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.framework.container.config;
+package org.apache.shardingsphere.test.e2e.discovery.framework.container.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/parameter/DiscoveryParameterized.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/parameter/DiscoveryTestParameter.java
similarity index 90%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/parameter/DiscoveryParameterized.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/parameter/DiscoveryTestParameter.java
index 43296539a2f..6aa06ac3728 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/framework/parameter/DiscoveryParameterized.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/parameter/DiscoveryTestParameter.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.framework.parameter;
+package org.apache.shardingsphere.test.e2e.discovery.framework.parameter;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-@Getter
@RequiredArgsConstructor
+@Getter
@ToString
-public final class DiscoveryParameterized {
+public final class DiscoveryTestParameter {
private final DatabaseType databaseType;
diff --git a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/util/DiscoveryContainerUtil.java b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
similarity index 97%
rename from test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/util/DiscoveryContainerUtil.java
rename to test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
index b8b97bb6b05..ebcd9e0ca37 100644
--- a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/integration/discovery/util/DiscoveryContainerUtil.java
+++ b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.discovery.util;
+package org.apache.shardingsphere.test.e2e.discovery.util;
import lombok.NoArgsConstructor;