This is an automated email from the ASF dual-hosted git repository.
panjuan 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 8e2debbcee5 Refactor E2ETestCaseArgumentsProvider (#24719)
8e2debbcee5 is described below
commit 8e2debbcee5de0cb6ed5b06b7a15b7ce57bd6c82
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Mar 21 18:36:56 2023 +0800
Refactor E2ETestCaseArgumentsProvider (#24719)
---
.../{ => arg}/E2ETestCaseArgumentsProvider.java | 17 ++++++++++++++--
.../e2e/engine/{ => arg}/E2ETestCaseSettings.java | 9 ++++++++-
.../test/e2e/engine/type/DALE2EIT.java | 4 ++--
.../test/e2e/engine/type/DCLE2EIT.java | 4 ++--
.../test/e2e/engine/type/DDLE2EIT.java | 4 ++--
.../test/e2e/engine/type/RALE2EIT.java | 4 ++--
.../test/e2e/engine/type/RDLE2EIT.java | 4 ++--
.../test/e2e/engine/type/RQLE2EIT.java | 4 ++--
.../e2e/engine/type/dml/AdditionalDMLE2EIT.java | 4 ++--
.../test/e2e/engine/type/dml/BatchDMLE2EIT.java | 23 +++++-----------------
.../test/e2e/engine/type/dml/GeneralDMLE2EIT.java | 4 ++--
.../e2e/engine/type/dql/AdditionalDQLE2EIT.java | 4 ++--
.../test/e2e/engine/type/dql/GeneralDQLE2EIT.java | 4 ++--
13 files changed, 48 insertions(+), 41 deletions(-)
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/E2ETestCaseArgumentsProvider.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
similarity index 67%
rename from
test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/E2ETestCaseArgumentsProvider.java
rename to
test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
index e3a75f97a57..fac024a5cc7 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/E2ETestCaseArgumentsProvider.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine;
+package org.apache.shardingsphere.test.e2e.engine.arg;
import com.google.common.base.Preconditions;
+import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.framework.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;
@@ -36,7 +39,17 @@ public final class E2ETestCaseArgumentsProvider implements
ArgumentsProvider {
public Stream<? extends Arguments> provideArguments(final ExtensionContext
extensionContext) {
E2ETestCaseSettings settings =
extensionContext.getRequiredTestClass().getAnnotation(E2ETestCaseSettings.class);
Preconditions.checkNotNull(settings, "Annotation E2ETestCaseSettings
is required.");
- Collection<AssertionTestParameter> result =
E2ETestParameterFactory.getAssertionTestParameters(settings.value());
+ return settings.batch() ? getBatchTestCaseArguments(settings.value())
: getSingleTestCaseArguments(settings.value());
+ }
+
+ private Stream<Arguments> getBatchTestCaseArguments(final SQLCommandType
type) {
+ Collection<E2ETestParameter> result =
E2ETestParameterFactory.getCaseTestParameters(type);
+ // TODO make sure test case can not be null
+ return result.isEmpty() ? Stream.of(Arguments.of(new
CaseTestParameter(null, null, null, null, null))) :
result.stream().map(Arguments::of);
+ }
+
+ private Stream<Arguments> getSingleTestCaseArguments(final SQLCommandType
type) {
+ Collection<AssertionTestParameter> result =
E2ETestParameterFactory.getAssertionTestParameters(type);
// TODO make sure test case can not be null
return result.isEmpty() ? Stream.of(Arguments.of(new
AssertionTestParameter(null, null, null, null, null, null, null))) :
result.stream().map(Arguments::of);
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/E2ETestCaseSettings.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
similarity index 88%
rename from
test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/E2ETestCaseSettings.java
rename to
test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
index ef8f3d41996..3ccfb3c61bb 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/E2ETestCaseSettings.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.engine;
+package org.apache.shardingsphere.test.e2e.engine.arg;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.framework.E2EExtension;
@@ -39,4 +39,11 @@ public @interface E2ETestCaseSettings {
* @return SQL command type
*/
SQLCommandType value();
+
+ /**
+ * Is batch execute.
+ *
+ * @return batch execute or not
+ */
+ boolean batch() default false;
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
index ac52161b8dd..0a771c49d54 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
@@ -22,8 +22,8 @@ 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.E2EContainerComposer;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
index 7d2f1c0ebef..fcda251ce7b 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.e2e.engine.type;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.authority.AuthorityEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
index d881534667a..d54fa9824fe 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
@@ -26,8 +26,8 @@ import
org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetIndex;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
index fe9c38c2513..27f8dcbe62d 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
index e07ad53ec21..7ae0ea5c22a 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
index 1d26da6437b..45bc7631c3d 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
@@ -21,8 +21,8 @@ import
org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
index ec5766fa2d9..0759c199c90 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.engine.type.dml;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
index 4a2c70b14a4..e29612f1dae 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
@@ -21,14 +21,12 @@ import
org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
import org.apache.shardingsphere.test.e2e.engine.BatchE2EITContainerComposer;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
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.param.model.E2ETestParameter;
import org.junit.jupiter.api.condition.EnabledIf;
-import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import javax.xml.bind.JAXBException;
@@ -37,17 +35,16 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.text.ParseException;
-import java.util.Collection;
-import java.util.stream.Stream;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+@E2ETestCaseSettings(value = SQLCommandType.DML, batch = true)
public final class BatchDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(TestCaseArgumentsProvider.class)
+ @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
public void assertExecuteBatch(final CaseTestParameter testParam) throws
SQLException, ParseException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -80,7 +77,7 @@ public final class BatchDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(TestCaseArgumentsProvider.class)
+ @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
public void assertClearBatch(final CaseTestParameter testParam) throws
SQLException, ParseException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -102,14 +99,4 @@ public final class BatchDMLE2EIT {
private static boolean isEnabled() {
return E2ETestParameterFactory.containsTestParameter();
}
-
- private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
-
- @Override
- public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- Collection<E2ETestParameter> result =
E2ETestParameterFactory.getCaseTestParameters(SQLCommandType.DML);
- // TODO make sure test case can not be null
- return result.isEmpty() ? Stream.of(Arguments.of(new
CaseTestParameter(null, null, null, null, null))) :
result.stream().map(Arguments::of);
- }
- }
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/GeneralDMLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/GeneralDMLE2EIT.java
index 6f53e84e807..6fd0299367a 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/GeneralDMLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/GeneralDMLE2EIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.engine.type.dml;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
index 751ef3947e3..eb3a49fce66 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.engine.type.dql;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
index 28e4982c04f..e930503096d 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/GeneralDQLE2EIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.engine.type.dql;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
import org.apache.shardingsphere.test.e2e.cases.SQLExecuteType;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import org.apache.shardingsphere.test.e2e.engine.SingleE2EITContainerComposer;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
