You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/01/01 04:07:57 UTC
[shardingsphere] branch master updated: Rename rule type to
scenario (#8853)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 81f3807 Rename rule type to scenario (#8853)
81f3807 is described below
commit 81f3807bb77ecb51eb7961878cbc1d4539f53ef6
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Jan 1 12:07:29 2021 +0800
Rename rule type to scenario (#8853)
* Rename test case name for BatchDMLIT
* Rename rule type to scenario
---
.../integration/cases/dataset/DataSetLoader.java | 14 +++++-----
.../test/integration/engine/it/BaseIT.java | 12 ++++-----
.../test/integration/engine/it/BatchIT.java | 8 +++---
.../test/integration/engine/it/SingleIT.java | 6 ++---
.../test/integration/engine/it/dcl/BaseDCLIT.java | 8 +++---
.../integration/engine/it/dcl/GeneralDCLIT.java | 6 ++---
.../test/integration/engine/it/ddl/BaseDDLIT.java | 6 ++---
.../integration/engine/it/ddl/GeneralDDLIT.java | 4 +--
.../integration/engine/it/dml/AdditionalDMLIT.java | 18 ++++++-------
.../test/integration/engine/it/dml/BaseDMLIT.java | 6 ++---
.../test/integration/engine/it/dml/BatchDMLIT.java | 15 +++++------
.../integration/engine/it/dml/GeneralDMLIT.java | 12 ++++-----
.../integration/engine/it/dql/AdditionalDQLIT.java | 4 +--
.../test/integration/engine/it/dql/BaseDQLIT.java | 8 +++---
.../integration/engine/it/dql/GeneralDQLIT.java | 4 +--
.../engine/param/IntegrateTestParameters.java | 4 +--
.../test/integration/env/EnvironmentPath.java | 28 ++++++++++----------
.../integration/env/IntegrateTestEnvironment.java | 4 +--
.../builder/ActualDataSourceBuilder.java | 6 ++---
.../env/schema/SchemaEnvironmentManager.java | 30 +++++++++++-----------
.../resources/integrate/env-jdbc-ci.properties | 4 +--
.../resources/integrate/env-jdbc-local.properties | 4 +--
.../test/resources/integrate/env-proxy.properties | 4 +--
23 files changed, 107 insertions(+), 108 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSetLoader.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSetLoader.java
index 352d4ae..384d55b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSetLoader.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/dataset/DataSetLoader.java
@@ -40,24 +40,24 @@ public final class DataSetLoader {
* Load data set.
*
* @param parentPath parent path of data set file
- * @param ruleType rule type
+ * @param scenario scenario
* @param databaseType database type
* @param dataSetFile name of data set file
* @return data set
*/
@SneakyThrows({JAXBException.class, IOException.class})
- public static DataSet load(final String parentPath, final String ruleType, final DatabaseType databaseType, final String dataSetFile) {
- try (FileReader reader = new FileReader(getFile(parentPath, ruleType, databaseType, dataSetFile))) {
+ public static DataSet load(final String parentPath, final String scenario, final DatabaseType databaseType, final String dataSetFile) {
+ try (FileReader reader = new FileReader(getFile(parentPath, scenario, databaseType, dataSetFile))) {
return (DataSet) JAXBContext.newInstance(DataSet.class).createUnmarshaller().unmarshal(reader);
}
}
- private static String getFile(final String parentPath, final String ruleType, final DatabaseType databaseType, final String dataSetFile) {
- String result = String.join(File.separator, parentPath, DATA_SET_FOLDER_NAME, ruleType, databaseType.getName().toLowerCase(), dataSetFile);
+ private static String getFile(final String parentPath, final String scenario, final DatabaseType databaseType, final String dataSetFile) {
+ String result = String.join(File.separator, parentPath, DATA_SET_FOLDER_NAME, scenario, databaseType.getName().toLowerCase(), dataSetFile);
if (new File(result).exists()) {
return result;
}
- result = String.join(File.separator, parentPath, DATA_SET_FOLDER_NAME, ruleType, dataSetFile);
+ result = String.join(File.separator, parentPath, DATA_SET_FOLDER_NAME, scenario, dataSetFile);
if (new File(result).exists()) {
return result;
}
@@ -65,6 +65,6 @@ public final class DataSetLoader {
if (new File(result).exists()) {
return result;
}
- throw new IllegalArgumentException(String.format("%s not found, path=%s, ruleType=%s, databaseType=%s", dataSetFile, parentPath, ruleType, databaseType.getName()));
+ throw new IllegalArgumentException(String.format("%s not found, path=%s, scenario=%s, databaseType=%s", dataSetFile, parentPath, scenario, databaseType.getName()));
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseIT.java
index 5b2182e..7b3386d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseIT.java
@@ -47,7 +47,7 @@ public abstract class BaseIT {
public static final String NOT_VERIFY_FLAG = "NOT_VERIFY";
- private final String ruleType;
+ private final String scenario;
private final DatabaseType databaseType;
@@ -62,16 +62,16 @@ public abstract class BaseIT {
}
}
- BaseIT(final String ruleType, final DatabaseType databaseType) throws IOException, JAXBException, SQLException {
- this.ruleType = ruleType;
+ BaseIT(final String scenario, final DatabaseType databaseType) throws IOException, JAXBException, SQLException {
+ this.scenario = scenario;
this.databaseType = databaseType;
- actualDataSources = ActualDataSourceBuilder.createActualDataSources(ruleType, databaseType);
+ actualDataSources = ActualDataSourceBuilder.createActualDataSources(scenario, databaseType);
targetDataSource = createTargetDataSource();
}
private DataSource createTargetDataSource() throws SQLException, IOException {
- return IntegrateTestEnvironment.getInstance().isProxyEnvironment() ? ProxyDataSourceBuilder.build(String.format("proxy_%s", ruleType), databaseType)
- : YamlShardingSphereDataSourceFactory.createDataSource(actualDataSources, new File(EnvironmentPath.getRulesConfigurationFile(ruleType)));
+ return IntegrateTestEnvironment.getInstance().isProxyEnvironment() ? ProxyDataSourceBuilder.build(String.format("proxy_%s", scenario), databaseType)
+ : YamlShardingSphereDataSourceFactory.createDataSource(actualDataSources, new File(EnvironmentPath.getRulesConfigurationFile(scenario)));
}
protected final void resetTargetDataSource() throws IOException, SQLException {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchIT.java
index 4c9e873..13ec641 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchIT.java
@@ -69,15 +69,15 @@ public abstract class BatchIT extends BaseIT {
private final Collection<DataSet> dataSets;
protected BatchIT(final IntegrateTestCaseContext testCaseContext,
- final String ruleType, final DatabaseType databaseType, final String sql) throws IOException, JAXBException, SQLException {
- super(ruleType, databaseType);
+ final String scenario, final DatabaseType databaseType, final String sql) throws IOException, JAXBException, SQLException {
+ super(scenario, databaseType);
this.testCaseContext = testCaseContext;
this.sql = sql;
dataSets = new LinkedList<>();
for (IntegrateTestCaseAssertion each : testCaseContext.getTestCase().getIntegrateTestCaseAssertions()) {
- dataSets.add(DataSetLoader.load(testCaseContext.getParentPath(), ruleType, databaseType, each.getExpectedDataFile()));
+ dataSets.add(DataSetLoader.load(testCaseContext.getParentPath(), scenario, databaseType, each.getExpectedDataFile()));
}
- dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(ruleType), getActualDataSources());
+ dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(scenario), getActualDataSources());
}
@BeforeClass
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/SingleIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/SingleIT.java
index 0bd195f..0f42718 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/SingleIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/SingleIT.java
@@ -52,14 +52,14 @@ public abstract class SingleIT extends BaseIT {
private final String sql;
- protected SingleIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String ruleType,
+ protected SingleIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String scenario,
final DatabaseType databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(ruleType, databaseType);
+ super(scenario, databaseType);
caseIdentifier = sql;
this.assertion = assertion;
this.caseType = caseType;
this.sql = caseType == SQLCaseType.Literal ? getLiteralSQL(sql) : sql;
- dataSet = null == assertion ? null : DataSetLoader.load(parentPath, ruleType, databaseType, assertion.getExpectedDataFile());
+ dataSet = null == assertion ? null : DataSetLoader.load(parentPath, scenario, databaseType, assertion.getExpectedDataFile());
}
private String getLiteralSQL(final String sql) throws ParseException {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/BaseDCLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/BaseDCLIT.java
index 7bab4aa..1f5cb3e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/BaseDCLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/BaseDCLIT.java
@@ -48,15 +48,15 @@ public abstract class BaseDCLIT extends SingleIT {
private final AuthorityEnvironmentManager authorityEnvironmentManager;
- protected BaseDCLIT(final String parentPath, final DCLIntegrateTestCaseAssertion assertion, final String ruleType,
+ protected BaseDCLIT(final String parentPath, final DCLIntegrateTestCaseAssertion assertion, final String scenario,
final DatabaseType databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, databaseType, caseType, sql);
+ super(parentPath, assertion, scenario, databaseType, caseType, sql);
authorityEnvironmentManager = new AuthorityEnvironmentManager(
- EnvironmentPath.getAuthorityFile(ruleType), null == getActualDataSources() ? null : createInstanceDataSourceMap(), databaseType);
+ EnvironmentPath.getAuthorityFile(scenario), null == getActualDataSources() ? null : createInstanceDataSourceMap(), databaseType);
}
private Map<String, DataSource> createInstanceDataSourceMap() throws SQLException {
- return "shadow".equals(getRuleType()) ? getActualDataSources() : getShardingInstanceDataSourceMap();
+ return "shadow".equals(getScenario()) ? getActualDataSources() : getShardingInstanceDataSourceMap();
}
private Map<String, DataSource> getShardingInstanceDataSourceMap() throws SQLException {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
index c2f272f..9a3c832 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
@@ -34,11 +34,11 @@ import java.util.Collection;
public final class GeneralDCLIT extends BaseDCLIT {
- public GeneralDCLIT(final String parentPath, final DCLIntegrateTestCaseAssertion assertion, final String ruleType,
+ public GeneralDCLIT(final String parentPath, final DCLIntegrateTestCaseAssertion assertion, final String scenario,
final String databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, DatabaseTypeRegistry.getActualDatabaseType(databaseType), caseType, sql);
+ super(parentPath, assertion, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), caseType, sql);
}
-
+
@Parameters(name = "{2} -> {3} -> {4} -> {5}")
public static Collection<Object[]> getParameters() {
return IntegrateTestParameters.getParametersWithAssertion(IntegrateTestCaseType.DCL);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
index f11ec8e..145ac42 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
@@ -59,10 +59,10 @@ public abstract class BaseDDLIT extends SingleIT {
private final DataSetEnvironmentManager dataSetEnvironmentManager;
- protected BaseDDLIT(final String parentPath, final DDLIntegrateTestCaseAssertion assertion, final String ruleType,
+ protected BaseDDLIT(final String parentPath, final DDLIntegrateTestCaseAssertion assertion, final String scenario,
final DatabaseType databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, databaseType, caseType, sql);
- dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(ruleType), getActualDataSources());
+ super(parentPath, assertion, scenario, databaseType, caseType, sql);
+ dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(scenario), getActualDataSources());
}
@BeforeClass
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
index f67ac6e..d6216f1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
@@ -34,9 +34,9 @@ import java.util.Collection;
public final class GeneralDDLIT extends BaseDDLIT {
- public GeneralDDLIT(final String parentPath, final DDLIntegrateTestCaseAssertion assertion, final String ruleType,
+ public GeneralDDLIT(final String parentPath, final DDLIntegrateTestCaseAssertion assertion, final String scenario,
final String databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, DatabaseTypeRegistry.getActualDatabaseType(databaseType), caseType, sql);
+ super(parentPath, assertion, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), caseType, sql);
}
@Parameters(name = "{2} -> {3} -> {4} -> {5}")
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
index a7d75de..5b484a1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
@@ -43,9 +43,9 @@ public final class AdditionalDMLIT extends BaseDMLIT {
private final DMLIntegrateTestCaseAssertion assertion;
- public AdditionalDMLIT(final String parentPath, final DMLIntegrateTestCaseAssertion assertion, final String ruleType,
+ public AdditionalDMLIT(final String parentPath, final DMLIntegrateTestCaseAssertion assertion, final String scenario,
final DatabaseType databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, databaseType, caseType, sql);
+ super(parentPath, assertion, scenario, databaseType, caseType, sql);
this.assertion = assertion;
}
@@ -57,7 +57,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void executeUpdateWithAutoGeneratedKeys() throws SQLException, ParseException {
// TODO fix replica_query
- if ("replica_query".equals(getRuleType())) {
+ if ("replica_query".equals(getScenario())) {
return;
}
int actualUpdateCount;
@@ -85,7 +85,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteUpdateWithColumnIndexes() throws SQLException, ParseException {
// TODO fix replica_query
- if ("PostgreSQL".equals(getDatabaseType().getName()) || "replica_query".equals(getRuleType())) {
+ if ("PostgreSQL".equals(getDatabaseType().getName()) || "replica_query".equals(getScenario())) {
return;
}
int actualUpdateCount;
@@ -113,7 +113,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteUpdateWithColumnNames() throws SQLException, ParseException {
// TODO fix replica_query
- if ("PostgreSQL".equals(getDatabaseType().getName()) || "replica_query".equals(getRuleType())) {
+ if ("PostgreSQL".equals(getDatabaseType().getName()) || "replica_query".equals(getScenario())) {
return;
}
int actualUpdateCount;
@@ -141,7 +141,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteWithoutAutoGeneratedKeys() throws SQLException, ParseException {
// TODO fix replica_query
- if ("replica_query".equals(getRuleType())) {
+ if ("replica_query".equals(getScenario())) {
return;
}
int actualUpdateCount;
@@ -171,7 +171,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteWithAutoGeneratedKeys() throws SQLException, ParseException {
// TODO fix replica_query
- if ("replica_query".equals(getRuleType())) {
+ if ("replica_query".equals(getScenario())) {
return;
}
int actualUpdateCount;
@@ -203,7 +203,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteWithColumnIndexes() throws SQLException, ParseException {
// TODO fix replica_query
- if ("PostgreSQL".equals(getDatabaseType().getName()) || "replica_query".equals(getRuleType())) {
+ if ("PostgreSQL".equals(getDatabaseType().getName()) || "replica_query".equals(getScenario())) {
return;
}
int actualUpdateCount;
@@ -233,7 +233,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Test
public void assertExecuteWithColumnNames() throws SQLException, ParseException {
// TODO fix replica_query
- if ("PostgreSQL".equals(getDatabaseType().getName()) || "replica_query".equals(getRuleType())) {
+ if ("PostgreSQL".equals(getDatabaseType().getName()) || "replica_query".equals(getScenario())) {
return;
}
int actualUpdateCount;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
index 685ecfe..cafec63 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
@@ -56,10 +56,10 @@ public abstract class BaseDMLIT extends SingleIT {
private final DataSetEnvironmentManager dataSetEnvironmentManager;
- protected BaseDMLIT(final String parentPath, final DMLIntegrateTestCaseAssertion assertion, final String ruleType,
+ protected BaseDMLIT(final String parentPath, final DMLIntegrateTestCaseAssertion assertion, final String scenario,
final DatabaseType databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, databaseType, caseType, sql);
- dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(ruleType), getActualDataSources());
+ super(parentPath, assertion, scenario, databaseType, caseType, sql);
+ dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(scenario), getActualDataSources());
}
@BeforeClass
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
index 4b443cc..b7dd92b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
@@ -42,13 +42,12 @@ public final class BatchDMLIT extends BatchIT {
private final IntegrateTestCaseContext testCaseContext;
- public BatchDMLIT(final IntegrateTestCaseContext testCaseContext,
- final String ruleType, final String databaseType, final String sql) throws IOException, JAXBException, SQLException {
- super(testCaseContext, ruleType, DatabaseTypeRegistry.getActualDatabaseType(databaseType), sql);
+ public BatchDMLIT(final IntegrateTestCaseContext testCaseContext, final String scenario, final String databaseType, final String sql) throws IOException, JAXBException, SQLException {
+ super(testCaseContext, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), sql);
this.testCaseContext = testCaseContext;
}
- @Parameters(name = "Rule:{1} -> {2} -> {3}")
+ @Parameters(name = "{1} -> {2} -> {3}")
public static Collection<Object[]> getParameters() {
return IntegrateTestParameters.getParametersWithCase(IntegrateTestCaseType.DML);
}
@@ -56,11 +55,11 @@ public final class BatchDMLIT extends BatchIT {
@Test
public void assertExecuteBatch() throws SQLException, ParseException {
// TODO fix replica_query
- if ("replica_query".equals(getRuleType())) {
+ if ("replica_query".equals(getScenario())) {
return;
}
// TODO fix shadow
- if ("shadow".equals(getRuleType())) {
+ if ("shadow".equals(getScenario())) {
return;
}
int[] actualUpdateCounts;
@@ -89,11 +88,11 @@ public final class BatchDMLIT extends BatchIT {
@Test
public void assertClearBatch() throws SQLException, ParseException {
// TODO fix replica_query
- if ("replica_query".equals(getRuleType())) {
+ if ("replica_query".equals(getScenario())) {
return;
}
// TODO fix shadow
- if ("shadow".equals(getRuleType())) {
+ if ("shadow".equals(getScenario())) {
return;
}
try (Connection connection = getTargetDataSource().getConnection()) {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
index c6b6bc1..b073fa9 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
@@ -41,9 +41,9 @@ public final class GeneralDMLIT extends BaseDMLIT {
private final DMLIntegrateTestCaseAssertion assertion;
- public GeneralDMLIT(final String parentPath, final DMLIntegrateTestCaseAssertion assertion, final String ruleType,
+ public GeneralDMLIT(final String parentPath, final DMLIntegrateTestCaseAssertion assertion, final String scenario,
final String databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, DatabaseTypeRegistry.getActualDatabaseType(databaseType), caseType, sql);
+ super(parentPath, assertion, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), caseType, sql);
this.assertion = assertion;
}
@@ -55,11 +55,11 @@ public final class GeneralDMLIT extends BaseDMLIT {
@Test
public void assertExecuteUpdate() throws SQLException, ParseException {
// TODO fix replica-query
- if ("replica_query".equals(getRuleType())) {
+ if ("replica_query".equals(getScenario())) {
return;
}
// TODO fix shadow
- if ("shadow".equals(getRuleType())) {
+ if ("shadow".equals(getScenario())) {
return;
}
int actualUpdateCount;
@@ -87,11 +87,11 @@ public final class GeneralDMLIT extends BaseDMLIT {
@Test
public void assertExecute() throws SQLException, ParseException {
// TODO fix replica_query
- if ("replica_query".equals(getRuleType())) {
+ if ("replica_query".equals(getScenario())) {
return;
}
// TODO fix shadow
- if ("shadow".equals(getRuleType())) {
+ if ("shadow".equals(getScenario())) {
return;
}
int actualUpdateCount;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
index 2f5db85..f5f3582 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
@@ -44,9 +44,9 @@ public final class AdditionalDQLIT extends BaseDQLIT {
private final DQLIntegrateTestCaseAssertion assertion;
- public AdditionalDQLIT(final String parentPath, final DQLIntegrateTestCaseAssertion assertion, final String ruleType,
+ public AdditionalDQLIT(final String parentPath, final DQLIntegrateTestCaseAssertion assertion, final String scenario,
final DatabaseType databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, databaseType, caseType, sql);
+ super(parentPath, assertion, scenario, databaseType, caseType, sql);
this.assertion = assertion;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
index d07e13d..cab0517 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
@@ -50,9 +50,9 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseDQLIT extends SingleIT {
- protected BaseDQLIT(final String parentPath, final DQLIntegrateTestCaseAssertion assertion, final String ruleType,
+ protected BaseDQLIT(final String parentPath, final DQLIntegrateTestCaseAssertion assertion, final String scenario,
final DatabaseType databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, databaseType, caseType, sql);
+ super(parentPath, assertion, scenario, databaseType, caseType, sql);
}
@BeforeClass
@@ -65,7 +65,7 @@ public abstract class BaseDQLIT extends SingleIT {
}
private static void fillData(final DatabaseType databaseType) throws SQLException, ParseException, IOException, JAXBException {
- for (String each : IntegrateTestEnvironment.getInstance().getRuleTypes()) {
+ for (String each : IntegrateTestEnvironment.getInstance().getScenarios()) {
new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(each), ActualDataSourceBuilder.createActualDataSources(each, databaseType)).fillData();
}
}
@@ -90,7 +90,7 @@ public abstract class BaseDQLIT extends SingleIT {
private void assertMetaData(final ResultSetMetaData actual, final Collection<DataSetColumn> expected) throws SQLException {
// TODO Fix shadow
- if ("shadow".equals(getRuleType())) {
+ if ("shadow".equals(getScenario())) {
return;
}
assertThat(actual.getColumnCount(), is(expected.size()));
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
index aa5e460..5178f81 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
@@ -42,9 +42,9 @@ public final class GeneralDQLIT extends BaseDQLIT {
private final DQLIntegrateTestCaseAssertion assertion;
- public GeneralDQLIT(final String parentPath, final DQLIntegrateTestCaseAssertion assertion, final String ruleType,
+ public GeneralDQLIT(final String parentPath, final DQLIntegrateTestCaseAssertion assertion, final String scenario,
final String databaseType, final SQLCaseType caseType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
- super(parentPath, assertion, ruleType, DatabaseTypeRegistry.getActualDatabaseType(databaseType), caseType, sql);
+ super(parentPath, assertion, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), caseType, sql);
this.assertion = assertion;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/IntegrateTestParameters.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/IntegrateTestParameters.java
index 0501239..42a3368 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/IntegrateTestParameters.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/IntegrateTestParameters.java
@@ -92,7 +92,7 @@ public final class IntegrateTestParameters {
private static Collection<Object[]> getParametersWithAssertion(final IntegrateTestCaseContext testCaseContext,
final IntegrateTestCaseAssertion assertion, final DatabaseType databaseType, final SQLCaseType caseType) {
Collection<Object[]> result = new LinkedList<>();
- for (String each : INTEGRATE_TEST_ENVIRONMENT.getRuleTypes()) {
+ for (String each : INTEGRATE_TEST_ENVIRONMENT.getScenarios()) {
Object[] data = new Object[6];
data[0] = testCaseContext.getParentPath();
data[1] = assertion;
@@ -129,7 +129,7 @@ public final class IntegrateTestParameters {
private static Collection<Object[]> getParametersWithCase(final DatabaseType databaseType, final IntegrateTestCaseContext testCaseContext) {
Collection<Object[]> result = new LinkedList<>();
- for (String each : INTEGRATE_TEST_ENVIRONMENT.getRuleTypes()) {
+ for (String each : INTEGRATE_TEST_ENVIRONMENT.getScenarios()) {
Object[] data = new Object[4];
data[0] = testCaseContext;
data[1] = each;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
index ec24c47..bc59cac 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
@@ -43,45 +43,45 @@ public final class EnvironmentPath {
/**
* Get schema file.
*
- * @param ruleType rule type
+ * @param scenario scenario
* @return schema file
*/
- public static String getSchemaFile(final String ruleType) {
- return getFile(ruleType, SCHEMA_FILE);
+ public static String getSchemaFile(final String scenario) {
+ return getFile(scenario, SCHEMA_FILE);
}
/**
* Get data set file.
*
- * @param ruleType rule type
+ * @param scenario scenario
* @return data set file
*/
- public static String getDataSetFile(final String ruleType) {
- return getFile(ruleType, DATASET_FILE);
+ public static String getDataSetFile(final String scenario) {
+ return getFile(scenario, DATASET_FILE);
}
/**
* Get rules configuration file.
*
- * @param ruleType rule type
+ * @param scenario scenario
* @return rules configuration file
*/
- public static String getRulesConfigurationFile(final String ruleType) {
- return getFile(ruleType, RULES_CONFIG_FILE);
+ public static String getRulesConfigurationFile(final String scenario) {
+ return getFile(scenario, RULES_CONFIG_FILE);
}
/**
* Get authority file.
*
- * @param ruleType rule type
+ * @param scenario scenario
* @return authority file
*/
- public static String getAuthorityFile(final String ruleType) {
- return getFile(ruleType, AUTHORITY_FILE);
+ public static String getAuthorityFile(final String scenario) {
+ return getFile(scenario, AUTHORITY_FILE);
}
- private static String getFile(final String ruleType, final String fileName) {
- URL url = EnvironmentPath.class.getClassLoader().getResource(String.join("/", ROOT_PATH, ruleType, fileName));
+ private static String getFile(final String scenario, final String fileName) {
+ URL url = EnvironmentPath.class.getClassLoader().getResource(String.join("/", ROOT_PATH, scenario, fileName));
assertNotNull(url);
return url.getFile();
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrateTestEnvironment.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrateTestEnvironment.java
index 0dacc4f..2cb5896 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrateTestEnvironment.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrateTestEnvironment.java
@@ -43,7 +43,7 @@ public final class IntegrateTestEnvironment {
private final boolean runAdditionalTestCases;
- private final Collection<String> ruleTypes;
+ private final Collection<String> scenarios;
private final Map<DatabaseType, DatabaseEnvironment> databaseEnvironments;
@@ -51,7 +51,7 @@ public final class IntegrateTestEnvironment {
activeProfile = loadProperties("integrate/profile.properties").getProperty("mode");
Properties envProps = loadProperties(IntegrateTestEnvironmentType.valueFromProfileName(activeProfile).getEnvFileName());
runAdditionalTestCases = Boolean.parseBoolean(envProps.getProperty("run.additional.cases"));
- ruleTypes = Splitter.on(",").trimResults().splitToList(envProps.getProperty("rule.types"));
+ scenarios = Splitter.on(",").trimResults().splitToList(envProps.getProperty("scenarios"));
databaseEnvironments = createDatabaseEnvironments(envProps);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
index 9ed74e4..af6a506 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
@@ -49,14 +49,14 @@ public final class ActualDataSourceBuilder {
/**
* Create actual data sources.
*
- * @param ruleType rule type
+ * @param scenario scenario
* @param databaseType database type
* @return actual data sources map
* @throws IOException IO exception
* @throws JAXBException JAXB exception
*/
- public static Map<String, DataSource> createActualDataSources(final String ruleType, final DatabaseType databaseType) throws IOException, JAXBException {
- Collection<String> dataSourceNames = SchemaEnvironmentManager.getDataSourceNames(ruleType);
+ public static Map<String, DataSource> createActualDataSources(final String scenario, final DatabaseType databaseType) throws IOException, JAXBException {
+ Collection<String> dataSourceNames = SchemaEnvironmentManager.getDataSourceNames(scenario);
Map<String, DataSource> result = new HashMap<>(dataSourceNames.size(), 1);
for (String each : dataSourceNames) {
result.put(each, build(each, databaseType));
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/schema/SchemaEnvironmentManager.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/schema/SchemaEnvironmentManager.java
index eb9aadb..14abcbb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/schema/SchemaEnvironmentManager.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/schema/SchemaEnvironmentManager.java
@@ -47,13 +47,13 @@ public final class SchemaEnvironmentManager {
/**
* Get data source names.
*
- * @param ruleType rule type
+ * @param scenario scenario
* @return data source names
* @throws IOException IO exception
* @throws JAXBException JAXB exception
*/
- public static Collection<String> getDataSourceNames(final String ruleType) throws IOException, JAXBException {
- return unmarshal(EnvironmentPath.getSchemaFile(ruleType)).getDatabases();
+ public static Collection<String> getDataSourceNames(final String scenario) throws IOException, JAXBException {
+ return unmarshal(EnvironmentPath.getSchemaFile(scenario)).getDatabases();
}
private static SchemaEnvironment unmarshal(final String schemaEnvironmentConfigFile) throws IOException, JAXBException {
@@ -69,14 +69,14 @@ public final class SchemaEnvironmentManager {
* @throws JAXBException JAXB exception
*/
public static void createDatabases() throws IOException, JAXBException {
- for (String each : IntegrateTestEnvironment.getInstance().getRuleTypes()) {
+ for (String each : IntegrateTestEnvironment.getInstance().getScenarios()) {
dropDatabases(each);
createDatabases(each);
}
}
- private static void createDatabases(final String ruleType) throws IOException, JAXBException {
- SchemaEnvironment schemaEnvironment = unmarshal(EnvironmentPath.getSchemaFile(ruleType));
+ private static void createDatabases(final String scenario) throws IOException, JAXBException {
+ SchemaEnvironment schemaEnvironment = unmarshal(EnvironmentPath.getSchemaFile(scenario));
for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
// TODO use multiple threads to improve performance
DataSource dataSource = ActualDataSourceBuilder.build(null, each);
@@ -102,13 +102,13 @@ public final class SchemaEnvironmentManager {
* @throws JAXBException JAXB exception
*/
public static void dropDatabases() throws IOException, JAXBException {
- for (String each : IntegrateTestEnvironment.getInstance().getRuleTypes()) {
+ for (String each : IntegrateTestEnvironment.getInstance().getScenarios()) {
dropDatabases(each);
}
}
- private static void dropDatabases(final String ruleType) throws IOException, JAXBException {
- SchemaEnvironment schemaEnvironment = unmarshal(EnvironmentPath.getSchemaFile(ruleType));
+ private static void dropDatabases(final String scenario) throws IOException, JAXBException {
+ SchemaEnvironment schemaEnvironment = unmarshal(EnvironmentPath.getSchemaFile(scenario));
for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
// TODO use multiple threads to improve performance
DataSource dataSource = ActualDataSourceBuilder.build(null, each);
@@ -143,13 +143,13 @@ public final class SchemaEnvironmentManager {
* @throws IOException IO exception
*/
public static void createTables() throws JAXBException, IOException {
- for (String each : IntegrateTestEnvironment.getInstance().getRuleTypes()) {
+ for (String each : IntegrateTestEnvironment.getInstance().getScenarios()) {
createTables(each);
}
}
- private static void createTables(final String ruleType) throws JAXBException, IOException {
- SchemaEnvironment schemaEnvironment = unmarshal(EnvironmentPath.getSchemaFile(ruleType));
+ private static void createTables(final String scenario) throws JAXBException, IOException {
+ SchemaEnvironment schemaEnvironment = unmarshal(EnvironmentPath.getSchemaFile(scenario));
for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
createTables(schemaEnvironment, each);
}
@@ -170,13 +170,13 @@ public final class SchemaEnvironmentManager {
* @throws IOException IO exception
*/
public static void dropTables() throws JAXBException, IOException {
- for (String each : IntegrateTestEnvironment.getInstance().getRuleTypes()) {
+ for (String each : IntegrateTestEnvironment.getInstance().getScenarios()) {
dropTables(each);
}
}
- private static void dropTables(final String ruleType) throws JAXBException, IOException {
- SchemaEnvironment schemaEnvironment = unmarshal(EnvironmentPath.getSchemaFile(ruleType));
+ private static void dropTables(final String scenario) throws JAXBException, IOException {
+ SchemaEnvironment schemaEnvironment = unmarshal(EnvironmentPath.getSchemaFile(scenario));
for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
dropTables(schemaEnvironment, each);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-jdbc-ci.properties b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-jdbc-ci.properties
index 112e6ce..9c7a3b6 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-jdbc-ci.properties
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-jdbc-ci.properties
@@ -16,8 +16,8 @@
#
run.additional.cases=false
-#rule.types=db,tbl,dbtbl_with_replica_query,replica_query,shadow
-rule.types=db,tbl,dbtbl_with_replica_query,replica_query
+#scenarios=db,tbl,dbtbl_with_replica_query,replica_query,shadow
+scenarios=db,tbl,dbtbl_with_replica_query,replica_query
#databases=H2,MySQL,Oracle,SQLServer,PostgreSQL
databases=MySQL,PostgreSQL
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-jdbc-local.properties b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-jdbc-local.properties
index 11e3c08..6f6ee02 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-jdbc-local.properties
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-jdbc-local.properties
@@ -16,8 +16,8 @@
#
run.additional.cases=false
-#rule.types=db,tbl,dbtbl_with_replica_query,replica_query,shadow
-rule.types=db,tbl,dbtbl_with_replica_query,replica_query
+#scenarios=db,tbl,dbtbl_with_replica_query,replica_query,shadow
+scenarios=db,tbl,dbtbl_with_replica_query,replica_query
#databases=H2,MySQL,Oracle,SQLServer,PostgreSQL
databases=H2
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-proxy.properties b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-proxy.properties
index 641efb8..7b8b92e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-proxy.properties
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env-proxy.properties
@@ -16,8 +16,8 @@
#
run.additional.cases=false
-#rule.types=db,tbl,dbtbl_with_masterslave,masterslave,shadow
-rule.types=db
+#scenarios=db,tbl,dbtbl_with_masterslave,masterslave,shadow
+scenarios=db
#databases=H2,MySQL,Oracle,SQLServer,PostgreSQL
databases=MySQL