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/13 08:14:14 UTC
[shardingsphere] branch master updated: Unify integrate to
integration (#9012)
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 f878ea7 Unify integrate to integration (#9012)
f878ea7 is described below
commit f878ea7541056b09fd9c66806817dd2e2d57247d
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Jan 13 16:13:47 2021 +0800
Unify integrate to integration (#9012)
---
.../test-engine/integration-test-engine.cn.md | 22 ++++++------
.../test-engine/integration-test-engine.en.md | 22 ++++++------
...ontext.java => IntegrationTestCaseContext.java} | 8 ++---
...ateTestCases.java => IntegrationTestCases.java} | 10 +++---
...Loader.java => IntegrationTestCasesLoader.java} | 42 +++++++++++-----------
.../test/integration/cases/SQLCommandType.java | 12 +++----
...grateTestCase.java => IntegrationTestCase.java} | 6 ++--
...tion.java => IntegrationTestCaseAssertion.java} | 6 ++--
...=> IntegrationTestCaseAssertionInitialSQL.java} | 4 +--
.../test/integration/engine/it/BaseIT.java | 6 ++--
.../test/integration/engine/it/BatchIT.java | 10 +++---
.../test/integration/engine/it/SingleIT.java | 6 ++--
.../test/integration/engine/it/dcl/BaseDCLIT.java | 4 +--
.../integration/engine/it/dcl/GeneralDCLIT.java | 4 +--
.../test/integration/engine/it/ddl/BaseDDLIT.java | 4 +--
.../integration/engine/it/ddl/GeneralDDLIT.java | 4 +--
.../integration/engine/it/dml/AdditionalDMLIT.java | 10 +++---
.../test/integration/engine/it/dml/BaseDMLIT.java | 4 +--
.../test/integration/engine/it/dml/BatchDMLIT.java | 14 ++++----
.../integration/engine/it/dml/GeneralDMLIT.java | 6 ++--
.../integration/engine/it/dql/AdditionalDQLIT.java | 10 +++---
.../test/integration/engine/it/dql/BaseDQLIT.java | 10 +++---
.../integration/engine/it/dql/GeneralDQLIT.java | 6 ++--
.../engine/param/ParameterizedArrayFactory.java | 40 ++++++++++-----------
.../param/domain/AssertionParameterizedArray.java | 10 +++---
.../param/domain/CaseParameterizedArray.java | 6 ++--
...onment.java => IntegrationTestEnvironment.java} | 10 +++---
.../env/database/DatabaseEnvironmentManager.java | 6 ++--
.../builder/ActualDataSourceBuilder.java | 4 +--
.../env/props/EnvironmentProperties.java | 4 +--
...st-cases.xml => dcl-integration-test-cases.xml} | 4 +--
...st-cases.xml => ddl-integration-test-cases.xml} | 4 +--
...st-cases.xml => dml-integration-test-cases.xml} | 4 +--
...st-cases.xml => dql-integration-test-cases.xml} | 4 +--
34 files changed, 163 insertions(+), 163 deletions(-)
diff --git a/docs/document/content/features/test-engine/integration-test-engine.cn.md b/docs/document/content/features/test-engine/integration-test-engine.cn.md
index 8766067..8f694b7 100644
--- a/docs/document/content/features/test-engine/integration-test-engine.cn.md
+++ b/docs/document/content/features/test-engine/integration-test-engine.cn.md
@@ -13,12 +13,12 @@ Junit 中的 `Parameterized` 会聚合起所有的测试数据，并将测试数
### 配置
- 环境类文件
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/env-native.properties
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/env/`SQL-TYPE`/dataset.xml
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/env/`SQL-TYPE`/schema.xml
+ - /shardingsphere-integration-test-suite/src/test/resources/env-native.properties
+ - /shardingsphere-integration-test-suite/src/test/resources/env/`SQL-TYPE`/dataset.xml
+ - /shardingsphere-integration-test-suite/src/test/resources/env/`SQL-TYPE`/schema.xml
- 测试用例类文件
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/cases/`SQL-TYPE`/`SQL-TYPE`-integrate-test-cases.xml
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/cases/`SQL-TYPE`/dataset/`FEATURE-TYPE`/*.xml
+ - /shardingsphere-integration-test-suite/src/test/resources/cases/`SQL-TYPE`/`SQL-TYPE`-integration-test-cases.xml
+ - /shardingsphere-integration-test-suite/src/test/resources/cases/`SQL-TYPE`/dataset/`FEATURE-TYPE`/*.xml
- sql-case 文件
- /shardingsphere-integration-test-suite/src/main/resources/sql/sharding/`SQL-TYPE`/*.xml
@@ -26,7 +26,7 @@ Junit 中的 `Parameterized` 会聚合起所有的测试数据，并将测试数
集成测试需要真实的数据库环境，根据相应的配置文件创建测试环境：
-首先，修改配置文件 `/shardingsphere-integration-test-suite/src/test/resources/integrate/env-native.properties` ，例子如下：
+首先，修改配置文件 `/shardingsphere-integration-test-suite/src/test/resources/env-native.properties` ，例子如下：
```properties
# 测试主键，并发，column index等的开关
@@ -63,7 +63,7 @@ it.oracle.username=jdbc
it.oracle.password=jdbc
```
-其次，修改文件 `/shardingsphere-integration-test-suite/src/test/resources/integrate/env/SQL-TYPE/dataset.xml`
+其次，修改文件 `/shardingsphere-integration-test-suite/src/test/resources/env/SQL-TYPE/dataset.xml`
在`dataset.xml`文件中定义元数据和测试数据。例如：
```xml
@@ -92,18 +92,18 @@ it.oracle.password=jdbc
`env-native.properties` 与 `dataset.xml ` 确定了什么SQL在什么环境执行，下面是断言数据的配置：
-断言的配置，需要两种文件，第一类文件位于 `/shardingsphere-integration-test-suite/src/test/resources/integrate/cases/SQL-TYPE/SQL-TYPE-integrate-test-cases.xml`
+断言的配置，需要两种文件，第一类文件位于 `/shardingsphere-integration-test-suite/src/test/resources/cases/SQL-TYPE/SQL-TYPE-integration-test-cases.xml`
这个文件类似于一个索引，定义了要执行的SQL，参数以及期待的数据的文件位置。这里的 test-case 引用的就是`sharding-sql-test`中 SQL 对应的`sql-case-id`，例子如下：
```xml
-<integrate-test-cases>
+<integration-test-cases>
<dml-test-case sql-case-id="insert_with_all_placeholders">
<assertion parameters="1:int, 1:int, insert:String" expected-data-file="insert_for_order_1.xml" />
<assertion parameters="2:int, 2:int, insert:String" expected-data-file="insert_for_order_2.xml" />
</dml-test-case>
-</integrate-test-cases>
+</integration-test-cases>
```
-还有一类文件 -- 断言数据，也就是上面配置中的 expected-data-file 对应的文件，文件在 `/shardingsphere-integration-test-suite/src/test/resources/integrate/cases/SQL-TYPE/dataset/FEATURE-TYPE/*.xml`
+还有一类文件 -- 断言数据，也就是上面配置中的 expected-data-file 对应的文件，文件在 `/shardingsphere-integration-test-suite/src/test/resources/cases/SQL-TYPE/dataset/FEATURE-TYPE/*.xml`
这个文件内容跟 dataset.xml 很相似，只不过`expected-data-file`文件中不仅定义了断言的数据，还有相应SQL执行后的返回值等。例如：
```xml
diff --git a/docs/document/content/features/test-engine/integration-test-engine.en.md b/docs/document/content/features/test-engine/integration-test-engine.en.md
index ddc1c1f..851d8b1 100644
--- a/docs/document/content/features/test-engine/integration-test-engine.en.md
+++ b/docs/document/content/features/test-engine/integration-test-engine.en.md
@@ -12,12 +12,12 @@ The `Parameterized` in JUnit will collect all test data, and pass to test method
### Configuration
- environment type
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/env-native.properties
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/env/`SQL-TYPE`/dataset.xml
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/env/`SQL-TYPE`/schema.xml
+ - /shardingsphere-integration-test-suite/src/test/resources/env-native.properties
+ - /shardingsphere-integration-test-suite/src/test/resources/env/`SQL-TYPE`/dataset.xml
+ - /shardingsphere-integration-test-suite/src/test/resources/env/`SQL-TYPE`/schema.xml
- test case type
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/cases/`SQL-TYPE`/`SQL-TYPE`-integrate-test-cases.xml
- - /shardingsphere-integration-test-suite/src/test/resources/integrate/cases/`SQL-TYPE`/dataset/`FEATURE-TYPE`/*.xml
+ - /shardingsphere-integration-test-suite/src/test/resources/cases/`SQL-TYPE`/`SQL-TYPE`-integration-test-cases.xml
+ - /shardingsphere-integration-test-suite/src/test/resources/cases/`SQL-TYPE`/dataset/`FEATURE-TYPE`/*.xml
- sql-case
- /sharding-sql-test/src/main/resources/sql/sharding/`SQL-TYPE`/*.xml
@@ -25,7 +25,7 @@ The `Parameterized` in JUnit will collect all test data, and pass to test method
Integration test depends on existed database environment, developer need to setup the configuration file for corresponding database to test:
-Firstly, setup configuration file `/shardingsphere-integration-test-suite/src/test/resources/integrate/env-native.properties`, for example:
+Firstly, setup configuration file `/shardingsphere-integration-test-suite/src/test/resources/env-native.properties`, for example:
```properties
# the switch for PK, concurrent, column index testing and so on
@@ -62,7 +62,7 @@ it.oracle.username=jdbc
it.oracle.password=jdbc
```
-Secondly, setup configuration file `/shardingsphere-integration-test-suite/src/test/resources/integrate/env/SQL-TYPE/dataset.xml`.
+Secondly, setup configuration file `/shardingsphere-integration-test-suite/src/test/resources/env/SQL-TYPE/dataset.xml`.
Developer can set up metadata and expected data to start the data initialization in `dataset.xml`. For example:
```xml
@@ -90,19 +90,19 @@ Developer can customize DDL to create databases and tables in `schema.xml`.
### Assertion Configuration
So far have confirmed what kind of sql execute in which environment in upon configuration, here define the data for assert.
-There are two kinds of config for assert, one is at `/shardingsphere-integration-test-suite/src/test/resources/integrate/cases/SQL-TYPE/SQL-TYPE-integrate-test-cases.xml`.
+There are two kinds of config for assert, one is at `/shardingsphere-integration-test-suite/src/test/resources/cases/SQL-TYPE/SQL-TYPE-integration-test-cases.xml`.
This file just like an index, defined the sql, parameters and expected index position for execution. the SQL is the value for `sql-case-id`. For example:
```xml
-<integrate-test-cases>
+<integration-test-cases>
<dml-test-case sql-case-id="insert_with_all_placeholders">
<assertion parameters="1:int, 1:int, insert:String" expected-data-file="insert_for_order_1.xml" />
<assertion parameters="2:int, 2:int, insert:String" expected-data-file="insert_for_order_2.xml" />
</dml-test-case>
-</integrate-test-cases>
+</integration-test-cases>
```
-Another kind of config for assert is the data, as known as the corresponding expected-data-file in SQL-TYPE-integrate-test-cases.xml, which is at `/shardingsphere-integration-test-suite/src/test/resources/integrate/cases/SQL-TYPE/dataset/FEATURE-TYPE/*.xml`.
+Another kind of config for assert is the data, as known as the corresponding expected-data-file in SQL-TYPE-integration-test-cases.xml, which is at `/shardingsphere-integration-test-suite/src/test/resources/cases/SQL-TYPE/dataset/FEATURE-TYPE/*.xml`.
This file is very like the dataset.xml mentioned before, and the difference is that expected-data-file contains some other assert data, such as the return value after a sql execution. For examples:
```xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCaseContext.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCaseContext.java
similarity index 87%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCaseContext.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCaseContext.java
index 3969049..adbf2b4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCaseContext.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCaseContext.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.test.integration.cases;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCase;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCase;
/**
- * Integrate test case context.
+ * Integration test case context.
*/
@RequiredArgsConstructor
@Getter
-public final class IntegrateTestCaseContext {
+public final class IntegrationTestCaseContext {
- private final IntegrateTestCase testCase;
+ private final IntegrationTestCase testCase;
private final String parentPath;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCases.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCases.java
similarity index 82%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCases.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCases.java
index c25aab2..e57631d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCases.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCases.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.integration.cases;
import lombok.Getter;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCase;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCase;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@@ -26,12 +26,12 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * JAXB definition of integrate test cases.
+ * JAXB definition of integration test cases.
*/
@Getter
-@XmlRootElement(name = "integrate-test-cases")
-public final class IntegrateTestCases {
+@XmlRootElement(name = "integration-test-cases")
+public final class IntegrationTestCases {
@XmlElement(name = "test-case")
- private final Collection<IntegrateTestCase> testCases = new LinkedList<>();
+ private final Collection<IntegrationTestCase> testCases = new LinkedList<>();
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCasesLoader.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCasesLoader.java
similarity index 62%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCasesLoader.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCasesLoader.java
index 820798a..726855f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCasesLoader.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrationTestCasesLoader.java
@@ -40,47 +40,47 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * Integrate test cases loader.
+ * Integration test cases loader.
*/
-public final class IntegrateTestCasesLoader {
+public final class IntegrationTestCasesLoader {
- private static final IntegrateTestCasesLoader INSTANCE = new IntegrateTestCasesLoader();
+ private static final IntegrationTestCasesLoader INSTANCE = new IntegrationTestCasesLoader();
- private final Map<SQLCommandType, Collection<IntegrateTestCaseContext>> testCaseContexts = new LinkedHashMap<>();
+ private final Map<SQLCommandType, Collection<IntegrationTestCaseContext>> testCaseContexts = new LinkedHashMap<>();
/**
* Get singleton instance.
*
* @return singleton instance
*/
- public static IntegrateTestCasesLoader getInstance() {
+ public static IntegrationTestCasesLoader getInstance() {
return INSTANCE;
}
/**
- * Get integrate test case contexts.
+ * Get integration test case contexts.
*
* @param sqlCommandType SQL command type
- * @return integrate test case contexts
+ * @return integration test case contexts
*/
- public Collection<IntegrateTestCaseContext> getTestCaseContexts(final SQLCommandType sqlCommandType) {
- testCaseContexts.putIfAbsent(sqlCommandType, loadIntegrateTestCaseContexts(sqlCommandType));
+ public Collection<IntegrationTestCaseContext> getTestCaseContexts(final SQLCommandType sqlCommandType) {
+ testCaseContexts.putIfAbsent(sqlCommandType, loadIntegrationTestCaseContexts(sqlCommandType));
return testCaseContexts.get(sqlCommandType);
}
@SneakyThrows({IOException.class, URISyntaxException.class, JAXBException.class})
- private Collection<IntegrateTestCaseContext> loadIntegrateTestCaseContexts(final SQLCommandType sqlCommandType) {
- URL url = IntegrateTestCasesLoader.class.getClassLoader().getResource("cases/");
- Preconditions.checkNotNull(url, "Can not find integrate test cases.");
- return loadIntegrateTestCaseContexts(url, sqlCommandType);
+ private Collection<IntegrationTestCaseContext> loadIntegrationTestCaseContexts(final SQLCommandType sqlCommandType) {
+ URL url = IntegrationTestCasesLoader.class.getClassLoader().getResource("cases/");
+ Preconditions.checkNotNull(url, "Can not find integration test cases.");
+ return loadIntegrationTestCaseContexts(url, sqlCommandType);
}
- private Collection<IntegrateTestCaseContext> loadIntegrateTestCaseContexts(final URL url, final SQLCommandType sqlCommandType) throws IOException, URISyntaxException, JAXBException {
+ private Collection<IntegrationTestCaseContext> loadIntegrationTestCaseContexts(final URL url, final SQLCommandType sqlCommandType) throws IOException, URISyntaxException, JAXBException {
Collection<File> files = getFiles(url, sqlCommandType);
- Preconditions.checkNotNull(files, "Can not find integrate test cases.");
- Collection<IntegrateTestCaseContext> result = new LinkedList<>();
+ Preconditions.checkNotNull(files, "Can not find integration test cases.");
+ Collection<IntegrationTestCaseContext> result = new LinkedList<>();
for (File each : files) {
- result.addAll(getIntegrateTestCaseContexts(each));
+ result.addAll(getIntegrationTestCaseContexts(each));
}
return result;
}
@@ -100,13 +100,13 @@ public final class IntegrateTestCasesLoader {
return result;
}
- private Collection<IntegrateTestCaseContext> getIntegrateTestCaseContexts(final File file) throws IOException, JAXBException {
- return unmarshal(file.getPath()).getTestCases().stream().map(each -> new IntegrateTestCaseContext(each, file.getParent())).collect(Collectors.toList());
+ private Collection<IntegrationTestCaseContext> getIntegrationTestCaseContexts(final File file) throws IOException, JAXBException {
+ return unmarshal(file.getPath()).getTestCases().stream().map(each -> new IntegrationTestCaseContext(each, file.getParent())).collect(Collectors.toList());
}
- private static IntegrateTestCases unmarshal(final String integrateCasesFile) throws IOException, JAXBException {
+ private static IntegrationTestCases unmarshal(final String integrateCasesFile) throws IOException, JAXBException {
try (FileReader reader = new FileReader(integrateCasesFile)) {
- return (IntegrateTestCases) JAXBContext.newInstance(IntegrateTestCases.class).createUnmarshaller().unmarshal(reader);
+ return (IntegrationTestCases) JAXBContext.newInstance(IntegrationTestCases.class).createUnmarshaller().unmarshal(reader);
}
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/SQLCommandType.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/SQLCommandType.java
index 065f11f..f8a5b2d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/SQLCommandType.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/SQLCommandType.java
@@ -39,38 +39,38 @@ public enum SQLCommandType {
*
* <p>Such as {@code SELECT}.</p>
*/
- DQL(SelectStatement.class, "dql-integrate-test-cases"),
+ DQL(SelectStatement.class, "dql-integration-test-cases"),
/**
* Data Manipulation Language.
*
* <p>Such as {@code INSERT}, {@code UPDATE}, {@code DELETE}.</p>
*/
- DML(DMLStatement.class, "dml-integrate-test-cases"),
+ DML(DMLStatement.class, "dml-integration-test-cases"),
/**
* Data Definition Language.
*
* <p>Such as {@code CREATE}, {@code ALTER}, {@code DROP}, {@code TRUNCATE}.</p>
*/
- DDL(DDLStatement.class, "ddl-integrate-test-cases"),
+ DDL(DDLStatement.class, "ddl-integration-test-cases"),
/**
* Transaction Control Language.
*
* <p>Such as {@code SET}, {@code COMMIT}, {@code ROLLBACK}, {@code SAVEPOIINT}, {@code BEGIN}.</p>
*/
- TCL(TCLStatement.class, "tcl-integrate-test-cases"),
+ TCL(TCLStatement.class, "tcl-integration-test-cases"),
/**
* Database administrator Language.
*/
- DAL(DALStatement.class, "dal-integrate-test-cases"),
+ DAL(DALStatement.class, "dal-integration-test-cases"),
/**
* Database control Language.
*/
- DCL(DCLStatement.class, "dcl-integrate-test-cases");
+ DCL(DCLStatement.class, "dcl-integration-test-cases");
private final Class<? extends SQLStatement> sqlStatementClass;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCase.java
similarity index 89%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCase.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCase.java
index 847825a..e1eb832 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCase.java
@@ -28,12 +28,12 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * JAXB definition of integrate test case.
+ * JAXB definition of integration test case.
*/
@Getter
@Setter
@XmlAccessorType(XmlAccessType.FIELD)
-public final class IntegrateTestCase {
+public final class IntegrationTestCase {
@XmlAttribute(name = "sql")
private String sql;
@@ -42,5 +42,5 @@ public final class IntegrateTestCase {
private String dbTypes;
@XmlElement(name = "assertion")
- private Collection<IntegrateTestCaseAssertion> assertions = new LinkedList<>();
+ private Collection<IntegrationTestCaseAssertion> assertions = new LinkedList<>();
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCaseAssertion.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertion.java
similarity index 93%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCaseAssertion.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertion.java
index 83b4617..3711304 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCaseAssertion.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertion.java
@@ -33,12 +33,12 @@ import java.util.LinkedList;
import java.util.List;
/**
- * JAXB definition of integrate test case assertion.
+ * JAXB definition of integration test case assertion.
*/
@Getter
@Setter
@XmlAccessorType(XmlAccessType.FIELD)
-public final class IntegrateTestCaseAssertion {
+public final class IntegrationTestCaseAssertion {
@XmlAttribute(name = "expected-data-file")
private String expectedDataFile;
@@ -47,7 +47,7 @@ public final class IntegrateTestCaseAssertion {
private String parameters;
@XmlElement(name = "initial-sql")
- private IntegrateTestCaseAssertionInitialSQL initialSQL;
+ private IntegrationTestCaseAssertionInitialSQL initialSQL;
/**
* Get SQL values.
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCaseAssertionInitialSQL.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertionInitialSQL.java
similarity index 90%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCaseAssertionInitialSQL.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertionInitialSQL.java
index da43b97..e853471 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCaseAssertionInitialSQL.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertionInitialSQL.java
@@ -25,12 +25,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
/**
- * JAXB definition of integrate test case assertion initial SQL.
+ * JAXB definition of integration test case assertion initial SQL.
*/
@Getter
@Setter
@XmlAccessorType(XmlAccessType.FIELD)
-public final class IntegrateTestCaseAssertionInitialSQL {
+public final class IntegrationTestCaseAssertionInitialSQL {
@XmlAttribute
private String sql;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseIT.java
index d34534d..4782a40 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BaseIT.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFac
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
-import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
+import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.apache.shardingsphere.test.integration.env.datasource.builder.ActualDataSourceBuilder;
import org.apache.shardingsphere.test.integration.env.datasource.builder.ProxyDataSourceBuilder;
import org.apache.shardingsphere.test.integration.env.database.DatabaseEnvironmentManager;
@@ -70,7 +70,7 @@ public abstract class BaseIT {
private DataSource createTargetDataSource() throws SQLException, IOException {
if ("proxy".equalsIgnoreCase(adapter)) {
- return ProxyDataSourceBuilder.build(scenario, databaseType, IntegrateTestEnvironment.getInstance().getProxyEnvironments().get(scenario));
+ return ProxyDataSourceBuilder.build(scenario, databaseType, IntegrationTestEnvironment.getInstance().getProxyEnvironments().get(scenario));
}
return YamlShardingSphereDataSourceFactory.createDataSource(actualDataSources, new File(EnvironmentPath.getRulesConfigurationFile(scenario)));
}
@@ -81,7 +81,7 @@ public abstract class BaseIT {
@BeforeClass
public static void executeInitSQLs() throws IOException, JAXBException, SQLException {
- if (!IntegrateTestEnvironment.getInstance().isEnvironmentPrepared()) {
+ if (!IntegrationTestEnvironment.getInstance().isEnvironmentPrepared()) {
DatabaseEnvironmentManager.executeInitSQLs();
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchIT.java
index 55909cb..a03359f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/BatchIT.java
@@ -22,8 +22,8 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.sharding.algorithm.sharding.inline.InlineExpressionParser;
-import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseContext;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
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.dataset.metadata.DataSetColumn;
@@ -59,19 +59,19 @@ public abstract class BatchIT extends BaseIT {
private static DataSetEnvironmentManager dataSetEnvironmentManager;
- private final IntegrateTestCaseContext testCaseContext;
+ private final IntegrationTestCaseContext testCaseContext;
private final String sql;
private final Collection<DataSet> dataSets;
- protected BatchIT(final IntegrateTestCaseContext testCaseContext,
+ protected BatchIT(final IntegrationTestCaseContext testCaseContext,
final String adapter, final String scenario, final DatabaseType databaseType, final String sql) throws IOException, JAXBException, SQLException {
super(adapter, scenario, databaseType);
this.testCaseContext = testCaseContext;
this.sql = sql;
dataSets = new LinkedList<>();
- for (IntegrateTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
+ for (IntegrationTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
dataSets.add(DataSetLoader.load(testCaseContext.getParentPath(), scenario, databaseType, each.getExpectedDataFile()));
}
dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(scenario), getActualDataSources());
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/SingleIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/SingleIT.java
index 55dd926..7cb4634 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/SingleIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/SingleIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.it;
import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.cases.dataset.DataSet;
@@ -44,7 +44,7 @@ public abstract class SingleIT extends BaseIT {
private final String caseIdentifier;
- private final IntegrateTestCaseAssertion assertion;
+ private final IntegrationTestCaseAssertion assertion;
private final SQLExecuteType sqlExecuteType;
@@ -52,7 +52,7 @@ public abstract class SingleIT extends BaseIT {
private final String sql;
- protected SingleIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ protected SingleIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(adapter, scenario, databaseType);
caseIdentifier = sql;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/BaseDCLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/BaseDCLIT.java
index 46778db..a4f381b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/BaseDCLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/BaseDCLIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.it.dcl;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.metadata.MemorizedDataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.it.SingleIT;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
@@ -45,7 +45,7 @@ public abstract class BaseDCLIT extends SingleIT {
private final AuthorityEnvironmentManager authorityEnvironmentManager;
- protected BaseDCLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ protected BaseDCLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, databaseType, sqlExecuteType, sql);
authorityEnvironmentManager = new AuthorityEnvironmentManager(
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
index a4d9996..9c6b6bb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.it.dcl;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
import org.junit.Test;
@@ -34,7 +34,7 @@ import java.util.Collection;
public final class GeneralDCLIT extends BaseDCLIT {
- public GeneralDCLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ public GeneralDCLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final String databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), sqlExecuteType, sql);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
index 1251cec..21db0a7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
@@ -21,7 +21,7 @@ import com.google.common.base.Splitter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.sharding.algorithm.sharding.inline.InlineExpressionParser;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetIndex;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
@@ -56,7 +56,7 @@ public abstract class BaseDDLIT extends SingleIT {
private final DataSetEnvironmentManager dataSetEnvironmentManager;
- protected BaseDDLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ protected BaseDDLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, databaseType, sqlExecuteType, sql);
dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(scenario), getActualDataSources());
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
index e3f1aa2..ca9a826 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.it.ddl;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
import org.junit.Test;
@@ -34,7 +34,7 @@ import java.util.Collection;
public final class GeneralDDLIT extends BaseDDLIT {
- public GeneralDDLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ public GeneralDDLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final String databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), sqlExecuteType, sql);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
index c1909c4..efc59e3 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
@@ -19,11 +19,11 @@ package org.apache.shardingsphere.test.integration.engine.it.dml;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
+import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -41,9 +41,9 @@ import static org.junit.Assert.assertFalse;
public final class AdditionalDMLIT extends BaseDMLIT {
- private final IntegrateTestCaseAssertion assertion;
+ private final IntegrationTestCaseAssertion assertion;
- public AdditionalDMLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ public AdditionalDMLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, databaseType, sqlExecuteType, sql);
this.assertion = assertion;
@@ -51,7 +51,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Parameters(name = "{2} -> {3} -> {4} -> {5}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestEnvironment.getInstance().isRunAdditionalTestCases() ? ParameterizedArrayFactory.getAssertionParameterizedArray(SQLCommandType.DML) : Collections.emptyList();
+ return IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases() ? ParameterizedArrayFactory.getAssertionParameterizedArray(SQLCommandType.DML) : Collections.emptyList();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
index 6f6ee89..1b7e6e7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BaseDMLIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.sharding.algorithm.sharding.inline.InlineExpressionParser;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
@@ -53,7 +53,7 @@ public abstract class BaseDMLIT extends SingleIT {
private final DataSetEnvironmentManager dataSetEnvironmentManager;
- protected BaseDMLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ protected BaseDMLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, databaseType, sqlExecuteType, sql);
dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(scenario), getActualDataSources());
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
index 475a692..5224e8f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.integration.engine.it.dml;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseContext;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
+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.it.BatchIT;
import org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
@@ -40,9 +40,9 @@ import static org.junit.Assert.assertThat;
public final class BatchDMLIT extends BatchIT {
- private final IntegrateTestCaseContext testCaseContext;
+ private final IntegrationTestCaseContext testCaseContext;
- public BatchDMLIT(final IntegrateTestCaseContext testCaseContext, final String adapter,
+ public BatchDMLIT(final IntegrationTestCaseContext testCaseContext, final String adapter,
final String scenario, final String databaseType, final String sql) throws IOException, JAXBException, SQLException {
super(testCaseContext, adapter, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), sql);
this.testCaseContext = testCaseContext;
@@ -72,14 +72,14 @@ public final class BatchDMLIT extends BatchIT {
private int[] executeBatchForPreparedStatement(final Connection connection) throws SQLException, ParseException {
try (PreparedStatement preparedStatement = connection.prepareStatement(getSql())) {
- for (IntegrateTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
+ for (IntegrationTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
addBatch(preparedStatement, each);
}
return preparedStatement.executeBatch();
}
}
- private void addBatch(final PreparedStatement preparedStatement, final IntegrateTestCaseAssertion assertion) throws ParseException, SQLException {
+ private void addBatch(final PreparedStatement preparedStatement, final IntegrationTestCaseAssertion assertion) throws ParseException, SQLException {
for (SQLValue each : assertion.getSQLValues()) {
preparedStatement.setObject(each.getIndex(), each.getValue());
}
@@ -98,7 +98,7 @@ public final class BatchDMLIT extends BatchIT {
}
try (Connection connection = getTargetDataSource().getConnection()) {
try (PreparedStatement preparedStatement = connection.prepareStatement(getSql())) {
- for (IntegrateTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
+ for (IntegrationTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
addBatch(preparedStatement, each);
}
preparedStatement.clearBatch();
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
index 80c4aa77..e351fbe 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.it.dml;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
@@ -39,9 +39,9 @@ import static org.junit.Assert.assertFalse;
public final class GeneralDMLIT extends BaseDMLIT {
- private final IntegrateTestCaseAssertion assertion;
+ private final IntegrationTestCaseAssertion assertion;
- public GeneralDMLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ public GeneralDMLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final String databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), sqlExecuteType, sql);
this.assertion = assertion;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
index 873d9fe..ca01aef 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
@@ -19,11 +19,11 @@ package org.apache.shardingsphere.test.integration.engine.it.dql;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
+import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -42,9 +42,9 @@ import static org.junit.Assert.assertTrue;
public final class AdditionalDQLIT extends BaseDQLIT {
- private final IntegrateTestCaseAssertion assertion;
+ private final IntegrationTestCaseAssertion assertion;
- public AdditionalDQLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ public AdditionalDQLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, databaseType, sqlExecuteType, sql);
this.assertion = assertion;
@@ -52,7 +52,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
@Parameters(name = "{2} -> {3} -> {4} -> {5}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestEnvironment.getInstance().isRunAdditionalTestCases() ? ParameterizedArrayFactory.getAssertionParameterizedArray(SQLCommandType.DQL) : Collections.emptyList();
+ return IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases() ? ParameterizedArrayFactory.getAssertionParameterizedArray(SQLCommandType.DQL) : Collections.emptyList();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
index 43453a8..a55daa8 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.test.integration.engine.it.dql;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
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.it.SingleIT;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
-import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
+import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.apache.shardingsphere.test.integration.env.dataset.DataSetEnvironmentManager;
import org.apache.shardingsphere.test.integration.env.datasource.builder.ActualDataSourceBuilder;
import org.junit.BeforeClass;
@@ -48,20 +48,20 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseDQLIT extends SingleIT {
- protected BaseDQLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ protected BaseDQLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, databaseType, sqlExecuteType, sql);
}
@BeforeClass
public static void fillData() throws IOException, JAXBException, SQLException, ParseException {
- for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
+ for (DatabaseType each : IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
fillData(each);
}
}
private static void fillData(final DatabaseType databaseType) throws SQLException, ParseException, IOException, JAXBException {
- for (String each : IntegrateTestEnvironment.getInstance().getScenarios()) {
+ for (String each : IntegrationTestEnvironment.getInstance().getScenarios()) {
new DataSetEnvironmentManager(EnvironmentPath.getDataSetFile(each), ActualDataSourceBuilder.createActualDataSources(each, databaseType)).fillData();
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
index eb913d9..f548e89 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.it.dql;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
@@ -40,9 +40,9 @@ import static org.junit.Assert.assertTrue;
public final class GeneralDQLIT extends BaseDQLIT {
- private final IntegrateTestCaseAssertion assertion;
+ private final IntegrationTestCaseAssertion assertion;
- public GeneralDQLIT(final String parentPath, final IntegrateTestCaseAssertion assertion, final String adapter, final String scenario,
+ public GeneralDQLIT(final String parentPath, final IntegrationTestCaseAssertion assertion, final String adapter, final String scenario,
final String databaseType, final SQLExecuteType sqlExecuteType, final String sql) throws IOException, JAXBException, SQLException, ParseException {
super(parentPath, assertion, adapter, scenario, DatabaseTypeRegistry.getActualDatabaseType(databaseType), sqlExecuteType, sql);
this.assertion = assertion;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
index cfe76ed..9bcd2d5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
@@ -24,14 +24,14 @@ import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseContext;
-import org.apache.shardingsphere.test.integration.cases.IntegrateTestCasesLoader;
+import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
+import org.apache.shardingsphere.test.integration.cases.IntegrationTestCasesLoader;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.domain.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.engine.param.domain.CaseParameterizedArray;
import org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedArray;
-import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
+import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import java.util.Collection;
import java.util.LinkedList;
@@ -45,9 +45,9 @@ import java.util.stream.Collectors;
@Slf4j
public final class ParameterizedArrayFactory {
- private static final IntegrateTestCasesLoader TEST_CASES_LOADER = IntegrateTestCasesLoader.getInstance();
+ private static final IntegrationTestCasesLoader TEST_CASES_LOADER = IntegrationTestCasesLoader.getInstance();
- private static final IntegrateTestEnvironment ENV = IntegrateTestEnvironment.getInstance();
+ private static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
/**
* Get assertion parameterized array.
@@ -57,23 +57,23 @@ public final class ParameterizedArrayFactory {
*/
public static Collection<Object[]> getAssertionParameterizedArray(final SQLCommandType sqlCommandType) {
Collection<ParameterizedArray> result = new LinkedList<>();
- for (IntegrateTestCaseContext each : TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
+ for (IntegrationTestCaseContext each : TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
result.addAll(getAssertionParameterizedArray(each));
}
return toArrays(result);
}
- private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrateTestCaseContext testCaseContext) {
+ private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext) {
Collection<ParameterizedArray> result = new LinkedList<>();
for (DatabaseType each : getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
- if (IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().containsKey(each)) {
+ if (IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().containsKey(each)) {
result.addAll(getAssertionParameterizedArray(testCaseContext, each));
}
}
return result;
}
- private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrateTestCaseContext testCaseContext, final DatabaseType databaseType) {
+ private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext, final DatabaseType databaseType) {
Collection<ParameterizedArray> result = new LinkedList<>();
for (SQLExecuteType each : SQLExecuteType.values()) {
result.addAll(getAssertionParameterizedArray(testCaseContext, databaseType, each));
@@ -81,17 +81,17 @@ public final class ParameterizedArrayFactory {
return result;
}
- private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrateTestCaseContext testCaseContext,
+ private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext,
final DatabaseType databaseType, final SQLExecuteType sqlExecuteType) {
Collection<ParameterizedArray> result = new LinkedList<>();
- for (IntegrateTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
+ for (IntegrationTestCaseAssertion each : testCaseContext.getTestCase().getAssertions()) {
result.addAll(getAssertionParameterizedArray(testCaseContext, databaseType, sqlExecuteType, each));
}
return result;
}
- private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrateTestCaseContext testCaseContext,
- final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final IntegrateTestCaseAssertion assertion) {
+ private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext,
+ final DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final IntegrationTestCaseAssertion assertion) {
Collection<ParameterizedArray> result = new LinkedList<>();
for (String adapter : ENV.getAdapters()) {
result.addAll(getAssertionParameterizedArray(testCaseContext, assertion, adapter, databaseType, sqlExecuteType));
@@ -99,7 +99,7 @@ public final class ParameterizedArrayFactory {
return result;
}
- private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrateTestCaseContext testCaseContext, final IntegrateTestCaseAssertion assertion,
+ private static Collection<ParameterizedArray> getAssertionParameterizedArray(final IntegrationTestCaseContext testCaseContext, final IntegrationTestCaseAssertion assertion,
final String adapter, final DatabaseType databaseType, final SQLExecuteType sqlExecuteType) {
return ENV.getScenarios().stream().map(
each -> new AssertionParameterizedArray(testCaseContext, assertion, adapter, each, databaseType, sqlExecuteType)).collect(Collectors.toList());
@@ -113,23 +113,23 @@ public final class ParameterizedArrayFactory {
*/
public static Collection<Object[]> getCaseParameterizedArray(final SQLCommandType sqlCommandType) {
Collection<ParameterizedArray> result = new LinkedList<>();
- for (IntegrateTestCaseContext each : TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
+ for (IntegrationTestCaseContext each : TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
result.addAll(getCaseParameterizedArray(each));
}
return toArrays(result);
}
- private static Collection<ParameterizedArray> getCaseParameterizedArray(final IntegrateTestCaseContext testCaseContext) {
+ private static Collection<ParameterizedArray> getCaseParameterizedArray(final IntegrationTestCaseContext testCaseContext) {
Collection<ParameterizedArray> result = new LinkedList<>();
for (DatabaseType each : getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
- if (IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().containsKey(each)) {
+ if (IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().containsKey(each)) {
result.addAll(getCaseParameterizedArray(testCaseContext, each));
}
}
return result;
}
- private static Collection<ParameterizedArray> getCaseParameterizedArray(final IntegrateTestCaseContext testCaseContext, final DatabaseType databaseType) {
+ private static Collection<ParameterizedArray> getCaseParameterizedArray(final IntegrationTestCaseContext testCaseContext, final DatabaseType databaseType) {
Collection<ParameterizedArray> result = new LinkedList<>();
for (String adapter : ENV.getAdapters()) {
result.addAll(getCaseParameterizedArray(testCaseContext, adapter, databaseType));
@@ -137,7 +137,7 @@ public final class ParameterizedArrayFactory {
return result;
}
- private static Collection<ParameterizedArray> getCaseParameterizedArray(final IntegrateTestCaseContext testCaseContext, final String adapter, final DatabaseType databaseType) {
+ private static Collection<ParameterizedArray> getCaseParameterizedArray(final IntegrationTestCaseContext testCaseContext, final String adapter, final DatabaseType databaseType) {
return ENV.getScenarios().stream().map(each -> new CaseParameterizedArray(testCaseContext, adapter, each, databaseType)).collect(Collectors.toList());
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/AssertionParameterizedArray.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/AssertionParameterizedArray.java
index 874aeb4..893cdcc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/AssertionParameterizedArray.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/AssertionParameterizedArray.java
@@ -19,19 +19,19 @@ package org.apache.shardingsphere.test.integration.engine.param.domain;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseContext;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestCaseAssertion;
+import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
/**
- * Parameterized array of assertion based integrate test.
+ * Parameterized array of assertion based integration test.
*/
@RequiredArgsConstructor
public final class AssertionParameterizedArray implements ParameterizedArray {
- private final IntegrateTestCaseContext testCaseContext;
+ private final IntegrationTestCaseContext testCaseContext;
- private final IntegrateTestCaseAssertion assertion;
+ private final IntegrationTestCaseAssertion assertion;
private final String adapters;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/CaseParameterizedArray.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/CaseParameterizedArray.java
index d1c1e84..2e17f2d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/CaseParameterizedArray.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/CaseParameterizedArray.java
@@ -19,15 +19,15 @@ package org.apache.shardingsphere.test.integration.engine.param.domain;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseContext;
+import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
/**
- * Parameterized array of case based integrate test.
+ * Parameterized array of case based integration test.
*/
@RequiredArgsConstructor
public final class CaseParameterizedArray implements ParameterizedArray {
- private final IntegrateTestCaseContext testCaseContext;
+ private final IntegrationTestCaseContext testCaseContext;
private final String adapters;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrateTestEnvironment.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
similarity index 95%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrateTestEnvironment.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
index ac36f6a..c01edac 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrateTestEnvironment.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
@@ -39,12 +39,12 @@ import java.util.Properties;
import java.util.stream.Collectors;
/**
- * Integrate test running environment.
+ * Integration test running environment.
*/
@Getter
-public final class IntegrateTestEnvironment {
+public final class IntegrationTestEnvironment {
- private static final IntegrateTestEnvironment INSTANCE = new IntegrateTestEnvironment();
+ private static final IntegrationTestEnvironment INSTANCE = new IntegrationTestEnvironment();
private final boolean isEnvironmentPrepared;
@@ -58,7 +58,7 @@ public final class IntegrateTestEnvironment {
private final Map<String, DatabaseEnvironment> proxyEnvironments;
- private IntegrateTestEnvironment() {
+ private IntegrationTestEnvironment() {
Properties engineEnvProps = EnvironmentProperties.loadProperties("env/engine-env.properties");
isEnvironmentPrepared = "docker".equals(engineEnvProps.getProperty("it.env.type"));
adapters = Splitter.on(",").trimResults().splitToList(engineEnvProps.getProperty("it.adapters"));
@@ -119,7 +119,7 @@ public final class IntegrateTestEnvironment {
*
* @return singleton instance
*/
- public static IntegrateTestEnvironment getInstance() {
+ public static IntegrationTestEnvironment getInstance() {
if (INSTANCE.adapters.contains("proxy")) {
for (String each : INSTANCE.scenarios) {
waitForProxyReady(each);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/database/DatabaseEnvironmentManager.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/database/DatabaseEnvironmentManager.java
index 3d81251..a7c570d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/database/DatabaseEnvironmentManager.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/database/DatabaseEnvironmentManager.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
-import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
+import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.apache.shardingsphere.test.integration.env.datasource.builder.ActualDataSourceBuilder;
import org.h2.tools.RunScript;
@@ -67,13 +67,13 @@ public final class DatabaseEnvironmentManager {
* @throws SQLException SQL exception
*/
public static void executeInitSQLs() throws IOException, JAXBException, SQLException {
- for (String each : IntegrateTestEnvironment.getInstance().getScenarios()) {
+ for (String each : IntegrationTestEnvironment.getInstance().getScenarios()) {
executeInitSQLs(each);
}
}
private static void executeInitSQLs(final String scenario) throws IOException, JAXBException, SQLException {
- for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
+ for (DatabaseType each : IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
if ("H2".equals(each.getName())) {
executeInitSQLForSchemaNotSupportedDatabase(scenario, each);
return;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
index 67d3c4d..cea8ab5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
@@ -23,7 +23,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
+import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.apache.shardingsphere.test.integration.env.datasource.DatabaseEnvironment;
import org.apache.shardingsphere.test.integration.env.database.DatabaseEnvironmentManager;
@@ -83,7 +83,7 @@ public final class ActualDataSourceBuilder {
}
private static DataSource createDataSource(final String name, final String scenario, final DatabaseType databaseType) {
- DatabaseEnvironment databaseEnvironment = IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().get(databaseType).get(scenario);
+ DatabaseEnvironment databaseEnvironment = IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().get(databaseType).get(scenario);
switch (DATA_SOURCE_POOL_TYPE) {
case DBCP:
return createDBCP(name, databaseType, databaseEnvironment);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/props/EnvironmentProperties.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/props/EnvironmentProperties.java
index 55258ce..e2cf282 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/props/EnvironmentProperties.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/props/EnvironmentProperties.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.env.props;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
+import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import java.io.IOException;
import java.util.Properties;
@@ -40,7 +40,7 @@ public final class EnvironmentProperties {
public static Properties loadProperties(final String propsFileName) {
Properties result = new Properties();
try {
- result.load(IntegrateTestEnvironment.class.getClassLoader().getResourceAsStream(propsFileName));
+ result.load(IntegrationTestEnvironment.class.getClassLoader().getResourceAsStream(propsFileName));
} catch (final IOException ex) {
throw new RuntimeException(ex);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dcl/dcl-integrate-test-cases.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dcl/dcl-integration-test-cases.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dcl/dcl-integrate-test-cases.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dcl/dcl-integration-test-cases.xml
index 2257f53..febe7fa 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dcl/dcl-integrate-test-cases.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dcl/dcl-integration-test-cases.xml
@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integrate-test-cases>
+<integration-test-cases>
<test-case sql="CREATE USER 'user_dev_new'@'localhost'" db-types="MySQL" />
<test-case sql="CREATE USER user_dev_new" db-types="PostgreSQL" />
<test-case sql="CREATE USER 'user_dev_new'@'localhost' identified by 'passwd_dev'" db-types="MySQL"/>
@@ -178,4 +178,4 @@
<test-case sql="REVOKE SELECT ON t_order FROM user_dev" db-types="SQLServer"/>
<test-case sql="SET ROLE ALL EXCEPT role_dev" db-types="MySQL"/>
<test-case sql="SET ROLE ALL EXCEPT role_dev, role2" db-types="MySQL"/>
-</integrate-test-cases>
+</integration-test-cases>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integrate-test-cases.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
similarity index 98%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integrate-test-cases.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
index f516a57..b7fba4b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integrate-test-cases.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<integrate-test-cases>
+<integration-test-cases>
<test-case sql="CREATE TABLE t_order_details(id int PRIMARY KEY, description varchar(10))">
<assertion expected-data-file="create_table.xml">
<initial-sql affected-table="t_order_details" />
@@ -65,4 +65,4 @@
</test-case>
<!-- TODO add single table DDL test cases -->
-</integrate-test-cases>
+</integration-test-cases>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integrate-test-cases.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integration-test-cases.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integrate-test-cases.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integration-test-cases.xml
index 999986c..1d5a1a6 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integrate-test-cases.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integration-test-cases.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<integrate-test-cases>
+<integration-test-cases>
<test-case sql="INSERT INTO t_order (order_id, user_id, status) VALUES (?, ?, ?)">
<assertion parameters="1:int, 1:int, insert:String" expected-data-file="insert_for_order_1.xml" />
<assertion parameters="2:int, 2:int, insert:String" expected-data-file="insert_for_order_2.xml" />
@@ -156,4 +156,4 @@
<!--<test-case sql="DELETE o FROM t_order AS o WHERE status=?" db-types="MySQL,Oracle,SQLServer">-->
<!--<assertion parameters="init:String" expected-data-file="delete_with_alias.xml" />-->
<!--</test-case>-->
-</integrate-test-cases>
+</integration-test-cases>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integrate-test-cases.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integrate-test-cases.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
index fa1fd4f..14afaab 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integrate-test-cases.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<integrate-test-cases>
+<integration-test-cases>
<test-case sql="SELECT 1 as a">
<assertion expected-data-file="select_constant_without_table.xml" />
</test-case>
@@ -477,4 +477,4 @@
from t_order t left join t_order_item as o on o.order_id =t.order_id where t.order_id=1000 limit 1" db-types="MySQL,H2">
<assertion expected-data-file="select_with_case_expression.xml" />
</test-case>
-</integrate-test-cases>
+</integration-test-cases>