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 e83bce3dab9 Rename SQLE2EEnvironmentEngine (#35256)
e83bce3dab9 is described below
commit e83bce3dab912514d729d726845a54d302755fe9
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Apr 26 18:27:22 2025 +0800
Rename SQLE2EEnvironmentEngine (#35256)
---
.../org/apache/shardingsphere/test/e2e/engine/type/SQLE2EIT.java | 6 +++---
.../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 ++--
.../shardingsphere/test/e2e/engine/type/sql/dal/DALE2EIT.java | 4 ++--
.../shardingsphere/test/e2e/engine/type/sql/dcl/DCLE2EIT.java | 4 ++--
.../shardingsphere/test/e2e/engine/type/sql/ddl/DDLE2EIT.java | 8 ++++----
.../shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java | 4 ++--
.../shardingsphere/test/e2e/engine/type/sql/dql/BaseDQLE2EIT.java | 4 ++--
.../{E2EEnvironmentEngine.java => SQLE2EEnvironmentEngine.java} | 6 +++---
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EIT.java
index c9c0bef4c97..0c825d6e5d1 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/SQLE2EIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.engine.type;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.E2ETestParameter;
import
org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT.SQLE2EITEnvironmentExtension;
-import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
+import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -40,7 +40,7 @@ public interface SQLE2EIT {
*
* @param environmentEngine environment engine
*/
- void setEnvironmentEngine(E2EEnvironmentEngine environmentEngine);
+ void setEnvironmentEngine(SQLE2EEnvironmentEngine environmentEngine);
/**
* SQL E2E IT environment extension.
@@ -64,7 +64,7 @@ public interface SQLE2EIT {
}
private void setEnvironmentEngine(final ExtensionContext
extensionContext, final E2ETestParameter testParam) {
- E2EEnvironmentEngine environmentEngine = new
E2EEnvironmentEngine(testParam.getKey(), testParam.getScenario(),
testParam.getDatabaseType(),
+ SQLE2EEnvironmentEngine environmentEngine = new
SQLE2EEnvironmentEngine(testParam.getKey(), testParam.getScenario(),
testParam.getDatabaseType(),
AdapterMode.valueOf(testParam.getMode().toUpperCase()),
AdapterType.valueOf(testParam.getAdapter().toUpperCase()));
((SQLE2EIT)
extensionContext.getRequiredTestInstance()).setEnvironmentEngine(environmentEngine);
}
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 e31ca2cab20..e08a4db7cac 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
@@ -23,7 +23,7 @@ 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.type.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
+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.context.E2ETestContext;
@@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Setter
class RALE2EIT implements SQLE2EIT {
- private E2EEnvironmentEngine environmentEngine;
+ private SQLE2EEnvironmentEngine environmentEngine;
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
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 79780efb3d1..91eb932aedf 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
@@ -23,7 +23,7 @@ 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.type.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
+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.context.E2ETestContext;
@@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Setter
class RDLE2EIT implements SQLE2EIT {
- private E2EEnvironmentEngine environmentEngine;
+ private SQLE2EEnvironmentEngine environmentEngine;
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
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 6af6221e244..8b5daf2fc66 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
@@ -22,7 +22,7 @@ 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.type.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
+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.context.E2ETestContext;
@@ -50,7 +50,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Setter
class RQLE2EIT implements SQLE2EIT {
- private E2EEnvironmentEngine environmentEngine;
+ private SQLE2EEnvironmentEngine environmentEngine;
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
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 17803125e13..feabebfc1c6 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
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.test.e2e.engine.arg.SQLE2ETestCaseArgumentsProv
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;
+import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.engine.framework.type.SQLCommandType;
@@ -52,7 +52,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Setter
class DALE2EIT implements SQLE2EIT {
- private E2EEnvironmentEngine environmentEngine;
+ private SQLE2EEnvironmentEngine environmentEngine;
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
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 b28e57394d6..4e63f39f02e 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
@@ -19,7 +19,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.E2EEnvironmentEngine;
+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.context.E2ETestContext;
@@ -44,7 +44,7 @@ import java.sql.Statement;
@Setter
class DCLE2EIT implements SQLE2EIT {
- private E2EEnvironmentEngine environmentEngine;
+ private SQLE2EEnvironmentEngine environmentEngine;
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
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 34d9a21f966..afeedc3a81b 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
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
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.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.context.E2ETestContext;
@@ -61,7 +61,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
@Setter
class DDLE2EIT implements SQLE2EIT {
- private E2EEnvironmentEngine environmentEngine;
+ private SQLE2EEnvironmentEngine environmentEngine;
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@@ -191,9 +191,9 @@ class DDLE2EIT implements SQLE2EIT {
assertIndexMetaData(actualIndexes, expected.getIndexes());
}
- private void assertNotContainsTable(final E2EEnvironmentEngine
containerComposer, final Collection<DataNode> dataNodes) throws SQLException {
+ private void assertNotContainsTable(final SQLE2EEnvironmentEngine
environmentEngine, final Collection<DataNode> dataNodes) throws SQLException {
for (DataNode each : dataNodes) {
- try (Connection connection =
containerComposer.getActualDataSourceMap().get(each.getDataSourceName()).getConnection())
{
+ try (Connection connection =
environmentEngine.getActualDataSourceMap().get(each.getDataSourceName()).getConnection())
{
assertNotContainsTable(connection, each.getTableName());
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
index 995e8a704c9..7441656f2ac 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dml/BaseDMLE2EIT.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
+import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
@@ -82,7 +82,7 @@ public abstract class BaseDMLE2EIT implements SQLE2EIT {
@Getter
@Setter
- private E2EEnvironmentEngine environmentEngine;
+ private SQLE2EEnvironmentEngine environmentEngine;
/**
* Init.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/BaseDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/BaseDQLE2EIT.java
index fa76f21e58c..2203a7828a0 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/BaseDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/sql/dql/BaseDQLE2EIT.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.e2e.engine.context.E2ETestContext;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
import org.apache.shardingsphere.test.e2e.engine.type.SQLE2EIT;
-import org.apache.shardingsphere.test.e2e.env.E2EEnvironmentEngine;
+import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
import
org.apache.shardingsphere.test.e2e.engine.framework.param.model.AssertionTestParameter;
@@ -67,7 +67,7 @@ public abstract class BaseDQLE2EIT implements SQLE2EIT {
private boolean useXMLAsExpectedDataset;
@Setter
- private E2EEnvironmentEngine environmentEngine;
+ private SQLE2EEnvironmentEngine environmentEngine;
protected final void init(final AssertionTestParameter testParam, final
E2ETestContext context) throws SQLException, IOException, JAXBException {
fillDataOnlyOnce(testParam);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentEngine.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/SQLE2EEnvironmentEngine.java
similarity index 93%
rename from
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentEngine.java
rename to
test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/SQLE2EEnvironmentEngine.java
index c237b40287f..876e1de798e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/E2EEnvironmentEngine.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/SQLE2EEnvironmentEngine.java
@@ -35,10 +35,10 @@ import java.util.Map;
import java.util.Optional;
/**
- * E2E container composer.
+ * SQL E2E environment engine.
*/
@Getter
-public final class E2EEnvironmentEngine {
+public final class SQLE2EEnvironmentEngine {
private static final ContainerComposerRegistry CONTAINER_COMPOSER_REGISTRY
= new ContainerComposerRegistry();
@@ -53,7 +53,7 @@ public final class E2EEnvironmentEngine {
private final Map<String, DataSource> expectedDataSourceMap;
- public E2EEnvironmentEngine(final String key, final String scenario, final
DatabaseType databaseType, final AdapterMode adapterMode, final AdapterType
adapterType) {
+ public SQLE2EEnvironmentEngine(final String key, final String scenario,
final DatabaseType databaseType, final AdapterMode adapterMode, final
AdapterType adapterType) {
containerComposer =
CONTAINER_COMPOSER_REGISTRY.getContainerComposer(key, scenario, databaseType,
adapterMode, adapterType);
containerComposer.start();
actualDataSourceMap = containerComposer.getActualDataSourceMap();
