dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add WAIT_TIMEOUT and duration to constants

Browse Source
This commit is contained in:
Seraphym-Tuhai 2023-04-19 15:33:04 +03:00
parent b0ecb5b86f
commit 4f7420b92a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
View File

@ -49,6 +49,7 @@ import java.net.URL;
import java.time.Duration; import java.time.Duration;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -68,6 +69,8 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
protected static final PageLink pageLink = new PageLink(10); protected static final PageLink pageLink = new PageLink(10);
private static final ContainerTestSuite instance = ContainerTestSuite.getInstance(); private static final ContainerTestSuite instance = ContainerTestSuite.getInstance();
private JavascriptExecutor js; private JavascriptExecutor js;
public static final long WAIT_TIMEOUT = TimeUnit.SECONDS.toMillis(10);
private final Duration duration = Duration.ofMillis(WAIT_TIMEOUT);
@BeforeClass @BeforeClass
public void startUp() throws MalformedURLException { public void startUp() throws MalformedURLException {
@ -105,8 +108,7 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
} }
public String getJwtTokenFromLocalStorage() { public String getJwtTokenFromLocalStorage() {
js = (JavascriptExecutor) driver; return (String) getJs().executeScript("return window.localStorage.getItem('jwt_token');");
return (String) js.executeScript("return window.localStorage.getItem('jwt_token');");
} }
public void openBaseUiUrl() { public void openBaseUiUrl() {
@ -122,7 +124,7 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
} }
protected boolean urlContains(String urlPath) { protected boolean urlContains(String urlPath) {
WebDriverWait wait = new WebDriverWait(driver, Duration.ofMillis(5000)); WebDriverWait wait = new WebDriverWait(driver, duration);
try { try {
wait.until(ExpectedConditions.urlContains(urlPath)); wait.until(ExpectedConditions.urlContains(urlPath));
} catch (WebDriverException e) { } catch (WebDriverException e) {
@ -132,8 +134,7 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
} }
public void jsClick(WebElement element) { public void jsClick(WebElement element) {
js = (JavascriptExecutor) driver; getJs().executeScript("arguments[0].click();", element);
js.executeScript("arguments[0].click();", element);
} }
public static RuleChain getRuleChainByName(String name) { public static RuleChain getRuleChainByName(String name) {
@ -193,6 +194,10 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
} }
} }
public JavascriptExecutor getJs() {
return js = (JavascriptExecutor) driver;
}
public void assertIsDisplayed(WebElement element) { public void assertIsDisplayed(WebElement element) {
assertThat(element.isDisplayed()).as(element + " is displayed").isTrue(); assertThat(element.isDisplayed()).as(element + " is displayed").isTrue();
} }