You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/03 08:03:47 UTC
[shardingsphere] branch master updated: Rename ITTestParameter (#22620)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 550e8172f7a Rename ITTestParameter (#22620)
550e8172f7a is described below
commit 550e8172f7a47dd1c887a05f64763573c331b19b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Dec 3 16:03:41 2022 +0800
Rename ITTestParameter (#22620)
---
.../compose/ContainerComposerRegistry.java | 18 ++---
.../compose/mode/ClusterContainerComposer.java | 14 ++--
.../compose/mode/StandaloneContainerComposer.java | 14 ++--
.../test/integration/engine/BaseITCase.java | 16 ++--
.../test/integration/engine/BatchITCase.java | 8 +-
.../test/integration/engine/SingleITCase.java | 12 +--
.../test/integration/engine/dal/BaseDALIT.java | 6 +-
.../test/integration/engine/dal/GeneralDALIT.java | 12 +--
.../test/integration/engine/dcl/BaseDCLIT.java | 6 +-
.../test/integration/engine/dcl/GeneralDCLIT.java | 12 +--
.../test/integration/engine/ddl/BaseDDLIT.java | 6 +-
.../test/integration/engine/ddl/GeneralDDLIT.java | 12 +--
.../integration/engine/dml/AdditionalDMLIT.java | 12 +--
.../test/integration/engine/dml/BaseDMLIT.java | 6 +-
.../test/integration/engine/dml/BatchDMLIT.java | 14 ++--
.../test/integration/engine/dml/GeneralDMLIT.java | 12 +--
.../integration/engine/dql/AdditionalDQLIT.java | 12 +--
.../test/integration/engine/dql/BaseDQLIT.java | 6 +-
.../test/integration/engine/dql/GeneralDQLIT.java | 12 +--
.../test/integration/engine/ral/BaseRALIT.java | 6 +-
.../test/integration/engine/ral/GeneralRALIT.java | 12 +--
.../test/integration/engine/rdl/BaseRDLIT.java | 6 +-
.../test/integration/engine/rdl/GeneralRDLIT.java | 12 +--
.../test/integration/engine/rql/BaseRQLIT.java | 6 +-
.../test/integration/engine/rql/GeneralRQLIT.java | 12 +--
...ava => ClusterTestParameterArrayGenerator.java} | 30 ++++----
...rayFactory.java => ITTestParameterFactory.java} | 36 ++++-----
...enerator.java => ITTestParameterGenerator.java} | 86 +++++++++++-----------
...a => JdbcStandaloneTestParameterGenerator.java} | 24 +++---
... => ProxyStandaloneTestParameterGenerator.java} | 28 +++----
...rizedArray.java => AssertionTestParameter.java} | 4 +-
...ameterizedArray.java => CaseTestParameter.java} | 4 +-
...arameterizedArray.java => ITTestParameter.java} | 6 +-
.../key/ParallelRunnerExecutorKeyProvider.java | 6 +-
.../CaseParallelRunnerExecutorKeyProvider.java | 6 +-
.../ScenarioParallelRunnerExecutorKeyProvider.java | 6 +-
.../framework/runner/param/RunnerParameters.java | 10 +--
.../runner/scheduler/ParallelRunnerScheduler.java | 2 +-
38 files changed, 256 insertions(+), 256 deletions(-)
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
index 8cc7bdf3edb..37f7cd282c3 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.test.integration.container.compose.mode.Cluster
import org.apache.shardingsphere.test.integration.container.compose.mode.StandaloneContainerComposer;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.AdapterContainerConstants;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.EnvironmentConstants;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import javax.sql.DataSource;
import java.util.HashMap;
@@ -39,29 +39,29 @@ public final class ContainerComposerRegistry implements AutoCloseable {
/**
* Get container composer.
*
- * @param parameterizedArray parameterized array
+ * @param testParameter test parameter
* @return composed container
*/
- public ContainerComposer getContainerComposer(final ITParameterizedArray parameterizedArray) {
- String key = parameterizedArray.getKey();
+ public ContainerComposer getContainerComposer(final ITTestParameter testParameter) {
+ String key = testParameter.getKey();
if (containerComposers.containsKey(key)) {
return containerComposers.get(key);
}
synchronized (containerComposers) {
if (!containerComposers.containsKey(key)) {
- containerComposers.put(key, createContainerComposer(parameterizedArray));
+ containerComposers.put(key, createContainerComposer(testParameter));
}
return containerComposers.get(key);
}
}
- private ContainerComposer createContainerComposer(final ITParameterizedArray parameterizedArray) {
- return isClusterMode(parameterizedArray) ? new ClusterContainerComposer(parameterizedArray) : new StandaloneContainerComposer(parameterizedArray);
+ private ContainerComposer createContainerComposer(final ITTestParameter testParameter) {
+ return isClusterMode(testParameter) ? new ClusterContainerComposer(testParameter) : new StandaloneContainerComposer(testParameter);
}
- private boolean isClusterMode(final ITParameterizedArray parameterizedArray) {
+ private boolean isClusterMode(final ITTestParameter testParameter) {
// TODO cluster mode often throw exception sometimes, issue is #15517
- return EnvironmentConstants.CLUSTER_MODE.equalsIgnoreCase(parameterizedArray.getMode()) && AdapterContainerConstants.PROXY.equalsIgnoreCase(parameterizedArray.getAdapter());
+ return EnvironmentConstants.CLUSTER_MODE.equalsIgnoreCase(testParameter.getMode()) && AdapterContainerConstants.PROXY.equalsIgnoreCase(testParameter.getAdapter());
}
@Override
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
index 3fdab05f7da..0efaacf12b3 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.test.integration.env.container.atomic.storage.S
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainerFactory;
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import org.apache.shardingsphere.test.integration.env.container.atomic.util.AdapterContainerUtil;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import javax.sql.DataSource;
import java.util.Map;
@@ -48,18 +48,18 @@ public final class ClusterContainerComposer implements ContainerComposer {
private final AdapterContainer adapterContainer;
- public ClusterContainerComposer(final ITParameterizedArray parameterizedArray) {
- String scenario = parameterizedArray.getScenario();
+ public ClusterContainerComposer(final ITTestParameter testParameter) {
+ String scenario = testParameter.getScenario();
containers = new ITContainers(scenario);
// TODO support other types of governance
governanceContainer = containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"));
// TODO add more version of databases
- storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), "", scenario,
- StorageContainerConfigurationFactory.newInstance(parameterizedArray.getDatabaseType())));
+ storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(testParameter.getDatabaseType(), "", scenario,
+ StorageContainerConfigurationFactory.newInstance(testParameter.getDatabaseType())));
AdaptorContainerConfiguration containerConfig = ProxyClusterContainerConfigurationFactory.newInstance(
- scenario, parameterizedArray.getDatabaseType(), AdapterContainerUtil.getAdapterContainerImage());
+ scenario, testParameter.getDatabaseType(), AdapterContainerUtil.getAdapterContainerImage());
AdapterContainer adapterContainer = AdapterContainerFactory.newInstance(
- parameterizedArray.getMode(), parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(), storageContainer, scenario, containerConfig);
+ testParameter.getMode(), testParameter.getAdapter(), testParameter.getDatabaseType(), storageContainer, scenario, containerConfig);
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer) adapterContainer).dependsOn(governanceContainer, storageContainer);
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneContainerComposer.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneContainerComposer.java
index 1b1b9c9c0f0..94e9ac58de5 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneContainerComposer.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneContainerComposer.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.test.integration.env.container.atomic.adapter.A
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainerFactory;
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import javax.sql.DataSource;
import java.util.Map;
@@ -42,14 +42,14 @@ public final class StandaloneContainerComposer implements ContainerComposer {
private final AdapterContainer adapterContainer;
- public StandaloneContainerComposer(final ITParameterizedArray parameterizedArray) {
- String scenario = parameterizedArray.getScenario();
+ public StandaloneContainerComposer(final ITTestParameter testParameter) {
+ String scenario = testParameter.getScenario();
containers = new ITContainers(scenario);
// TODO add more version of databases
- storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), "", scenario,
- StorageContainerConfigurationFactory.newInstance(parameterizedArray.getDatabaseType())));
- adapterContainer = containers.registerContainer(AdapterContainerFactory.newInstance(parameterizedArray.getMode(), parameterizedArray.getAdapter(),
- parameterizedArray.getDatabaseType(), storageContainer, scenario, ProxyStandaloneContainerConfigurationFactory.newInstance(scenario, parameterizedArray.getDatabaseType())));
+ storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(testParameter.getDatabaseType(), "", scenario,
+ StorageContainerConfigurationFactory.newInstance(testParameter.getDatabaseType())));
+ adapterContainer = containers.registerContainer(AdapterContainerFactory.newInstance(testParameter.getMode(), testParameter.getAdapter(),
+ testParameter.getDatabaseType(), storageContainer, scenario, ProxyStandaloneContainerConfigurationFactory.newInstance(scenario, testParameter.getDatabaseType())));
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer) adapterContainer).dependsOn(storageContainer);
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
index 10401a32e9a..53affd75f65 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTes
import org.apache.shardingsphere.test.integration.container.compose.ContainerComposer;
import org.apache.shardingsphere.test.integration.container.compose.ContainerComposerRegistry;
import org.apache.shardingsphere.test.integration.env.runtime.scenario.path.ScenarioDataPath;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelParameterized;
import org.h2.tools.RunScript;
import org.junit.AfterClass;
@@ -76,13 +76,13 @@ public abstract class BaseITCase {
private Map<String, DataSource> expectedDataSourceMap;
- public BaseITCase(final ITParameterizedArray parameterizedArray) {
- mode = parameterizedArray.getMode();
- scenario = parameterizedArray.getScenario();
- databaseType = parameterizedArray.getDatabaseType();
- itKey = parameterizedArray.getKey();
- itCase = parameterizedArray.getTestCaseContext().getTestCase();
- containerComposer = CONTAINER_COMPOSER_REGISTRY.getContainerComposer(parameterizedArray);
+ public BaseITCase(final ITTestParameter testParameter) {
+ mode = testParameter.getMode();
+ scenario = testParameter.getScenario();
+ databaseType = testParameter.getDatabaseType();
+ itKey = testParameter.getKey();
+ itCase = testParameter.getTestCaseContext().getTestCase();
+ containerComposer = CONTAINER_COMPOSER_REGISTRY.getContainerComposer(testParameter);
}
@Before
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
index 2fa6a288084..3567512c87d 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.env.runtime.scenario.path.ScenarioDataPath;
import org.apache.shardingsphere.test.integration.env.runtime.scenario.path.ScenarioDataPath.Type;
import org.apache.shardingsphere.test.integration.env.DataSetEnvironmentManager;
-import org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.CaseTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -58,9 +58,9 @@ public abstract class BatchITCase extends BaseITCase {
private DataSetEnvironmentManager dataSetEnvironmentManager;
- public BatchITCase(final CaseParameterizedArray parameterizedArray) {
- super(parameterizedArray);
- parentPath = parameterizedArray.getTestCaseContext().getParentPath();
+ public BatchITCase(final CaseTestParameter testParameter) {
+ super(testParameter);
+ parentPath = testParameter.getTestCaseContext().getParentPath();
}
@Before
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
index a5480d1d4ab..c1ab6ca531b 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTes
import org.apache.shardingsphere.test.integration.cases.dataset.DataSet;
import org.apache.shardingsphere.test.integration.cases.dataset.DataSetLoader;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.watcher.ITWatcher;
import org.junit.Rule;
@@ -46,13 +46,13 @@ public abstract class SingleITCase extends BaseITCase {
private final DataSet dataSet;
- public SingleITCase(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
- sqlExecuteType = parameterizedArray.getSqlExecuteType();
- assertion = parameterizedArray.getAssertion();
+ public SingleITCase(final AssertionTestParameter testParameter) {
+ super(testParameter);
+ sqlExecuteType = testParameter.getSqlExecuteType();
+ assertion = testParameter.getAssertion();
dataSet = null == assertion || null == assertion.getExpectedDataFile()
? null
- : DataSetLoader.load(parameterizedArray.getTestCaseContext().getParentPath(), getScenario(), getDatabaseType(), getMode(), assertion.getExpectedDataFile());
+ : DataSetLoader.load(testParameter.getTestCaseContext().getParentPath(), getScenario(), getDatabaseType(), getMode(), assertion.getExpectedDataFile());
}
protected final String getSQL() throws ParseException {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/BaseDALIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/BaseDALIT.java
index 980d0389815..c8e3f1b806e 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/BaseDALIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/BaseDALIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
@@ -38,8 +38,8 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseDALIT extends SingleITCase {
- public BaseDALIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDALIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
protected final void assertResultSet(final ResultSet resultSet) throws SQLException {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
index 7bae522a5f5..28b0a47f9af 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.integration.engine.dal;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -35,13 +35,13 @@ import java.util.Collection;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralDALIT extends BaseDALIT {
- public GeneralDALIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public GeneralDALIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DAL);
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DAL);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/BaseDCLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/BaseDCLIT.java
index e2562648db8..10bb8d6d0f4 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/BaseDCLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/BaseDCLIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.dcl;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
import org.apache.shardingsphere.test.integration.env.runtime.scenario.path.ScenarioCommonPath;
import org.apache.shardingsphere.test.integration.env.runtime.scenario.authority.AuthorityEnvironmentManager;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -28,8 +28,8 @@ public abstract class BaseDCLIT extends SingleITCase {
private AuthorityEnvironmentManager authorityEnvironmentManager;
- public BaseDCLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDCLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Before
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
index 0a42bb93cfb..090e70b9ad0 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.integration.engine.dcl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -36,13 +36,13 @@ import java.util.Collection;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralDCLIT extends BaseDCLIT {
- public GeneralDCLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public GeneralDCLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DCL);
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DCL);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
index ac6c5a86b2b..9029289ab60 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetIndex;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -50,8 +50,8 @@ import static org.junit.Assert.assertNotNull;
public abstract class BaseDDLIT extends SingleITCase {
- public BaseDDLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDDLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Before
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
index 0143f7f98cd..a76d813ea46 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.integration.engine.ddl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -38,13 +38,13 @@ import static org.junit.Assert.assertFalse;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralDDLIT extends BaseDDLIT {
- public GeneralDDLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public GeneralDDLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DDL);
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DDL);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
index 046ef2ee1b6..57e0b832d50 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
@@ -21,8 +21,8 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -41,14 +41,14 @@ import static org.junit.Assert.assertFalse;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class AdditionalDMLIT extends BaseDMLIT {
- public AdditionalDMLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public AdditionalDMLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
+ public static Collection<AssertionTestParameter> getTestParameters() {
if (IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases()) {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DML);
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DML);
}
return Collections.emptyList();
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
index 3b8b50beebd..6055afb4edb 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.test.integration.env.runtime.scenario.path.Scen
import org.apache.shardingsphere.test.integration.env.DataSetEnvironmentManager;
import org.apache.shardingsphere.test.integration.framework.database.DatabaseAssertionMetaData;
import org.apache.shardingsphere.test.integration.framework.database.DatabaseAssertionMetaDataFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -51,8 +51,8 @@ public abstract class BaseDMLIT extends SingleITCase {
private DataSetEnvironmentManager dataSetEnvironmentManager;
- public BaseDMLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDMLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Before
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
index 19397107184..14c4d8a24ab 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
@@ -21,9 +21,9 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.engine.BatchITCase;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.CaseTestParameter;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -41,13 +41,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class BatchDMLIT extends BatchITCase {
- public BatchDMLIT(final CaseParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BatchDMLIT(final CaseTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<ITParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getCaseParameterized(SQLCommandType.DML);
+ public static Collection<ITTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getCaseTestParameters(SQLCommandType.DML);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
index 907d8397ce7..cc1fe414fb0 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.integration.engine.dml;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -39,13 +39,13 @@ import static org.junit.Assert.assertFalse;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralDMLIT extends BaseDMLIT {
- public GeneralDMLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public GeneralDMLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DML);
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DML);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
index af95fd765c3..1052ee80c4e 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
@@ -21,8 +21,8 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -42,13 +42,13 @@ import static org.junit.Assert.assertTrue;
@ParallelRunningStrategy(ParallelLevel.CASE)
public final class AdditionalDQLIT extends BaseDQLIT {
- public AdditionalDQLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public AdditionalDQLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases() ? ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DQL) : Collections.emptyList();
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases() ? ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DQL) : Collections.emptyList();
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
index dde0d5e82d5..1a3301c5f26 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.test.integration.engine.SingleITCase;
import org.apache.shardingsphere.test.integration.env.DataSetEnvironmentManager;
import org.apache.shardingsphere.test.integration.env.runtime.scenario.path.ScenarioDataPath;
import org.apache.shardingsphere.test.integration.env.runtime.scenario.path.ScenarioDataPath.Type;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.junit.Before;
import javax.sql.DataSource;
@@ -49,8 +49,8 @@ public abstract class BaseDQLIT extends SingleITCase {
private DataSource expectedDataSource;
- public BaseDQLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDQLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Before
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
index c0e3ccbec72..5a40a9a7f05 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.integration.engine.dql;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -40,13 +40,13 @@ import static org.junit.Assert.assertTrue;
@ParallelRunningStrategy(ParallelLevel.CASE)
public final class GeneralDQLIT extends BaseDQLIT {
- public GeneralDQLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public GeneralDQLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DQL);
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.DQL);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
index 05ee074d037..efb9aedfb09 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -42,8 +42,8 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseRALIT extends SingleITCase {
- public BaseRALIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseRALIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Before
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
index 38cfc0f5090..1e339e3471b 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.integration.engine.ral;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -35,13 +35,13 @@ import java.util.Collection;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralRALIT extends BaseRALIT {
- public GeneralRALIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public GeneralRALIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RAL);
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.RAL);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
index a83ad703d9b..2ac91f43ab0 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.junit.After;
import org.junit.Before;
@@ -42,8 +42,8 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseRDLIT extends SingleITCase {
- public BaseRDLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseRDLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Before
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
index 3fbab3fb4f1..7e07e3e46a4 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.integration.engine.rdl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -37,13 +37,13 @@ import static org.junit.Assert.assertNotNull;
@ParallelRunningStrategy(ParallelLevel.SCENARIO)
public final class GeneralRDLIT extends BaseRDLIT {
- public GeneralRDLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public GeneralRDLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RDL);
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.RDL);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/BaseRQLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/BaseRQLIT.java
index 93d37637a86..7ae72e41f24 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/BaseRQLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/BaseRQLIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
@@ -36,8 +36,8 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseRQLIT extends SingleITCase {
- public BaseRQLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseRQLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
protected final void assertResultSet(final ResultSet resultSet) throws SQLException {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
index d1f2bd754e8..ecbe56972a0 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.integration.engine.rql;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.array.ITTestParameterFactory;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.junit.Test;
@@ -35,13 +35,13 @@ import java.util.Collection;
@ParallelRunningStrategy(ParallelLevel.CASE)
public final class GeneralRQLIT extends BaseRQLIT {
- public GeneralRQLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public GeneralRQLIT(final AssertionTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RQL);
+ public static Collection<AssertionTestParameter> getTestParameters() {
+ return ITTestParameterFactory.getAssertionTestParameters(SQLCommandType.RQL);
}
@Test
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ClusterParameterizedArrayGenerator.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ClusterTestParameterArrayGenerator.java
similarity index 63%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ClusterParameterizedArrayGenerator.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ClusterTestParameterArrayGenerator.java
index 8d9d102b7c1..b431412fa3d 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ClusterParameterizedArrayGenerator.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -22,38 +22,38 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.EnvironmentConstants;
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import java.util.Collection;
/**
- * Parameterized array generator for cluster mode.
+ * Test parameter generator for cluster mode.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ClusterParameterizedArrayGenerator {
+public final class ClusterTestParameterArrayGenerator {
private static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
/**
- * Get assertion parameterized array.
+ * Get assertion test parameter.
*
* @param sqlCommandType SQL command type
- * @return assertion parameterized array
+ * @return assertion test parameter
*/
- public static Collection<AssertionParameterizedArray> getAssertionParameterized(final SQLCommandType sqlCommandType) {
- return new ParameterizedArrayGenerator(ENV.getClusterEnvironment().getAdapters(), ENV.getScenarios(), EnvironmentConstants.CLUSTER_MODE,
- ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionParameterized(sqlCommandType);
+ public static Collection<AssertionTestParameter> getAssertionTestParameter(final SQLCommandType sqlCommandType) {
+ return new ITTestParameterGenerator(ENV.getClusterEnvironment().getAdapters(), ENV.getScenarios(), EnvironmentConstants.CLUSTER_MODE,
+ ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionTestParameter(sqlCommandType);
}
/**
- * Get case parameterized array.
+ * Get case test parameter.
*
- * @param sqlCommandType SQL commandEnvironmentConstants type
- * @return case parameterized array
+ * @param sqlCommandType SQL command type
+ * @return case parameter
*/
- public static Collection<ITParameterizedArray> getCaseParameterized(final SQLCommandType sqlCommandType) {
- return new ParameterizedArrayGenerator(ENV.getClusterEnvironment().getAdapters(), ENV.getScenarios(), EnvironmentConstants.CLUSTER_MODE,
- ENV.getClusterEnvironment().getDatabaseTypes()).getCaseParameterized(sqlCommandType);
+ public static Collection<ITTestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
+ return new ITTestParameterGenerator(ENV.getClusterEnvironment().getAdapters(), ENV.getScenarios(), EnvironmentConstants.CLUSTER_MODE,
+ ENV.getClusterEnvironment().getDatabaseTypes()).getCaseTestParameter(sqlCommandType);
}
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ParameterizedArrayFactory.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ITTestParameterFactory.java
similarity index 65%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ParameterizedArrayFactory.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ITTestParameterFactory.java
index f7b0a484f8c..763eb41365a 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ParameterizedArrayFactory.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ITTestParameterFactory.java
@@ -22,55 +22,55 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.EnvironmentConstants;
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import java.util.Collection;
import java.util.LinkedList;
/**
- * Parameterized array factory.
+ * IT test parameter factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ParameterizedArrayFactory {
+public final class ITTestParameterFactory {
private static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
/**
- * Get assertion parameterized array.
+ * Get assertion test parameters.
*
* @param sqlCommandType SQL command type
- * @return assertion parameterized array
+ * @return assertion test parameters
*/
- public static Collection<AssertionParameterizedArray> getAssertionParameterized(final SQLCommandType sqlCommandType) {
- Collection<AssertionParameterizedArray> result = new LinkedList<>();
+ public static Collection<AssertionTestParameter> getAssertionTestParameters(final SQLCommandType sqlCommandType) {
+ Collection<AssertionTestParameter> result = new LinkedList<>();
for (String each : ENV.getRunModes()) {
if (EnvironmentConstants.STANDALONE_MODE.equalsIgnoreCase(each)) {
result.addAll(isDistSQLCommandType(sqlCommandType)
- ? ProxyStandaloneParameterizedArrayGenerator.getAssertionParameterized(sqlCommandType)
- : JdbcStandaloneParameterizedArrayGenerator.getAssertionParameterized(sqlCommandType));
+ ? ProxyStandaloneTestParameterGenerator.getAssertionTestParameter(sqlCommandType)
+ : JdbcStandaloneTestParameterGenerator.getAssertionTestParameter(sqlCommandType));
} else if (EnvironmentConstants.CLUSTER_MODE.equalsIgnoreCase(each)) {
- result.addAll(ClusterParameterizedArrayGenerator.getAssertionParameterized(sqlCommandType));
+ result.addAll(ClusterTestParameterArrayGenerator.getAssertionTestParameter(sqlCommandType));
}
}
return result;
}
/**
- * Get case parameterized array.
+ * Get case test parameters.
*
* @param sqlCommandType SQL command type
- * @return case parameterized array
+ * @return case test parameters
*/
- public static Collection<ITParameterizedArray> getCaseParameterized(final SQLCommandType sqlCommandType) {
- Collection<ITParameterizedArray> result = new LinkedList<>();
+ public static Collection<ITTestParameter> getCaseTestParameters(final SQLCommandType sqlCommandType) {
+ Collection<ITTestParameter> result = new LinkedList<>();
for (String each : ENV.getRunModes()) {
if (EnvironmentConstants.STANDALONE_MODE.equalsIgnoreCase(each)) {
result.addAll(isDistSQLCommandType(sqlCommandType)
- ? ProxyStandaloneParameterizedArrayGenerator.getCaseParameterized(sqlCommandType)
- : JdbcStandaloneParameterizedArrayGenerator.getCaseParameterized(sqlCommandType));
+ ? ProxyStandaloneTestParameterGenerator.getCaseTestParameter(sqlCommandType)
+ : JdbcStandaloneTestParameterGenerator.getCaseTestParameter(sqlCommandType));
} else if (EnvironmentConstants.CLUSTER_MODE.equalsIgnoreCase(each)) {
- result.addAll(ClusterParameterizedArrayGenerator.getCaseParameterized(sqlCommandType));
+ result.addAll(ClusterTestParameterArrayGenerator.getCaseTestParameter(sqlCommandType));
}
}
return result;
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ParameterizedArrayGenerator.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ITTestParameterGenerator.java
similarity index 59%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ParameterizedArrayGenerator.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ITTestParameterGenerator.java
index 4711d57dbac..a801f4d74ec 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ParameterizedArrayGenerator.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ITTestParameterGenerator.java
@@ -30,9 +30,9 @@ import org.apache.shardingsphere.test.integration.cases.IntegrationTestCasesLoad
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-import org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.integration.framework.param.model.CaseTestParameter;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import java.util.Arrays;
import java.util.Collection;
@@ -41,10 +41,10 @@ import java.util.LinkedList;
import java.util.stream.Collectors;
/**
- * Parameterized array generator.
+ * IT test parameter generator.
*/
@RequiredArgsConstructor
-public final class ParameterizedArrayGenerator {
+public final class ITTestParameterGenerator {
private static final IntegrationTestCasesLoader TEST_CASES_LOADER = IntegrationTestCasesLoader.getInstance();
@@ -57,67 +57,67 @@ public final class ParameterizedArrayGenerator {
private final Collection<DatabaseType> envDatabaseTypes;
/**
- * Get assertion parameterized array.
+ * Get assertion test parameter.
*
* @param sqlCommandType SQL command type
- * @return assertion parameterized array
+ * @return assertion test parameter
*/
- public Collection<AssertionParameterizedArray> getAssertionParameterized(final SQLCommandType sqlCommandType) {
- Collection<AssertionParameterizedArray> result = new LinkedList<>();
+ public Collection<AssertionTestParameter> getAssertionTestParameter(final SQLCommandType sqlCommandType) {
+ Collection<AssertionTestParameter> result = new LinkedList<>();
for (IntegrationTestCaseContext each : TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
- result.addAll(getAssertionParameterizedArray(each, sqlCommandType));
+ result.addAll(getAssertionTestParameter(each, sqlCommandType));
}
return result;
}
- private Collection<AssertionParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext, final SQLCommandType sqlCommandType) {
- Collection<AssertionParameterizedArray> result = new LinkedList<>();
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final IntegrationTestCaseContext testCaseContext, final SQLCommandType sqlCommandType) {
+ Collection<AssertionTestParameter> result = new LinkedList<>();
for (DatabaseType each : getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
if (envDatabaseTypes.contains(each)) {
- result.addAll(getAssertionParameterizedArray(testCaseContext, each, sqlCommandType));
+ result.addAll(getAssertionTestParameter(testCaseContext, each, sqlCommandType));
}
}
return result;
}
- private Collection<AssertionParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext,
- final DatabaseType databaseType, final SQLCommandType sqlCommandType) {
- Collection<AssertionParameterizedArray> result = new LinkedList<>();
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final IntegrationTestCaseContext testCaseContext,
+ final DatabaseType databaseType, final SQLCommandType sqlCommandType) {
+ Collection<AssertionTestParameter> result = new LinkedList<>();
for (SQLExecuteType each : SQLExecuteType.values()) {
if (!sqlCommandType.isLiteralOnly() || SQLExecuteType.Literal == each) {
- result.addAll(getAssertionParameterizedArray(testCaseContext, databaseType, each, sqlCommandType));
+ result.addAll(getAssertionTestParameter(testCaseContext, databaseType, each, sqlCommandType));
}
}
return result;
}
- private Collection<AssertionParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext,
- final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final SQLCommandType sqlCommandType) {
- Collection<AssertionParameterizedArray> result = new LinkedList<>();
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final IntegrationTestCaseContext testCaseContext,
+ final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final SQLCommandType sqlCommandType) {
+ Collection<AssertionTestParameter> result = new LinkedList<>();
for (IntegrationTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
- result.addAll(getAssertionParameterizedArray(testCaseContext, databaseType, sqlExecuteType, each, sqlCommandType));
+ result.addAll(getAssertionTestParameter(testCaseContext, databaseType, sqlExecuteType, each, sqlCommandType));
}
return result;
}
- private Collection<AssertionParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext,
- final DatabaseType databaseType, final SQLExecuteType sqlExecuteType,
- final IntegrationTestCaseAssertion assertion, final SQLCommandType sqlCommandType) {
- Collection<AssertionParameterizedArray> result = new LinkedList<>();
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final IntegrationTestCaseContext testCaseContext,
+ final DatabaseType databaseType, final SQLExecuteType sqlExecuteType,
+ final IntegrationTestCaseAssertion assertion, final SQLCommandType sqlCommandType) {
+ Collection<AssertionTestParameter> result = new LinkedList<>();
for (String each : envAdapters) {
if (sqlCommandType.getRunningAdaptors().contains(each)) {
- result.addAll(getAssertionParameterizedArray(testCaseContext, assertion, each, databaseType, sqlExecuteType, sqlCommandType));
+ result.addAll(getAssertionTestParameter(testCaseContext, assertion, each, databaseType, sqlExecuteType, sqlCommandType));
}
}
return result;
}
- private Collection<AssertionParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext, final IntegrationTestCaseAssertion assertion,
- final String adapter, final DatabaseType databaseType,
- final SQLExecuteType sqlExecuteType, final SQLCommandType sqlCommandType) {
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final IntegrationTestCaseContext testCaseContext, final IntegrationTestCaseAssertion assertion,
+ final String adapter, final DatabaseType databaseType,
+ final SQLExecuteType sqlExecuteType, final SQLCommandType sqlCommandType) {
Collection<String> scenarios = null == testCaseContext.getTestCase().getScenarioTypes() ? Collections.emptyList() : Arrays.asList(testCaseContext.getTestCase().getScenarioTypes().split(","));
return envScenarios.stream().filter(each -> filterScenarios(each, scenarios, sqlCommandType.getSqlStatementClass()))
- .map(each -> new AssertionParameterizedArray(testCaseContext, assertion, adapter, each, envMode, databaseType, sqlExecuteType)).collect(Collectors.toList());
+ .map(each -> new AssertionTestParameter(testCaseContext, assertion, adapter, each, envMode, databaseType, sqlExecuteType)).collect(Collectors.toList());
}
private boolean filterScenarios(final String scenario, final Collection<String> scenarios, final Class<? extends SQLStatement> sqlStatementClass) {
@@ -134,41 +134,41 @@ public final class ParameterizedArrayGenerator {
}
/**
- * Get case parameterized array.
+ * Get case test parameter.
*
* @param sqlCommandType SQL command type
- * @return case parameterized array
+ * @return case test parameter
*/
- public Collection<ITParameterizedArray> getCaseParameterized(final SQLCommandType sqlCommandType) {
- Collection<ITParameterizedArray> result = new LinkedList<>();
+ public Collection<ITTestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
+ Collection<ITTestParameter> result = new LinkedList<>();
for (IntegrationTestCaseContext each : TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
- result.addAll(getCaseParameterizedArray(each));
+ result.addAll(getCaseTestParameter(each));
}
return result;
}
- private Collection<ITParameterizedArray> getCaseParameterizedArray(final IntegrationTestCaseContext testCaseContext) {
- Collection<ITParameterizedArray> result = new LinkedList<>();
+ private Collection<ITTestParameter> getCaseTestParameter(final IntegrationTestCaseContext testCaseContext) {
+ Collection<ITTestParameter> result = new LinkedList<>();
for (DatabaseType each : getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
if (envDatabaseTypes.contains(each)) {
- result.addAll(getCaseParameterizedArray(testCaseContext, each));
+ result.addAll(getCaseTestParameter(testCaseContext, each));
}
}
return result;
}
- private Collection<ITParameterizedArray> getCaseParameterizedArray(final IntegrationTestCaseContext testCaseContext, final DatabaseType databaseType) {
- Collection<ITParameterizedArray> result = new LinkedList<>();
+ private Collection<ITTestParameter> getCaseTestParameter(final IntegrationTestCaseContext testCaseContext, final DatabaseType databaseType) {
+ Collection<ITTestParameter> result = new LinkedList<>();
for (String adapter : envAdapters) {
- result.addAll(getCaseParameterizedArray(testCaseContext, adapter, databaseType));
+ result.addAll(getCaseTestParameter(testCaseContext, adapter, databaseType));
}
return result;
}
- private Collection<ITParameterizedArray> getCaseParameterizedArray(final IntegrationTestCaseContext testCaseContext, final String adapter, final DatabaseType databaseType) {
+ private Collection<ITTestParameter> 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 CaseParameterizedArray(testCaseContext, adapter, each, envMode, databaseType)).collect(Collectors.toList());
+ .map(each -> new CaseTestParameter(testCaseContext, adapter, each, envMode, databaseType)).collect(Collectors.toList());
}
private static Collection<DatabaseType> getDatabaseTypes(final String databaseTypes) {
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/JdbcStandaloneParameterizedArrayGenerator.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/JdbcStandaloneTestParameterGenerator.java
similarity index 70%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/JdbcStandaloneParameterizedArrayGenerator.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 93909222316..e21007b0924 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/JdbcStandaloneParameterizedArrayGenerator.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -25,17 +25,17 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.AdapterContainerConstants;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.EnvironmentConstants;
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import java.util.Collection;
import java.util.Collections;
/**
- * JDBC Parameterized array generator for standalone mode.
+ * JDBC test parameter generator for standalone mode.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class JdbcStandaloneParameterizedArrayGenerator {
+public final class JdbcStandaloneTestParameterGenerator {
private static final Collection<String> ADAPTERS = Collections.singleton(AdapterContainerConstants.JDBC);
@@ -44,22 +44,22 @@ public final class JdbcStandaloneParameterizedArrayGenerator {
private static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
/**
- * Get assertion parameterized array.
+ * Get assertion test parameter.
*
* @param sqlCommandType SQL command type
- * @return assertion parameterized array
+ * @return assertion test parameter
*/
- public static Collection<AssertionParameterizedArray> getAssertionParameterized(final SQLCommandType sqlCommandType) {
- return new ParameterizedArrayGenerator(ADAPTERS, ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, DATABASE_TYPES).getAssertionParameterized(sqlCommandType);
+ public static Collection<AssertionTestParameter> getAssertionTestParameter(final SQLCommandType sqlCommandType) {
+ return new ITTestParameterGenerator(ADAPTERS, ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, DATABASE_TYPES).getAssertionTestParameter(sqlCommandType);
}
/**
- * Get case parameterized array.
+ * Get case test parameter.
*
* @param sqlCommandType SQL command type
- * @return case parameterized array
+ * @return case test parameter
*/
- public static Collection<ITParameterizedArray> getCaseParameterized(final SQLCommandType sqlCommandType) {
- return new ParameterizedArrayGenerator(ADAPTERS, ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, DATABASE_TYPES).getCaseParameterized(sqlCommandType);
+ public static Collection<ITTestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
+ return new ITTestParameterGenerator(ADAPTERS, ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, DATABASE_TYPES).getCaseTestParameter(sqlCommandType);
}
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ProxyStandaloneParameterizedArrayGenerator.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ProxyStandaloneTestParameterGenerator.java
similarity index 69%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ProxyStandaloneParameterizedArrayGenerator.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index a28e1b0a71c..fd1cab0b73f 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ProxyStandaloneParameterizedArrayGenerator.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -22,38 +22,38 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.EnvironmentConstants;
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import java.util.Collection;
/**
- * PROXY Parameterized array generator for standalone mode.
+ * PROXY test parameter generator for standalone mode.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ProxyStandaloneParameterizedArrayGenerator {
+public final class ProxyStandaloneTestParameterGenerator {
private static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
/**
- * Get assertion parameterized array.
+ * Get assertion test parameters.
*
* @param sqlCommandType SQL command type
- * @return assertion parameterized array
+ * @return assertion test parameters
*/
- public static Collection<AssertionParameterizedArray> getAssertionParameterized(final SQLCommandType sqlCommandType) {
- return new ParameterizedArrayGenerator(ENV.getClusterEnvironment().getAdapters(),
- ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionParameterized(sqlCommandType);
+ public static Collection<AssertionTestParameter> getAssertionTestParameter(final SQLCommandType sqlCommandType) {
+ return new ITTestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
+ ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionTestParameter(sqlCommandType);
}
/**
- * Get case parameterized array.
+ * Get case test parameters.
*
* @param sqlCommandType SQL command type
- * @return case parameterized array
+ * @return assertion test parameters
*/
- public static Collection<ITParameterizedArray> getCaseParameterized(final SQLCommandType sqlCommandType) {
- return new ParameterizedArrayGenerator(ENV.getClusterEnvironment().getAdapters(),
- ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, ENV.getClusterEnvironment().getDatabaseTypes()).getCaseParameterized(sqlCommandType);
+ public static Collection<ITTestParameter> getCaseTestParameter(final SQLCommandType sqlCommandType) {
+ return new ITTestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
+ ENV.getScenarios(), EnvironmentConstants.STANDALONE_MODE, ENV.getClusterEnvironment().getDatabaseTypes()).getCaseTestParameter(sqlCommandType);
}
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionTestParameter.java
similarity index 92%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionTestParameter.java
index 60ee42eb4eb..fbea38c35a9 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionTestParameter.java
@@ -25,11 +25,11 @@ import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
/**
- * Parameterized array of assertion based integration test.
+ * Assertion test parameter.
*/
@RequiredArgsConstructor
@Getter
-public final class AssertionParameterizedArray implements ITParameterizedArray {
+public final class AssertionTestParameter implements ITTestParameter {
private final IntegrationTestCaseContext testCaseContext;
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseTestParameter.java
similarity index 92%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseTestParameter.java
index 7c44746e797..21b18f9dbff 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseTestParameter.java
@@ -23,11 +23,11 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
/**
- * Parameterized array of case based integration test.
+ * Case test parameter.
*/
@RequiredArgsConstructor
@Getter
-public final class CaseParameterizedArray implements ITParameterizedArray {
+public final class CaseTestParameter implements ITTestParameter {
private final IntegrationTestCaseContext testCaseContext;
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITParameterizedArray.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITTestParameter.java
similarity index 94%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITParameterizedArray.java
rename to test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITTestParameter.java
index 094ef6b471a..498daa0c1b5 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITParameterizedArray.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITTestParameter.java
@@ -21,9 +21,9 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
/**
- * IT parameterized array.
+ * IT test parameter.
*/
-public interface ITParameterizedArray {
+public interface ITTestParameter {
/**
* Get test case context.
@@ -63,7 +63,7 @@ public interface ITParameterizedArray {
/**
* Get key.
*
- * @return key of parameterized array
+ * @return key of test parameter
*/
default String getKey() {
return String.join("-", getScenario(), getAdapter(), getDatabaseType().getType());
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
index b2c74831983..0f853573c9f 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.integration.framework.runner.executor.key;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
/**
@@ -28,10 +28,10 @@ public interface ParallelRunnerExecutorKeyProvider {
/**
* Get key.
*
- * @param parameterizedArray parameterized array
+ * @param testParameter test parameter
* @return parallel runner executor key
*/
- String getKey(ITParameterizedArray parameterizedArray);
+ String getKey(ITTestParameter testParameter);
/**
* Get parallel level.
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
index a8830164264..3126dbf0348 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.integration.framework.runner.executor.key.impl;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.executor.key.ParallelRunnerExecutorKeyProvider;
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.test.integration.framework.runner.executor.key.
public final class CaseParallelRunnerExecutorKeyProvider implements ParallelRunnerExecutorKeyProvider {
@Override
- public String getKey(final ITParameterizedArray parameterizedArray) {
- return parameterizedArray.getDatabaseType().getType();
+ public String getKey(final ITTestParameter testParameter) {
+ return testParameter.getDatabaseType().getType();
}
@Override
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
index 8b0325b106b..6736e0a0a84 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.integration.framework.runner.executor.key.impl;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import org.apache.shardingsphere.test.integration.framework.runner.ParallelRunningStrategy.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.executor.key.ParallelRunnerExecutorKeyProvider;
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.test.integration.framework.runner.executor.key.
public final class ScenarioParallelRunnerExecutorKeyProvider implements ParallelRunnerExecutorKeyProvider {
@Override
- public String getKey(final ITParameterizedArray parameterizedArray) {
- return String.join("-", parameterizedArray.getAdapter(), parameterizedArray.getScenario(), parameterizedArray.getDatabaseType().getType());
+ public String getKey(final ITTestParameter testParameter) {
+ return String.join("-", testParameter.getAdapter(), testParameter.getScenario(), testParameter.getDatabaseType().getType());
}
@Override
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/param/RunnerParameters.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/param/RunnerParameters.java
index e9a9c16a00f..168025edf59 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/param/RunnerParameters.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/param/RunnerParameters.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.framework.runner.param;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
+import org.apache.shardingsphere.test.integration.framework.param.model.ITTestParameter;
import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters;
import java.lang.reflect.Field;
@@ -33,16 +33,16 @@ public final class RunnerParameters {
private final Runnable childStatement;
/**
- * Get parameterized array.
+ * Get test parameter.
*
- * @return parameterized array
+ * @return test parameter
*/
@SneakyThrows(ReflectiveOperationException.class)
- public ITParameterizedArray getParameterizedArray() {
+ public ITTestParameter getTestParameter() {
Field paramsField = BlockJUnit4ClassRunnerWithParameters.class.getDeclaredField("parameters");
paramsField.setAccessible(true);
Object[] params = (Object[]) paramsField.get(getRunner());
- return (ITParameterizedArray) params[0];
+ return (ITTestParameter) params[0];
}
@SneakyThrows(ReflectiveOperationException.class)
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/scheduler/ParallelRunnerScheduler.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/scheduler/ParallelRunnerScheduler.java
index 638cb00add9..1d7ae8be4d9 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/scheduler/ParallelRunnerScheduler.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/scheduler/ParallelRunnerScheduler.java
@@ -36,7 +36,7 @@ public final class ParallelRunnerScheduler implements RunnerScheduler {
@Override
public void schedule(final Runnable childStatement) {
- executor.execute(ParallelRunnerExecutorKeyProviderFactory.newInstance(parallelLevel).getKey(new RunnerParameters(childStatement).getParameterizedArray()), childStatement);
+ executor.execute(ParallelRunnerExecutorKeyProviderFactory.newInstance(parallelLevel).getKey(new RunnerParameters(childStatement).getTestParameter()), childStatement);
}
@Override