diff --git a/pom.xml b/pom.xml index 4333f36..65843de 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ com.github.aquality-automation aquality-selenium-core - 4.12.0 + 4.13.0 org.apache.commons @@ -80,7 +80,7 @@ com.fasterxml.jackson.core jackson-databind - 2.20.1 + 2.21.2 org.slf4j @@ -97,7 +97,7 @@ org.testng testng - 7.11.0 + 7.12.0 test @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.15.0 11 11 @@ -116,7 +116,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 pre-unit-test @@ -144,7 +144,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.3 + 3.5.5 ${surefireArgLine} -Dfile.encoding=UTF-8 false @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.7.1 + 3.8.0 @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.1 + 3.4.0 attach-sources @@ -187,7 +187,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.2 + 3.12.0 11 @@ -223,7 +223,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.8.0 + 0.10.0 true central @@ -234,7 +234,7 @@ org.codehaus.mojo versions-maven-plugin - 2.18.0 + 2.21.0 diff --git a/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java b/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java index 1a12c1b..f2cface 100644 --- a/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java +++ b/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java @@ -9,8 +9,8 @@ import org.openqa.selenium.devtools.DevTools; import org.openqa.selenium.devtools.Event; import org.openqa.selenium.devtools.HasDevTools; -import org.openqa.selenium.devtools.v144.performance.Performance; -import org.openqa.selenium.devtools.v144.performance.model.Metric; +import org.openqa.selenium.devtools.v145.performance.Performance; +import org.openqa.selenium.devtools.v145.performance.model.Metric; import java.util.List; import java.util.Map; diff --git a/src/main/java/aquality/selenium/browser/devtools/EmulationHandling.java b/src/main/java/aquality/selenium/browser/devtools/EmulationHandling.java index 63582f5..e470827 100644 --- a/src/main/java/aquality/selenium/browser/devtools/EmulationHandling.java +++ b/src/main/java/aquality/selenium/browser/devtools/EmulationHandling.java @@ -2,10 +2,10 @@ import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.devtools.Command; -import org.openqa.selenium.devtools.v144.dom.model.RGBA; -import org.openqa.selenium.devtools.v144.emulation.Emulation; -import org.openqa.selenium.devtools.v144.emulation.model.MediaFeature; -import org.openqa.selenium.devtools.v144.emulation.model.ScreenOrientation; +import org.openqa.selenium.devtools.v145.dom.model.RGBA; +import org.openqa.selenium.devtools.v145.emulation.Emulation; +import org.openqa.selenium.devtools.v145.emulation.model.MediaFeature; +import org.openqa.selenium.devtools.v145.emulation.model.ScreenOrientation; import java.util.Collections; import java.util.List; diff --git a/src/main/java/aquality/selenium/browser/devtools/JavaScriptHandling.java b/src/main/java/aquality/selenium/browser/devtools/JavaScriptHandling.java index fe1a8ac..5c6e76b 100644 --- a/src/main/java/aquality/selenium/browser/devtools/JavaScriptHandling.java +++ b/src/main/java/aquality/selenium/browser/devtools/JavaScriptHandling.java @@ -12,9 +12,9 @@ import org.openqa.selenium.devtools.idealized.Javascript; import org.openqa.selenium.devtools.idealized.ScriptId; import org.openqa.selenium.devtools.idealized.target.model.SessionID; -import org.openqa.selenium.devtools.v144.page.Page; -import org.openqa.selenium.devtools.v144.page.model.ScriptIdentifier; -import org.openqa.selenium.devtools.v144.runtime.Runtime; +import org.openqa.selenium.devtools.v145.page.Page; +import org.openqa.selenium.devtools.v145.page.model.ScriptIdentifier; +import org.openqa.selenium.devtools.v145.runtime.Runtime; import org.openqa.selenium.logging.EventType; import org.openqa.selenium.logging.HasLogEvents; import org.openqa.selenium.remote.Augmenter; diff --git a/src/main/java/aquality/selenium/browser/devtools/NetworkHandling.java b/src/main/java/aquality/selenium/browser/devtools/NetworkHandling.java index a02267a..5b14155 100644 --- a/src/main/java/aquality/selenium/browser/devtools/NetworkHandling.java +++ b/src/main/java/aquality/selenium/browser/devtools/NetworkHandling.java @@ -8,7 +8,7 @@ import org.openqa.selenium.UsernameAndPassword; import org.openqa.selenium.devtools.NetworkInterceptor; import org.openqa.selenium.devtools.idealized.Network; -import org.openqa.selenium.devtools.v144.network.model.*; +import org.openqa.selenium.devtools.v145.network.model.*; import org.openqa.selenium.remote.http.*; import java.net.URI; @@ -22,11 +22,11 @@ import static aquality.selenium.browser.AqualityServices.getBrowser; import static aquality.selenium.logging.LocalizedLoggerUtility.logByLevel; -import static org.openqa.selenium.devtools.v144.network.Network.*; +import static org.openqa.selenium.devtools.v145.network.Network.*; /** * DevTools commands for version-independent network interception. - * For more information, see {@link org.openqa.selenium.devtools.v144.network.Network} and {@link Network}. + * For more information, see {@link org.openqa.selenium.devtools.v145.network.Network} and {@link Network}. */ public class NetworkHandling { public static final String LOC_NETWORK_INTERCEPTOR_START = "loc.browser.network.interceptor.start"; diff --git a/src/main/java/aquality/selenium/elements/interfaces/IShadowRootExpander.java b/src/main/java/aquality/selenium/elements/interfaces/IShadowRootExpander.java index 77552b1..2220c0b 100644 --- a/src/main/java/aquality/selenium/elements/interfaces/IShadowRootExpander.java +++ b/src/main/java/aquality/selenium/elements/interfaces/IShadowRootExpander.java @@ -347,6 +347,7 @@ default List findElementsInShadowRoot(By locator, String * @param name Child elements name. * @param supplier Required elements' supplier. * @param state Visibility state of shadowed elements. + * @param count Expected number of elements that have to be found (zero, more than zero, any). * @return List of shadowed elements. */ default List findElementsInShadowRoot(By locator, String name, IElementSupplier supplier, ElementState state, ElementsCount count) { diff --git a/src/main/java/aquality/selenium/logging/DevToolsCommandLoggingOptions.java b/src/main/java/aquality/selenium/logging/DevToolsCommandLoggingOptions.java index ecab019..8079a6b 100644 --- a/src/main/java/aquality/selenium/logging/DevToolsCommandLoggingOptions.java +++ b/src/main/java/aquality/selenium/logging/DevToolsCommandLoggingOptions.java @@ -33,6 +33,7 @@ public LoggingParameters getResult() { /** * Sets logging parameters for command result (when it's present). + * @param result command result logging parameters. */ public void setResult(LoggingParameters result) { this.result = result; diff --git a/src/test/java/forms/MyLocationForm.java b/src/test/java/forms/MyLocationForm.java index e8ddf2b..ff590c6 100644 --- a/src/test/java/forms/MyLocationForm.java +++ b/src/test/java/forms/MyLocationForm.java @@ -15,11 +15,13 @@ public MyLocationForm() { super(By.xpath("//*[contains(text(),'Location')]"), "My Location"); } - public double getLatitude() { + public Double getLatitude() { if (!lblLatitude.state().isDisplayed() && btnConsent.state().waitForDisplayed()) { clickConsent(); } - lblLatitude.state().waitForDisplayed(); + if (!lblLatitude.state().waitForDisplayed()) { + return null; + } return Double.parseDouble(lblLatitude.getText()); } diff --git a/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java b/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java index cdcf737..669e2e1 100644 --- a/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java +++ b/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java @@ -3,8 +3,8 @@ import aquality.selenium.browser.AqualityServices; import aquality.selenium.browser.devtools.EmulationHandling; import com.google.common.collect.ImmutableMap; -import org.openqa.selenium.devtools.v143.emulation.Emulation; -import org.openqa.selenium.devtools.v143.emulation.model.DisplayFeature; +import org.openqa.selenium.devtools.v144.emulation.Emulation; +import org.openqa.selenium.devtools.v144.emulation.model.DisplayFeature; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java b/src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java index 0ce19dd..852fe3b 100644 --- a/src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java +++ b/src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java @@ -3,8 +3,8 @@ import aquality.selenium.browser.AqualityServices; import aquality.selenium.browser.devtools.NetworkHandling; import org.openqa.selenium.TimeoutException; -import org.openqa.selenium.devtools.v144.network.model.ConnectionType; -import org.openqa.selenium.devtools.v144.network.model.NetworkConditions; +import org.openqa.selenium.devtools.v145.network.model.ConnectionType; +import org.openqa.selenium.devtools.v145.network.model.NetworkConditions; import org.testng.Assert; import org.testng.annotations.Test; import tests.BaseTest; diff --git a/src/test/java/tests/usecases/devtools/OverrideGeolocationTest.java b/src/test/java/tests/usecases/devtools/OverrideGeolocationTest.java index e3f012a..f08e2fe 100644 --- a/src/test/java/tests/usecases/devtools/OverrideGeolocationTest.java +++ b/src/test/java/tests/usecases/devtools/OverrideGeolocationTest.java @@ -3,6 +3,7 @@ import aquality.selenium.browser.AqualityServices; import forms.MyLocationForm; import org.testng.Assert; +import org.testng.SkipException; import org.testng.annotations.Test; import tests.BaseTest; @@ -19,7 +20,10 @@ public void overrideGeolocationTest() { AqualityServices.getBrowser().goTo(URL_MYLOCATIONORG); MyLocationForm form = new MyLocationForm(); Assert.assertTrue(form.state().waitForDisplayed()); - double latDefault = form.getLatitude(); + Double latDefault = form.getLatitude(); + if (latDefault == null) { + throw new SkipException("Geolocation access is disabled"); + } double lngDefault = form.getLongitude(); AqualityServices.getBrowser().devTools().emulation().setGeolocationOverride(LAT_FOR_OVERRIDE, LNG_FOR_OVERRIDE); diff --git a/src/test/java/tests/usecases/devtools/OverrideUserAgentTest.java b/src/test/java/tests/usecases/devtools/OverrideUserAgentTest.java index 33eab76..3de9cbd 100644 --- a/src/test/java/tests/usecases/devtools/OverrideUserAgentTest.java +++ b/src/test/java/tests/usecases/devtools/OverrideUserAgentTest.java @@ -8,7 +8,7 @@ import manytools.BrowserLanguageForm; import manytools.UserAgentForm; import org.openqa.selenium.devtools.idealized.Network; -import org.openqa.selenium.devtools.v143.emulation.Emulation; +import org.openqa.selenium.devtools.v144.emulation.Emulation; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test;