This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 a1018f365c7 Rename SQLE2ETestCases (#35257)
a1018f365c7 is described below
commit a1018f365c765b7e45f2a49c7cf0a3759debb6df
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Apr 26 18:59:28 2025 +0800
Rename SQLE2ETestCases (#35257)
---
.../{E2ETestCases.java => SQLE2ETestCases.java} | 8 ++---
...esLoader.java => SQLE2ETestCasesXMLLoader.java} | 28 +++++++++---------
.../{E2ETestCase.java => SQLE2ETestCase.java} | 8 ++---
...CaseContext.java => SQLE2ETestCaseContext.java} | 6 ++--
...Assertion.java => SQLE2ETestCaseAssertion.java} | 10 +++----
...ionSQL.java => SQLE2ETestCaseAssertionSQL.java} | 4 +--
.../test/e2e/engine/context/E2ETestContext.java | 4 +--
.../param/array/E2ETestParameterGenerator.java | 34 +++++++++++-----------
.../param/model/AssertionTestParameter.java | 8 ++---
.../framework/param/model/CaseTestParameter.java | 4 +--
.../framework/param/model/E2ETestParameter.java | 4 +--
.../test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java | 12 ++++----
.../e2e/engine/type/sql/dml/BatchDMLE2EIT.java | 12 ++++----
13 files changed, 71 insertions(+), 71 deletions(-)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCases.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCases.java
similarity index 83%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCases.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCases.java
index 3033a9903d7..5047536bb39 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCases.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCases.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.cases;
import lombok.Getter;
-import org.apache.shardingsphere.test.e2e.cases.casse.E2ETestCase;
+import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCase;
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 E2E test cases.
+ * JAXB definition of SQL E2E test cases.
*/
@XmlRootElement(name = "e2e-test-cases")
@Getter
-public final class E2ETestCases {
+public final class SQLE2ETestCases {
@XmlElement(name = "test-case")
- private final Collection<E2ETestCase> testCases = new LinkedList<>();
+ private final Collection<SQLE2ETestCase> testCases = new LinkedList<>();
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCasesLoader.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCasesXMLLoader.java
similarity index 73%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCasesLoader.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCasesXMLLoader.java
index 25dad9b87fe..804c62fcb4b 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCasesLoader.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCasesXMLLoader.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.cases;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.e2e.cases.casse.E2ETestCaseContext;
+import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
import javax.xml.bind.JAXBContext;
@@ -43,22 +43,22 @@ import java.util.Objects;
import java.util.stream.Collectors;
/**
- * E2E test cases loader.
+ * SQL E2E test cases XML loader.
*/
-public final class E2ETestCasesLoader {
+public final class SQLE2ETestCasesXMLLoader {
private static final String FILE_EXTENSION = ".xml";
- private static final E2ETestCasesLoader INSTANCE = new
E2ETestCasesLoader();
+ private static final SQLE2ETestCasesXMLLoader INSTANCE = new
SQLE2ETestCasesXMLLoader();
- private final Map<SQLCommandType, Collection<E2ETestCaseContext>>
testCaseContexts = new LinkedHashMap<>();
+ private final Map<SQLCommandType, Collection<SQLE2ETestCaseContext>>
testCaseContexts = new LinkedHashMap<>();
/**
* Get singleton instance.
*
* @return singleton instance
*/
- public static E2ETestCasesLoader getInstance() {
+ public static SQLE2ETestCasesXMLLoader getInstance() {
return INSTANCE;
}
@@ -68,20 +68,20 @@ public final class E2ETestCasesLoader {
* @param sqlCommandType SQL command type
* @return E2E test case contexts
*/
- public Collection<E2ETestCaseContext> getTestCaseContexts(final
SQLCommandType sqlCommandType) {
+ public Collection<SQLE2ETestCaseContext> getTestCaseContexts(final
SQLCommandType sqlCommandType) {
return testCaseContexts.computeIfAbsent(sqlCommandType,
this::loadE2ETestCaseContexts);
}
@SneakyThrows({IOException.class, URISyntaxException.class,
JAXBException.class})
- private Collection<E2ETestCaseContext> loadE2ETestCaseContexts(final
SQLCommandType sqlCommandType) {
+ private Collection<SQLE2ETestCaseContext> loadE2ETestCaseContexts(final
SQLCommandType sqlCommandType) {
URL url =
Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource("cases/"));
return loadE2ETestCaseContexts(url, sqlCommandType);
}
- private Collection<E2ETestCaseContext> loadE2ETestCaseContexts(final URL
url, final SQLCommandType sqlCommandType) throws IOException,
URISyntaxException, JAXBException {
+ private Collection<SQLE2ETestCaseContext> loadE2ETestCaseContexts(final
URL url, final SQLCommandType sqlCommandType) throws IOException,
URISyntaxException, JAXBException {
Collection<File> files = getFiles(url, sqlCommandType);
Preconditions.checkNotNull(files, "Can not find E2E test cases.");
- Collection<E2ETestCaseContext> result = new LinkedList<>();
+ Collection<SQLE2ETestCaseContext> result = new LinkedList<>();
for (File each : files) {
result.addAll(getE2ETestCaseContexts(each));
}
@@ -103,17 +103,17 @@ public final class E2ETestCasesLoader {
return result;
}
- private Collection<E2ETestCaseContext> getE2ETestCaseContexts(final File
file) throws IOException, JAXBException {
- return unmarshal(file.getPath()).getTestCases().stream().map(each ->
new E2ETestCaseContext(each, getParentPath(file))).collect(Collectors.toList());
+ private Collection<SQLE2ETestCaseContext> getE2ETestCaseContexts(final
File file) throws IOException, JAXBException {
+ return unmarshal(file.getPath()).getTestCases().stream().map(each ->
new SQLE2ETestCaseContext(each,
getParentPath(file))).collect(Collectors.toList());
}
private String getParentPath(final File file) {
return file.getParent().replaceAll("(/cases/.+)/cases/.+", "$1");
}
- private E2ETestCases unmarshal(final String e2eCasesFile) throws
IOException, JAXBException {
+ private SQLE2ETestCases unmarshal(final String e2eCasesFile) throws
IOException, JAXBException {
try (FileReader reader = new FileReader(e2eCasesFile)) {
- return (E2ETestCases)
JAXBContext.newInstance(E2ETestCases.class).createUnmarshaller().unmarshal(reader);
+ return (SQLE2ETestCases)
JAXBContext.newInstance(SQLE2ETestCases.class).createUnmarshaller().unmarshal(reader);
}
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCase.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCase.java
similarity index 90%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCase.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCase.java
index 715b701aa4a..6a96f560798 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCase.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.cases.casse;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,12 +29,12 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * JAXB definition of E2E test case.
+ * JAXB definition of SQL E2E test case.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-public final class E2ETestCase {
+public final class SQLE2ETestCase {
@XmlAttribute
private String sql;
@@ -58,5 +58,5 @@ public final class E2ETestCase {
private boolean smoke;
@XmlElement(name = "assertion")
- private Collection<E2ETestCaseAssertion> assertions = new LinkedList<>();
+ private Collection<SQLE2ETestCaseAssertion> assertions = new
LinkedList<>();
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCaseContext.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCaseContext.java
similarity index 89%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCaseContext.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCaseContext.java
index 1814b400a72..4cb0ce45c48 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCaseContext.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCaseContext.java
@@ -21,13 +21,13 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * E2E test case context.
+ * SQL E2E test case context.
*/
@RequiredArgsConstructor
@Getter
-public final class E2ETestCaseContext {
+public final class SQLE2ETestCaseContext {
- private final E2ETestCase testCase;
+ private final SQLE2ETestCase testCase;
private final String parentPath;
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertion.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertion.java
similarity index 92%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertion.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertion.java
index e67f639eaca..84bc5eb2eae 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertion.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertion.java
@@ -33,12 +33,12 @@ import java.util.LinkedList;
import java.util.List;
/**
- * JAXB definition of E2E test case assertion.
+ * JAXB definition of SQL E2E test case assertion.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-public final class E2ETestCaseAssertion {
+public final class SQLE2ETestCaseAssertion {
@XmlAttribute(name = "expected-data-source-name")
private String expectedDataSourceName;
@@ -53,13 +53,13 @@ public final class E2ETestCaseAssertion {
private String parameters;
@XmlElement(name = "initial-sql")
- private E2ETestCaseAssertionSQL initialSQL;
+ private SQLE2ETestCaseAssertionSQL initialSQL;
@XmlElement(name = "assertion-sql")
- private E2ETestCaseAssertionSQL assertionSQL;
+ private SQLE2ETestCaseAssertionSQL assertionSQL;
@XmlElement(name = "destroy-sql")
- private E2ETestCaseAssertionSQL destroySQL;
+ private SQLE2ETestCaseAssertionSQL destroySQL;
/**
* Get SQL values.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertionSQL.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertionSQL.java
similarity index 91%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertionSQL.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertionSQL.java
index b5db18672dc..5697c665cff 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertionSQL.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertionSQL.java
@@ -25,12 +25,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
/**
- * JAXB definition of E2E test case assertion initial SQL.
+ * JAXB definition of SQL E2E test case assertion initial SQL.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-public final class E2ETestCaseAssertionSQL {
+public final class SQLE2ETestCaseAssertionSQL {
@XmlAttribute
private String sql;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/context/E2ETestContext.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/context/E2ETestContext.java
index 6dcc5dcc3a5..4fe0e7b88d2 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/context/E2ETestContext.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/context/E2ETestContext.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.context;
import lombok.Getter;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
import org.apache.shardingsphere.test.e2e.cases.dataset.DataSet;
import org.apache.shardingsphere.test.e2e.cases.dataset.DataSetLoader;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
@@ -41,7 +41,7 @@ public final class E2ETestContext {
private final SQLExecuteType sqlExecuteType;
- private final E2ETestCaseAssertion assertion;
+ private final SQLE2ETestCaseAssertion assertion;
private final DataSet dataSet;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterGenerator.java
index f2a80875063..f79568ca766 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterGenerator.java
@@ -25,11 +25,11 @@ import
org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
-import org.apache.shardingsphere.test.e2e.cases.casse.E2ETestCaseContext;
-import org.apache.shardingsphere.test.e2e.cases.E2ETestCasesLoader;
+import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
+import org.apache.shardingsphere.test.e2e.cases.SQLE2ETestCasesXMLLoader;
import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.CaseTestParameter;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public final class E2ETestParameterGenerator {
- private static final E2ETestCasesLoader TEST_CASES_LOADER =
E2ETestCasesLoader.getInstance();
+ private static final SQLE2ETestCasesXMLLoader TEST_CASES_LOADER =
SQLE2ETestCasesXMLLoader.getInstance();
private final Collection<String> envAdapters;
@@ -66,7 +66,7 @@ public final class E2ETestParameterGenerator {
*/
public Collection<AssertionTestParameter> getAssertionTestParameter(final
SQLCommandType sqlCommandType) {
Collection<AssertionTestParameter> result = new LinkedList<>();
- for (E2ETestCaseContext each :
TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
+ for (SQLE2ETestCaseContext each :
TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
if (smoke) {
result.addAll(getAssertionTestParameterFilterBySmoke(each,
sqlCommandType));
} else {
@@ -76,7 +76,7 @@ public final class E2ETestParameterGenerator {
return result;
}
- private Collection<AssertionTestParameter> getAssertionTestParameter(final
E2ETestCaseContext testCaseContext, final SQLCommandType sqlCommandType) {
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final
SQLE2ETestCaseContext testCaseContext, final SQLCommandType sqlCommandType) {
Collection<AssertionTestParameter> result = new LinkedList<>();
for (DatabaseType each :
getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
if (envDatabaseTypes.contains(each)) {
@@ -86,7 +86,7 @@ public final class E2ETestParameterGenerator {
return result;
}
- private Collection<AssertionTestParameter> getAssertionTestParameter(final
E2ETestCaseContext testCaseContext,
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final
SQLE2ETestCaseContext testCaseContext,
final
DatabaseType databaseType, final SQLCommandType sqlCommandType) {
Collection<AssertionTestParameter> result = new LinkedList<>();
for (SQLExecuteType each : SQLExecuteType.values()) {
@@ -97,18 +97,18 @@ public final class E2ETestParameterGenerator {
return result;
}
- private Collection<AssertionTestParameter> getAssertionTestParameter(final
E2ETestCaseContext testCaseContext,
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final
SQLE2ETestCaseContext testCaseContext,
final
DatabaseType databaseType, final SQLExecuteType sqlExecuteType, final
SQLCommandType sqlCommandType) {
Collection<AssertionTestParameter> result = new LinkedList<>();
- for (E2ETestCaseAssertion each :
testCaseContext.getTestCase().getAssertions()) {
+ for (SQLE2ETestCaseAssertion each :
testCaseContext.getTestCase().getAssertions()) {
result.addAll(getAssertionTestParameter(testCaseContext,
databaseType, sqlExecuteType, each, sqlCommandType));
}
return result;
}
- private Collection<AssertionTestParameter> getAssertionTestParameter(final
E2ETestCaseContext testCaseContext,
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final
SQLE2ETestCaseContext testCaseContext,
final
DatabaseType databaseType, final SQLExecuteType sqlExecuteType,
- final
E2ETestCaseAssertion assertion, final SQLCommandType sqlCommandType) {
+ final
SQLE2ETestCaseAssertion assertion, final SQLCommandType sqlCommandType) {
Collection<AssertionTestParameter> result = new LinkedList<>();
for (String each :
getEnvAdapters(testCaseContext.getTestCase().getAdapters())) {
if (sqlCommandType.getRunningAdaptors().contains(each) &&
envAdapters.contains(each)) {
@@ -118,7 +118,7 @@ public final class E2ETestParameterGenerator {
return result;
}
- private Collection<AssertionTestParameter> getAssertionTestParameter(final
E2ETestCaseContext testCaseContext, final E2ETestCaseAssertion assertion,
+ private Collection<AssertionTestParameter> getAssertionTestParameter(final
SQLE2ETestCaseContext testCaseContext, final SQLE2ETestCaseAssertion assertion,
final
String adapter, final DatabaseType databaseType,
final
SQLExecuteType sqlExecuteType, final SQLCommandType sqlCommandType) {
Collection<String> scenarios = null ==
testCaseContext.getTestCase().getScenarioTypes() ? Collections.emptyList() :
Arrays.asList(testCaseContext.getTestCase().getScenarioTypes().split(","));
@@ -126,7 +126,7 @@ public final class E2ETestParameterGenerator {
.map(each -> new AssertionTestParameter(testCaseContext,
assertion, adapter, each, envMode, databaseType, sqlExecuteType,
sqlCommandType)).collect(Collectors.toList());
}
- private Collection<AssertionTestParameter>
getAssertionTestParameterFilterBySmoke(final E2ETestCaseContext
testCaseContext, final SQLCommandType sqlCommandType) {
+ private Collection<AssertionTestParameter>
getAssertionTestParameterFilterBySmoke(final SQLE2ETestCaseContext
testCaseContext, final SQLCommandType sqlCommandType) {
Collection<AssertionTestParameter> result = new LinkedList<>();
if (testCaseContext.getTestCase().isSmoke()) {
result.addAll(getAssertionTestParameter(testCaseContext,
sqlCommandType));
@@ -159,13 +159,13 @@ public final class E2ETestParameterGenerator {
*/
public Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
Collection<E2ETestParameter> result = new LinkedList<>();
- for (E2ETestCaseContext each :
TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
+ for (SQLE2ETestCaseContext each :
TEST_CASES_LOADER.getTestCaseContexts(sqlCommandType)) {
result.addAll(getCaseTestParameter(each, sqlCommandType));
}
return result;
}
- private Collection<E2ETestParameter> getCaseTestParameter(final
E2ETestCaseContext testCaseContext, final SQLCommandType sqlCommandType) {
+ private Collection<E2ETestParameter> getCaseTestParameter(final
SQLE2ETestCaseContext testCaseContext, final SQLCommandType sqlCommandType) {
Collection<E2ETestParameter> result = new LinkedList<>();
for (DatabaseType each :
getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
if (envDatabaseTypes.contains(each)) {
@@ -175,7 +175,7 @@ public final class E2ETestParameterGenerator {
return result;
}
- private Collection<E2ETestParameter> getCaseTestParameter(final
E2ETestCaseContext testCaseContext, final DatabaseType databaseType, final
SQLCommandType sqlCommandType) {
+ private Collection<E2ETestParameter> getCaseTestParameter(final
SQLE2ETestCaseContext testCaseContext, final DatabaseType databaseType, final
SQLCommandType sqlCommandType) {
Collection<E2ETestParameter> result = new LinkedList<>();
for (String each : envAdapters) {
result.addAll(getCaseTestParameter(testCaseContext, each,
databaseType, sqlCommandType));
@@ -183,7 +183,7 @@ public final class E2ETestParameterGenerator {
return result;
}
- private Collection<E2ETestParameter> getCaseTestParameter(final
E2ETestCaseContext testCaseContext, final String adapter,
+ private Collection<E2ETestParameter> getCaseTestParameter(final
SQLE2ETestCaseContext testCaseContext, final String adapter,
final
DatabaseType databaseType, final SQLCommandType sqlCommandType) {
if (null != testCaseContext.getTestCase().getAdapters() &&
!testCaseContext.getTestCase().getAdapters().contains(adapter)) {
return Collections.emptyList();
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/AssertionTestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/AssertionTestParameter.java
index 0b2ac4f69fc..2ff38a242f6 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/AssertionTestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/AssertionTestParameter.java
@@ -20,10 +20,10 @@ package
org.apache.shardingsphere.test.e2e.engine.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.cases.casse.E2ETestCaseContext;
+import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
/**
* Assertion test parameter.
@@ -32,9 +32,9 @@ import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAsser
@Getter
public final class AssertionTestParameter implements E2ETestParameter {
- private final E2ETestCaseContext testCaseContext;
+ private final SQLE2ETestCaseContext testCaseContext;
- private final E2ETestCaseAssertion assertion;
+ private final SQLE2ETestCaseAssertion assertion;
private final String adapter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/CaseTestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/CaseTestParameter.java
index 43a5edb4fcd..f9c1e40d62a 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/CaseTestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/CaseTestParameter.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.engine.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.cases.casse.E2ETestCaseContext;
+import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
/**
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
@Getter
public final class CaseTestParameter implements E2ETestParameter {
- private final E2ETestCaseContext testCaseContext;
+ private final SQLE2ETestCaseContext testCaseContext;
private final String adapter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/E2ETestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/E2ETestParameter.java
index 6803a3aeaf0..e31bb0aa8b1 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/E2ETestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/E2ETestParameter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.framework.param.model;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.cases.casse.E2ETestCaseContext;
+import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
/**
@@ -31,7 +31,7 @@ public interface E2ETestParameter {
*
* @return test case context
*/
- E2ETestCaseContext getTestCaseContext();
+ SQLE2ETestCaseContext getTestCaseContext();
/**
* Get database type.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
index 7441656f2ac..7aee94ff379 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
import org.apache.shardingsphere.test.e2e.cases.dataset.DataSet;
import org.apache.shardingsphere.test.e2e.cases.dataset.DataSetLoader;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
@@ -208,7 +208,7 @@ public abstract class BaseDMLE2EIT implements SQLE2EIT {
protected final void assertDataSet(final int[] actualUpdateCounts, final
CaseTestParameter testParam) throws SQLException {
Collection<DataSet> dataSets = new LinkedList<>();
- for (E2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
+ for (SQLE2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
dataSets.add(DataSetLoader.load(testParam.getTestCaseContext().getParentPath(),
testParam.getScenario(), testParam.getDatabaseType(), testParam.getMode(),
each.getExpectedDataFile()));
}
DataSet dataSet = getDataSet(actualUpdateCounts, dataSets,
testParam.getTestCaseContext().getTestCase().getSql());
@@ -313,7 +313,7 @@ public abstract class BaseDMLE2EIT implements SQLE2EIT {
assertRows(generatedKeys, generatedKeyDataSet.getRows(), databaseType);
}
- protected void executeInitSQLs(final E2ETestCaseAssertion assertion)
throws SQLException {
+ protected void executeInitSQLs(final SQLE2ETestCaseAssertion assertion)
throws SQLException {
if (null == assertion.getInitialSQL()) {
return;
}
@@ -322,7 +322,7 @@ public abstract class BaseDMLE2EIT implements SQLE2EIT {
}
}
- private void executeInitSQLs(final E2ETestCaseAssertion assertion, final
Connection connection) throws SQLException {
+ private void executeInitSQLs(final SQLE2ETestCaseAssertion assertion,
final Connection connection) throws SQLException {
if (null == assertion.getInitialSQL().getSql()) {
return;
}
@@ -338,7 +338,7 @@ public abstract class BaseDMLE2EIT implements SQLE2EIT {
Awaitility.await().pollDelay(1500L, TimeUnit.MILLISECONDS).until(() ->
true);
}
- protected void executeDestroySQLs(final E2ETestCaseAssertion assertion)
throws SQLException {
+ protected void executeDestroySQLs(final SQLE2ETestCaseAssertion assertion)
throws SQLException {
if (null != assertion.getDestroySQL()) {
try (Connection connection =
getEnvironmentEngine().getTargetDataSource().getConnection()) {
executeDestroySQLs(assertion, connection);
@@ -346,7 +346,7 @@ public abstract class BaseDMLE2EIT implements SQLE2EIT {
}
}
- private void executeDestroySQLs(final E2ETestCaseAssertion assertion,
final Connection connection) throws SQLException {
+ private void executeDestroySQLs(final SQLE2ETestCaseAssertion assertion,
final Connection connection) throws SQLException {
if (null == assertion.getDestroySQL().getSql()) {
return;
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java
index e3122c807d0..19262d9827f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.engine.type.sql.dml;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.engine.arg.SQLE2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
@@ -71,27 +71,27 @@ class BatchDMLE2EIT extends BaseDMLE2EIT {
}
private void executeInitSQLs(final CaseTestParameter testParam) throws
SQLException {
- for (E2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
+ for (SQLE2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
executeInitSQLs(each);
}
}
private void executeDestroySQLs(final CaseTestParameter testParam) throws
SQLException {
- for (E2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
+ for (SQLE2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
executeDestroySQLs(each);
}
}
private int[] executeBatchForPreparedStatement(final CaseTestParameter
testParam, final Connection connection) throws SQLException {
try (PreparedStatement preparedStatement =
connection.prepareStatement(testParam.getTestCaseContext().getTestCase().getSql()))
{
- for (E2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
+ for (SQLE2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
addBatch(preparedStatement, each);
}
return preparedStatement.executeBatch();
}
}
- private void addBatch(final PreparedStatement preparedStatement, final
E2ETestCaseAssertion assertion) throws SQLException {
+ private void addBatch(final PreparedStatement preparedStatement, final
SQLE2ETestCaseAssertion assertion) throws SQLException {
for (SQLValue each : assertion.getSQLValues()) {
preparedStatement.setObject(each.getIndex(), each.getValue());
}
@@ -110,7 +110,7 @@ class BatchDMLE2EIT extends BaseDMLE2EIT {
try (
Connection connection =
getEnvironmentEngine().getTargetDataSource().getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(testParam.getTestCaseContext().getTestCase().getSql()))
{
- for (E2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
+ for (SQLE2ETestCaseAssertion each :
testParam.getTestCaseContext().getTestCase().getAssertions()) {
addBatch(preparedStatement, each);
}
preparedStatement.clearBatch();
