diff --git a/pom.xml b/pom.xml index 7346ae2..ae57599 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ com.github.aquality-automation aquality-selenium-core - 4.17.0 + 4.18.0 org.apache.commons @@ -84,8 +84,8 @@ org.slf4j - slf4j-simple - 2.0.18 + slf4j-nop + 2.0.19 test diff --git a/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java b/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java index 9d07dfc..af35e01 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.v151.performance.Performance; -import org.openqa.selenium.devtools.v151.performance.model.Metric; +import org.openqa.selenium.devtools.v152.performance.Performance; +import org.openqa.selenium.devtools.v152.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 8fd8d4e..d9c2895 100644 --- a/src/main/java/aquality/selenium/browser/devtools/EmulationHandling.java +++ b/src/main/java/aquality/selenium/browser/devtools/EmulationHandling.java @@ -2,13 +2,13 @@ import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.devtools.Command; -import org.openqa.selenium.devtools.v151.dom.model.RGBA; -import org.openqa.selenium.devtools.v151.emulation.Emulation; -import org.openqa.selenium.devtools.v151.emulation.model.DevicePosture; -import org.openqa.selenium.devtools.v151.emulation.model.DisplayFeature; -import org.openqa.selenium.devtools.v151.emulation.model.MediaFeature; -import org.openqa.selenium.devtools.v151.emulation.model.ScreenOrientation; -import org.openqa.selenium.devtools.v151.page.model.Viewport; +import org.openqa.selenium.devtools.v152.dom.model.RGBA; +import org.openqa.selenium.devtools.v152.emulation.Emulation; +import org.openqa.selenium.devtools.v152.emulation.model.DevicePosture; +import org.openqa.selenium.devtools.v152.emulation.model.DisplayFeature; +import org.openqa.selenium.devtools.v152.emulation.model.MediaFeature; +import org.openqa.selenium.devtools.v152.emulation.model.ScreenOrientation; +import org.openqa.selenium.devtools.v152.page.model.Viewport; 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 ca8ec93..f420571 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.v151.page.Page; -import org.openqa.selenium.devtools.v151.page.model.ScriptIdentifier; -import org.openqa.selenium.devtools.v151.runtime.Runtime; +import org.openqa.selenium.devtools.v152.page.Page; +import org.openqa.selenium.devtools.v152.page.model.ScriptIdentifier; +import org.openqa.selenium.devtools.v152.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 c80867c..03af6fb 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.v151.network.model.*; +import org.openqa.selenium.devtools.v152.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.v151.network.Network.*; +import static org.openqa.selenium.devtools.v152.network.Network.*; /** * DevTools commands for version-independent network interception. - * For more information, see {@link org.openqa.selenium.devtools.v151.network.Network} and {@link Network}. + * For more information, see {@link org.openqa.selenium.devtools.v152.network.Network} and {@link Network}. */ public class NetworkHandling { public static final String LOC_NETWORK_INTERCEPTOR_START = "loc.browser.network.interceptor.start"; @@ -290,7 +290,7 @@ public NetworkInterceptor interceptAllRequests(HttpResponse response) { */ public NetworkInterceptor addRequestTransformer(Predicate requestMatcher, Function requestTransformer) { return startNetworkInterceptor((Filter) next -> req -> - requestMatcher.test(req) ? next.execute(requestTransformer.apply(req)) : next.execute(req)); + next.execute(requestMatcher.test(req) ? requestTransformer.apply(req) : req)); } /** diff --git a/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java b/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java index 2239726..225e399 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.v150.emulation.Emulation; -import org.openqa.selenium.devtools.v150.emulation.model.DisplayFeature; +import org.openqa.selenium.devtools.v151.emulation.Emulation; +import org.openqa.selenium.devtools.v151.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 7150eef..0f410fe 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.v151.network.model.ConnectionType; -import org.openqa.selenium.devtools.v151.network.model.NetworkConditions; +import org.openqa.selenium.devtools.v152.network.model.ConnectionType; +import org.openqa.selenium.devtools.v152.network.model.NetworkConditions; import org.testng.Assert; import org.testng.annotations.Test; import tests.BaseTest; diff --git a/src/test/java/tests/usecases/devtools/OverrideUserAgentTest.java b/src/test/java/tests/usecases/devtools/OverrideUserAgentTest.java index ed34b28..1850c88 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.v150.emulation.Emulation; +import org.openqa.selenium.devtools.v151.emulation.Emulation; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test;