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 a77421163be Rename SQLE2EITSettings (#35255)
a77421163be is described below
commit a77421163be72f52770a2ceb0baf1e6db232d892
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Apr 26 11:22:38 2025 +0800
Rename SQLE2EITSettings (#35255)
---
...2ETestCaseSettings.java => SQLE2EITSettings.java} | 4 ++--
...der.java => SQLE2ETestCaseArgumentsProvider.java} | 6 +++---
.../test/e2e/engine/type/distsql/ral/RALE2EIT.java | 8 ++++----
.../test/e2e/engine/type/distsql/rdl/RDLE2EIT.java | 8 ++++----
.../test/e2e/engine/type/distsql/rql/RQLE2EIT.java | 8 ++++----
.../test/e2e/engine/type/sql/dal/DALE2EIT.java | 8 ++++----
.../test/e2e/engine/type/sql/dcl/DCLE2EIT.java | 10 +++++-----
.../test/e2e/engine/type/sql/ddl/DDLE2EIT.java | 10 +++++-----
.../e2e/engine/type/sql/dml/AdditionalDMLE2EIT.java | 20 ++++++++++----------
.../test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java | 10 +++++-----
.../e2e/engine/type/sql/dml/GeneralDMLE2EIT.java | 10 +++++-----
.../e2e/engine/type/sql/dql/AdditionalDQLE2EIT.java | 14 +++++++-------
.../e2e/engine/type/sql/dql/GeneralDQLE2EIT.java | 10 +++++-----
13 files changed, 63 insertions(+), 63 deletions(-)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2EITSettings.java
similarity index 95%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2EITSettings.java
index 63c884d82b6..98f6486ff92 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseSettings.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2EITSettings.java
@@ -26,12 +26,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
- * E2E test case settings.
+ * SQL E2E IT settings.
*/
@ExtendWith(E2ESettingExtension.class)
@Inherited
@Retention(RetentionPolicy.RUNTIME)
-public @interface E2ETestCaseSettings {
+public @interface SQLE2EITSettings {
/**
* Get SQL command type.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2ETestCaseArgumentsProvider.java
similarity index 92%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2ETestCaseArgumentsProvider.java
index 51e88373472..f3588ce017c 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/E2ETestCaseArgumentsProvider.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2ETestCaseArgumentsProvider.java
@@ -31,13 +31,13 @@ import java.util.Collection;
import java.util.stream.Stream;
/**
- * E2E test case arguments provider.
+ * SQL E2E test case arguments provider.
*/
-public final class E2ETestCaseArgumentsProvider implements ArgumentsProvider {
+public final class SQLE2ETestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(final ExtensionContext
extensionContext) {
- E2ETestCaseSettings settings =
extensionContext.getRequiredTestClass().getAnnotation(E2ETestCaseSettings.class);
+ SQLE2EITSettings settings =
extensionContext.getRequiredTestClass().getAnnotation(SQLE2EITSettings.class);
Preconditions.checkNotNull(settings, "Annotation E2ETestCaseSettings
is required.");
return settings.batch() ? getBatchTestCaseArguments(settings.value())
: getSingleTestCaseArguments(settings.value());
}
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/engine/type/distsql/ral/RALE2EIT.java
index a42ad7557c6..e31ca2cab20 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/engine/type/distsql/ral/RALE2EIT.java
@@ -24,8 +24,8 @@ 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.env.E2EEnvironmentEngine;
-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.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
@@ -51,7 +51,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@E2ETestCaseSettings(SQLCommandType.RAL)
+@SQLE2EITSettings(SQLCommandType.RAL)
@Setter
class RALE2EIT implements SQLE2EIT {
@@ -59,7 +59,7 @@ class RALE2EIT implements SQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecute(final AssertionTestParameter testParam) throws
SQLException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/distsql/rdl/RDLE2EIT.java
index 3a7b8bbbc8d..79780efb3d1 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/engine/type/distsql/rdl/RDLE2EIT.java
@@ -24,8 +24,8 @@ 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.env.E2EEnvironmentEngine;
-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.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
@@ -51,7 +51,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@E2ETestCaseSettings(SQLCommandType.RDL)
+@SQLE2EITSettings(SQLCommandType.RDL)
@Setter
class RDLE2EIT implements SQLE2EIT {
@@ -59,7 +59,7 @@ class RDLE2EIT implements SQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecute(final AssertionTestParameter testParam) throws
SQLException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/distsql/rql/RQLE2EIT.java
index 5b1b5448696..6af6221e244 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/engine/type/distsql/rql/RQLE2EIT.java
@@ -23,8 +23,8 @@ 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.env.E2EEnvironmentEngine;
-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.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
@@ -46,7 +46,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@E2ETestCaseSettings(SQLCommandType.RQL)
+@SQLE2EITSettings(SQLCommandType.RQL)
@Setter
class RQLE2EIT implements SQLE2EIT {
@@ -54,7 +54,7 @@ class RQLE2EIT implements SQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecute(final AssertionTestParameter testParam) throws
SQLException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/sql/dal/DALE2EIT.java
index df73b7230d2..17803125e13 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/engine/type/sql/dal/DALE2EIT.java
@@ -22,8 +22,8 @@ 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.arg.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
@@ -48,7 +48,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@E2ETestCaseSettings(SQLCommandType.DAL)
+@SQLE2EITSettings(SQLCommandType.DAL)
@Setter
class DALE2EIT implements SQLE2EIT {
@@ -56,7 +56,7 @@ class DALE2EIT implements SQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecute(final AssertionTestParameter testParam) throws
SQLException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/sql/dcl/DCLE2EIT.java
index e31455de9cf..b28e57394d6 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/engine/type/sql/dcl/DCLE2EIT.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.test.e2e.engine.type.sql.dcl;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
-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.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.authority.AuthorityEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
@@ -40,7 +40,7 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
-@E2ETestCaseSettings(SQLCommandType.DCL)
+@SQLE2EITSettings(SQLCommandType.DCL)
@Setter
class DCLE2EIT implements SQLE2EIT {
@@ -48,7 +48,7 @@ class DCLE2EIT implements SQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteUpdate(final AssertionTestParameter testParam) throws
SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -79,7 +79,7 @@ class DCLE2EIT implements SQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecute(final AssertionTestParameter testParam) throws
SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/sql/ddl/DDLE2EIT.java
index b6488651291..34d9a21f966 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/engine/type/sql/ddl/DDLE2EIT.java
@@ -26,8 +26,8 @@ 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.env.E2EEnvironmentEngine;
-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.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
@@ -57,7 +57,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@E2ETestCaseSettings(SQLCommandType.DDL)
+@SQLE2EITSettings(SQLCommandType.DDL)
@Setter
class DDLE2EIT implements SQLE2EIT {
@@ -65,7 +65,7 @@ class DDLE2EIT implements SQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteUpdate(final AssertionTestParameter testParam) throws
SQLException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -101,7 +101,7 @@ class DDLE2EIT implements SQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecute(final AssertionTestParameter testParam) throws
Exception {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/sql/dml/AdditionalDMLE2EIT.java
index d749dc67d51..d63543fe7d6 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/engine/type/sql/dml/AdditionalDMLE2EIT.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.e2e.engine.type.sql.dml;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
@@ -41,12 +41,12 @@ import java.sql.Statement;
import static org.junit.jupiter.api.Assertions.assertFalse;
-@E2ETestCaseSettings(SQLCommandType.DML)
+@SQLE2EITSettings(SQLCommandType.DML)
class AdditionalDMLE2EIT extends BaseDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteUpdateWithAutoGeneratedKeys(final AssertionTestParameter
testParam) throws SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -100,7 +100,7 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT {
@Disabled("support execute update with column indexes in #23626")
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteUpdateWithColumnIndexes(final AssertionTestParameter
testParam) throws SQLException, JAXBException, IOException {
if (isPostgreSQLOrOpenGauss(testParam.getDatabaseType().getType())) {
return;
@@ -135,7 +135,7 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT {
@Disabled("support execute update with column names in #23626")
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteUpdateWithColumnNames(final AssertionTestParameter
testParam) throws SQLException, JAXBException, IOException {
if (isPostgreSQLOrOpenGauss(testParam.getDatabaseType().getType())) {
return;
@@ -168,7 +168,7 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteWithoutAutoGeneratedKeys(final AssertionTestParameter
testParam) throws SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -207,7 +207,7 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteWithAutoGeneratedKeys(final AssertionTestParameter
testParam) throws SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -252,7 +252,7 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT {
@Disabled("support execute with column indexes in #23626")
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteWithColumnIndexes(final AssertionTestParameter
testParam) throws SQLException, JAXBException, IOException {
if (isPostgreSQLOrOpenGauss(testParam.getDatabaseType().getType())) {
return;
@@ -289,7 +289,7 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT {
@Disabled("support execute with column names in #23626")
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteWithColumnNames(final AssertionTestParameter testParam)
throws SQLException, JAXBException, IOException {
if (isPostgreSQLOrOpenGauss(testParam.getDatabaseType().getType())) {
return;
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/engine/type/sql/dml/BatchDMLE2EIT.java
index a496f049986..e3122c807d0 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/engine/type/sql/dml/BatchDMLE2EIT.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.test.e2e.engine.type.sql.dml;
import
org.apache.shardingsphere.test.e2e.cases.casse.assertion.E2ETestCaseAssertion;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.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;
@@ -37,12 +37,12 @@ import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-@E2ETestCaseSettings(value = SQLCommandType.DML, batch = true)
+@SQLE2EITSettings(value = SQLCommandType.DML, batch = true)
class BatchDMLE2EIT extends BaseDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteBatch(final CaseTestParameter testParam) throws
SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -100,7 +100,7 @@ class BatchDMLE2EIT extends BaseDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertClearBatch(final CaseTestParameter testParam) throws
SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/sql/dml/GeneralDMLE2EIT.java
index 3c469b2d8e1..bacf3663aec 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/engine/type/sql/dml/GeneralDMLE2EIT.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.e2e.engine.type.sql.dml;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
@@ -38,12 +38,12 @@ import java.sql.Statement;
import static org.junit.jupiter.api.Assertions.assertFalse;
-@E2ETestCaseSettings(SQLCommandType.DML)
+@SQLE2EITSettings(SQLCommandType.DML)
class GeneralDMLE2EIT extends BaseDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteUpdate(final AssertionTestParameter testParam) throws
SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -91,7 +91,7 @@ class GeneralDMLE2EIT extends BaseDMLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecute(final AssertionTestParameter testParam) throws
SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/sql/dql/AdditionalDQLE2EIT.java
index 8c990279b92..e03d3a48981 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/engine/type/sql/dql/AdditionalDQLE2EIT.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.e2e.engine.type.sql.dql;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
@@ -40,12 +40,12 @@ import java.sql.Statement;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@E2ETestCaseSettings(SQLCommandType.DQL)
+@SQLE2EITSettings(SQLCommandType.DQL)
class AdditionalDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteQueryWithResultSetTypeAndConcurrency(final
AssertionTestParameter testParam) throws SQLException, JAXBException,
IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -66,7 +66,7 @@ class AdditionalDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteQueryWithResultSetTypeAndConcurrencyAndHoldability(final
AssertionTestParameter testParam) throws SQLException, JAXBException,
IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -88,7 +88,7 @@ class AdditionalDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteWithResultSetTypeAndConcurrency(final
AssertionTestParameter testParam) throws SQLException, JAXBException,
IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -109,7 +109,7 @@ class AdditionalDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteWithResultSetTypeAndConcurrencyAndHoldability(final
AssertionTestParameter testParam) throws SQLException, JAXBException,
IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
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/engine/type/sql/dql/GeneralDQLE2EIT.java
index 3800ad9b1ff..3c54542ac7d 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/engine/type/sql/dql/GeneralDQLE2EIT.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.e2e.engine.type.sql.dql;
import org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
-import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
-import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
+import
org.apache.shardingsphere.test.e2e.engine.arg.SQLE2ETestCaseArgumentsProvider;
+import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
@@ -39,12 +39,12 @@ import java.sql.Statement;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@E2ETestCaseSettings(SQLCommandType.DQL)
+@SQLE2EITSettings(SQLCommandType.DQL)
class GeneralDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecuteQuery(final AssertionTestParameter testParam) throws
SQLException, IOException, JAXBException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
@@ -144,7 +144,7 @@ class GeneralDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
- @ArgumentsSource(E2ETestCaseArgumentsProvider.class)
+ @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class)
void assertExecute(final AssertionTestParameter testParam) throws
SQLException, JAXBException, IOException {
// TODO make sure test case can not be null
if (null == testParam.getTestCaseContext()) {
