You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/04/26 16:13:52 UTC
(shardingsphere) branch master updated: Refactor package structure to use 'it' for integration tests (#35267)
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 bb495066a45 Refactor package structure to use 'it' for integration tests (#35267)
bb495066a45 is described below
commit bb495066a45b7950d9385c08cfda82a59738973b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Apr 27 00:13:46 2025 +0800
Refactor package structure to use 'it' for integration tests (#35267)
---
.../test/e2e/cases/SQLE2ETestCasesXMLLoader.java | 2 +-
.../framework/SQLE2EITArgumentsProvider.java | 12 ++++++------
.../e2e/{engine => }/framework/SQLE2EITSettings.java | 4 ++--
.../framework/SQLE2EITSettingsExtension.java | 2 +-
.../framework/database/DatabaseAssertionMetaData.java | 2 +-
.../database/DatabaseAssertionMetaDataFactory.java | 4 ++--
.../impl/PostgreSQLDatabaseAssertionMetaData.java | 4 ++--
.../array/ClusterTestParameterArrayGenerator.java | 8 ++++----
.../framework/param/array/E2ETestParameterFactory.java | 8 ++++----
.../param/array/E2ETestParameterGenerator.java | 12 ++++++------
.../array/JdbcStandaloneTestParameterGenerator.java | 8 ++++----
.../array/ProxyStandaloneTestParameterGenerator.java | 8 ++++----
.../framework/param/model/AssertionTestParameter.java | 6 +++---
.../framework/param/model/CaseTestParameter.java | 4 ++--
.../framework/param/model/E2ETestParameter.java | 4 ++--
.../{engine => }/framework/type/SQLCommandType.java | 2 +-
.../{engine => }/framework/type/SQLExecuteType.java | 2 +-
.../test/e2e/{engine/type => it}/SQLE2EIT.java | 6 +++---
.../test/e2e/{engine/type => it}/SQLE2EITContext.java | 6 +++---
.../e2e/{engine/type => it}/distsql/ral/RALE2EIT.java | 16 ++++++++--------
.../e2e/{engine/type => it}/distsql/rdl/RDLE2EIT.java | 16 ++++++++--------
.../e2e/{engine/type => it}/distsql/rql/RQLE2EIT.java | 16 ++++++++--------
.../test/e2e/{engine/type => it}/sql/dal/DALE2EIT.java | 16 ++++++++--------
.../test/e2e/{engine/type => it}/sql/dcl/DCLE2EIT.java | 18 +++++++++---------
.../test/e2e/{engine/type => it}/sql/ddl/DDLE2EIT.java | 18 +++++++++---------
.../type => it}/sql/dml/AdditionalDMLE2EIT.java | 16 ++++++++--------
.../e2e/{engine/type => it}/sql/dml/BaseDMLE2EIT.java | 16 ++++++++--------
.../e2e/{engine/type => it}/sql/dml/BatchDMLE2EIT.java | 12 ++++++------
.../{engine/type => it}/sql/dml/GeneralDMLE2EIT.java | 16 ++++++++--------
.../type => it}/sql/dql/AdditionalDQLE2EIT.java | 16 ++++++++--------
.../e2e/{engine/type => it}/sql/dql/BaseDQLE2EIT.java | 8 ++++----
.../{engine/type => it}/sql/dql/GeneralDQLE2EIT.java | 16 ++++++++--------
32 files changed, 152 insertions(+), 152 deletions(-)
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/cases/SQLE2ETestCasesXMLLoader.java
index 804c62fcb4b..000538fd0e7 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/cases/SQLE2ETestCasesXMLLoader.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.cases;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITArgumentsProvider.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITArgumentsProvider.java
similarity index 83%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITArgumentsProvider.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITArgumentsProvider.java
index e0f934ce9be..4fd60eb5857 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITArgumentsProvider.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITArgumentsProvider.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework;
+package org.apache.shardingsphere.test.e2e.framework;
import com.google.common.base.Preconditions;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.CaseTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.CaseTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
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/engine/framework/SQLE2EITSettings.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettings.java
similarity index 90%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettings.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettings.java
index c0bef5405f7..6c90d235ed3 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettings.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettings.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework;
+package org.apache.shardingsphere.test.e2e.framework;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.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/engine/framework/SQLE2EITSettingsExtension.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettingsExtension.java
similarity index 97%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettingsExtension.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettingsExtension.java
index 20ec9805c45..2c45964d655 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettingsExtension.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/SQLE2EITSettingsExtension.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework;
+package org.apache.shardingsphere.test.e2e.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/engine/framework/database/DatabaseAssertionMetaData.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/DatabaseAssertionMetaData.java
similarity index 94%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/database/DatabaseAssertionMetaData.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/DatabaseAssertionMetaData.java
index 1419464d222..81b0cca010e 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/database/DatabaseAssertionMetaData.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/DatabaseAssertionMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.database;
+package org.apache.shardingsphere.test.e2e.framework.database;
import javax.sql.DataSource;
import java.sql.SQLException;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/database/DatabaseAssertionMetaDataFactory.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/DatabaseAssertionMetaDataFactory.java
similarity index 90%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/database/DatabaseAssertionMetaDataFactory.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/DatabaseAssertionMetaDataFactory.java
index de9771a4ec9..7ecdaffead9 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/database/DatabaseAssertionMetaDataFactory.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/DatabaseAssertionMetaDataFactory.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.database;
+package org.apache.shardingsphere.test.e2e.framework.database;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.engine.framework.database.impl.PostgreSQLDatabaseAssertionMetaData;
+import org.apache.shardingsphere.test.e2e.framework.database.impl.PostgreSQLDatabaseAssertionMetaData;
import java.util.Optional;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/database/impl/PostgreSQLDatabaseAssertionMetaData.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/impl/PostgreSQLDatabaseAssertionMetaData.java
similarity index 91%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/database/impl/PostgreSQLDatabaseAssertionMetaData.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/impl/PostgreSQLDatabaseAssertionMetaData.java
index 96f0e9bd502..b7bc9cf6307 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/database/impl/PostgreSQLDatabaseAssertionMetaData.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/database/impl/PostgreSQLDatabaseAssertionMetaData.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.database.impl;
+package org.apache.shardingsphere.test.e2e.framework.database.impl;
-import org.apache.shardingsphere.test.e2e.engine.framework.database.DatabaseAssertionMetaData;
+import org.apache.shardingsphere.test.e2e.framework.database.DatabaseAssertionMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/ClusterTestParameterArrayGenerator.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
similarity index 87%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/ClusterTestParameterArrayGenerator.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
index ad60fc5931e..1b8b5d37bd4 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/ClusterTestParameterArrayGenerator.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.param.array;
+package org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Collection;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterFactory.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
similarity index 91%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterFactory.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
index 2c1a00bb5e1..09475818e3a 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterFactory.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.param.array;
+package org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Collection;
import java.util.LinkedList;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterGenerator.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
similarity index 95%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterGenerator.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
index f79568ca766..6500d0e144a 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/E2ETestParameterGenerator.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.param.array;
+package org.apache.shardingsphere.test.e2e.framework.param.array;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -27,12 +27,12 @@ import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
import org.apache.shardingsphere.test.e2e.cases.SQLE2ETestCasesXMLLoader;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.CaseTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
+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 java.util.Arrays;
import java.util.Collection;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/JdbcStandaloneTestParameterGenerator.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
similarity index 88%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/JdbcStandaloneTestParameterGenerator.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 9559c711497..6205c57c9da 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.param.array;
+package org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Collection;
import java.util.Collections;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/ProxyStandaloneTestParameterGenerator.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
similarity index 87%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/ProxyStandaloneTestParameterGenerator.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index b1edb3c2663..3eb31791d4c 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/array/ProxyStandaloneTestParameterGenerator.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.param.array;
+package org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import java.util.Collection;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/AssertionTestParameter.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
similarity index 89%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/AssertionTestParameter.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
index 2ff38a242f6..66498b7618a 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/AssertionTestParameter.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/AssertionTestParameter.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.param.model;
+package org.apache.shardingsphere.test.e2e.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAssertion;
/**
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/CaseTestParameter.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
similarity index 91%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/CaseTestParameter.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
index f9c1e40d62a..3ae03132326 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/CaseTestParameter.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/CaseTestParameter.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.param.model;
+package org.apache.shardingsphere.test.e2e.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
/**
* Case test parameter.
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/E2ETestParameter.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
similarity index 92%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/E2ETestParameter.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
index e31bb0aa8b1..fa089574d57 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/param/model/E2ETestParameter.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/model/E2ETestParameter.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.param.model;
+package org.apache.shardingsphere.test.e2e.framework.param.model;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.test.e2e.cases.casse.SQLE2ETestCaseContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
/**
* E2E test parameter.
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/type/SQLCommandType.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
similarity index 98%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/type/SQLCommandType.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
index 40ab725ad67..97f93e44a58 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/type/SQLCommandType.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLCommandType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.type;
+package org.apache.shardingsphere.test.e2e.framework.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/type/SQLExecuteType.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
similarity index 93%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/type/SQLExecuteType.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
index d8fd57f90d1..b8ab28f32f7 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/type/SQLExecuteType.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/type/SQLExecuteType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.framework.type;
+package org.apache.shardingsphere.test.e2e.framework.type;
/**
* SQL execute type.
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EIT.java
similarity index 92%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EIT.java
index 0c825d6e5d1..c864703acdd 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EIT.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type;
+package org.apache.shardingsphere.test.e2e.it;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT.SQLE2EITEnvironmentExtension;
+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;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EITContext.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EITContext.java
similarity index 92%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EITContext.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EITContext.java
index c48f317bf6c..df1b9647ce3 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EITContext.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/SQLE2EITContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type;
+package org.apache.shardingsphere.test.e2e.it;
import lombok.AccessLevel;
import lombok.Getter;
@@ -23,8 +23,8 @@ import org.apache.shardingsphere.test.e2e.cases.casse.assertion.SQLE2ETestCaseAs
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.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.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/engine/type/distsql/ral/RALE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
similarity index 93%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/distsql/ral/RALE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
index a3119adfd4b..07ced9f4845 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/distsql/ral/RALE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.distsql.ral;
+package org.apache.shardingsphere.test.e2e.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.engine.type.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+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.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/engine/type/distsql/rdl/RDLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
similarity index 92%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/distsql/rdl/RDLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
index 6d6a7267efc..f72cae15432 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/distsql/rdl/RDLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.distsql.rdl;
+package org.apache.shardingsphere.test.e2e.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.engine.type.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+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.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/engine/type/distsql/rql/RQLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rql/RQLE2EIT.java
similarity index 89%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/distsql/rql/RQLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rql/RQLE2EIT.java
index ee9bdb16ff0..0d8b5d89fb5 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/distsql/rql/RQLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rql/RQLE2EIT.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.distsql.rql;
+package org.apache.shardingsphere.test.e2e.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.engine.type.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+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.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/engine/type/sql/dal/DALE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dal/DALE2EIT.java
similarity index 91%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dal/DALE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dal/DALE2EIT.java
index 6eb23982dde..90995142303 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dal/DALE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dal/DALE2EIT.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dal;
+package org.apache.shardingsphere.test.e2e.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.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT;
+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.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
+import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.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/engine/type/sql/dcl/DCLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dcl/DCLE2EIT.java
similarity index 86%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dcl/DCLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dcl/DCLE2EIT.java
index 553398b71ca..487ed2b8c53 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dcl/DCLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dcl/DCLE2EIT.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dcl;
+package org.apache.shardingsphere.test.e2e.it.sql.dcl;
import lombok.Setter;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
+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.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.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.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/engine/type/sql/ddl/DDLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
similarity index 95%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/ddl/DDLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
index 65caaad72c5..d1499bd56f2 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/ddl/DDLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.ddl;
+package org.apache.shardingsphere.test.e2e.it.sql.ddl;
import com.google.common.base.Splitter;
import lombok.Setter;
@@ -24,15 +24,15 @@ import org.apache.shardingsphere.infra.expr.core.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.engine.type.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.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.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/engine/type/sql/dml/AdditionalDMLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/AdditionalDMLE2EIT.java
similarity index 96%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/AdditionalDMLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/AdditionalDMLE2EIT.java
index e7befb78c50..d5204703958 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/AdditionalDMLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/AdditionalDMLE2EIT.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dml;
+package org.apache.shardingsphere.test.e2e.it.sql.dml;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
+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.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.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.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/engine/type/sql/dml/BaseDMLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
similarity index 96%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
index adb3d295abc..847f81385a5 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dml;
+package org.apache.shardingsphere.test.e2e.it.sql.dml;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
@@ -32,18 +32,18 @@ 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.engine.type.SQLE2EITContext;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
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.engine.framework.database.DatabaseAssertionMetaData;
-import org.apache.shardingsphere.test.e2e.engine.framework.database.DatabaseAssertionMetaDataFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.CaseTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
+import org.apache.shardingsphere.test.e2e.framework.database.DatabaseAssertionMetaData;
+import org.apache.shardingsphere.test.e2e.framework.database.DatabaseAssertionMetaDataFactory;
+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.testcontainers.shaded.org.awaitility.Awaitility;
import javax.sql.DataSource;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BatchDMLE2EIT.java
similarity index 91%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BatchDMLE2EIT.java
index 4480a50e948..68238b23763 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BatchDMLE2EIT.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dml;
+package org.apache.shardingsphere.test.e2e.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.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.CaseTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
+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.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/engine/type/sql/dml/GeneralDMLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/GeneralDMLE2EIT.java
similarity index 89%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/GeneralDMLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/GeneralDMLE2EIT.java
index 3d585633280..7e3d669fadf 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/GeneralDMLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/GeneralDMLE2EIT.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dml;
+package org.apache.shardingsphere.test.e2e.it.sql.dml;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.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.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/engine/type/sql/dql/AdditionalDQLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/AdditionalDQLE2EIT.java
similarity index 95%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/AdditionalDQLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/AdditionalDQLE2EIT.java
index ca39836c98e..0447efd1abc 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/AdditionalDQLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/AdditionalDQLE2EIT.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dql;
+package org.apache.shardingsphere.test.e2e.it.sql.dql;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
+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.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.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.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/engine/type/sql/dql/BaseDQLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
similarity index 97%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/BaseDQLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
index a7830935527..115b217faab 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/BaseDQLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dql;
+package org.apache.shardingsphere.test.e2e.it.sql.dql;
import lombok.AccessLevel;
import lombok.Getter;
@@ -24,13 +24,13 @@ 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.engine.type.SQLE2EITContext;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
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.engine.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.testcontainers.shaded.org.awaitility.Awaitility;
import javax.sql.DataSource;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/GeneralDQLE2EIT.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/GeneralDQLE2EIT.java
similarity index 95%
rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/GeneralDQLE2EIT.java
rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/GeneralDQLE2EIT.java
index 35ac5d175b2..b3c13a4c69b 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/GeneralDQLE2EIT.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/GeneralDQLE2EIT.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine.type.sql.dql;
+package org.apache.shardingsphere.test.e2e.it.sql.dql;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EITContext;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
-import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
-import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.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.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;