Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/aquality/selenium/browser/Browser.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import aquality.selenium.configuration.ITimeoutConfiguration;
import aquality.selenium.localization.LocalizationManager;
import aquality.selenium.logger.Logger;
import aquality.selenium.waitings.ConditionalWait;
import org.apache.commons.io.IOUtils;
import org.openqa.selenium.Alert;
import org.openqa.selenium.Dimension;
Expand All @@ -12,11 +13,11 @@
import org.openqa.selenium.WebDriver.Navigation;
import org.openqa.selenium.remote.RemoteWebDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.WebDriverWait;

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;

Expand Down Expand Up @@ -161,7 +162,11 @@ public void waitForPageToLoad() {
Object result = executeScript(JavaScript.IS_PAGE_LOADED.getScript());
return result instanceof Boolean && (Boolean) result;
};
getWebDriverWait(timeouts.getPageLoad()).until(condition);
ConditionalWait.waitFor(condition,
timeouts.getPageLoad(),
timeouts.getPollingInterval(),
String.format(getLocManager().getValue("loc.browser.page.is.not.loaded"), timeouts.getPageLoad()),
Collections.emptyList());
}

/**
Expand Down Expand Up @@ -326,9 +331,5 @@ private Long getImplicitWaitTimeout() {
private LocalizationManager getLocManager(){
return LocalizationManager.getInstance();
}

private WebDriverWait getWebDriverWait(long timeout){
return new WebDriverWait(getDriver(), timeout);
}
}

11 changes: 7 additions & 4 deletions src/main/java/aquality/selenium/elements/ElementFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
import aquality.selenium.browser.JavaScript;
import aquality.selenium.configuration.Configuration;
import aquality.selenium.elements.interfaces.*;
import aquality.selenium.localization.LocalizationManager;
import aquality.selenium.logger.Logger;
import aquality.selenium.waitings.ConditionalWait;
import org.openqa.selenium.By;
import org.openqa.selenium.By.ByXPath;
import org.openqa.selenium.SearchContext;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.WebDriverWait;

import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
Expand Down Expand Up @@ -102,9 +103,11 @@ private <T extends IElement> List<T> findElementsCore(By locator, IElementSuppl
case ZERO:
break;
case MORE_THEN_ZERO:
WebDriverWait webDriverWait = new WebDriverWait(getBrowser().getDriver(),
Configuration.getInstance().getTimeoutConfiguration().getCondition());
webDriverWait.until(driver -> !driver.findElements(locator).isEmpty());
ConditionalWait.waitFor(driver -> !driver.findElements(locator).isEmpty(),
String.format(LocalizationManager.getInstance().getValue("loc.no.elements.found.in.state"),
locator.toString(),
state.toString(),
Configuration.getInstance().getTimeoutConfiguration().getCondition()));
break;
default:
throw new IllegalArgumentException("No such expected value:".concat(count.toString()));
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/aquality/selenium/elements/ElementFinder.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@
import aquality.selenium.elements.interfaces.IElementFinder;
import aquality.selenium.localization.LocalizationManager;
import aquality.selenium.logger.Logger;
import org.openqa.selenium.By;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.WebDriverWait;
import aquality.selenium.waitings.ConditionalWait;
import org.openqa.selenium.*;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
Expand Down Expand Up @@ -69,15 +67,16 @@ List<WebElement> findElements(By locator, long timeout, DesiredState desiredStat
long zeroTimeout = 0L;
getBrowser().setImplicitWaitTimeout(zeroTimeout);
try{
WebDriverWait webDriverWait = new WebDriverWait(getBrowser().getDriver(), timeout);
webDriverWait.until(driver ->

ConditionalWait.waitFor(driver ->
{
List<WebElement> allFoundElements = driver.findElements(locator);
foundElements.addAll(allFoundElements);
List<WebElement> filteredElements = filterByState(allFoundElements, desiredState.getDesiredStatePredicate());
resultElements.addAll(filteredElements);
return !filteredElements.isEmpty();
});
}, timeout, getTimeoutConfiguration().getPollingInterval(),
desiredState.getMessage(), Collections.emptyList());
}catch (TimeoutException e){
applyResult(locator, desiredState, foundElements);
}
Expand Down
22 changes: 15 additions & 7 deletions src/main/java/aquality/selenium/elements/ElementStateProvider.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package aquality.selenium.elements;

import aquality.selenium.browser.BrowserManager;
import aquality.selenium.configuration.Configuration;
import aquality.selenium.configuration.ITimeoutConfiguration;
import aquality.selenium.elements.interfaces.IElementStateProvider;
import aquality.selenium.localization.LocalizationManager;
import aquality.selenium.logger.Logger;
import aquality.selenium.waitings.ConditionalWait;
import org.openqa.selenium.By;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.WebDriverWait;

import java.util.Collections;
import java.util.List;
import java.util.Objects;

Expand Down Expand Up @@ -89,12 +90,15 @@ public boolean waitForExist() {

@Override
public boolean waitForNotExist(long timeout) {
getLogger().info(getLocManager().getValue("loc.waitnotexists"), timeout);
String message = String.format(getLocManager().getValue("loc.waitnotexists"), timeout);
getLogger().info(message);
try{
long zeroTimeout = 0L;
WebDriverWait webDriverWait = new WebDriverWait(BrowserManager.getBrowser().getDriver(),
timeout);
return webDriverWait.until(y -> findElements(zeroTimeout).isEmpty());
return ConditionalWait.waitFor(y -> findElements(zeroTimeout).isEmpty(),
timeout,
getTimeoutConfiguration().getPollingInterval(),
message,
Collections.emptyList());
}catch (TimeoutException e){
getLogger().debug(getDesiredStateMessage("NOT EXIST", timeout));
return false;
Expand Down Expand Up @@ -161,7 +165,11 @@ private LocalizationManager getLocManager(){
}

private long getDefaultTimeout(){
return Configuration.getInstance().getTimeoutConfiguration().getCondition();
return getTimeoutConfiguration().getCondition();
}

private ITimeoutConfiguration getTimeoutConfiguration(){
return Configuration.getInstance().getTimeoutConfiguration();
}

private String getDesiredStateMessage(String desiredStateName, long timeout){
Expand Down
138 changes: 138 additions & 0 deletions src/main/java/aquality/selenium/waitings/ConditionalWait.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
package aquality.selenium.waitings;

import aquality.selenium.browser.Browser;
import aquality.selenium.browser.BrowserManager;
import aquality.selenium.configuration.Configuration;
import aquality.selenium.configuration.ITimeoutConfiguration;
import aquality.selenium.localization.LocalizationManager;
import org.openqa.selenium.StaleElementReferenceException;
import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.WebDriverWait;

import java.time.Duration;
import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.TimeoutException;
import java.util.function.BooleanSupplier;
import java.util.function.Function;

public final class ConditionalWait {

private ConditionalWait() {
throw new IllegalStateException("All methods are static in this 'ConditionalWait' class, class instance is not required");
}

/**
* Wait for some condition within timeout. Method does not use WebDriverWait
* Default values for timeouts used from configuration settings file
* @param condition condition with boolean result (predicate)
* @param message Part of error message in case of Timeout exception
* @return true if the condition has been met during the timeout
*/
public static boolean waitForTrue(BooleanSupplier condition, String message)
{
try
{
waitForTrue(condition, getTimeoutConfiguration().getCondition(), getTimeoutConfiguration().getPollingInterval(), message);
return true;
}
catch (TimeoutException e) {
return false;
}
}

