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 694113ed6c0 Rename SQLE2EITArgumentsProvider (#35262) 694113ed6c0 is described below commit 694113ed6c03928b75d4749f01db1435d06c7bf4 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sat Apr 26 21:08:55 2025 +0800 Rename SQLE2EITArgumentsProvider (#35262) --- ...mentsProvider.java => SQLE2EITArgumentsProvider.java} | 7 +++---- .../test/e2e/engine/type/distsql/ral/RALE2EIT.java | 4 ++-- .../test/e2e/engine/type/distsql/rdl/RDLE2EIT.java | 4 ++-- .../test/e2e/engine/type/distsql/rql/RQLE2EIT.java | 4 ++-- .../test/e2e/engine/type/sql/dal/DALE2EIT.java | 4 ++-- .../test/e2e/engine/type/sql/dcl/DCLE2EIT.java | 6 +++--- .../test/e2e/engine/type/sql/ddl/DDLE2EIT.java | 6 +++--- .../test/e2e/engine/type/sql/dml/AdditionalDMLE2EIT.java | 16 ++++++++-------- .../test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java | 6 +++--- .../test/e2e/engine/type/sql/dml/GeneralDMLE2EIT.java | 6 +++--- .../test/e2e/engine/type/sql/dql/AdditionalDQLE2EIT.java | 10 +++++----- .../test/e2e/engine/type/sql/dql/GeneralDQLE2EIT.java | 6 +++--- 12 files changed, 39 insertions(+), 40 deletions(-) diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/arg/SQLE2ETestCaseArgumentsProvider.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITArgumentsProvider.java similarity index 91% rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/arg/SQLE2ETestCaseArgumentsProvider.java rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITArgumentsProvider.java index ccc50551373..19589a56d50 100644 --- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/arg/SQLE2ETestCaseArgumentsProvider.java +++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITArgumentsProvider.java @@ -15,10 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.test.e2e.engine.framework.arg; +package org.apache.shardingsphere.test.e2e.engine.framework; import com.google.common.base.Preconditions; -import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2EITSettings; 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; @@ -32,9 +31,9 @@ import java.util.Collection; import java.util.stream.Stream; /** - * SQL E2E test case arguments provider. + * SQL E2E IT arguments provider. */ -public final class SQLE2ETestCaseArgumentsProvider implements ArgumentsProvider { +public final class SQLE2EITArgumentsProvider implements ArgumentsProvider { @Override public Stream<? extends Arguments> provideArguments(final ExtensionContext extensionContext) { 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 5e024853e95..d726cf096ef 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,7 +24,7 @@ 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.SQLE2EEnvironmentEngine; -import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory; @@ -59,7 +59,7 @@ class RALE2EIT implements SQLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 f0bf1050ae0..2556c2db661 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,7 +24,7 @@ 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.SQLE2EEnvironmentEngine; -import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory; @@ -59,7 +59,7 @@ class RDLE2EIT implements SQLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 d12712bfbf5..f6c07968246 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,7 +23,7 @@ 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.SQLE2EEnvironmentEngine; -import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory; @@ -54,7 +54,7 @@ class RQLE2EIT implements SQLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 c61955da53c..3454162c3a2 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,7 +22,7 @@ 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.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT; @@ -56,7 +56,7 @@ class DALE2EIT implements SQLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 1543f262a80..801c15d23b4 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,7 +20,7 @@ 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.SQLE2EEnvironmentEngine; -import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.env.runtime.scenario.authority.AuthorityEnvironmentManager; @@ -48,7 +48,7 @@ class DCLE2EIT implements SQLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 8b53cc0f4be..e42b7090f75 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,7 +26,7 @@ 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.SQLE2EEnvironmentEngine; -import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory; @@ -65,7 +65,7 @@ class DDLE2EIT implements SQLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 0a2e84af133..56bca73c540 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,7 +18,7 @@ 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.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment; @@ -46,7 +46,7 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 796dbfa5039..4480a50e948 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,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.type.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.arg.SQLE2ETestCaseArgumentsProvider; +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; @@ -42,7 +42,7 @@ class BatchDMLE2EIT extends BaseDMLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 6c6c7228a1e..dfed26243af 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,7 +18,7 @@ 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.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory; @@ -43,7 +43,7 @@ class GeneralDMLE2EIT extends BaseDMLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 c0a5638db39..b958a417448 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,7 +18,7 @@ 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.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment; @@ -45,7 +45,7 @@ class AdditionalDQLE2EIT extends BaseDQLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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 85c95d3ab3b..ac632b450ef 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,7 +18,7 @@ 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.framework.arg.SQLE2ETestCaseArgumentsProvider; +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.context.SQLE2ETestContext; import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory; @@ -44,7 +44,7 @@ class GeneralDQLE2EIT extends BaseDQLE2EIT { @ParameterizedTest(name = "{0}") @EnabledIf("isEnabled") - @ArgumentsSource(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.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(SQLE2ETestCaseArgumentsProvider.class) + @ArgumentsSource(SQLE2EITArgumentsProvider.class) void assertExecute(final AssertionTestParameter testParam) throws SQLException, JAXBException, IOException { // TODO make sure test case can not be null if (null == testParam.getTestCaseContext()) {