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/12/06 06:00:29 UTC
[shardingsphere] branch master updated: Refactor suite's class names (#22692)
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 d530d21bcff Refactor suite's class names (#22692)
d530d21bcff is described below
commit d530d21bcff9e43cd6aeb3caf3ec10a1e2c83f8d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Dec 6 14:00:23 2022 +0800
Refactor suite's class names (#22692)
* Refactor pipeline's class names
* Refactor showprocesslist's class names
* Refactor transaction's class names
* Refactor suite's class names
---
.../container/compose/ContainerComposerRegistry.java | 8 ++++----
.../compose/mode/ClusterContainerComposer.java | 4 ++--
.../compose/mode/StandaloneContainerComposer.java | 4 ++--
.../e2e/engine/{BaseITCase.java => BaseE2EIT.java} | 6 +++---
.../e2e/engine/{BatchITCase.java => BatchE2EIT.java} | 4 ++--
.../engine/{SingleITCase.java => SingleE2EIT.java} | 8 ++++----
.../engine/dal/{BaseDALIT.java => BaseDALE2EIT.java} | 6 +++---
.../dal/{GeneralDALIT.java => GeneralDALE2EIT.java} | 8 ++++----
.../engine/dcl/{BaseDCLIT.java => BaseDCLE2EIT.java} | 6 +++---
.../dcl/{GeneralDCLIT.java => GeneralDCLE2EIT.java} | 8 ++++----
.../engine/ddl/{BaseDDLIT.java => BaseDDLE2EIT.java} | 6 +++---
.../ddl/{GeneralDDLIT.java => GeneralDDLE2EIT.java} | 8 ++++----
...{AdditionalDMLIT.java => AdditionalDMLE2EIT.java} | 8 ++++----
.../engine/dml/{BaseDMLIT.java => BaseDMLE2EIT.java} | 6 +++---
.../dml/{BatchDMLIT.java => BatchDMLE2EIT.java} | 14 +++++++-------
.../dml/{GeneralDMLIT.java => GeneralDMLE2EIT.java} | 8 ++++----
...{AdditionalDQLIT.java => AdditionalDQLE2EIT.java} | 8 ++++----
.../engine/dql/{BaseDQLIT.java => BaseDQLE2EIT.java} | 6 +++---
.../dql/{GeneralDQLIT.java => GeneralDQLE2EIT.java} | 8 ++++----
.../engine/ral/{BaseRALIT.java => BaseRALE2EIT.java} | 6 +++---
.../ral/{GeneralRALIT.java => GeneralRALE2EIT.java} | 8 ++++----
.../engine/rdl/{BaseRDLIT.java => BaseRDLE2EIT.java} | 6 +++---
.../rdl/{GeneralRDLIT.java => GeneralRDLE2EIT.java} | 8 ++++----
.../engine/rql/{BaseRQLIT.java => BaseRQLE2EIT.java} | 6 +++---
.../rql/{GeneralRQLIT.java => GeneralRQLE2EIT.java} | 8 ++++----
.../array/ClusterTestParameterArrayGenerator.java | 8 ++++----
...eterFactory.java => E2ETestParameterFactory.java} | 10 +++++-----
...Generator.java => E2ETestParameterGenerator.java} | 20 ++++++++++----------
.../array/JdbcStandaloneTestParameterGenerator.java | 8 ++++----
.../array/ProxyStandaloneTestParameterGenerator.java | 8 ++++----
.../param/model/AssertionTestParameter.java | 2 +-
.../e2e/framework/param/model/CaseTestParameter.java | 2 +-
.../{ITTestParameter.java => E2ETestParameter.java} | 4 ++--
.../key/ParallelRunnerExecutorKeyProvider.java | 4 ++--
.../impl/CaseParallelRunnerExecutorKeyProvider.java | 4 ++--
.../ScenarioParallelRunnerExecutorKeyProvider.java | 4 ++--
.../e2e/framework/runner/param/RunnerParameters.java | 6 +++---
.../watcher/{ITWatcher.java => E2EWatcher.java} | 4 ++--
38 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/ContainerComposerRegistry.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/ContainerComposerRegistry.java
index 305dae5714e..73febaf10e2 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/ContainerComposerRegistry.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/ContainerComposerRegistry.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.test.e2e.container.compose.mode.ClusterContaine
import org.apache.shardingsphere.test.e2e.container.compose.mode.StandaloneContainerComposer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.EnvironmentConstants;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import javax.sql.DataSource;
import java.util.HashMap;
@@ -42,7 +42,7 @@ public final class ContainerComposerRegistry implements AutoCloseable {
* @param testParameter test parameter
* @return composed container
*/
- public ContainerComposer getContainerComposer(final ITTestParameter testParameter) {
+ public ContainerComposer getContainerComposer(final E2ETestParameter testParameter) {
String key = testParameter.getKey();
if (containerComposers.containsKey(key)) {
return containerComposers.get(key);
@@ -55,11 +55,11 @@ public final class ContainerComposerRegistry implements AutoCloseable {
}
}
- private ContainerComposer createContainerComposer(final ITTestParameter testParameter) {
+ private ContainerComposer createContainerComposer(final E2ETestParameter testParameter) {
return isClusterMode(testParameter) ? new ClusterContainerComposer(testParameter) : new StandaloneContainerComposer(testParameter);
}
- private boolean isClusterMode(final ITTestParameter testParameter) {
+ private boolean isClusterMode(final E2ETestParameter testParameter) {
// TODO cluster mode often throw exception sometimes, issue is #15517
return EnvironmentConstants.CLUSTER_MODE.equalsIgnoreCase(testParameter.getMode()) && AdapterContainerConstants.PROXY.equalsIgnoreCase(testParameter.getAdapter());
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
index 699ef4375e9..3e44817224d 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageCo
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import javax.sql.DataSource;
import java.util.Map;
@@ -48,7 +48,7 @@ public final class ClusterContainerComposer implements ContainerComposer {
private final AdapterContainer adapterContainer;
- public ClusterContainerComposer(final ITTestParameter testParameter) {
+ public ClusterContainerComposer(final E2ETestParameter testParameter) {
String scenario = testParameter.getScenario();
containers = new ITContainers(scenario);
// TODO support other types of governance
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
index 46a5dadae87..fc240463335 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterCo
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import javax.sql.DataSource;
import java.util.Map;
@@ -42,7 +42,7 @@ public final class StandaloneContainerComposer implements ContainerComposer {
private final AdapterContainer adapterContainer;
- public StandaloneContainerComposer(final ITTestParameter testParameter) {
+ public StandaloneContainerComposer(final E2ETestParameter testParameter) {
String scenario = testParameter.getScenario();
containers = new ITContainers(scenario);
// TODO add more version of databases
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BaseITCase.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BaseE2EIT.java
similarity index 97%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BaseITCase.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BaseE2EIT.java
index 7c1cd358ebd..ed2e9964c3d 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BaseITCase.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BaseE2EIT.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCase;
import org.apache.shardingsphere.test.e2e.container.compose.ContainerComposer;
import org.apache.shardingsphere.test.e2e.container.compose.ContainerComposerRegistry;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelParameterized;
import org.h2.tools.RunScript;
import org.junit.AfterClass;
@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@RunWith(ParallelParameterized.class)
@Getter(AccessLevel.PROTECTED)
-public abstract class BaseITCase {
+public abstract class BaseE2EIT {
public static final String NOT_VERIFY_FLAG = "NOT_VERIFY";
@@ -76,7 +76,7 @@ public abstract class BaseITCase {
private Map<String, DataSource> expectedDataSourceMap;
- public BaseITCase(final ITTestParameter testParameter) {
+ public BaseE2EIT(final E2ETestParameter testParameter) {
mode = testParameter.getMode();
scenario = testParameter.getScenario();
databaseType = testParameter.getDatabaseType();
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BatchITCase.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BatchE2EIT.java
similarity index 98%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BatchITCase.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BatchE2EIT.java
index 63363846cd3..a03e45475e6 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BatchITCase.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/BatchE2EIT.java
@@ -50,7 +50,7 @@ import java.util.Set;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public abstract class BatchITCase extends BaseITCase {
+public abstract class BatchE2EIT extends BaseE2EIT {
private final Collection<DataSet> dataSets = new LinkedList<>();
@@ -58,7 +58,7 @@ public abstract class BatchITCase extends BaseITCase {
private DataSetEnvironmentManager dataSetEnvironmentManager;
- public BatchITCase(final CaseTestParameter testParameter) {
+ public BatchE2EIT(final CaseTestParameter testParameter) {
super(testParameter);
parentPath = testParameter.getTestCaseContext().getParentPath();
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/SingleITCase.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/SingleE2EIT.java
similarity index 91%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/SingleITCase.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/SingleE2EIT.java
index 13acd554c30..f8e59f56f36 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/SingleITCase.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/SingleE2EIT.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.test.e2e.cases.dataset.DataSet;
import org.apache.shardingsphere.test.e2e.cases.dataset.DataSetLoader;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.watcher.ITWatcher;
+import org.apache.shardingsphere.test.e2e.framework.watcher.E2EWatcher;
import org.junit.Rule;
import java.text.ParseException;
@@ -34,11 +34,11 @@ import java.util.List;
import java.util.stream.Collectors;
@Getter(AccessLevel.PROTECTED)
-public abstract class SingleITCase extends BaseITCase {
+public abstract class SingleE2EIT extends BaseE2EIT {
@Rule
@Getter(AccessLevel.NONE)
- public ITWatcher watcher = new ITWatcher();
+ public E2EWatcher watcher = new E2EWatcher();
private final SQLExecuteType sqlExecuteType;
@@ -46,7 +46,7 @@ public abstract class SingleITCase extends BaseITCase {
private final DataSet dataSet;
- public SingleITCase(final AssertionTestParameter testParameter) {
+ public SingleE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
sqlExecuteType = testParameter.getSqlExecuteType();
assertion = testParameter.getAssertion();
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/BaseDALIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/BaseDALE2EIT.java
similarity index 96%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/BaseDALIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/BaseDALE2EIT.java
index df30dfa6cb9..727b92f1ef6 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/BaseDALIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/BaseDALE2EIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.engine.dal;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.engine.SingleITCase;
+import org.apache.shardingsphere.test.e2e.engine.SingleE2EIT;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import java.sql.ResultSet;
@@ -36,9 +36,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public abstract class BaseDALIT extends SingleITCase {
+public abstract class BaseDALE2EIT extends SingleE2EIT {
- public BaseDALIT(final AssertionTestParameter testParameter) {
+ public BaseDALE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/GeneralDALIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/GeneralDALE2EIT.java
similarity index 89%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/GeneralDALIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/GeneralDALE2EIT.java
index 4e527b81bfa..ce44dde0f27 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/GeneralDALIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dal/GeneralDALE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.dal;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -33,15 +33,15 @@ import java.text.ParseException;
import java.util.Collection;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
-public final class GeneralDALIT extends BaseDALIT {
+public final class GeneralDALE2EIT extends BaseDALE2EIT {
- public GeneralDALIT(final AssertionTestParameter testParameter) {
+ public GeneralDALE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DAL);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.DAL);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/BaseDCLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/BaseDCLE2EIT.java
similarity index 90%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/BaseDCLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/BaseDCLE2EIT.java
index e745e3a8664..140c8e381c9 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/BaseDCLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/BaseDCLE2EIT.java
@@ -17,18 +17,18 @@
package org.apache.shardingsphere.test.e2e.engine.dcl;
-import org.apache.shardingsphere.test.e2e.engine.SingleITCase;
+import org.apache.shardingsphere.test.e2e.engine.SingleE2EIT;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.authority.AuthorityEnvironmentManager;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
-public abstract class BaseDCLIT extends SingleITCase {
+public abstract class BaseDCLE2EIT extends SingleE2EIT {
private AuthorityEnvironmentManager authorityEnvironmentManager;
- public BaseDCLIT(final AssertionTestParameter testParameter) {
+ public BaseDCLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/GeneralDCLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/GeneralDCLE2EIT.java
similarity index 92%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/GeneralDCLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/GeneralDCLE2EIT.java
index 2399e22a186..88bcb530b82 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/GeneralDCLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dcl/GeneralDCLE2EIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.dcl;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -34,15 +34,15 @@ import java.text.ParseException;
import java.util.Collection;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
-public final class GeneralDCLIT extends BaseDCLIT {
+public final class GeneralDCLE2EIT extends BaseDCLE2EIT {
- public GeneralDCLIT(final AssertionTestParameter testParameter) {
+ public GeneralDCLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DCL);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.DCL);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/BaseDDLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/BaseDDLE2EIT.java
similarity index 98%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/BaseDDLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/BaseDDLE2EIT.java
index 8b9d326a750..6903f940373 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/BaseDDLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/BaseDDLE2EIT.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.util.expr.InlineExpressionParser;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetIndex;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.engine.SingleITCase;
+import org.apache.shardingsphere.test.e2e.engine.SingleE2EIT;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -48,9 +48,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-public abstract class BaseDDLIT extends SingleITCase {
+public abstract class BaseDDLE2EIT extends SingleE2EIT {
- public BaseDDLIT(final AssertionTestParameter testParameter) {
+ public BaseDDLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/GeneralDDLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/GeneralDDLE2EIT.java
similarity index 94%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/GeneralDDLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/GeneralDDLE2EIT.java
index 8fbfbb2f2ca..49552d0a4a0 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/GeneralDDLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ddl/GeneralDDLE2EIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.ddl;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -36,15 +36,15 @@ import java.util.Collection;
import static org.junit.Assert.assertFalse;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
-public final class GeneralDDLIT extends BaseDDLIT {
+public final class GeneralDDLE2EIT extends BaseDDLE2EIT {
- public GeneralDDLIT(final AssertionTestParameter testParameter) {
+ public GeneralDDLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DDL);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.DDL);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/AdditionalDMLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/AdditionalDMLE2EIT.java
similarity index 98%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/AdditionalDMLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/AdditionalDMLE2EIT.java
index 1958267838a..bb241ca5c15 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/AdditionalDMLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/AdditionalDMLE2EIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
import org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -39,16 +39,16 @@ import java.util.Collections;
import static org.junit.Assert.assertFalse;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
-public final class AdditionalDMLIT extends BaseDMLIT {
+public final class AdditionalDMLE2EIT extends BaseDMLE2EIT {
- public AdditionalDMLIT(final AssertionTestParameter testParameter) {
+ public AdditionalDMLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
if (IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases()) {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DML);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.DML);
}
return Collections.emptyList();
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BaseDMLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BaseDMLE2EIT.java
similarity index 97%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BaseDMLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BaseDMLE2EIT.java
index ce4e4e336d2..981c5825e0e 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BaseDMLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BaseDMLE2EIT.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.util.expr.InlineExpressionParser;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.engine.SingleITCase;
+import org.apache.shardingsphere.test.e2e.engine.SingleE2EIT;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
@@ -47,11 +47,11 @@ import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public abstract class BaseDMLIT extends SingleITCase {
+public abstract class BaseDMLE2EIT extends SingleE2EIT {
private DataSetEnvironmentManager dataSetEnvironmentManager;
- public BaseDMLIT(final AssertionTestParameter testParameter) {
+ public BaseDMLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BatchDMLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BatchDMLE2EIT.java
similarity index 91%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BatchDMLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BatchDMLE2EIT.java
index 49219d243b6..4422ed2ab3a 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BatchDMLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/BatchDMLE2EIT.java
@@ -20,10 +20,10 @@ package org.apache.shardingsphere.test.e2e.engine.dml;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.BatchITCase;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.engine.BatchE2EIT;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.CaseTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -39,15 +39,15 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
-public final class BatchDMLIT extends BatchITCase {
+public final class BatchDMLE2EIT extends BatchE2EIT {
- public BatchDMLIT(final CaseTestParameter testParameter) {
+ public BatchDMLE2EIT(final CaseTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<ITTestParameter> getTestParameters() {
- return ITTestParameterFactory.getCaseTestParameters(SQLCommandType.DML);
+ public static Collection<E2ETestParameter> getTestParameters() {
+ return E2ETestParameterFactory.getCaseTestParameters(SQLCommandType.DML);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/GeneralDMLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/GeneralDMLE2EIT.java
similarity index 94%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/GeneralDMLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/GeneralDMLE2EIT.java
index b0f46c5afc5..ccd724be57c 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/GeneralDMLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dml/GeneralDMLE2EIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.engine.dml;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -37,15 +37,15 @@ import java.util.Collection;
import static org.junit.Assert.assertFalse;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
-public final class GeneralDMLIT extends BaseDMLIT {
+public final class GeneralDMLE2EIT extends BaseDMLE2EIT {
- public GeneralDMLIT(final AssertionTestParameter testParameter) {
+ public GeneralDMLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DML);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.DML);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLE2EIT.java
similarity index 98%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLE2EIT.java
index 244e68870ae..cdafff6ddc8 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLE2EIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
import org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -40,15 +40,15 @@ import java.util.Collections;
import static org.junit.Assert.assertTrue;
@ParallelRunningStrategy(ParallelLevel.CASE)
-public final class AdditionalDQLIT extends BaseDQLIT {
+public final class AdditionalDQLE2EIT extends BaseDQLE2EIT {
- public AdditionalDQLIT(final AssertionTestParameter testParameter) {
+ public AdditionalDQLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases() ? ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DQL) : Collections.emptyList();
+ return IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases() ? E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.DQL) : Collections.emptyList();
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/BaseDQLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/BaseDQLE2EIT.java
similarity index 96%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/BaseDQLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/BaseDQLE2EIT.java
index d3b9577149e..f57535f335a 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/BaseDQLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/BaseDQLE2EIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.dql;
import lombok.AccessLevel;
import lombok.Getter;
-import org.apache.shardingsphere.test.e2e.engine.SingleITCase;
+import org.apache.shardingsphere.test.e2e.engine.SingleE2EIT;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
@@ -43,13 +43,13 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@Getter(AccessLevel.PROTECTED)
-public abstract class BaseDQLIT extends SingleITCase {
+public abstract class BaseDQLE2EIT extends SingleE2EIT {
private static final Collection<String> FILLED_SUITES = new HashSet<>();
private DataSource expectedDataSource;
- public BaseDQLIT(final AssertionTestParameter testParameter) {
+ public BaseDQLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/GeneralDQLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/GeneralDQLE2EIT.java
similarity index 96%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/GeneralDQLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/GeneralDQLE2EIT.java
index 6140e4709bc..00a21a0dd37 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/GeneralDQLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/GeneralDQLE2EIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.engine.dql;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -38,15 +38,15 @@ import java.util.Collection;
import static org.junit.Assert.assertTrue;
@ParallelRunningStrategy(ParallelLevel.CASE)
-public final class GeneralDQLIT extends BaseDQLIT {
+public final class GeneralDQLE2EIT extends BaseDQLE2EIT {
- public GeneralDQLIT(final AssertionTestParameter testParameter) {
+ public GeneralDQLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DQL);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.DQL);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/BaseRALIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/BaseRALE2EIT.java
similarity index 96%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/BaseRALIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/BaseRALE2EIT.java
index 1bd941e200b..2350e86ab2f 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/BaseRALIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/BaseRALE2EIT.java
@@ -21,7 +21,7 @@ import com.google.common.base.Splitter;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.engine.SingleITCase;
+import org.apache.shardingsphere.test.e2e.engine.SingleE2EIT;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -40,9 +40,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public abstract class BaseRALIT extends SingleITCase {
+public abstract class BaseRALE2EIT extends SingleE2EIT {
- public BaseRALIT(final AssertionTestParameter testParameter) {
+ public BaseRALE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/GeneralRALIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/GeneralRALE2EIT.java
similarity index 91%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/GeneralRALIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/GeneralRALE2EIT.java
index 851ae3a7059..0104d79a4f3 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/GeneralRALIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/ral/GeneralRALE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.ral;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -33,15 +33,15 @@ import java.text.ParseException;
import java.util.Collection;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
-public final class GeneralRALIT extends BaseRALIT {
+public final class GeneralRALE2EIT extends BaseRALE2EIT {
- public GeneralRALIT(final AssertionTestParameter testParameter) {
+ public GeneralRALE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.RAL);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RAL);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/BaseRDLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/BaseRDLE2EIT.java
similarity index 96%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/BaseRDLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/BaseRDLE2EIT.java
index 6a1dc203270..bc622073181 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/BaseRDLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/BaseRDLE2EIT.java
@@ -21,7 +21,7 @@ import com.google.common.base.Splitter;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.engine.SingleITCase;
+import org.apache.shardingsphere.test.e2e.engine.SingleE2EIT;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -40,9 +40,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public abstract class BaseRDLIT extends SingleITCase {
+public abstract class BaseRDLE2EIT extends SingleE2EIT {
- public BaseRDLIT(final AssertionTestParameter testParameter) {
+ public BaseRDLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/GeneralRDLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/GeneralRDLE2EIT.java
similarity index 91%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/GeneralRDLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/GeneralRDLE2EIT.java
index 378771a0465..05e3427a854 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/GeneralRDLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rdl/GeneralRDLE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.rdl;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -35,15 +35,15 @@ import java.util.Collection;
import static org.junit.Assert.assertNotNull;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
-public final class GeneralRDLIT extends BaseRDLIT {
+public final class GeneralRDLE2EIT extends BaseRDLE2EIT {
- public GeneralRDLIT(final AssertionTestParameter testParameter) {
+ public GeneralRDLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.RDL);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RDL);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/BaseRQLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/BaseRQLE2EIT.java
similarity index 95%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/BaseRQLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/BaseRQLE2EIT.java
index 49e3346bfe4..b96bb24afdd 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/BaseRQLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/BaseRQLE2EIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.engine.rql;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.engine.SingleITCase;
+import org.apache.shardingsphere.test.e2e.engine.SingleE2EIT;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import java.sql.ResultSet;
@@ -34,9 +34,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public abstract class BaseRQLIT extends SingleITCase {
+public abstract class BaseRQLE2EIT extends SingleE2EIT {
- public BaseRQLIT(final AssertionTestParameter testParameter) {
+ public BaseRQLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/GeneralRQLIT.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/GeneralRQLE2EIT.java
similarity index 89%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/GeneralRQLIT.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/GeneralRQLE2EIT.java
index d7407ca6bd2..438a729f204 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/GeneralRQLIT.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/rql/GeneralRQLE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.rql;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
@@ -33,15 +33,15 @@ import java.text.ParseException;
import java.util.Collection;
@ParallelRunningStrategy(ParallelLevel.CASE)
-public final class GeneralRQLIT extends BaseRQLIT {
+public final class GeneralRQLE2EIT extends BaseRQLE2EIT {
- public GeneralRQLIT(final AssertionTestParameter testParameter) {
+ public GeneralRQLE2EIT(final AssertionTestParameter testParameter) {
super(testParameter);
}
@Parameters(name = "{0}")
public static Collection<AssertionTestParameter> getTestParameters() {
- return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.RQL);
+ return E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RQL);
}
@Test
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
index d691c13a579..1d31e74360d 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.EnvironmentConstants;
import org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Collection;
@@ -42,7 +42,7 @@ public final class ClusterTestParameterArrayGenerator {
* @return assertion test parameter
*/
public static Collection<AssertionTestParameter> getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new ITTestParameterGenerator(ENV.getClusterEnvironment().getAdapters(), ENV.getScenarios(), EnvironmentConstants.CLUSTER_MODE,
+ return new E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(), ENV.getScenarios(), EnvironmentConstants.CLUSTER_MODE,
ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionTestParameter(sqlCommandType);
}
@@ -52,8 +52,8 @@ public final class ClusterTestParameterArrayGenerator {
* @param sqlCommandType SQL command type
* @return case parameter
*/
- public static Collection<ITTestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
- return new ITTestParameterGenerator(ENV.getClusterEnvironment().getAdapters(), ENV.getScenarios(), EnvironmentConstants.CLUSTER_MODE,
+ public static Collection<E2ETestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
+ return new E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(), ENV.getScenarios(), EnvironmentConstants.CLUSTER_MODE,
ENV.getClusterEnvironment().getDatabaseTypes()).getCaseTestParameter(sqlCommandType);
}
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ITTestParameterFactory.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
similarity index 92%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ITTestParameterFactory.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
index 18f7b40f930..d2b1b45e478 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ITTestParameterFactory.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
@@ -23,16 +23,16 @@ import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.EnvironmentConstants;
import org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Collection;
import java.util.LinkedList;
/**
- * IT test parameter factory.
+ * E2E test parameter factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ITTestParameterFactory {
+public final class E2ETestParameterFactory {
private static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
@@ -62,8 +62,8 @@ public final class ITTestParameterFactory {
* @param sqlCommandType SQL command type
* @return case test parameters
*/
- public static Collection<ITTestParameter> getCaseTestParameters(final SQLCommandType sqlCommandType) {
- Collection<ITTestParameter> result = new LinkedList<>();
+ public static Collection<E2ETestParameter> getCaseTestParameters(final SQLCommandType sqlCommandType) {
+ Collection<E2ETestParameter> result = new LinkedList<>();
for (String each : ENV.getRunModes()) {
if (EnvironmentConstants.STANDALONE_MODE.equalsIgnoreCase(each)) {
result.addAll(isDistSQLCommandType(sqlCommandType)
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ITTestParameterGenerator.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
similarity index 91%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ITTestParameterGenerator.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
index 87a2e35abc5..89714b157fd 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ITTestParameterGenerator.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.param.model.CaseTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Arrays;
import java.util.Collection;
@@ -41,10 +41,10 @@ import java.util.LinkedList;
import java.util.stream.Collectors;
/**
- * IT test parameter generator.
+ * E2E test parameter generator.
*/
@RequiredArgsConstructor
-public final class ITTestParameterGenerator {
+public final class E2ETestParameterGenerator {
private static final IntegrationTestCasesLoader TEST_CASES_LOADER = IntegrationTestCasesLoader.getInstance();
@@ -139,16 +139,16 @@ public final class ITTestParameterGenerator {
* @param sqlCommandType SQL command type
* @return case test parameter
*/
- public Collection<ITTestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
- Collection<ITTestParameter> result = new LinkedList<>();
+ public Collection<E2ETestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
+ Collection<E2ETestParameter> result = new LinkedList<>();
for (IntegrationTestCaseContext each : TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
result.addAll(getCaseTestParameter(each));
}
return result;
}
- private Collection<ITTestParameter> getCaseTestParameter(final IntegrationTestCaseContext testCaseContext) {
- Collection<ITTestParameter> result = new LinkedList<>();
+ private Collection<E2ETestParameter> getCaseTestParameter(final IntegrationTestCaseContext testCaseContext) {
+ Collection<E2ETestParameter> result = new LinkedList<>();
for (DatabaseType each : getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
if (envDatabaseTypes.contains(each)) {
result.addAll(getCaseTestParameter(testCaseContext, each));
@@ -157,15 +157,15 @@ public final class ITTestParameterGenerator {
return result;
}
- private Collection<ITTestParameter> getCaseTestParameter(final IntegrationTestCaseContext testCaseContext, final DatabaseType databaseType) {
- Collection<ITTestParameter> result = new LinkedList<>();
+ private Collection<E2ETestParameter> getCaseTestParameter(final IntegrationTestCaseContext testCaseContext, final DatabaseType databaseType) {
+ Collection<E2ETestParameter> result = new LinkedList<>();
for (String adapter : envAdapters) {
result.addAll(getCaseTestParameter(testCaseContext, adapter, databaseType));
}
return result;
}
- private Collection<ITTestParameter> getCaseTestParameter(final IntegrationTestCaseContext testCaseContext, final String adapter, final DatabaseType databaseType) {
+ private Collection<E2ETestParameter> getCaseTestParameter(final IntegrationTestCaseContext testCaseContext, final String adapter, final DatabaseType databaseType) {
Collection<String> scenarios = null == testCaseContext.getTestCase().getScenarioTypes() ? Collections.emptyList() : Arrays.asList(testCaseContext.getTestCase().getScenarioTypes().split(","));
return envScenarios.stream().filter(each -> scenarios.isEmpty() || scenarios.contains(each))
.map(each -> new CaseTestParameter(testCaseContext, adapter, each, envMode, databaseType)).collect(Collectors.toList());
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 2b1f0d4d47a..c579720edbc 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.Adapter
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.EnvironmentConstants;
import org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Collection;
import java.util.Collections;
@@ -50,7 +50,7 @@ public final class JdbcStandaloneTestParameterGenerator {
* @return assertion test parameter
*/
public static Collection<AssertionTestParameter> getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new ITTestParameterGenerator(ADAPTERS, ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, DATABASE_TYPES).getAssertionTestParameter(sqlCommandType);
+ return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, DATABASE_TYPES).getAssertionTestParameter(sqlCommandType);
}
/**
@@ -59,7 +59,7 @@ public final class JdbcStandaloneTestParameterGenerator {
* @param sqlCommandType SQL command type
* @return case test parameter
*/
- public static Collection<ITTestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
- return new ITTestParameterGenerator(ADAPTERS, ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, DATABASE_TYPES).getCaseTestParameter(sqlCommandType);
+ public static Collection<E2ETestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
+ return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, DATABASE_TYPES).getCaseTestParameter(sqlCommandType);
}
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index 2494f6f76ef..24f6ef9352e 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.EnvironmentConstants;
import org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Collection;
@@ -42,7 +42,7 @@ public final class ProxyStandaloneTestParameterGenerator {
* @return assertion test parameters
*/
public static Collection<AssertionTestParameter> getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new ITTestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
+ return new E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionTestParameter(sqlCommandType);
}
@@ -52,8 +52,8 @@ public final class ProxyStandaloneTestParameterGenerator {
* @param sqlCommandType SQL command type
* @return assertion test parameters
*/
- public static Collection<ITTestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
- return new ITTestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
+ public static Collection<E2ETestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
+ return new E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, ENV.getClusterEnvironment().getDatabaseTypes()).getCaseTestParameter(sqlCommandType);
}
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
index 6b9ec899bd9..282262787e4 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAss
*/
@RequiredArgsConstructor
@Getter
-public final class AssertionTestParameter implements ITTestParameter {
+public final class AssertionTestParameter implements E2ETestParameter {
private final IntegrationTestCaseContext testCaseContext;
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
index 9333f277d9f..14636fb99bd 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.test.e2e.cases.IntegrationTestCaseContext;
*/
@RequiredArgsConstructor
@Getter
-public final class CaseTestParameter implements ITTestParameter {
+public final class CaseTestParameter implements E2ETestParameter {
private final IntegrationTestCaseContext testCaseContext;
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/ITTestParameter.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
similarity index 96%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/ITTestParameter.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
index 7ea8dc267a6..00da0442fa4 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/ITTestParameter.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
@@ -21,9 +21,9 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.e2e.cases.IntegrationTestCaseContext;
/**
- * IT test parameter.
+ * E2E test parameter.
*/
-public interface ITTestParameter {
+public interface E2ETestParameter {
/**
* Get test case context.
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
index a8abee7577a..efe24e2b7d2 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.framework.runner.executor.key;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
/**
@@ -31,7 +31,7 @@ public interface ParallelRunnerExecutorKeyProvider {
* @param testParameter test parameter
* @return parallel runner executor key
*/
- String getKey(ITTestParameter testParameter);
+ String getKey(E2ETestParameter testParameter);
/**
* Get parallel level.
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
index 94db9c16fb9..6d3d458d5d8 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.framework.runner.executor.key.impl;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.apache.shardingsphere.test.e2e.framework.runner.executor.key.ParallelRunnerExecutorKeyProvider;
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.test.e2e.framework.runner.executor.key.Parallel
public final class CaseParallelRunnerExecutorKeyProvider implements ParallelRunnerExecutorKeyProvider {
@Override
- public String getKey(final ITTestParameter testParameter) {
+ public String getKey(final E2ETestParameter testParameter) {
return testParameter.getDatabaseType().getType();
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
index ff542dd8b91..c744318be23 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.framework.runner.executor.key.impl;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.apache.shardingsphere.test.e2e.framework.runner.executor.key.ParallelRunnerExecutorKeyProvider;
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.test.e2e.framework.runner.executor.key.Parallel
public final class ScenarioParallelRunnerExecutorKeyProvider implements ParallelRunnerExecutorKeyProvider {
@Override
- public String getKey(final ITTestParameter testParameter) {
+ public String getKey(final E2ETestParameter testParameter) {
return String.join("-", testParameter.getAdapter(), testParameter.getScenario(), testParameter.getDatabaseType().getType());
}
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/param/RunnerParameters.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/param/RunnerParameters.java
index 2d4b4578a9f..66fdf9c4461 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/param/RunnerParameters.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/param/RunnerParameters.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.framework.runner.param;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.e2e.framework.param.model.ITTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters;
import java.lang.reflect.Field;
@@ -38,11 +38,11 @@ public final class RunnerParameters {
* @return test parameter
*/
@SneakyThrows(ReflectiveOperationException.class)
- public ITTestParameter getTestParameter() {
+ public E2ETestParameter getTestParameter() {
Field paramsField = BlockJUnit4ClassRunnerWithParameters.class.getDeclaredField("parameters");
paramsField.setAccessible(true);
Object[] params = (Object[]) paramsField.get(getRunner());
- return (ITTestParameter) params[0];
+ return (E2ETestParameter) params[0];
}
@SneakyThrows(ReflectiveOperationException.class)
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/watcher/ITWatcher.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/watcher/E2EWatcher.java
similarity index 95%
rename from test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/watcher/ITWatcher.java
rename to test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/watcher/E2EWatcher.java
index 04b34b70734..98f4db846c8 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/watcher/ITWatcher.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/watcher/E2EWatcher.java
@@ -25,10 +25,10 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
/**
- * Integration test watcher.
+ * E2E test watcher.
*/
@Slf4j
-public final class ITWatcher extends TestWatcher {
+public final class E2EWatcher extends TestWatcher {
@Override
protected void failed(final Throwable cause, final Description description) {