This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 9481c90fd38 Refactor package structure of e2e.cases (#32162)
9481c90fd38 is described below

commit 9481c90fd3816ef36979a57a1401799c2f16c79b
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jul 18 17:55:51 2024 +0800

    Refactor package structure of e2e.cases (#32162)
    
    * Refactor E2ETestCase
    
    * Refactor package structure of e2e.cases
    
    * Refactor package structure of e2e.cases
    
    * Refactor package structure of e2e.cases
---
 .../test/e2e/cases/{jaxb => }/E2ETestCases.java              |  3 ++-
 .../e2e/cases/{loader => }/IntegrationTestCasesLoader.java   |  4 ++--
 .../test/e2e/cases/{jaxb => casse}/E2ETestCase.java          |  6 +++---
 .../cases/{loader => casse}/IntegrationTestCaseContext.java  |  3 +--
 .../{jaxb => casse}/assertion/E2ETestCaseAssertion.java      |  4 ++--
 .../{jaxb => casse}/assertion/E2ETestCaseAssertionSQL.java   |  2 +-
 .../test/e2e/cases/{jaxb => }/dataset/DataSet.java           |  6 +++---
 .../test/e2e/cases/{loader => dataset}/DataSetLoader.java    |  3 +--
 .../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            |  2 +-
 .../test/e2e/cases/{jaxb => }/value/SQLValueGroup.java       |  4 ++--
 .../test/e2e/engine/composer/BatchE2EContainerComposer.java  |  8 ++++----
 .../test/e2e/engine/composer/SingleE2EContainerComposer.java |  8 ++++----
 .../apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java |  6 +++---
 .../apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java |  6 +++---
 .../apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java |  6 +++---
 .../apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java |  6 +++---
 .../apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java |  6 +++---
 .../test/e2e/engine/type/dml/AdditionalDMLE2EIT.java         |  2 +-
 .../test/e2e/engine/type/dml/BaseDMLE2EIT.java               |  6 +++---
 .../test/e2e/engine/type/dml/BatchDMLE2EIT.java              |  4 ++--
 .../test/e2e/engine/type/dml/GeneralDMLE2EIT.java            |  2 +-
 .../test/e2e/engine/type/dql/AdditionalDQLE2EIT.java         |  2 +-
 .../test/e2e/engine/type/dql/BaseDQLE2EIT.java               |  6 +++---
 .../test/e2e/engine/type/dql/GeneralDQLE2EIT.java            |  2 +-
 .../test/e2e/env/DataSetEnvironmentManager.java              | 12 ++++++------
 .../e2e/framework/param/array/E2ETestParameterGenerator.java |  6 +++---
 .../e2e/framework/param/model/AssertionTestParameter.java    |  4 ++--
 .../test/e2e/framework/param/model/CaseTestParameter.java    |  2 +-
 .../test/e2e/framework/param/model/E2ETestParameter.java     |  2 +-
 33 files changed, 70 insertions(+), 71 deletions(-)

diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/E2ETestCases.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCases.java
similarity index 91%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/E2ETestCases.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCases.java
index 15d57b3e7a9..3033a9903d7 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/E2ETestCases.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/E2ETestCases.java
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb;
+package org.apache.shardingsphere.test.e2e.cases;
 
 import lombok.Getter;
+import org.apache.shardingsphere.test.e2e.cases.casse.E2ETestCase;
 
 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/loader/IntegrationTestCasesLoader.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
similarity index 97%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCasesLoader.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
index a93b2688846..3b93e8916c2 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCasesLoader.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.loader;
+package org.apache.shardingsphere.test.e2e.cases;
 
 import com.google.common.base.Preconditions;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.e2e.cases.jaxb.E2ETestCases;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.IntegrationTestCaseContext;
 import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
 
 import javax.xml.bind.JAXBContext;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/E2ETestCase.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCase.java
similarity index 91%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/E2ETestCase.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCase.java
index ab8c3659093..715b701aa4a 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/E2ETestCase.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/E2ETestCase.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb;
+package org.apache.shardingsphere.test.e2e.cases.casse;
 
 import lombok.Getter;
 import lombok.Setter;
-import 
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.E2ETestCaseAssertion;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -48,7 +48,7 @@ public final class E2ETestCase {
     @XmlAttribute(name = "scenario-comments")
     private String scenarioComments;
     
-    @XmlAttribute(name = "adapters")
+    @XmlAttribute
     private String adapters;
     
     @XmlAttribute(name = "delay-assertion-seconds")
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCaseContext.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/IntegrationTestCaseContext.java
similarity index 89%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCaseContext.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/IntegrationTestCaseContext.java
index a285512dee4..1117b6b5582 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/IntegrationTestCaseContext.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/IntegrationTestCaseContext.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.loader;
+package org.apache.shardingsphere.test.e2e.cases.casse;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.test.e2e.cases.jaxb.E2ETestCase;
 
 /**
  * Integration test case context.
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/E2ETestCaseAssertion.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertion.java
similarity index 95%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/E2ETestCaseAssertion.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertion.java
index 09cbfc813b4..e67f639eaca 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/E2ETestCaseAssertion.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertion.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.assertion;
+package org.apache.shardingsphere.test.e2e.cases.casse.assertion;
 
 import com.google.common.base.Splitter;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/E2ETestCaseAssertionSQL.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertionSQL.java
similarity index 95%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/E2ETestCaseAssertionSQL.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertionSQL.java
index ec0b9002b5e..b5db18672dc 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/assertion/E2ETestCaseAssertionSQL.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/E2ETestCaseAssertionSQL.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.assertion;
+package org.apache.shardingsphere.test.e2e.cases.casse.assertion;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/DataSet.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
similarity index 93%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/DataSet.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
index 1ec53f4f533..40137fe4d3b 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/DataSet.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset;
+package org.apache.shardingsphere.test.e2e.cases.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.jaxb.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row.DataSetRow;
+import 
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.cases.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/loader/DataSetLoader.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
similarity index 96%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/DataSetLoader.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
index 7a7060d58a7..55b06805340 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/loader/DataSetLoader.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.loader;
+package org.apache.shardingsphere.test.e2e.cases.dataset;
 
 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/jaxb/dataset/metadata/DataSetColumn.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
similarity index 94%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetColumn.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
index 3e2ce89da2a..fda94e761aa 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetColumn.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetColumn.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata;
+package org.apache.shardingsphere.test.e2e.cases.dataset.metadata;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetIndex.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetIndex.java
similarity index 94%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetIndex.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetIndex.java
index 02db2c3f021..183fd1df117 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetIndex.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetIndex.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata;
+package org.apache.shardingsphere.test.e2e.cases.dataset.metadata;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetMetaData.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetMetaData.java
similarity index 95%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetMetaData.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetMetaData.java
index 71fba24b4ce..5f58115c84c 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/metadata/DataSetMetaData.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/metadata/DataSetMetaData.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata;
+package org.apache.shardingsphere.test.e2e.cases.dataset.metadata;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/row/DataSetRow.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/row/DataSetRow.java
similarity index 96%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/row/DataSetRow.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/row/DataSetRow.java
index 55c90b08938..dbfdbbc34da 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/dataset/row/DataSetRow.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/row/DataSetRow.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.row;
+package org.apache.shardingsphere.test.e2e.cases.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/jaxb/value/SQLValue.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValue.java
similarity index 98%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValue.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValue.java
index 916abc72c59..eaa12f815bf 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValue.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValue.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.value;
+package org.apache.shardingsphere.test.e2e.cases.value;
 
 import lombok.Getter;
 import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValueGroup.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
similarity index 91%
rename from 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValueGroup.java
rename to 
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
index 16a0f954b87..dc800166fe4 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/jaxb/value/SQLValueGroup.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/value/SQLValueGroup.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.cases.jaxb.value;
+package org.apache.shardingsphere.test.e2e.cases.value;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.test.e2e.cases.jaxb.dataset.metadata.DataSetMetaData;
+import 
org.apache.shardingsphere.test.e2e.cases.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/engine/composer/BatchE2EContainerComposer.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/composer/BatchE2EContainerComposer.java
index 92d5e437f5b..301df6d0557 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.jaxb.assertion.E2ETestCaseAssertion;
-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.cases.casse.assertion.E2ETestCaseAssertion;
+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.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 5cae6f12db5..69d3f687a5e 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
@@ -19,10 +19,10 @@ package org.apache.shardingsphere.test.e2e.engine.composer;
 
 import lombok.Getter;
 import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
-import 
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.E2ETestCaseAssertion;
-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.cases.casse.assertion.E2ETestCaseAssertion;
+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.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 da975d4a256..fdbb7bbd767 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
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.test.e2e.engine.type;
 
 import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
 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.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.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/DDLE2EIT.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
index f3477abd5de..09437b5bd92 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
@@ -22,9 +22,9 @@ import org.apache.shardingsphere.infra.datanode.DataNode;
 import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
 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.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.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 ef9021d6527..ea0383c0dab 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
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.test.e2e.engine.type;
 
 import com.google.common.base.Splitter;
 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.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.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 f54b0ab8648..22c3ffe1388 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
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.test.e2e.engine.type;
 
 import com.google.common.base.Splitter;
 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.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.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 71b41e280be..1868ebf61d9 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
@@ -18,9 +18,9 @@
 package org.apache.shardingsphere.test.e2e.engine.type;
 
 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.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.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 27efc580b38..696286ffe34 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.type.dml;
 
 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.cases.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 36db9957dc4..f7b222f516e 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.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.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.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 1917cd92a9b..aec207b21ae 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
@@ -18,8 +18,8 @@
 package org.apache.shardingsphere.test.e2e.engine.type.dml;
 
 import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
-import 
org.apache.shardingsphere.test.e2e.cases.jaxb.assertion.E2ETestCaseAssertion;
-import org.apache.shardingsphere.test.e2e.cases.jaxb.value.SQLValue;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
+import org.apache.shardingsphere.test.e2e.cases.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 dce40a9aa00..6a2fc6048ad 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.type.dml;
 
 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.cases.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 3d24047d252..2333b7e7ae4 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.type.dql;
 
 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.cases.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 5554c3d202c..08be501aba4 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.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.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.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 7e5614e81ef..6e09226755d 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.type.dql;
 
 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.cases.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 024f4454ef2..a5fe21c2e94 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.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 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 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/E2ETestParameterGenerator.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
index f19a112a4d7..8748d25ef03 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.loader.IntegrationTestCaseContext;
-import 
org.apache.shardingsphere.test.e2e.cases.loader.IntegrationTestCasesLoader;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.IntegrationTestCaseContext;
+import org.apache.shardingsphere.test.e2e.cases.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.E2ETestCaseAssertion;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
 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/model/AssertionTestParameter.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
index 9e3b5d1c21a..d70a1f3fc8a 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.loader.IntegrationTestCaseContext;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.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.E2ETestCaseAssertion;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
 
 /**
  * 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 e8c5902d1b1..f5b4aab413d 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,7 +20,7 @@ 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.loader.IntegrationTestCaseContext;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.IntegrationTestCaseContext;
 import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
 
 /**
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 a4b3a1421cc..b9b835f3d9b 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,7 +18,7 @@
 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.loader.IntegrationTestCaseContext;
+import 
org.apache.shardingsphere.test.e2e.cases.casse.IntegrationTestCaseContext;
 import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
 
 /**


Reply via email to