Skip to content

Refactor E2ETestEnvironment #36647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2025
Merged

Refactor E2ETestEnvironment #36647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .../env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.google.common.base.Splitter;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
Expand All @@ -43,14 +44,14 @@ public final class E2ETestEnvironment {

private final boolean runAdditionalTestCases;

private final boolean smoke;

private final Collection<String> scenarios;

private final String governanceCenter;

private final ClusterEnvironment clusterEnvironment;

private final boolean smoke;

private final String nativeStorageHost;

private final int nativeStoragePort;
Expand All @@ -61,26 +62,25 @@ public final class E2ETestEnvironment {

private E2ETestEnvironment() {
Properties props = loadProperties();
TimeZone.setDefault(TimeZone.getTimeZone(props.getProperty("it.timezone", "UTC")));
runModes = Splitter.on(",").trimResults().splitToList(props.getProperty("it.run.modes", "")).stream()
.filter(each -> !each.isEmpty()).map(each -> AdapterMode.valueOf(each.toUpperCase())).collect(Collectors.toList());
runAdditionalTestCases = Boolean.parseBoolean(props.getProperty("it.run.additional.cases"));
TimeZone.setDefault(TimeZone.getTimeZone(props.getProperty("it.timezone", "UTC")));
scenarios = getScenarios(props);
smoke = Boolean.parseBoolean(props.getProperty("it.run.smoke"));
scenarios = getScenarios(props);
governanceCenter = props.getProperty("it.env.governance.center");
clusterEnvironment = new ClusterEnvironment(props);
nativeStorageHost = props.getProperty("it.native.storage.host", "127.0.0.1");
nativeStoragePort = Integer.parseInt(props.getProperty("it.native.storage.port", "0"));
nativeStorageUsername = props.getProperty("it.native.storage.username", StorageContainerConstants.OPERATION_USER);
nativeStoragePassword = props.getProperty("it.native.storage.password", StorageContainerConstants.OPERATION_PASSWORD);
governanceCenter = props.getProperty("it.env.governance.center");
}

@SneakyThrows(IOException.class)
private Properties loadProperties() {
Properties result = new Properties();
try (InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("env/it-env.properties")) {
result.load(inputStream);
} catch (final IOException ex) {
throw new RuntimeException(ex);
}
for (String each : System.getProperties().stringPropertyNames()) {
result.setProperty(each, System.getProperty(each));
Expand Down