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 cd2d5c570e3 Refactor package of IntegrationTestCases (#32156)
cd2d5c570e3 is described below
commit cd2d5c570e371e256f7e8e1a5a17f6b74d63e9a9
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jul 17 20:13:23 2024 +0800
Refactor package of IntegrationTestCases (#32156)
* Remove useless name of IntegrationTestCase
* Move package of IntegrationTestCase
* Move package of SQLExecuteType
* Move package of SQLExecuteType
* Refactor package of IntegrationTestCases
---
.../e2e/cases/{assertion => jaxb}/IntegrationTestCase.java | 7 ++++---
.../test/e2e/cases/{ => jaxb}/IntegrationTestCases.java | 3 +--
.../{ => jaxb}/assertion/IntegrationTestCaseAssertion.java | 6 +++---
.../assertion/IntegrationTestCaseAssertionSQL.java | 4 ++--
.../test/e2e/cases/{ => jaxb}/dataset/DataSet.java | 6 +++---
.../e2e/cases/{ => jaxb}/dataset/metadata/DataSetColumn.java | 2 +-
.../e2e/cases/{ => jaxb}/dataset/metadata/DataSetIndex.java | 2 +-
.../cases/{ => jaxb}/dataset/metadata/DataSetMetaData.java | 2 +-
.../test/e2e/cases/{ => jaxb}/dataset/row/DataSetRow.java | 2 +-
.../test/e2e/cases/{ => jaxb}/value/SQLValue.java | 5 ++---
.../test/e2e/cases/{ => jaxb}/value/SQLValueGroup.java | 4 ++--
.../test/e2e/cases/{dataset => loader}/DataSetLoader.java | 3 ++-
.../e2e/cases/{ => loader}/IntegrationTestCaseContext.java | 4 ++--
.../e2e/cases/{ => loader}/IntegrationTestCasesLoader.java | 4 +++-
.../test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java | 2 +-
.../test/e2e/engine/arg/E2ETestCaseSettings.java | 2 +-
.../test/e2e/engine/composer/BatchE2EContainerComposer.java | 8 ++++----
.../test/e2e/engine/composer/SingleE2EContainerComposer.java | 10 +++++-----
.../apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java | 8 ++++----
.../apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java | 4 ++--
.../apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java | 10 +++++-----
.../apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java | 8 ++++----
.../apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java | 8 ++++----
.../apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java | 8 ++++----
.../test/e2e/engine/type/dml/AdditionalDMLE2EIT.java | 6 +++---
.../test/e2e/engine/type/dml/BaseDMLE2EIT.java | 6 +++---
.../test/e2e/engine/type/dml/BatchDMLE2EIT.java | 6 +++---
.../test/e2e/engine/type/dml/GeneralDMLE2EIT.java | 6 +++---
.../test/e2e/engine/type/dql/AdditionalDQLE2EIT.java | 6 +++---
.../test/e2e/engine/type/dql/BaseDQLE2EIT.java | 6 +++---
.../test/e2e/engine/type/dql/GeneralDQLE2EIT.java | 6 +++---
.../test/e2e/env/DataSetEnvironmentManager.java | 12 ++++++------
.../param/array/ClusterTestParameterArrayGenerator.java | 2 +-
.../e2e/framework/param/array/E2ETestParameterFactory.java | 2 +-
.../e2e/framework/param/array/E2ETestParameterGenerator.java | 10 +++++-----
.../param/array/JdbcStandaloneTestParameterGenerator.java | 2 +-
.../param/array/ProxyStandaloneTestParameterGenerator.java | 2 +-
.../e2e/framework/param/model/AssertionTestParameter.java | 8 ++++----
.../test/e2e/framework/param/model/CaseTestParameter.java | 4 ++--
.../test/e2e/framework/param/model/E2ETestParameter.java | 4 ++--
.../test/e2e/{cases => framework/type}/SQLCommandType.java | 2 +-
.../test/e2e/{cases => framework/type}/SQLExecuteType.java | 2 +-
42 files changed, 108 insertions(+), 106 deletions(-)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCase.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/IntegrationTestCase.java
similarity index 90%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCase.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/IntegrationTestCase.java
index 57165940913..6df4fe56706 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCase.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/IntegrationTestCase.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.assertion;
+package org.apache.shardingsphere.test.e2e.cases.jaxb;
import lombok.Getter;
import lombok.Setter;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.IntegrationTestCaseAssertion;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -35,7 +36,7 @@ import java.util.LinkedList;
@Setter
public final class IntegrationTestCase {
- @XmlAttribute(name = "sql")
+ @XmlAttribute
private String sql;
@XmlAttribute(name = "db-types")
@@ -53,7 +54,7 @@ public final class IntegrationTestCase {
@XmlAttribute(name = "delay-assertion-seconds")
private int delayAssertionSeconds;
- @XmlAttribute(name = "smoke")
+ @XmlAttribute
private boolean smoke;
@XmlElement(name = "assertion")
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCases.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/IntegrationTestCases.java
similarity index 90%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCases.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/IntegrationTestCases.java
index 1a896170043..2ec6c4c3c5b 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCases.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/IntegrationTestCases.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases;
+package org.apache.shardingsphere.test.e2e.cases.jaxb;
import lombok.Getter;
-import org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCase;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCaseAssertion.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/IntegrationTestCaseAssertion.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCaseAssertion.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/IntegrationTestCaseAssertion.java
index f9ce3d4692d..08f74dcaac8 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCaseAssertion.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/IntegrationTestCaseAssertion.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.assertion;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.assertion;
import com.google.common.base.Splitter;
import lombok.Getter;
import lombok.Setter;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -35,9 +35,9 @@ import java.util.List;
/**
* JAXB definition of integration test case assertion.
*/
+@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-@XmlAccessorType(XmlAccessType.FIELD)
public final class IntegrationTestCaseAssertion {
@XmlAttribute(name = "expected-data-source-name")
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCaseAssertionSQL.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/IntegrationTestCaseAssertionSQL.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCaseAssertionSQL.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/IntegrationTestCaseAssertionSQL.java
index 76943db9aba..6e74351f7e0 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/assertion/IntegrationTestCaseAssertionSQL.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/IntegrationTestCaseAssertionSQL.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.assertion;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.assertion;
import lombok.Getter;
import lombok.Setter;
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlAttribute;
/**
* JAXB definition of integration test case assertion initial SQL.
*/
+@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-@XmlAccessorType(XmlAccessType.FIELD)
public final class IntegrationTestCaseAssertionSQL {
@XmlAttribute
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/DataSet.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/DataSet.java
index 40137fe4d3b..1ec53f4f533 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/DataSet.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.dataset;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset;
import lombok.Getter;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetColumn.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetColumn.java
index fda94e761aa..3e2ce89da2a 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetColumn.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.dataset.metadata;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetIndex.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetIndex.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetIndex.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetIndex.java
index 183fd1df117..02db2c3f021 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetIndex.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetIndex.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.dataset.metadata;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata;
import lombok.Getter;
import lombok.Setter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetMetaData.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetMetaData.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetMetaData.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetMetaData.java
index 5f58115c84c..71fba24b4ce 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetMetaData.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.dataset.metadata;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata;
import lombok.Getter;
import lombok.Setter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/row/DataSetRow.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/row/DataSetRow.java
similarity index 96%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/row/DataSetRow.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/row/DataSetRow.java
index dbfdbbc34da..55c90b08938 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/row/DataSetRow.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/row/DataSetRow.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.dataset.row;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row;
import com.google.common.base.Splitter;
import lombok.EqualsAndHashCode;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValue.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValue.java
similarity index 98%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValue.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValue.java
index b6036a538d7..916abc72c59 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValue.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValue.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.value;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.value;
import lombok.Getter;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
@@ -33,12 +33,11 @@ import java.util.UUID;
/**
* SQL value.
*/
+@Getter
public final class SQLValue {
- @Getter
private final Object value;
- @Getter
private final int index;
public SQLValue(final String value, final String type, final int index) {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValueGroup.java
similarity index 91%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValueGroup.java
index dc800166fe4..16a0f954b87 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValueGroup.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.value;
+package org.apache.shardingsphere.test.e2e.cases.jaxb.value;
import lombok.Getter;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
import java.util.Collection;
import java.util.LinkedList;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/DataSetLoader.java
similarity index 96%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/DataSetLoader.java
index 55b06805340..7a7060d58a7 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/DataSetLoader.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.dataset;
+package org.apache.shardingsphere.test.e2e.cases.loader;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.DataSet;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCaseContext.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCaseContext.java
similarity index 89%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCaseContext.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCaseContext.java
index a198d36014d..fd166ff6d50 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCaseContext.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCaseContext.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases;
+package org.apache.shardingsphere.test.e2e.cases.loader;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCase;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.IntegrationTestCase;
/**
* Integration test case context.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCasesLoader.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCasesLoader.java
index 5f7b436bab6..cf7e079da7f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCasesLoader.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases;
+package org.apache.shardingsphere.test.e2e.cases.loader;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.IntegrationTestCases;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
index 07afb9ea6d3..a43a1982143 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.arg;
import com.google.common.base.Preconditions;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.CaseTestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
index 85f2e495da6..edc43371f40 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.engine.arg;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.framework.E2EExtension;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/BatchE2EContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/BatchE2EContainerComposer.java
index 9565b129323..cb7a304ee07 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/BatchE2EContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/BatchE2EContainerComposer.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.test.e2e.engine.composer;
-import
org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAssertion;
-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.row.DataSetRow;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.IntegrationTestCaseAssertion;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.DataSet;
+import org.apache.shardingsphere.test.e2e.cases.loader.DataSetLoader;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/SingleE2EContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/SingleE2EContainerComposer.java
index 753b75e7aed..c1062f1d233 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/SingleE2EContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/SingleE2EContainerComposer.java
@@ -18,11 +18,11 @@
package org.apache.shardingsphere.test.e2e.engine.composer;
import lombok.Getter;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAssertion;
-import org.apache.shardingsphere.test.e2e.cases.dataset.DataSet;
-import org.apache.shardingsphere.test.e2e.cases.dataset.DataSetLoader;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.IntegrationTestCaseAssertion;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.DataSet;
+import org.apache.shardingsphere.test.e2e.cases.loader.DataSetLoader;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import java.util.Collections;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
index 1b11175862b..da975d4a256 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.test.e2e.engine.type;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.composer.E2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
index 6ce11d59455..e326ffdfc0c 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.test.e2e.engine.type;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
index 4adfeaa1766..f3477abd5de 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
@@ -20,11 +20,11 @@ package org.apache.shardingsphere.test.e2e.engine.type;
import com.google.common.base.Splitter;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetIndex;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetIndex;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
index b124bbe8ed8..ef9021d6527 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.test.e2e.engine.type;
import com.google.common.base.Splitter;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
index 0c100fd3458..f54b0ab8648 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.test.e2e.engine.type;
import com.google.common.base.Splitter;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
index 8da1eff7781..71b41e280be 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.test.e2e.engine.type;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
index 93d42779c35..27efc580b38 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.e2e.engine.type.dml;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
index f7b222f516e..36db9957dc4 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
@@ -21,9 +21,9 @@ 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.dataset.metadata.DataSetColumn;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
import
org.apache.shardingsphere.test.e2e.engine.composer.BatchE2EContainerComposer;
import org.apache.shardingsphere.test.e2e.engine.composer.E2EContainerComposer;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
index 9e2974da0eb..c362f0a2132 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.e2e.engine.type.dml;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import
org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAssertion;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.IntegrationTestCaseAssertion;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.BatchE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/GeneralDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/GeneralDMLE2EIT.java
index 634d8895416..dce40a9aa00 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/GeneralDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/GeneralDMLE2EIT.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.e2e.engine.type.dml;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
index c80dda628f2..3d24047d252 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.e2e.engine.type.dql;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
index 08be501aba4..5554c3d202c 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.test.e2e.engine.type.dql;
import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
index 4c22dcb289e..7e5614e81ef 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.e2e.engine.type.dql;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
index a5fe21c2e94..024f4454ef2 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
@@ -29,12 +29,12 @@ import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import
org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorServiceManager;
import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
-import org.apache.shardingsphere.test.e2e.cases.dataset.DataSet;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValueGroup;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.DataSet;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValueGroup;
import javax.sql.DataSource;
import javax.xml.bind.JAXBContext;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
index 70f57c903d1..42002c8eebe 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
index 4cadc02a29b..2fbcb0da7a0 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
index d6aef4a3342..173b0ddb865 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/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.IntegrationTestCaseContext;
-import org.apache.shardingsphere.test.e2e.cases.IntegrationTestCasesLoader;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.cases.loader.IntegrationTestCaseContext;
+import
org.apache.shardingsphere.test.e2e.cases.loader.IntegrationTestCasesLoader;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.IntegrationTestCaseAssertion;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.CaseTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 11b74690938..47dc8d24548 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index f88d9e2a563..0898c55e01e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
index 4a44185c2ff..5ccac7ec819 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
@@ -20,10 +20,10 @@ package
org.apache.shardingsphere.test.e2e.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.IntegrationTestCaseContext;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.cases.loader.IntegrationTestCaseContext;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.IntegrationTestCaseAssertion;
/**
* Assertion test parameter.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
index 555ad9e3879..e8c5902d1b1 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.test.e2e.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.IntegrationTestCaseContext;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.cases.loader.IntegrationTestCaseContext;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
/**
* Case test parameter.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
index ce672ff1a9c..a4b3a1421cc 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.e2e.framework.param.model;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.cases.IntegrationTestCaseContext;
-import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.cases.loader.IntegrationTestCaseContext;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
/**
* E2E test parameter.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
similarity index 98%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
index 54cc92a2d2f..97f93e44a58 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases;
+package org.apache.shardingsphere.test.e2e.framework.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLExecuteType.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLExecuteType.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
index 97ee0aae755..8e60ff4e924 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLExecuteType.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases;
+package org.apache.shardingsphere.test.e2e.framework.type;
/**
* SQL execute type.
