You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/04/25 10:57:20 UTC
(shardingsphere) branch master updated: Refactor E2EEnvironmentAware (#35243)
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 602677eab1c Refactor E2EEnvironmentAware (#35243)
602677eab1c is described below
commit 602677eab1cebc66e39925de658277ce97251a6d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Apr 25 18:57:14 2025 +0800
Refactor E2EEnvironmentAware (#35243)
---
.../apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java | 2 +-
.../apache/shardingsphere/test/e2e/engine/type/DCLE2EIT.java | 12 ++++++------
.../apache/shardingsphere/test/e2e/engine/type/RQLE2EIT.java | 6 +++---
.../shardingsphere/test/e2e/env/E2EEnvironmentAware.java | 4 ++--
4 files changed, 12 insertions(+), 12 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 086c5a3212d..0f3fa083dee 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
@@ -54,7 +54,7 @@ class DALE2EIT implements E2EEnvironmentAware {
@Override
public void setEnvironmentEngine(final E2EEnvironmentEngine environmentEngine) {
- this.environmentSetupEngine = environmentEngine;
+ environmentSetupEngine = environmentEngine;
}
@ParameterizedTest(name = "{0}")
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 2325f05222b..38330ec16d7 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
@@ -42,11 +42,11 @@ import java.sql.Statement;
@E2ETestCaseSettings(SQLCommandType.DCL)
class DCLE2EIT implements E2EEnvironmentAware {
- private E2EEnvironmentEngine environmentSetupEngine;
+ private E2EEnvironmentEngine environmentEngine;
@Override
public void setEnvironmentEngine(final E2EEnvironmentEngine environmentEngine) {
- this.environmentSetupEngine = environmentEngine;
+ this.environmentEngine = environmentEngine;
}
@ParameterizedTest(name = "{0}")
@@ -60,14 +60,14 @@ class DCLE2EIT implements E2EEnvironmentAware {
E2ETestContext context = new E2ETestContext(testParam);
try (
AuthorityEnvironmentManager ignored = new AuthorityEnvironmentManager(
- new ScenarioCommonPath(testParam.getScenario()).getAuthorityFile(), environmentSetupEngine.getActualDataSourceMap(), testParam.getDatabaseType())) {
+ new ScenarioCommonPath(testParam.getScenario()).getAuthorityFile(), environmentEngine.getActualDataSourceMap(), testParam.getDatabaseType())) {
assertExecuteUpdate(context);
}
}
private void assertExecuteUpdate(final E2ETestContext context) throws SQLException {
String sql = context.getSQL();
- try (Connection connection = this.environmentSetupEngine.getTargetDataSource().getConnection()) {
+ try (Connection connection = environmentEngine.getTargetDataSource().getConnection()) {
if (SQLExecuteType.LITERAL == context.getSqlExecuteType()) {
try (Statement statement = connection.createStatement()) {
statement.executeUpdate(sql);
@@ -91,14 +91,14 @@ class DCLE2EIT implements E2EEnvironmentAware {
E2ETestContext context = new E2ETestContext(testParam);
try (
AuthorityEnvironmentManager ignored = new AuthorityEnvironmentManager(
- new ScenarioCommonPath(testParam.getScenario()).getAuthorityFile(), environmentSetupEngine.getActualDataSourceMap(), testParam.getDatabaseType())) {
+ new ScenarioCommonPath(testParam.getScenario()).getAuthorityFile(), environmentEngine.getActualDataSourceMap(), testParam.getDatabaseType())) {
assertExecute(context);
}
}
private void assertExecute(final E2ETestContext context) throws SQLException {
String sql = context.getSQL();
- try (Connection connection = environmentSetupEngine.getTargetDataSource().getConnection()) {
+ try (Connection connection = environmentEngine.getTargetDataSource().getConnection()) {
if (SQLExecuteType.LITERAL == context.getSqlExecuteType()) {
try (Statement statement = connection.createStatement()) {
statement.execute(sql);
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 060cb1b2e25..a1061c4672e 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
@@ -48,11 +48,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@E2ETestCaseSettings(SQLCommandType.RQL)
class RQLE2EIT implements E2EEnvironmentAware {
- private E2EEnvironmentEngine environmentSetupEngine;
+ private E2EEnvironmentEngine environmentEngine;
@Override
public void setEnvironmentEngine(final E2EEnvironmentEngine environmentEngine) {
- this.environmentSetupEngine = environmentEngine;
+ this.environmentEngine = environmentEngine;
}
@ParameterizedTest(name = "{0}")
@@ -69,7 +69,7 @@ class RQLE2EIT implements E2EEnvironmentAware {
private void assertExecute(final E2ETestContext context) throws SQLException {
try (
- Connection connection = environmentSetupEngine.getTargetDataSource().getConnection();
+ Connection connection = environmentEngine.getTargetDataSource().getConnection();
Statement statement = connection.createStatement()) {
statement.execute(context.getSQL());
try (ResultSet resultSet = statement.getResultSet()) {
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentAware.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentAware.java
index 1c06f5a83ea..3918762f9be 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentAware.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentAware.java
@@ -23,9 +23,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
public interface E2EEnvironmentAware {
/**
- * Set container composer.
+ * Set environment engine.
*
- * @param environmentEngine container composer
+ * @param environmentEngine environment engine
*/
void setEnvironmentEngine(E2EEnvironmentEngine environmentEngine);
}