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 5b8e431d7a1 Rename E2ETestEnvironment (#32182)
5b8e431d7a1 is described below
commit 5b8e431d7a138f60501db39b9c776d1e03df6c5f
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jul 18 20:37:50 2024 +0800
Rename E2ETestEnvironment (#32182)
---
...IntegrationTestEnvironment.java => E2ETestEnvironment.java} | 10 +++++-----
.../test/e2e/engine/TotalSuitesCountCalculator.java | 4 ++--
.../test/e2e/engine/type/dml/AdditionalDMLE2EIT.java | 4 ++--
.../test/e2e/engine/type/dql/AdditionalDQLE2EIT.java | 4 ++--
.../param/array/ClusterTestParameterArrayGenerator.java | 4 ++--
.../e2e/framework/param/array/E2ETestParameterFactory.java | 6 +++---
.../param/array/JdbcStandaloneTestParameterGenerator.java | 4 ++--
.../param/array/ProxyStandaloneTestParameterGenerator.java | 4 ++--
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/IntegrationTestEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
similarity index 91%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/IntegrationTestEnvironment.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index e126fdb2a74..1f213b7b40b 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/IntegrationTestEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -29,12 +29,12 @@ import java.util.Properties;
import java.util.TimeZone;
/**
- * Integration test environment.
+ * E2E test environment.
*/
@Getter
-public final class IntegrationTestEnvironment {
+public final class E2ETestEnvironment {
- private static final IntegrationTestEnvironment INSTANCE = new
IntegrationTestEnvironment();
+ private static final E2ETestEnvironment INSTANCE = new
E2ETestEnvironment();
private final Collection<String> runModes;
@@ -46,7 +46,7 @@ public final class IntegrationTestEnvironment {
private final boolean smoke;
- private IntegrationTestEnvironment() {
+ private E2ETestEnvironment() {
Properties props = loadProperties();
runModes =
Splitter.on(",").trimResults().splitToList(props.getProperty("it.run.modes"));
runAdditionalTestCases =
Boolean.parseBoolean(props.getProperty("it.run.additional.cases"));
@@ -83,7 +83,7 @@ public final class IntegrationTestEnvironment {
*
* @return singleton instance
*/
- public static IntegrationTestEnvironment getInstance() {
+ public static E2ETestEnvironment getInstance() {
return INSTANCE;
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/TotalSuitesCountCalculator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/TotalSuitesCountCalculator.java
index 40f520f6bb9..bea93d4d67e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/TotalSuitesCountCalculator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/TotalSuitesCountCalculator.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
/**
* Total test suites count calculator.
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class TotalSuitesCountCalculator {
- private static final IntegrationTestEnvironment ENV =
IntegrationTestEnvironment.getInstance();
+ private static final E2ETestEnvironment ENV =
E2ETestEnvironment.getInstance();
private static final int GENERIC_SUITES_COUNT = 4;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
index 696286ffe34..ad2f4964516 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/AdditionalDMLE2EIT.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.junit.jupiter.api.Disabled;
@@ -322,6 +322,6 @@ class AdditionalDMLE2EIT extends BaseDMLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter() &&
IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases();
+ return E2ETestParameterFactory.containsTestParameter() &&
E2ETestEnvironment.getInstance().isRunAdditionalTestCases();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
index 2333b7e7ae4..74c9f7c61dd 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/AdditionalDQLE2EIT.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.test.e2e.cases.value.SQLValue;
import
org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.engine.arg.E2ETestCaseSettings;
import
org.apache.shardingsphere.test.e2e.engine.composer.SingleE2EContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -256,6 +256,6 @@ class AdditionalDQLE2EIT extends BaseDQLE2EIT {
}
private static boolean isEnabled() {
- return E2ETestParameterFactory.containsTestParameter() &&
IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases();
+ return E2ETestParameterFactory.containsTestParameter() &&
E2ETestEnvironment.getInstance().isRunAdditionalTestCases();
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
index 42002c8eebe..1b8b5d37bd4 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
@@ -33,7 +33,7 @@ import java.util.Collection;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ClusterTestParameterArrayGenerator {
- private static final IntegrationTestEnvironment ENV =
IntegrationTestEnvironment.getInstance();
+ private static final E2ETestEnvironment ENV =
E2ETestEnvironment.getInstance();
/**
* Get assertion test parameter.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
index 2fbcb0da7a0..09475818e3a 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
@@ -34,7 +34,7 @@ import java.util.LinkedList;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class E2ETestParameterFactory {
- private static final IntegrationTestEnvironment ENV =
IntegrationTestEnvironment.getInstance();
+ private static final E2ETestEnvironment ENV =
E2ETestEnvironment.getInstance();
/**
* Get assertion test parameters.
@@ -86,7 +86,7 @@ public final class E2ETestParameterFactory {
* @return contains or not
*/
public static boolean containsTestParameter() {
- return IntegrationTestEnvironment.getInstance().getRunModes().stream()
+ return E2ETestEnvironment.getInstance().getRunModes().stream()
.anyMatch(each ->
AdapterMode.STANDALONE.getValue().equalsIgnoreCase(each) ||
AdapterMode.CLUSTER.getValue().equalsIgnoreCase(each));
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 47dc8d24548..6205c57c9da 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
@@ -37,7 +37,7 @@ public final class JdbcStandaloneTestParameterGenerator {
private static final Collection<String> ADAPTERS =
Collections.singleton(AdapterType.JDBC.getValue());
- private static final IntegrationTestEnvironment ENV =
IntegrationTestEnvironment.getInstance();
+ private static final E2ETestEnvironment ENV =
E2ETestEnvironment.getInstance();
/**
* Get assertion test parameter.
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index 0898c55e01e..3eb31791d4c 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
@@ -33,7 +33,7 @@ import java.util.Collection;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ProxyStandaloneTestParameterGenerator {
- private static final IntegrationTestEnvironment ENV =
IntegrationTestEnvironment.getInstance();
+ private static final E2ETestEnvironment ENV =
E2ETestEnvironment.getInstance();
/**
* Get assertion test parameters.
