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 f5197474488 Add E2ETestEnvironment.isValid() (#36687)
f5197474488 is described below
commit f5197474488108ac79d46072c00419bf785b00fa
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Sep 24 22:15:31 2025 +0800
Add E2ETestEnvironment.isValid() (#36687)
---
.../test/e2e/env/runtime/E2ETestEnvironment.java | 10 ++++++++++
.../test/e2e/env/runtime/type/RunEnvironment.java | 11 ++---------
.../sql/framework/param/array/E2ETestParameterFactory.java | 9 ---------
.../shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java | 3 ++-
.../shardingsphere/test/e2e/sql/it/distsql/rdl/RDLE2EIT.java | 3 ++-
.../shardingsphere/test/e2e/sql/it/distsql/rql/RQLE2EIT.java | 3 ++-
.../shardingsphere/test/e2e/sql/it/sql/dal/DALE2EIT.java | 4 ++--
.../shardingsphere/test/e2e/sql/it/sql/dcl/DCLE2EIT.java | 4 ++--
.../shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java | 4 ++--
.../test/e2e/sql/it/sql/dml/AdditionalDMLE2EIT.java | 3 +--
.../shardingsphere/test/e2e/sql/it/sql/dml/BatchDMLE2EIT.java | 4 ++--
.../test/e2e/sql/it/sql/dml/GeneralDMLE2EIT.java | 4 ++--
.../test/e2e/sql/it/sql/dql/AdditionalDQLE2EIT.java | 3 +--
.../test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java | 4 ++--
test/e2e/sql/src/test/resources/env/e2e-env.properties | 8 ++++----
15 files changed, 36 insertions(+), 41 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index a3ff19731d4..f133d2d5675 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -77,6 +77,16 @@ public final class E2ETestEnvironment {
return result;
}
+ /**
+ * Judge whether valid E2E test environment.
+ *
+ * @return valid or invalid E2E test environment
+ */
+ public boolean isValid() {
+ return !scenarios.isEmpty() && null != runEnvironment.getType()
+ && !artifactEnvironment.getModes().isEmpty() &&
!artifactEnvironment.getAdapters().isEmpty() &&
!artifactEnvironment.getDatabaseTypes().isEmpty();
+ }
+
/**
* Get instance.
*
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java
index 309cb3070bc..cd16380522f 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java
@@ -41,18 +41,11 @@ public final class RunEnvironment {
private Type getType(final Properties props) {
String value = props.getProperty("e2e.run.type");
- if (null == value) {
- return Type.NATIVE;
- }
- try {
- return Type.valueOf(value);
- } catch (final IllegalArgumentException ignored) {
- return Type.NATIVE;
- }
+ return null == value ? null : Type.valueOf(value);
}
/**
- * Cluster environment type.
+ * Run type.
*/
public enum Type {
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 71b6ef04dd9..b7ae6c5bd0d 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
@@ -80,13 +80,4 @@ public final class E2ETestParameterFactory {
private static boolean isDistSQLCommandType(final SQLCommandType
sqlCommandType) {
return SQLCommandType.RDL == sqlCommandType || SQLCommandType.RAL ==
sqlCommandType || SQLCommandType.RQL == sqlCommandType;
}
-
- /**
- * Judge whether contains test parameter.
- *
- * @return contains or not
- */
- public static boolean containsTestParameter() {
- 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/it/distsql/ral/RALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
index e6c261cc7e1..0ee33498dc0 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.test.e2e.sql.it.distsql.ral;
import com.google.common.base.Splitter;
import lombok.Setter;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
@@ -196,6 +197,6 @@ class RALE2EIT implements SQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter() &&
!E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RAL).isEmpty();
+ return E2ETestEnvironment.getInstance().isValid() &&
!E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RAL).isEmpty();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rdl/RDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rdl/RDLE2EIT.java
index 1c7ec784126..a38ba03f881 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rdl/RDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rdl/RDLE2EIT.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.test.e2e.sql.it.distsql.rdl;
import com.google.common.base.Splitter;
import lombok.Setter;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
@@ -181,6 +182,6 @@ class RDLE2EIT implements SQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter() &&
!E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RDL).isEmpty();
+ return E2ETestEnvironment.getInstance().isValid() &&
!E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RDL).isEmpty();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rql/RQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rql/RQLE2EIT.java
index 6b4f2186703..145e1011783 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rql/RQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/rql/RQLE2EIT.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.e2e.sql.it.distsql.rql;
import lombok.Setter;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
@@ -122,6 +123,6 @@ class RQLE2EIT implements SQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter() &&
!E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RQL).isEmpty();
+ return E2ETestEnvironment.getInstance().isValid() &&
!E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.RQL).isEmpty();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dal/DALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dal/DALE2EIT.java
index a733331a3bc..7340eebae73 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dal/DALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dal/DALE2EIT.java
@@ -19,13 +19,13 @@ package org.apache.shardingsphere.test.e2e.sql.it.sql.dal;
import lombok.Setter;
import org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.sql.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT;
@@ -153,6 +153,6 @@ class DALE2EIT implements SQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter();
+ return E2ETestEnvironment.getInstance().isValid();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dcl/DCLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dcl/DCLE2EIT.java
index 9ca40224e0b..72ec78b7e07 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dcl/DCLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dcl/DCLE2EIT.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.test.e2e.sql.it.sql.dcl;
import lombok.Setter;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.authority.AuthorityEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioCommonPath;
import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
@@ -109,6 +109,6 @@ class DCLE2EIT implements SQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter();
+ return E2ETestEnvironment.getInstance().isValid();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
index b8719e91eee..946e29e53ab 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/ddl/DDLE2EIT.java
@@ -21,13 +21,13 @@ import com.google.common.base.Splitter;
import lombok.Setter;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.expr.entry.InlineExpressionParserFactory;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetIndex;
import
org.apache.shardingsphere.test.e2e.sql.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
@@ -292,6 +292,6 @@ class DDLE2EIT implements SQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter();
+ return E2ETestEnvironment.getInstance().isValid();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/AdditionalDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/AdditionalDMLE2EIT.java
index ae9b94e55a3..8243b3263ee 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/AdditionalDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/AdditionalDMLE2EIT.java
@@ -21,7 +21,6 @@ import
org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
@@ -323,7 +322,7 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter() &&
E2ETestEnvironment.getInstance().getRunEnvironment().isRunAdditionalCases();
+ return E2ETestEnvironment.getInstance().isValid() &&
E2ETestEnvironment.getInstance().getRunEnvironment().isRunAdditionalCases();
}
@Override
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BatchDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BatchDMLE2EIT.java
index 84bb3eb8c8f..b342a45bdb4 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BatchDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/BatchDMLE2EIT.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.test.e2e.sql.it.sql.dml;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.cases.casse.assertion.SQLE2ETestCaseAssertion;
import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.CaseTestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -121,6 +121,6 @@ class BatchDMLE2EIT extends BaseDMLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter();
+ return E2ETestEnvironment.getInstance().isValid();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/GeneralDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/GeneralDMLE2EIT.java
index 85b49c88db0..df9ae44414d 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/GeneralDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dml/GeneralDMLE2EIT.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.test.e2e.sql.it.sql.dml;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
@@ -130,6 +130,6 @@ class GeneralDMLE2EIT extends BaseDMLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter();
+ return E2ETestEnvironment.getInstance().isValid();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/AdditionalDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/AdditionalDQLE2EIT.java
index 9974c1c7b1f..0e44981d0a3 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/AdditionalDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/AdditionalDQLE2EIT.java
@@ -21,7 +21,6 @@ import
org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
@@ -256,6 +255,6 @@ class AdditionalDQLE2EIT extends BaseDQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter() &&
E2ETestEnvironment.getInstance().getRunEnvironment().isRunAdditionalCases();
+ return E2ETestEnvironment.getInstance().isValid() &&
E2ETestEnvironment.getInstance().getRunEnvironment().isRunAdditionalCases();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java
index 2fa60d22196..65f014c9f30 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.test.e2e.sql.it.sql.dql;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITSettings;
-import
org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
@@ -252,6 +252,6 @@ class GeneralDQLE2EIT extends BaseDQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter();
+ return E2ETestEnvironment.getInstance().isValid();
}
}
diff --git a/test/e2e/sql/src/test/resources/env/e2e-env.properties
b/test/e2e/sql/src/test/resources/env/e2e-env.properties
index be5df4accc2..4893cd2b512 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -16,22 +16,22 @@
#
#e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
-e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
+e2e.scenarios=
e2e.run.additional.cases=false
e2e.run.smoke.cases=false
# e2e.run.type=DOCKER,NATIVE
-e2e.run.type=DOCKER
+e2e.run.type=
#e2e.artifact.modes=Standalone,Cluster
e2e.artifact.modes=
# e2e.artifact.adapters=jdbc,proxy
-e2e.artifact.adapters=proxy
+e2e.artifact.adapters=
# e2e.artifact.databases=MySQL,PostgreSQL,openGauss,Hive
-e2e.artifact.databases=MySQL
+e2e.artifact.databases=
#e2e.artifact.database.mysql.image=mysql:8.2.0
