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 2e0694aae3c Refactor usage of E2EEnvironmentAware (#35248)
2e0694aae3c is described below
commit 2e0694aae3ccfb217e1c90f1b0a0bc040a6ae520
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Apr 26 09:02:22 2025 +0800
Refactor usage of E2EEnvironmentAware (#35248)
* Refactor usage of E2EEnvironmentAware
* Refactor usage of E2EEnvironmentAware
---
.../shardingsphere/test/e2e/engine/type/DALE2EIT.java | 11 ++++-------
.../shardingsphere/test/e2e/engine/type/DCLE2EIT.java | 7 ++-----
.../shardingsphere/test/e2e/engine/type/DDLE2EIT.java | 7 ++-----
.../shardingsphere/test/e2e/engine/type/RALE2EIT.java | 7 ++-----
.../shardingsphere/test/e2e/engine/type/RDLE2EIT.java | 15 ++++++---------
.../shardingsphere/test/e2e/engine/type/RQLE2EIT.java | 7 ++-----
.../test/e2e/engine/type/dml/BaseDMLE2EIT.java | 7 ++-----
.../test/e2e/engine/type/dql/BaseDQLE2EIT.java | 7 ++-----
.../test/e2e/env/E2EEnvironmentSetupProcessor.java | 10 +++++++---
9 files changed, 29 insertions(+), 49 deletions(-)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
index 0f3fa083dee..043ca20bb00 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.e2e.engine.type;
+import lombok.Setter;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
@@ -48,14 +49,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
@E2ETestCaseSettings(SQLCommandType.DAL)
+@Setter
class DALE2EIT implements E2EEnvironmentAware {
- private E2EEnvironmentEngine environmentSetupEngine;
-
- @Override
- public void setEnvironmentEngine(final E2EEnvironmentEngine
environmentEngine) {
- environmentSetupEngine = environmentEngine;
- }
+ private E2EEnvironmentEngine environmentEngine;
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@@ -70,7 +67,7 @@ class DALE2EIT implements E2EEnvironmentAware {
}
private void assertExecute(final E2ETestContext context) throws
SQLException {
- try (Connection connection =
environmentSetupEngine.getTargetDataSource().getConnection()) {
+ try (Connection connection =
environmentEngine.getTargetDataSource().getConnection()) {
try (Statement statement = connection.createStatement()) {
statement.execute(context.getSQL());
assertExecuteResult(context, statement);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
index 38330ec16d7..06dd71c67b2 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.e2e.engine.type;
+import lombok.Setter;
import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentAware;
import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
@@ -40,15 +41,11 @@ import java.sql.SQLException;
import java.sql.Statement;
@E2ETestCaseSettings(SQLCommandType.DCL)
+@Setter
class DCLE2EIT implements E2EEnvironmentAware {
private E2EEnvironmentEngine environmentEngine;
- @Override
- public void setEnvironmentEngine(final E2EEnvironmentEngine
environmentEngine) {
- this.environmentEngine = environmentEngine;
- }
-
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(E2ETestCaseArgumentsProvider.class)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
index db06355431a..00c8d826577 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DDLE2EIT.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.type;
import com.google.common.base.Splitter;
+import lombok.Setter;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
@@ -57,15 +58,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@E2ETestCaseSettings(SQLCommandType.DDL)
+@Setter
class DDLE2EIT implements E2EEnvironmentAware {
private E2EEnvironmentEngine environmentEngine;
- @Override
- public void setEnvironmentEngine(final E2EEnvironmentEngine
environmentEngine) {
- this.environmentEngine = environmentEngine;
- }
-
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(E2ETestCaseArgumentsProvider.class)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
index a10d6ad40ea..2d4a59b251d 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.type;
import com.google.common.base.Splitter;
+import lombok.Setter;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
@@ -51,15 +52,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
@E2ETestCaseSettings(SQLCommandType.RAL)
+@Setter
class RALE2EIT implements E2EEnvironmentAware {
private E2EEnvironmentEngine environmentEngine;
- @Override
- public void setEnvironmentEngine(final E2EEnvironmentEngine
environmentEngine) {
- this.environmentEngine = environmentEngine;
- }
-
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(E2ETestCaseArgumentsProvider.class)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
index b90eb0a143d..774a4d2e370 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.e2e.engine.type;
import com.google.common.base.Splitter;
+import lombok.Setter;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
@@ -51,14 +52,10 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@E2ETestCaseSettings(SQLCommandType.RDL)
+@Setter
class RDLE2EIT implements E2EEnvironmentAware {
- private E2EEnvironmentEngine environmentSetupEngine;
-
- @Override
- public void setEnvironmentEngine(final E2EEnvironmentEngine
environmentEngine) {
- this.environmentSetupEngine = environmentEngine;
- }
+ private E2EEnvironmentEngine environmentEngine;
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@@ -79,7 +76,7 @@ class RDLE2EIT implements E2EEnvironmentAware {
private void assertExecute(final AssertionTestParameter testParam, final
E2ETestContext context) throws SQLException {
assertNotNull(testParam.getAssertion().getAssertionSQL(), "Assertion
SQL is required");
- try (Connection connection =
environmentSetupEngine.getTargetDataSource().getConnection()) {
+ try (Connection connection =
environmentEngine.getTargetDataSource().getConnection()) {
try (Statement statement = connection.createStatement()) {
executeSQLCase(context, statement);
Awaitility.await().pollDelay(2L, TimeUnit.SECONDS).until(() ->
true);
@@ -93,14 +90,14 @@ class RDLE2EIT implements E2EEnvironmentAware {
}
private void init(final E2ETestContext context) throws SQLException {
- try (Connection connection =
environmentSetupEngine.getTargetDataSource().getConnection()) {
+ try (Connection connection =
environmentEngine.getTargetDataSource().getConnection()) {
executeInitSQLs(context, connection);
}
}
private void tearDown(final E2ETestContext context) throws SQLException {
if (null != context.getAssertion().getDestroySQL()) {
- try (Connection connection =
environmentSetupEngine.getTargetDataSource().getConnection()) {
+ try (Connection connection =
environmentEngine.getTargetDataSource().getConnection()) {
executeDestroySQLs(context, connection);
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
index a1061c4672e..d1d1d6ffcc6 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.e2e.engine.type;
+import lombok.Setter;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
@@ -46,15 +47,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
@E2ETestCaseSettings(SQLCommandType.RQL)
+@Setter
class RQLE2EIT implements E2EEnvironmentAware {
private E2EEnvironmentEngine environmentEngine;
- @Override
- public void setEnvironmentEngine(final E2EEnvironmentEngine
environmentEngine) {
- this.environmentEngine = environmentEngine;
- }
-
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(E2ETestCaseArgumentsProvider.class)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
index c3780cfebce..6673b49b6cb 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.test.e2e.engine.type.dml;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
import lombok.Getter;
+import lombok.Setter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
@@ -80,13 +81,9 @@ public abstract class BaseDMLE2EIT implements
E2EEnvironmentAware {
private DataSetEnvironmentManager dataSetEnvironmentManager;
@Getter
+ @Setter
private E2EEnvironmentEngine environmentEngine;
- @Override
- public final void setEnvironmentEngine(final E2EEnvironmentEngine
environmentEngine) {
- this.environmentEngine = environmentEngine;
- }
-
/**
* Init.
*
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
index 51e5ac4f167..8e4199aa00e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.type.dql;
import lombok.AccessLevel;
import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
@@ -65,13 +66,9 @@ public abstract class BaseDQLE2EIT implements
E2EEnvironmentAware {
private boolean useXMLAsExpectedDataset;
+ @Setter
private E2EEnvironmentEngine environmentEngine;
- @Override
- public void setEnvironmentEngine(final E2EEnvironmentEngine
environmentEngine) {
- this.environmentEngine = environmentEngine;
- }
-
protected final void init(final AssertionTestParameter testParam, final
E2ETestContext context) throws SQLException, IOException, JAXBException {
fillDataOnlyOnce(testParam);
expectedDataSource = null ==
context.getAssertion().getExpectedDataSourceName() || 1 ==
getEnvironmentEngine().getExpectedDataSourceMap().size()
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentSetupProcessor.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentSetupProcessor.java
index e2c1c3e4a1d..0cea5b3536c 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentSetupProcessor.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentSetupProcessor.java
@@ -40,11 +40,15 @@ public final class E2EEnvironmentSetupProcessor implements
InvocationInterceptor
if (null == testParameter.getTestCaseContext()) {
break;
}
- E2EEnvironmentEngine e2EEnvironmentEngine = new
E2EEnvironmentEngine(testParameter.getKey(), testParameter.getScenario(),
testParameter.getDatabaseType(),
-
AdapterMode.valueOf(testParameter.getMode().toUpperCase()),
AdapterType.valueOf(testParameter.getAdapter().toUpperCase()));
- ((E2EEnvironmentAware)
extensionContext.getRequiredTestInstance()).setEnvironmentEngine(e2EEnvironmentEngine);
+ setEnvironmentEngine(extensionContext, testParameter);
}
}
invocation.proceed();
}
+
+ private void setEnvironmentEngine(final ExtensionContext extensionContext,
final E2ETestParameter testParam) {
+ E2EEnvironmentEngine environmentEngine = new
E2EEnvironmentEngine(testParam.getKey(), testParam.getScenario(),
testParam.getDatabaseType(),
+ AdapterMode.valueOf(testParam.getMode().toUpperCase()),
AdapterType.valueOf(testParam.getAdapter().toUpperCase()));
+ ((E2EEnvironmentAware)
extensionContext.getRequiredTestInstance()).setEnvironmentEngine(environmentEngine);
+ }
}
