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 744e22c50c2 Move AdapterMode into ArtifactEnvironment (#36677)
744e22c50c2 is described below
commit 744e22c50c2e9dc697ddbff79f284591a2ecf559
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Sep 23 23:31:35 2025 +0800
Move AdapterMode into ArtifactEnvironment (#36677)
---
.../env/container/adapter/enums/AdapterMode.java | 26 ----------------------
.../e2e/env/runtime/type/ArtifactEnvironment.java | 10 ++++++---
.../test/e2e/sql/cases/dataset/DataSetLoader.java | 6 ++---
.../test/e2e/sql/env/SQLE2EEnvironmentEngine.java | 6 ++---
.../compose/ContainerComposerRegistry.java | 12 +++++-----
.../array/ClusterTestParameterArrayGenerator.java | 6 ++---
.../param/array/E2ETestParameterFactory.java | 16 ++++++-------
.../param/array/E2ETestParameterGenerator.java | 8 +++----
.../JdbcStandaloneTestParameterGenerator.java | 6 ++---
.../ProxyStandaloneTestParameterGenerator.java | 6 ++---
.../param/model/AssertionTestParameter.java | 4 ++--
.../framework/param/model/CaseTestParameter.java | 4 ++--
.../framework/param/model/E2ETestParameter.java | 4 ++--
.../test/e2e/sql/it/sql/dql/BaseDQLE2EIT.java | 4 ++--
14 files changed, 48 insertions(+), 70 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterMode.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterMode.java
deleted file mode 100644
index e6fcfaef831..00000000000
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterMode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.env.container.adapter.enums;
-
-/**
- * Adapter mode.
- */
-public enum AdapterMode {
-
- STANDALONE, CLUSTER
-}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
index b2434879db3..8a6f4b1809b 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
@@ -22,7 +22,6 @@ import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import java.util.Collection;
import java.util.HashMap;
@@ -37,7 +36,7 @@ import java.util.stream.Collectors;
@Getter
public final class ArtifactEnvironment {
- private final Collection<AdapterMode> modes;
+ private final Collection<Mode> modes;
private final Collection<String> adapters;
@@ -49,7 +48,7 @@ public final class ArtifactEnvironment {
public ArtifactEnvironment(final Properties props) {
modes =
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.artifact.modes",
"")).stream()
- .filter(each -> !each.isEmpty()).map(each ->
AdapterMode.valueOf(each.toUpperCase())).collect(Collectors.toList());
+ .filter(each -> !each.isEmpty()).map(each ->
Mode.valueOf(each.toUpperCase())).collect(Collectors.toList());
adapters = getAdapters(props);
regCenterType = props.getProperty("e2e.artifact.regcenter");
databaseTypes = getDatabaseTypes(props);
@@ -72,4 +71,9 @@ public final class ArtifactEnvironment {
return
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.artifact.databases",
"")).stream()
.filter(each -> !each.isEmpty()).map(each ->
TypedSPILoader.getService(DatabaseType.class,
each.trim())).collect(Collectors.toSet());
}
+
+ public enum Mode {
+
+ STANDALONE, CLUSTER
+ }
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/dataset/DataSetLoader.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/dataset/DataSetLoader.java
index ed451dccf5c..5e9e7e33f17 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/dataset/DataSetLoader.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/cases/dataset/DataSetLoader.java
@@ -22,7 +22,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -49,13 +49,13 @@ public final class DataSetLoader {
* @return data set
*/
@SneakyThrows({JAXBException.class, IOException.class})
- public static DataSet load(final String parentPath, final String scenario,
final DatabaseType databaseType, final AdapterMode mode, final String
dataSetFile) {
+ public static DataSet load(final String parentPath, final String scenario,
final DatabaseType databaseType, final Mode mode, final String dataSetFile) {
try (FileReader reader = new FileReader(getFile(parentPath, scenario,
databaseType, mode, dataSetFile))) {
return (DataSet)
JAXBContext.newInstance(DataSet.class).createUnmarshaller().unmarshal(reader);
}
}
- private static String getFile(final String parentPath, final String
scenario, final DatabaseType databaseType, final AdapterMode mode, final String
dataSetFile) {
+ private static String getFile(final String parentPath, final String
scenario, final DatabaseType databaseType, final Mode mode, final String
dataSetFile) {
String result = String.join(File.separator, parentPath,
DATA_SET_FOLDER_NAME, scenario, mode.name().toLowerCase(),
databaseType.getType().toLowerCase(), dataSetFile);
if (new File(result).exists()) {
return result;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
index ac0f28f2152..581c8a73fc2 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
@@ -21,9 +21,9 @@ import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.DefaultDatabase;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.env.container.util.SQLScriptUtils;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposerRegistry;
@@ -53,8 +53,8 @@ public final class SQLE2EEnvironmentEngine {
private final Map<String, DataSource> expectedDataSourceMap;
- 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);
+ public SQLE2EEnvironmentEngine(final String key, final String scenario,
final DatabaseType databaseType, final Mode mode, final AdapterType
adapterType) {
+ containerComposer =
CONTAINER_COMPOSER_REGISTRY.getContainerComposer(key, scenario, databaseType,
mode, adapterType);
containerComposer.start();
actualDataSourceMap = containerComposer.getActualDataSourceMap();
targetDataSource = containerComposer.getTargetDataSource();
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
index bb403e7d80e..b719c56b4d6 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.test.e2e.sql.env.container.compose;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode.ClusterContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode.StandaloneContainerComposer;
@@ -46,24 +46,24 @@ public final class ContainerComposerRegistry implements
AutoCloseable {
* @param key key
* @param scenario scenario
* @param databaseType databaseType
- * @param adapterMode adapterMode
+ * @param mode adapterMode
* @param adapterType adapterType
* @return composed container
*/
- public ContainerComposer getContainerComposer(final String key, final
String scenario, final DatabaseType databaseType, final AdapterMode
adapterMode, final AdapterType adapterType) {
+ public ContainerComposer getContainerComposer(final String key, final
String scenario, final DatabaseType databaseType, final Mode mode, final
AdapterType adapterType) {
if (containerComposers.containsKey(key)) {
return containerComposers.get(key);
}
synchronized (containerComposers) {
if (!containerComposers.containsKey(key)) {
- containerComposers.put(key,
createContainerComposer(isClusterMode(adapterMode, adapterType), scenario,
databaseType, adapterType));
+ containerComposers.put(key,
createContainerComposer(isClusterMode(mode, adapterType), scenario,
databaseType, adapterType));
}
return containerComposers.get(key);
}
}
- private boolean isClusterMode(final AdapterMode adapterMode, final
AdapterType adapterType) {
- return AdapterMode.CLUSTER == adapterMode && AdapterType.PROXY ==
adapterType;
+ private boolean isClusterMode(final Mode mode, final AdapterType
adapterType) {
+ return Mode.CLUSTER == mode && AdapterType.PROXY == adapterType;
}
private ContainerComposer createContainerComposer(final boolean
clusterMode, final String scenario, final DatabaseType databaseType, final
AdapterType adapterType) {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
index 4b7ae2650b4..85599624684 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
@@ -42,7 +42,7 @@ public final class ClusterTestParameterArrayGenerator {
* @return assertion test parameter
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
ENV.getScenarios(), AdapterMode.CLUSTER,
+ return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
ENV.getScenarios(), Mode.CLUSTER,
ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getAssertionTestParameter(sqlCommandType);
}
@@ -53,7 +53,7 @@ public final class ClusterTestParameterArrayGenerator {
* @return case parameter
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
- return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
ENV.getScenarios(), AdapterMode.CLUSTER,
+ return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
ENV.getScenarios(), Mode.CLUSTER,
ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getCaseTestParameter(sqlCommandType);
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
index bd9d3e1c1f5..71b6ef04dd9 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
@@ -19,9 +19,9 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
@@ -45,12 +45,12 @@ public final class E2ETestParameterFactory {
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameters(final SQLCommandType sqlCommandType) {
Collection<AssertionTestParameter> result = new LinkedList<>();
- for (AdapterMode each : ENV.getModes()) {
- if (AdapterMode.STANDALONE == each) {
+ for (Mode each : ENV.getModes()) {
+ if (Mode.STANDALONE == each) {
result.addAll(isDistSQLCommandType(sqlCommandType)
?
ProxyStandaloneTestParameterGenerator.getAssertionTestParameter(sqlCommandType)
:
JdbcStandaloneTestParameterGenerator.getAssertionTestParameter(sqlCommandType));
- } else if (AdapterMode.CLUSTER == each) {
+ } else if (Mode.CLUSTER == each) {
result.addAll(ClusterTestParameterArrayGenerator.getAssertionTestParameter(sqlCommandType));
}
}
@@ -65,12 +65,12 @@ public final class E2ETestParameterFactory {
*/
public static Collection<E2ETestParameter> getCaseTestParameters(final
SQLCommandType sqlCommandType) {
Collection<E2ETestParameter> result = new LinkedList<>();
- for (AdapterMode each : ENV.getModes()) {
- if (AdapterMode.STANDALONE == each) {
+ for (Mode each : ENV.getModes()) {
+ if (Mode.STANDALONE == each) {
result.addAll(isDistSQLCommandType(sqlCommandType)
?
ProxyStandaloneTestParameterGenerator.getCaseTestParameter(sqlCommandType)
:
JdbcStandaloneTestParameterGenerator.getCaseTestParameter(sqlCommandType));
- } else if (AdapterMode.CLUSTER == each) {
+ } else if (Mode.CLUSTER == each) {
result.addAll(ClusterTestParameterArrayGenerator.getCaseTestParameter(sqlCommandType));
}
}
@@ -87,6 +87,6 @@ public final class E2ETestParameterFactory {
* @return contains or not
*/
public static boolean containsTestParameter() {
- return ENV.getModes().stream().anyMatch(each -> AdapterMode.STANDALONE
== each || AdapterMode.CLUSTER == each);
+ return ENV.getModes().stream().anyMatch(each -> Mode.STANDALONE ==
each || Mode.CLUSTER == each);
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterGenerator.java
index f9c42f5c311..550dd5aabf0 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterGenerator.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.distsql.statement.type.ral.RALStatement;
import org.apache.shardingsphere.distsql.statement.type.rdl.RDLStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import org.apache.shardingsphere.test.e2e.sql.cases.SQLE2ETestCasesXMLLoader;
import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
@@ -53,7 +53,7 @@ public final class E2ETestParameterGenerator {
private final Collection<String> envScenarios;
- private final AdapterMode adapterMode;
+ private final Mode mode;
private final Collection<DatabaseType> envDatabaseTypes;
@@ -124,7 +124,7 @@ public final class E2ETestParameterGenerator {
final
SQLExecuteType sqlExecuteType, final SQLCommandType sqlCommandType) {
Collection<String> scenarios = null ==
testCaseContext.getTestCase().getScenarioTypes() ? Collections.emptyList() :
Arrays.asList(testCaseContext.getTestCase().getScenarioTypes().split(","));
return envScenarios.stream().filter(each -> filterScenarios(each,
scenarios, sqlCommandType.getSqlStatementClass()))
- .map(each -> new AssertionTestParameter(testCaseContext,
assertion, adapter, each, adapterMode, databaseType, sqlExecuteType,
sqlCommandType)).collect(Collectors.toList());
+ .map(each -> new AssertionTestParameter(testCaseContext,
assertion, adapter, each, mode, databaseType, sqlExecuteType,
sqlCommandType)).collect(Collectors.toList());
}
private Collection<AssertionTestParameter>
getAssertionTestParameterFilterBySmoke(final SQLE2ETestCaseContext
testCaseContext, final SQLCommandType sqlCommandType) {
@@ -191,7 +191,7 @@ public final class E2ETestParameterGenerator {
}
Collection<String> scenarios = null ==
testCaseContext.getTestCase().getScenarioTypes() ? Collections.emptyList() :
Arrays.asList(testCaseContext.getTestCase().getScenarioTypes().split(","));
return envScenarios.stream().filter(each -> scenarios.isEmpty() ||
scenarios.contains(each))
- .map(each -> new CaseTestParameter(testCaseContext, adapter,
each, adapterMode, databaseType, sqlCommandType)).collect(Collectors.toList());
+ .map(each -> new CaseTestParameter(testCaseContext, adapter,
each, mode, databaseType, sqlCommandType)).collect(Collectors.toList());
}
private Collection<DatabaseType> getDatabaseTypes(final String
databaseTypes) {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index ef41afea7df..251e13ca786 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -19,9 +19,9 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
@@ -46,7 +46,7 @@ public final class JdbcStandaloneTestParameterGenerator {
* @return assertion test parameter
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterMode.STANDALONE, ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases())
+ return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
Mode.STANDALONE, ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases())
.getAssertionTestParameter(sqlCommandType);
}
@@ -57,7 +57,7 @@ public final class JdbcStandaloneTestParameterGenerator {
* @return case test parameter
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
- return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterMode.STANDALONE, ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases())
+ return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
Mode.STANDALONE, ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases())
.getCaseTestParameter(sqlCommandType);
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index d682dc6e31e..5dfd6ade97f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
@@ -43,7 +43,7 @@ public final class ProxyStandaloneTestParameterGenerator {
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
- ENV.getScenarios(), AdapterMode.STANDALONE,
ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getAssertionTestParameter(sqlCommandType);
+ ENV.getScenarios(), Mode.STANDALONE,
ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getAssertionTestParameter(sqlCommandType);
}
/**
@@ -54,6 +54,6 @@ public final class ProxyStandaloneTestParameterGenerator {
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
- ENV.getScenarios(), AdapterMode.STANDALONE,
ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getCaseTestParameter(sqlCommandType);
+ ENV.getScenarios(), Mode.STANDALONE,
ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getCaseTestParameter(sqlCommandType);
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/AssertionTestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/AssertionTestParameter.java
index 9ca29f4a924..69c75caf0d0 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/AssertionTestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/AssertionTestParameter.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
@@ -41,7 +41,7 @@ public final class AssertionTestParameter implements
E2ETestParameter {
private final String scenario;
- private final AdapterMode mode;
+ private final Mode mode;
private final DatabaseType databaseType;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/CaseTestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/CaseTestParameter.java
index 1215c31c0fb..c7b47e95686 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/CaseTestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/CaseTestParameter.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
@@ -37,7 +37,7 @@ public final class CaseTestParameter implements
E2ETestParameter {
private final String scenario;
- private final AdapterMode mode;
+ private final Mode mode;
private final DatabaseType databaseType;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/E2ETestParameter.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/E2ETestParameter.java
index a0c379ade4b..a1d5822bfad 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/E2ETestParameter.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/model/E2ETestParameter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.sql.framework.param.model;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.cases.casse.SQLE2ETestCaseContext;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
@@ -60,7 +60,7 @@ public interface E2ETestParameter {
*
* @return mode
*/
- AdapterMode getMode();
+ Mode getMode();
/**
* Get sql command type.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/BaseDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/BaseDQLE2EIT.java
index 38a4a6dc5ef..4d0583a5491 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/BaseDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/BaseDQLE2EIT.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioDataPath.Type;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
@@ -134,7 +134,7 @@ public abstract class BaseDQLE2EIT implements SQLE2EIT {
if ("db_tbl_sql_federation".equals(testParam.getScenario())) {
continue;
}
- if ("jdbc".equals(testParam.getAdapter()) && AdapterMode.CLUSTER
== testParam.getMode() && "encrypt".equals(testParam.getScenario())
+ if ("jdbc".equals(testParam.getAdapter()) && Mode.CLUSTER ==
testParam.getMode() && "encrypt".equals(testParam.getScenario())
|| "MySQL".equals(testParam.getDatabaseType().getType())
&& "passthrough".equals(testParam.getScenario())) {
// FIXME correct columnType with proxy adapter and other jdbc
scenario
assertThat(actualResultSetMetaData.getColumnType(i + 1),
is(expectedResultSetMetaData.getColumnType(i + 1)));