/**
* Wait for some condition within timeout. Method does not use WebDriverWait
* @param condition condition with boolean result (predicate)
* @param timeoutInSeconds Condition timeout
* @param pollingIntervalInMilliseconds Condition check interval
* @param message Part of error message in case of Timeout exception
* @throws TimeoutException will be thrown in case if timeout is over but condition was not met
*/
public static void waitForTrue(BooleanSupplier condition, long timeoutInSeconds, long pollingIntervalInMilliseconds, String message) throws TimeoutException {
if (condition == null)
{
throw new IllegalArgumentException(getLocalizationManager().getValue("loc.wait.condition.cant.be.null"));
}

double startTime = getCurrentTime();
while (true)
{
if (condition.getAsBoolean())
{
return;
}

double currentTime = getCurrentTime();
if ((currentTime - startTime) > timeoutInSeconds)
{
String exceptionMessage = String.format(getLocalizationManager().getValue("loc.wait.timeout.condition"), timeoutInSeconds, message);
throw new TimeoutException(exceptionMessage);
}

try {
Thread.sleep(pollingIntervalInMilliseconds);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
}

/**
* Waits for function will be true or return some except false.
* Default timeout condition from settings is using.
* StaleElementReferenceException will be handled by default
* @param condition Function for waiting {@link Function}
* @param message the message that will be added to an error in case if the condition is not matched during the timeout
* @param <T> Type of object which is waiting
* @return Object which waiting for or null - is exceptions occurred
*/
public static <T> T waitFor(ExpectedCondition<T> condition, String message) {
return waitFor(condition,
getTimeoutConfiguration().getCondition(),
getTimeoutConfiguration().getPollingInterval(),
message,
Collections.singleton(StaleElementReferenceException.class));
}

/**
* Waits for function will be true or return some except false.
*
* @param condition Function for waiting {@link Function}.,
* @param timeOutInSeconds Time-out in seconds
* @param pollingIntervalInMilliseconds interval in milliseconds between checks whether condition match
* @param message the message that will be added to an error in case if the condition is not matched during the timeout
* @param exceptionsToIgnore list of exceptions that should be ignored during waiting
* @param <T> Type of object which is waiting
* @return Object which waiting for or null - is exceptions occured
*/
public static <T> T waitFor(ExpectedCondition<T> condition, long timeOutInSeconds, long pollingIntervalInMilliseconds, String message, Collection<Class<? extends Throwable>> exceptionsToIgnore) {
getBrowser().setImplicitWaitTimeout(0L);
WebDriverWait wait = new WebDriverWait(getBrowser().getDriver(), timeOutInSeconds);
wait.pollingEvery(Duration.ofMillis(pollingIntervalInMilliseconds));
wait.withMessage(message);
wait.ignoreAll(exceptionsToIgnore);

try {
return wait.until(condition);
} finally {
getBrowser().setImplicitWaitTimeout(getTimeoutConfiguration().getImplicit());
}
}

private static Browser getBrowser(){
return BrowserManager.getBrowser();
}

private static ITimeoutConfiguration getTimeoutConfiguration(){
return Configuration.getInstance().getTimeoutConfiguration();
}

private static LocalizationManager getLocalizationManager(){
return LocalizationManager.getInstance();
}

private static double getCurrentTime(){
return System.nanoTime()/Math.pow(10,9);
}
}
3 changes: 3 additions & 0 deletions src/main/resources/localization/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"loc.browser.implicit.timeout" : "Set implicit timeout '%1$s' in seconds",
"loc.browser.script.timeout" : "Set async javascript execution timeout '%1$s' in seconds",
"loc.browser.alert.fail" : "Failed while handling alert",
"loc.browser.page.is.not.loaded" : "Page was not loaded during %1$s seconds",
"loc.element.wasnotfoundinstate" : "Element '%1$s' was not found in state %2$s during %3$s seconds",
"loc.button" : "Button",
"loc.checkbox" : "CheckBox",
Expand Down Expand Up @@ -53,6 +54,8 @@
"loc.text.sending.keys" : "Sending keys '%s'",
"loc.text.typing" : "Typing '%s'",
"loc.text.masked_value" : "********",
"loc.wait.condition.cant.be.null": "Condition cannot be null",
"loc.wait.timeout.condition": "Timed out after %1$s seconds during wait for condition '%2$s'",
"loc.waitexists" : "Wait until element exists in DOM",
"loc.waitinstate" : "Wait until is present in state %1$s using \"locator\": %2$s",
"loc.waitinvisible" : "Wait until element is not visible",
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/localization/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"loc.browser.implicit.timeout" : "Установка implicit(неявного) таймаута: '%1$s' секунд",
"loc.browser.script.timeout" : "Установка таймаута на выполнение асинхронных javascript вызовов: '%1$s' секунд",
"loc.browser.alert.fail" : "Не удалось обработать всплывающее окно",
"loc.browser.page.is.not.loaded" : "Страница не загрузилась в течении %1$s секунд(ы)",
"loc.element.wasnotfoundinstate" : "Элемент '%1$s' в состоянии %2$s не найден в течении %3$s секунд",
"loc.button" : "Кнопка",
"loc.checkbox" : "Чекбокс",
Expand Down Expand Up @@ -53,6 +54,8 @@
"loc.text.sending.keys" : "Нажатие клавиши '%s'",
"loc.text.typing" : "Ввод текста '%s'",
"loc.text.masked_value" : "********",
"loc.wait.condition.cant.be.null": "Ожидаемое условие не должно быть null",
"loc.wait.timeout.condition": "Не удалось дождаться ожидаемого условия '%2$s' в течении %1$s секунд(ы)",
"loc.waitexists" : "Ожидаем появления элемента в DOM",
"loc.waitinstate" : "Ожидание присутствия элемента в состоянии %1$s используя локатор: %2$s",
"loc.waitinvisible" : "Ожидаем пока элемент исчезнет",
Expand Down
Loading