diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5374fc941f..42048260ef 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -126,6 +126,12 @@ jobs: class: org.apache.streampark.e2e.cases.TeamManagementTest - name: MemberManagementTest class: org.apache.streampark.e2e.cases.MemberManagementTest + - name: Flink116OnYarnClustersTest + class: org.apache.streampark.e2e.cases.Flink116OnYarnClustersTest + - name: Flink117OnYarnClustersTest + class: org.apache.streampark.e2e.cases.Flink117OnYarnClustersTest + - name: Flink118OnYarnClustersTest + class: org.apache.streampark.e2e.cases.Flink118OnYarnClustersTest - name: FlinkSQL116OnYarnTest class: org.apache.streampark.e2e.cases.FlinkSQL116OnYarnTest - name: FlinkSQL117OnYarnTest diff --git a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/Flink117OnYarnClustersTest.java b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/Flink117OnYarnClustersTest.java index fe16daf96b..d1c945b62c 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/Flink117OnYarnClustersTest.java +++ b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/Flink117OnYarnClustersTest.java @@ -25,6 +25,7 @@ import org.apache.streampark.e2e.pages.flink.clusters.ClusterDetailForm; import org.apache.streampark.e2e.pages.flink.clusters.FlinkClustersPage; import org.apache.streampark.e2e.pages.flink.clusters.YarnSessionForm; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/Flink118OnYarnClustersTest.java b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/Flink118OnYarnClustersTest.java index 28243499bc..ff1ad073fb 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/Flink118OnYarnClustersTest.java +++ b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/Flink118OnYarnClustersTest.java @@ -25,6 +25,7 @@ import org.apache.streampark.e2e.pages.flink.clusters.ClusterDetailForm; import org.apache.streampark.e2e.pages.flink.clusters.FlinkClustersPage; import org.apache.streampark.e2e.pages.flink.clusters.YarnSessionForm; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/clusters/ClusterDetailForm.java b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/clusters/ClusterDetailForm.java index 5b556c37b8..15ad80de68 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/clusters/ClusterDetailForm.java +++ b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/clusters/ClusterDetailForm.java @@ -59,7 +59,8 @@ public T addCluster(ExecutionMode executionMode) { .click(); return (T) new YarnSessionForm(this); default: - throw new UnsupportedOperationException(String.format("Unknown execution mode: %s", executionMode.desc())); + throw new UnsupportedOperationException( + String.format("Unknown execution mode: %s", executionMode.desc())); } } diff --git a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/SystemPage.java b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/SystemPage.java index 8b3c7d9e7e..2bbae08bea 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/SystemPage.java +++ b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/SystemPage.java @@ -72,7 +72,7 @@ public T goToTab(Class tab) { return tab.cast(new RoleManagementPage(driver)); } if (tab == TokenManagementPage.class) { - new WebDriverWait(driver, Duration.ofSeconds(10)) + new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION) .until(ExpectedConditions.elementToBeClickable(menuTokenManagement)); menuTokenManagement.click(); return tab.cast(new TokenManagementPage(driver)); diff --git a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/TokenManagementPage.java b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/TokenManagementPage.java index 987e01ad46..32717c747b 100644 --- a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/TokenManagementPage.java +++ b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/TokenManagementPage.java @@ -17,6 +17,7 @@ package org.apache.streampark.e2e.pages.system; +import org.apache.streampark.e2e.pages.common.Constants; import org.apache.streampark.e2e.pages.common.NavBarPage; import lombok.Getter; @@ -29,7 +30,6 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; import java.util.List; @Getter @@ -56,11 +56,11 @@ public TokenManagementPage(RemoteWebDriver driver) { public TokenManagementPage createToken(String existUserName, String description) { waitForPageLoading(); - new WebDriverWait(driver, Duration.ofSeconds(10)) + new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION) .until(ExpectedConditions.elementToBeClickable(buttonCreateToken)); buttonCreateToken.click(); - new WebDriverWait(driver, Duration.ofSeconds(10)) + new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION) .until(ExpectedConditions.elementToBeClickable(createTokenForm.inputUserName())); createTokenForm.inputUserName().sendKeys(existUserName); createTokenForm.inputUserName().sendKeys(Keys.RETURN); @@ -97,7 +97,7 @@ public TokenManagementPage deleteToken(String existUserName) { .orElseThrow(() -> new RuntimeException("No delete button in token list")) .click(); - new WebDriverWait(driver, Duration.ofSeconds(10)) + new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION) .until(ExpectedConditions.elementToBeClickable(deleteConfirmButton)); deleteConfirmButton.click(); @@ -105,7 +105,7 @@ public TokenManagementPage deleteToken(String existUserName) { } private void waitForPageLoading() { - new WebDriverWait(driver, Duration.ofSeconds(10)) + new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION) .until(ExpectedConditions.urlContains("/system/token")); }