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 f70084ab1ff Rename SQLE2EITSettingsExtension (#35261) f70084ab1ff is described below commit f70084ab1fff8e58db3072fb445f64e0b3519345 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sat Apr 26 20:56:09 2025 +0800 Rename SQLE2EITSettingsExtension (#35261) --- .../test/e2e/engine/{arg => framework}/SQLE2EITSettings.java | 5 ++--- .../{SQLE2ESettingExtension.java => SQLE2EITSettingsExtension.java} | 4 ++-- .../engine/{ => framework}/arg/SQLE2ETestCaseArgumentsProvider.java | 3 ++- .../shardingsphere/test/e2e/engine/type/distsql/ral/RALE2EIT.java | 4 ++-- .../shardingsphere/test/e2e/engine/type/distsql/rdl/RDLE2EIT.java | 4 ++-- .../shardingsphere/test/e2e/engine/type/distsql/rql/RQLE2EIT.java | 4 ++-- .../apache/shardingsphere/test/e2e/engine/type/sql/dal/DALE2EIT.java | 4 ++-- .../apache/shardingsphere/test/e2e/engine/type/sql/dcl/DCLE2EIT.java | 4 ++-- .../apache/shardingsphere/test/e2e/engine/type/sql/ddl/DDLE2EIT.java | 4 ++-- .../test/e2e/engine/type/sql/dml/AdditionalDMLE2EIT.java | 4 ++-- .../shardingsphere/test/e2e/engine/type/sql/dml/BatchDMLE2EIT.java | 4 ++-- .../shardingsphere/test/e2e/engine/type/sql/dml/GeneralDMLE2EIT.java | 4 ++-- .../test/e2e/engine/type/sql/dql/AdditionalDQLE2EIT.java | 4 ++-- .../shardingsphere/test/e2e/engine/type/sql/dql/GeneralDQLE2EIT.java | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2EITSettings.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettings.java similarity index 88% rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2EITSettings.java rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettings.java index d98a7669bfc..c0bef5405f7 100644 --- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2EITSettings.java +++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettings.java @@ -15,10 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.test.e2e.engine.arg; +package org.apache.shardingsphere.test.e2e.engine.framework; import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType; -import org.apache.shardingsphere.test.e2e.engine.framework.SQLE2ESettingExtension; import org.junit.jupiter.api.extension.ExtendWith; import java.lang.annotation.Inherited; @@ -28,7 +27,7 @@ import java.lang.annotation.RetentionPolicy; /** * SQL E2E IT settings. */ -@ExtendWith(SQLE2ESettingExtension.class) +@ExtendWith(SQLE2EITSettingsExtension.class) @Inherited @Retention(RetentionPolicy.RUNTIME) public @interface SQLE2EITSettings { diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2ESettingExtension.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettingsExtension.java similarity index 95% rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2ESettingExtension.java rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettingsExtension.java index 81226b18219..20ec9805c45 100644 --- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2ESettingExtension.java +++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/SQLE2EITSettingsExtension.java @@ -26,10 +26,10 @@ import java.io.PrintStream; import java.util.Optional; /** - * SQL E2E setting extension. + * SQL E2E IT settings extension. */ @Slf4j -public final class SQLE2ESettingExtension implements TestWatcher { +public final class SQLE2EITSettingsExtension implements TestWatcher { @Override public void testFailed(final ExtensionContext context, final Throwable cause) { diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2ETestCaseArgumentsProvider.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/arg/SQLE2ETestCaseArgumentsProvider.java similarity index 95% rename from test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2ETestCaseArgumentsProvider.java rename to test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/arg/SQLE2ETestCaseArgumentsProvider.java index f3588ce017c..ccc50551373 100644 --- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/arg/SQLE2ETestCaseArgumentsProvider.java +++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/framework/arg/SQLE2ETestCaseArgumentsProvider.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.test.e2e.engine.arg; +package org.apache.shardingsphere.test.e2e.engine.framework.arg; 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; 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 570d43a47d8..5e024853e95 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.SQLE2EEnvironmentEngine; -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.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter; 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 d1455195d4b..f0bf1050ae0 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.SQLE2EEnvironmentEngine; -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.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter; 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 f8cec35fc7e..d12712bfbf5 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.SQLE2EEnvironmentEngine; -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.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter; 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 30d630345c2..c61955da53c 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.SQLE2ETestCaseArgumentsProvider; -import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings; +import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine; 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 cd1e56c7018..1543f262a80 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.SQLE2EEnvironmentEngine; -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.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath; 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 cc94617386a..8b53cc0f4be 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.SQLE2EEnvironmentEngine; -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.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter; 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 aa84b08af0e..0a2e84af133 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.SQLE2ETestCaseArgumentsProvider; -import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings; +import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory; 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 38e93cd8a49..796dbfa5039 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.SQLE2ETestCaseAssertion; import org.apache.shardingsphere.test.e2e.cases.value.SQLValue; -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.arg.SQLE2ETestCaseArgumentsProvider; +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; 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 25cbd63e933..6c6c7228a1e 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.SQLE2ETestCaseArgumentsProvider; -import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings; +import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter; 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 672e720b661..c0a5638db39 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.SQLE2ETestCaseArgumentsProvider; -import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings; +import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory; 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 1d7224451e5..85c95d3ab3b 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.SQLE2ETestCaseArgumentsProvider; -import org.apache.shardingsphere.test.e2e.engine.arg.SQLE2EITSettings; +import org.apache.shardingsphere.test.e2e.engine.framework.arg.SQLE2ETestCaseArgumentsProvider; +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; import org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;