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 e006637dbb9 Rename package name org.apache.shardingsphere.test.e2e.sql
(#36453)
e006637dbb9 is described below
commit e006637dbb9fbed0bb4264665690db22ea6967bf
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 2 15:20:18 2025 +0800
Rename package name org.apache.shardingsphere.test.e2e.sql (#36453)
---
.../test/e2e/{ => sql}/cases/SQLE2ETestCases.java | 4 +--
.../{ => sql}/cases/SQLE2ETestCasesXMLLoader.java | 6 ++---
.../e2e/{ => sql}/cases/casse/SQLE2ETestCase.java | 4 +--
.../cases/casse/SQLE2ETestCaseContext.java | 2 +-
.../casse/assertion/SQLE2ETestCaseAssertion.java | 4 +--
.../assertion/SQLE2ETestCaseAssertionSQL.java | 2 +-
.../test/e2e/{ => sql}/cases/dataset/DataSet.java | 6 ++---
.../e2e/{ => sql}/cases/dataset/DataSetLoader.java | 2 +-
.../cases/dataset/metadata/DataSetColumn.java | 2 +-
.../cases/dataset/metadata/DataSetIndex.java | 2 +-
.../cases/dataset/metadata/DataSetMetaData.java | 2 +-
.../{ => sql}/cases/dataset/row/DataSetRow.java | 2 +-
.../test/e2e/{ => sql}/cases/value/SQLValue.java | 2 +-
.../e2e/{ => sql}/cases/value/SQLValueGroup.java | 4 +--
.../{ => sql}/env/DataSetEnvironmentManager.java | 14 +++++-----
.../e2e/{ => sql}/env/SQLE2EEnvironmentEngine.java | 6 ++---
.../env/container/compose/ContainerComposer.java | 2 +-
.../compose/ContainerComposerRegistry.java | 6 ++---
.../compose/mode/ClusterContainerComposer.java | 6 ++---
.../compose/mode/StandaloneContainerComposer.java | 6 ++---
.../SQLE2EProxyContainerConfigurationFactory.java | 2 +-
.../framework/SQLE2EITArgumentsProvider.java | 12 ++++-----
.../e2e/{ => sql}/framework/SQLE2EITSettings.java | 4 +--
.../framework/SQLE2EITSettingsExtension.java | 2 +-
.../DialectDatabaseAssertionMetaDataFactory.java | 4 +--
...ialectDatabaseAssertionMetaDataSQLProvider.java | 2 +-
...greSQLDatabaseAssertionMetaDataSQLProvider.java | 4 +--
.../array/ClusterTestParameterArrayGenerator.java | 8 +++---
.../param/array/E2ETestParameterFactory.java | 8 +++---
.../param/array/E2ETestParameterGenerator.java | 18 ++++++-------
.../JdbcStandaloneTestParameterGenerator.java | 10 ++++----
.../ProxyStandaloneTestParameterGenerator.java | 8 +++---
.../param/model/AssertionTestParameter.java | 10 ++++----
.../framework/param/model/CaseTestParameter.java | 6 ++---
.../framework/param/model/E2ETestParameter.java | 6 ++---
.../{ => sql}/framework/type/SQLCommandType.java | 2 +-
.../{ => sql}/framework/type/SQLExecuteType.java | 2 +-
.../test/e2e/{ => sql}/it/SQLE2EIT.java | 8 +++---
.../test/e2e/{ => sql}/it/SQLE2EITContext.java | 14 +++++-----
.../e2e/{ => sql}/it/distsql/ral/RALE2EIT.java | 24 ++++++++---------
.../e2e/{ => sql}/it/distsql/rdl/RDLE2EIT.java | 24 ++++++++---------
.../e2e/{ => sql}/it/distsql/rql/RQLE2EIT.java | 24 ++++++++---------
.../test/e2e/{ => sql}/it/sql/dal/DALE2EIT.java | 24 ++++++++---------
.../test/e2e/{ => sql}/it/sql/dcl/DCLE2EIT.java | 20 +++++++--------
.../test/e2e/{ => sql}/it/sql/ddl/DDLE2EIT.java | 26 +++++++++----------
.../{ => sql}/it/sql/dml/AdditionalDMLE2EIT.java | 18 ++++++-------
.../e2e/{ => sql}/it/sql/dml/BaseDMLE2EIT.java | 30 +++++++++++-----------
.../e2e/{ => sql}/it/sql/dml/BatchDMLE2EIT.java | 16 ++++++------
.../e2e/{ => sql}/it/sql/dml/GeneralDMLE2EIT.java | 18 ++++++-------
.../{ => sql}/it/sql/dql/AdditionalDQLE2EIT.java | 19 +++++++-------
.../e2e/{ => sql}/it/sql/dql/BaseDQLE2EIT.java | 18 ++++++-------
.../e2e/{ => sql}/it/sql/dql/GeneralDQLE2EIT.java | 18 ++++++-------
52 files changed, 247 insertions(+), 246 deletions(-)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCases.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/SQLE2ETestCases.java
similarity index 90%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCases.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/SQLE2ETestCases.java
index 5047536bb39..3b6883d59e7 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCases.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/SQLE2ETestCases.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases;
+package org.apache.shardingsphere.test.e2e.sql.cases;
import lombok.Getter;
-import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCase;
+import org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCase;
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/SQLE2ETestCasesXMLLoader.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/SQLE2ETestCasesXMLLoader.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCasesXMLLoader.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/SQLE2ETestCasesXMLLoader.java
index 000538fd0e7..ff292ca413b 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLE2ETestCasesXMLLoader.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/SQLE2ETestCasesXMLLoader.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases;
+package org.apache.shardingsphere.test.e2e.sql.cases;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
+import org.apache.shardingsphere.test.e2e.sql.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/cases/casse/SQLE2ETestCase.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/SQLE2ETestCase.java
similarity index 92%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCase.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/SQLE2ETestCase.java
index 6a96f560798..08d89ddcc85 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCase.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/SQLE2ETestCase.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.casse;
+package org.apache.shardingsphere.test.e2e.sql.cases.casse;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
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/casse/SQLE2ETestCaseContext.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/SQLE2ETestCaseContext.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCaseContext.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/SQLE2ETestCaseContext.java
index 4cb0ce45c48..bb31c626417 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/SQLE2ETestCaseContext.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/SQLE2ETestCaseContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.casse;
+package org.apache.shardingsphere.test.e2e.sql.cases.casse;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertion.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/assertion/SQLE2ETestCaseAssertion.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertion.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/assertion/SQLE2ETestCaseAssertion.java
index 84bc5eb2eae..de75d389ddb 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertion.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/assertion/SQLE2ETestCaseAssertion.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.casse.assertion;
+package org.apache.shardingsphere.test.e2e.sql.cases.casse.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.sql.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/casse/assertion/SQLE2ETestCaseAssertionSQL.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/assertion/SQLE2ETestCaseAssertionSQL.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertionSQL.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/assertion/SQLE2ETestCaseAssertionSQL.java
index 5697c665cff..133944343a8 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/casse/assertion/SQLE2ETestCaseAssertionSQL.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/casse/assertion/SQLE2ETestCaseAssertionSQL.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.casse.assertion;
+package org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion;
import lombok.Getter;
import lombok.Setter;
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/sql/cases/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/sql/cases/dataset/DataSet.java
index be2ba419727..50ad6569581 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/sql/cases/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.sql.cases.dataset;
import lombok.Getter;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.expr.entry.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.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.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/dataset/DataSetLoader.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/dataset/DataSetLoader.java
similarity index 98%
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/sql/cases/dataset/DataSetLoader.java
index 27ddfdebede..1d45f082328 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/sql/cases/dataset/DataSetLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.cases.dataset;
+package org.apache.shardingsphere.test.e2e.sql.cases.dataset;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
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/sql/cases/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/sql/cases/dataset/metadata/DataSetColumn.java
index fda94e761aa..bb88c95afe7 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/sql/cases/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.sql.cases.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/sql/cases/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/sql/cases/dataset/metadata/DataSetIndex.java
index 183fd1df117..d2cfd02f3a1 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/sql/cases/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.sql.cases.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/sql/cases/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/sql/cases/dataset/metadata/DataSetMetaData.java
index 5f58115c84c..272c0b1c714 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/sql/cases/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.sql.cases.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/sql/cases/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/sql/cases/dataset/row/DataSetRow.java
index 491041c0339..a688aecd3a1 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/sql/cases/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.sql.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/value/SQLValue.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/value/SQLValue.java
similarity index 99%
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/sql/cases/value/SQLValue.java
index 6cb2eb925c5..d415c31638f 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/sql/cases/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.sql.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/value/SQLValueGroup.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/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/sql/cases/value/SQLValueGroup.java
index dc800166fe4..cbf88be26af 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/sql/cases/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.sql.cases.value;
import lombok.Getter;
-import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
+import
org.apache.shardingsphere.test.e2e.sql.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/env/DataSetEnvironmentManager.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
index a65daa40705..671b6df6f5d 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/sql/env/DataSetEnvironmentManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env;
+package org.apache.shardingsphere.test.e2e.sql.env;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -28,12 +28,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.entry.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.sql.cases.dataset.DataSet;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
+import org.apache.shardingsphere.test.e2e.sql.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/env/SQLE2EEnvironmentEngine.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/SQLE2EEnvironmentEngine.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
index fe7022ff605..2e2fcdd5b31 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/SQLE2EEnvironmentEngine.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env;
+package org.apache.shardingsphere.test.e2e.sql.env;
import lombok.AccessLevel;
import lombok.Getter;
@@ -24,9 +24,9 @@ import
org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.SQLScriptUtils;
-import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposerRegistry;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
+import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
+import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposerRegistry;
import javax.sql.DataSource;
import java.util.Collection;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposer.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposer.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposer.java
index 3a6782fe7e4..c0a5633bf95 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.compose;
+package org.apache.shardingsphere.test.e2e.sql.env.container.compose;
import org.testcontainers.lifecycle.Startable;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposerRegistry.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposerRegistry.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
index a518b902233..46a06a8d3aa 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposerRegistry.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.compose;
+package org.apache.shardingsphere.test.e2e.sql.env.container.compose;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.compose.mode.ClusterContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.container.compose.mode.StandaloneContainerComposer;
+import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode.ClusterContainerComposer;
+import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode.StandaloneContainerComposer;
import javax.sql.DataSource;
import java.util.HashMap;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
index ae933a45a9b..af09fe249ac 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.compose.mode;
+package org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
@@ -32,10 +32,10 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageCo
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyContainerConfigurationFactory;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
+import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
+import
org.apache.shardingsphere.test.e2e.sql.env.container.config.SQLE2EProxyContainerConfigurationFactory;
import javax.sql.DataSource;
import java.util.Map;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
index 66f89cf1277..eaa84b54a00 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.compose.mode;
+package org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
@@ -29,10 +29,10 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageCo
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyContainerConfigurationFactory;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
+import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
+import
org.apache.shardingsphere.test.e2e.sql.env.container.config.SQLE2EProxyContainerConfigurationFactory;
import javax.sql.DataSource;
import java.util.Map;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
similarity index 98%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
index 70735f57712..920f025725a 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.config;
+package org.apache.shardingsphere.test.e2e.sql.env.container.config;
import com.google.common.base.Strings;
import lombok.AccessLevel;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITArgumentsProvider.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITArgumentsProvider.java
similarity index 84%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITArgumentsProvider.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITArgumentsProvider.java
index 7307ca491c9..34e5d754131 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITArgumentsProvider.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITArgumentsProvider.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework;
+package org.apache.shardingsphere.test.e2e.sql.framework;
import com.google.common.base.Preconditions;
-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;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.CaseTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettings.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITSettings.java
similarity index 91%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettings.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITSettings.java
index 6c90d235ed3..63329ad12b5 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettings.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITSettings.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework;
+package org.apache.shardingsphere.test.e2e.sql.framework;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.junit.jupiter.api.extension.ExtendWith;
import java.lang.annotation.Inherited;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettingsExtension.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITSettingsExtension.java
similarity index 97%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettingsExtension.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITSettingsExtension.java
index 2c45964d655..907bc7d9182 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettingsExtension.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/SQLE2EITSettingsExtension.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework;
+package org.apache.shardingsphere.test.e2e.sql.framework;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.extension.ExtensionContext;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/DialectDatabaseAssertionMetaDataFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/DialectDatabaseAssertionMetaDataFactory.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/DialectDatabaseAssertionMetaDataFactory.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/DialectDatabaseAssertionMetaDataFactory.java
index 53e490a11c2..b7ab7e12a8f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/DialectDatabaseAssertionMetaDataFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/DialectDatabaseAssertionMetaDataFactory.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.metadata;
+package org.apache.shardingsphere.test.e2e.sql.framework.metadata;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.framework.metadata.dialect.PostgreSQLDatabaseAssertionMetaDataSQLProvider;
+import
org.apache.shardingsphere.test.e2e.sql.framework.metadata.dialect.PostgreSQLDatabaseAssertionMetaDataSQLProvider;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/DialectDatabaseAssertionMetaDataSQLProvider.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/DialectDatabaseAssertionMetaDataSQLProvider.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/DialectDatabaseAssertionMetaDataSQLProvider.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/DialectDatabaseAssertionMetaDataSQLProvider.java
index e01c0fdce2b..e8830e4f4aa 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/DialectDatabaseAssertionMetaDataSQLProvider.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/DialectDatabaseAssertionMetaDataSQLProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.metadata;
+package org.apache.shardingsphere.test.e2e.sql.framework.metadata;
/**
* Dialect database assertion meta data SQL provider.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/dialect/PostgreSQLDatabaseAssertionMetaDataSQLProvider.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/dialect/PostgreSQLDatabaseAssertionMetaDataSQLProvider.java
similarity index 88%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/dialect/PostgreSQLDatabaseAssertionMetaDataSQLProvider.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/dialect/PostgreSQLDatabaseAssertionMetaDataSQLProvider.java
index a03f81ba316..923854f3f5f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/metadata/dialect/PostgreSQLDatabaseAssertionMetaDataSQLProvider.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/metadata/dialect/PostgreSQLDatabaseAssertionMetaDataSQLProvider.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.metadata.dialect;
+package org.apache.shardingsphere.test.e2e.sql.framework.metadata.dialect;
-import
org.apache.shardingsphere.test.e2e.framework.metadata.DialectDatabaseAssertionMetaDataSQLProvider;
+import
org.apache.shardingsphere.test.e2e.sql.framework.metadata.DialectDatabaseAssertionMetaDataSQLProvider;
/**
* PostgreSQL database assertion meta data SQL provider.
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/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
similarity index 87%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
index 1b8b5d37bd4..b05d81acade 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/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.param.array;
+package org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-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.E2ETestEnvironment;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import java.util.Collection;
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/sql/framework/param/array/E2ETestParameterFactory.java
similarity index 92%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
index 09475818e3a..32e02ea70d7 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/sql/framework/param/array/E2ETestParameterFactory.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.param.array;
+package org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-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.E2ETestEnvironment;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import java.util.Collection;
import java.util.LinkedList;
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/sql/framework/param/array/E2ETestParameterGenerator.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterGenerator.java
index 283d7a922e5..39735a60f61 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/sql/framework/param/array/E2ETestParameterGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.param.array;
+package org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -25,14 +25,14 @@ import
org.apache.shardingsphere.distsql.statement.type.ral.RALStatement;
import org.apache.shardingsphere.distsql.statement.type.rdl.RDLStatement;
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.SQLE2ETestCasesXMLLoader;
-import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
-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;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.cases.SQLE2ETestCasesXMLLoader;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.CaseTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
import java.util.Arrays;
import java.util.Collection;
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/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
similarity index 88%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 6205c57c9da..27d67da1fdf 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/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.param.array;
+package org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-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.container.atomic.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import java.util.Collection;
import java.util.Collections;
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/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
similarity index 87%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index 3eb31791d4c..10d254358e2 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/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.param.array;
+package org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-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.E2ETestEnvironment;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import java.util.Collection;
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/sql/framework/param/model/AssertionTestParameter.java
similarity index 81%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/AssertionTestParameter.java
index 53be101fa16..234cda44260 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/sql/framework/param/model/AssertionTestParameter.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.param.model;
+package org.apache.shardingsphere.test.e2e.sql.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
/**
* 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/sql/framework/param/model/CaseTestParameter.java
similarity index 87%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/CaseTestParameter.java
index 7a88c627960..3b13cf9c298 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/sql/framework/param/model/CaseTestParameter.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.param.model;
+package org.apache.shardingsphere.test.e2e.sql.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
+import org.apache.shardingsphere.test.e2e.sql.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/sql/framework/param/model/E2ETestParameter.java
similarity index 89%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/E2ETestParameter.java
index 9203e5bb3b7..ea47c56ce82 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/sql/framework/param/model/E2ETestParameter.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.param.model;
+package org.apache.shardingsphere.test.e2e.sql.framework.param.model;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
/**
* E2E test parameter.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/type/SQLCommandType.java
similarity index 98%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/type/SQLCommandType.java
index 9ca5bb24ba1..317b1d137ad 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/type/SQLCommandType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.type;
+package org.apache.shardingsphere.test.e2e.sql.framework.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/type/SQLExecuteType.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/type/SQLExecuteType.java
index b8ab28f32f7..6afcea73138 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/type/SQLExecuteType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.framework.type;
+package org.apache.shardingsphere.test.e2e.sql.framework.type;
/**
* SQL execute type.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
similarity index 90%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
index c864703acdd..2c10dc5b41b 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it;
+package org.apache.shardingsphere.test.e2e.sql.it;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
-import
org.apache.shardingsphere.test.e2e.it.SQLE2EIT.SQLE2EITEnvironmentExtension;
-import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT.SQLE2EITEnvironmentExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.InvocationInterceptor;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EITContext.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EITContext.java
similarity index 82%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EITContext.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EITContext.java
index df1b9647ce3..63512b7226d 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EITContext.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EITContext.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it;
+package org.apache.shardingsphere.test.e2e.sql.it;
import lombok.AccessLevel;
import lombok.Getter;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
-import org.apache.shardingsphere.test.e2e.cases.dataset.DataSet;
-import org.apache.shardingsphere.test.e2e.cases.dataset.DataSetLoader;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.DataSet;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.DataSetLoader;
+import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
import java.util.Collections;
import java.util.List;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
similarity index 90%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
index 35d91a5ad13..e6c261cc7e1 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.distsql.ral;
+package org.apache.shardingsphere.test.e2e.sql.it.distsql.ral;
import com.google.common.base.Splitter;
import lombok.Setter;
-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.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-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.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rdl/RDLE2EIT.java
similarity index 89%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rdl/RDLE2EIT.java
index 2b884d58ae1..1c7ec784126 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rdl/RDLE2EIT.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.distsql.rdl;
+package org.apache.shardingsphere.test.e2e.sql.it.distsql.rdl;
import com.google.common.base.Splitter;
import lombok.Setter;
-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.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-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.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rql/RQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rql/RQLE2EIT.java
similarity index 84%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rql/RQLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rql/RQLE2EIT.java
index 0d8b5d89fb5..6b4f2186703 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rql/RQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rql/RQLE2EIT.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.distsql.rql;
+package org.apache.shardingsphere.test.e2e.sql.it.distsql.rql;
import lombok.Setter;
-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.it.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
-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.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dal/DALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dal/DALE2EIT.java
similarity index 87%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dal/DALE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dal/DALE2EIT.java
index 38831b290a3..a733331a3bc 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dal/DALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dal/DALE2EIT.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dal;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dal;
import lombok.Setter;
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.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
-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.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dcl/DCLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dcl/DCLE2EIT.java
similarity index 85%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dcl/DCLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dcl/DCLE2EIT.java
index 487ed2b8c53..2e6e804200f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dcl/DCLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dcl/DCLE2EIT.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dcl;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dcl;
import lombok.Setter;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.authority.AuthorityEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
-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.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
index 1a529c27c5e..b8719e91eee 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
@@ -15,24 +15,24 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.ddl;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.ddl;
import com.google.common.base.Splitter;
import lombok.Setter;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.expr.entry.InlineExpressionParserFactory;
-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.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-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.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetIndex;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/AdditionalDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/AdditionalDMLE2EIT.java
similarity index 96%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/AdditionalDMLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/AdditionalDMLE2EIT.java
index d5204703958..7b02bc1366f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/AdditionalDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/AdditionalDMLE2EIT.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dml;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dml;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-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.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.condition.EnabledIf;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BaseDMLE2EIT.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BaseDMLE2EIT.java
index 96055858ab4..aa8ae1e1908 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BaseDMLE2EIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dml;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dml;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
@@ -26,23 +26,23 @@ import
org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.expr.entry.InlineExpressionParserFactory;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
-import org.apache.shardingsphere.test.e2e.cases.dataset.DataSet;
-import org.apache.shardingsphere.test.e2e.cases.dataset.DataSetLoader;
-import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
-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.env.DataSetEnvironmentManager;
-import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
-import
org.apache.shardingsphere.test.e2e.framework.metadata.DialectDatabaseAssertionMetaDataFactory;
-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;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.DataSet;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.DataSetLoader;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.sql.env.DataSetEnvironmentManager;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.metadata.DialectDatabaseAssertionMetaDataFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.CaseTestParameter;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.awaitility.Awaitility;
import javax.sql.DataSource;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BatchDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BatchDMLE2EIT.java
similarity index 88%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BatchDMLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BatchDMLE2EIT.java
index 68238b23763..84bb3eb8c8f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BatchDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BatchDMLE2EIT.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dml;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dml;
-import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.CaseTestParameter;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
+import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.CaseTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/GeneralDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/GeneralDMLE2EIT.java
similarity index 88%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/GeneralDMLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/GeneralDMLE2EIT.java
index 7e3d669fadf..85b49c88db0 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/GeneralDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/GeneralDMLE2EIT.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dml;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dml;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
-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.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/AdditionalDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/AdditionalDQLE2EIT.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/AdditionalDQLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/AdditionalDQLE2EIT.java
index 0447efd1abc..8120387de5e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/AdditionalDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/AdditionalDQLE2EIT.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dql;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dql;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-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.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
@@ -40,6 +40,7 @@ import java.sql.Statement;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@SuppressWarnings("MagicConstant")
@SQLE2EITSettings(SQLCommandType.DQL)
class AdditionalDQLE2EIT extends BaseDQLE2EIT {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/BaseDQLE2EIT.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/BaseDQLE2EIT.java
index bfc8c4f49e1..a1e67df2c88 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/BaseDQLE2EIT.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dql;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dql;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
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.env.DataSetEnvironmentManager;
-import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
+import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
+import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
+import org.apache.shardingsphere.test.e2e.sql.env.DataSetEnvironmentManager;
+import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.awaitility.Awaitility;
import javax.sql.DataSource;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/GeneralDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java
similarity index 94%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/GeneralDQLE2EIT.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java
index bc416b69065..2fa60d22196 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/GeneralDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.it.sql.dql;
+package org.apache.shardingsphere.test.e2e.sql.it.sql.dql;
-import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-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.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
+import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EITContext;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
