From edcaeccb25c796fd8b7a3191b04bf186c267d43a Mon Sep 17 00:00:00 2001 From: Aliaksej Mialeshka Date: Wed, 19 Nov 2025 09:31:54 +0100 Subject: [PATCH] Update to Selenium 4.38.0 +semver:feature Update DevTools references to use V142 --- pom.xml | 2 +- .../browser/devtools/DevToolsHandling.java | 4 ++-- .../browser/devtools/EmulationHandling.java | 8 ++++---- .../browser/devtools/JavaScriptHandling.java | 6 +++--- .../browser/devtools/NetworkHandling.java | 16 ++++++++-------- .../usecases/devtools/DeviceEmulationTest.java | 4 ++-- .../devtools/NetworkSpeedEmulationTest.java | 2 +- .../usecases/devtools/OverrideUserAgentTest.java | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 99929a8..8cfece3 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ com.github.aquality-automation aquality-selenium-core - 4.9.0 + 4.10.0 org.apache.commons diff --git a/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java b/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java index f4ba934..095eff7 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.v140.performance.Performance; -import org.openqa.selenium.devtools.v140.performance.model.Metric; +import org.openqa.selenium.devtools.v142.performance.Performance; +import org.openqa.selenium.devtools.v142.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 8d2e0a7..6314b53 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.v140.dom.model.RGBA; -import org.openqa.selenium.devtools.v140.emulation.Emulation; -import org.openqa.selenium.devtools.v140.emulation.model.MediaFeature; -import org.openqa.selenium.devtools.v140.emulation.model.ScreenOrientation; +import org.openqa.selenium.devtools.v142.dom.model.RGBA; +import org.openqa.selenium.devtools.v142.emulation.Emulation; +import org.openqa.selenium.devtools.v142.emulation.model.MediaFeature; +import org.openqa.selenium.devtools.v142.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 0c66302..de6a1c1 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.v140.page.Page; -import org.openqa.selenium.devtools.v140.page.model.ScriptIdentifier; -import org.openqa.selenium.devtools.v140.runtime.Runtime; +import org.openqa.selenium.devtools.v142.page.Page; +import org.openqa.selenium.devtools.v142.page.model.ScriptIdentifier; +import org.openqa.selenium.devtools.v142.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 1029eb7..57aa196 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.v140.network.model.*; +import org.openqa.selenium.devtools.v142.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.v140.network.Network.*; +import static org.openqa.selenium.devtools.v142.network.Network.*; /** * DevTools commands for version-independent network interception. - * For more information, see {@link org.openqa.selenium.devtools.v140.network.Network} and {@link Network}. + * For more information, see {@link org.openqa.selenium.devtools.v142.network.Network} and {@link Network}. */ public class NetworkHandling { public static final String LOC_NETWORK_INTERCEPTOR_START = "loc.browser.network.interceptor.start"; @@ -130,7 +130,7 @@ public void interceptTrafficWith(Filter filter) { */ public void addRequestListener(Consumer listener) { logger.info("loc.browser.network.event.requestsent.add"); - tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); + tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); tools.addListener(requestWillBeSent(), listener); } @@ -140,7 +140,7 @@ public void addRequestListener(Consumer listener) { */ public void addResponseListener(Consumer listener) { logger.info("loc.browser.network.event.responsereceived.add"); - tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); + tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); tools.addListener(responseReceived(), listener); } @@ -200,7 +200,7 @@ private Consumer getResponseLogger(HttpExchangeLoggingOptions formatHeaders(response.getHeaders())); } if (loggingOptions.getResponseBody().isEnabled()) { - String responseBody = tools.sendCommand(org.openqa.selenium.devtools.v140.network.Network.getResponseBody(requestId)).getBody(); + String responseBody = tools.sendCommand(org.openqa.selenium.devtools.v142.network.Network.getResponseBody(requestId)).getBody(); if (StringUtils.isNotEmpty(responseBody)) { logByLevel(loggingOptions.getResponseBody().getLogLevel(), "loc.browser.network.event.responsereceived.log.body", @@ -323,7 +323,7 @@ public void clearNetworkInterceptor() { * @param uploadThroughput Maximal aggregated upload throughput (bytes/sec). -1 disables upload throttling. */ public void emulateConditions(Boolean offline, Number latency, Number downloadThroughput, Number uploadThroughput) { - tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); + tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); tools.sendCommand(emulateNetworkConditions(offline, latency, downloadThroughput, uploadThroughput, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); } @@ -339,7 +339,7 @@ public void emulateConditions(Boolean offline, Number latency, Number downloadTh * "wifi", "wimax", "other". */ public void emulateConditions(Boolean offline, Number latency, Number downloadThroughput, Number uploadThroughput, String connectionType) { - tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); + tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())); tools.sendCommand(emulateNetworkConditions(offline, latency, downloadThroughput, uploadThroughput, Optional.of(ConnectionType.fromString(connectionType)), Optional.empty(), Optional.empty(), Optional.empty())); } diff --git a/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java b/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java index c768b05..6c68c44 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.v139.emulation.Emulation; -import org.openqa.selenium.devtools.v139.emulation.model.DisplayFeature; +import org.openqa.selenium.devtools.v141.emulation.Emulation; +import org.openqa.selenium.devtools.v141.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 11adf78..582e742 100644 --- a/src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java +++ b/src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java @@ -2,7 +2,7 @@ import aquality.selenium.browser.AqualityServices; import org.openqa.selenium.TimeoutException; -import org.openqa.selenium.devtools.v139.network.model.ConnectionType; +import org.openqa.selenium.devtools.v141.network.model.ConnectionType; 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 08fa66b..26c13d6 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.v139.emulation.Emulation; +import org.openqa.selenium.devtools.v141.emulation.Emulation; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test;