From 2e64300593152a5aabc3eaf94a097a4d82f948ad Mon Sep 17 00:00:00 2001 From: Aleksey Meleshko Date: Wed, 4 Nov 2026 11:19:37 +0100 Subject: [PATCH] Update to Selenium 4.51.0 +semver:feature - Update aquality-selenium-core to 5.1.0 and add a separate selenium-java dependency as it's not included into core package anymore - Update dependency versions - Update DevTools references to latest (use v155 in custom version tests) - Rework RemoteBrowserFactory to get rid of HttpCommandExecutor deprecated ctor and methods --- pom.xml | 7 +++- .../browser/RemoteBrowserFactory.java | 32 +++---------------- .../browser/devtools/DevToolsHandling.java | 4 +-- .../browser/devtools/EmulationHandling.java | 27 ++++++++++------ .../browser/devtools/JavaScriptHandling.java | 6 ++-- .../browser/devtools/NetworkHandling.java | 6 ++-- .../devtools/DeviceEmulationTest.java | 6 ++-- .../devtools/NetworkSpeedEmulationTest.java | 4 +-- .../devtools/OverrideUserAgentTest.java | 2 +- 9 files changed, 41 insertions(+), 53 deletions(-) diff --git a/pom.xml b/pom.xml index fd637da4..d8287ae3 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,12 @@ com.github.aquality-automation aquality-selenium-core - 5.0.2 + 5.1.0 + + + org.seleniumhq.selenium + selenium-java + 4.51.0 org.apache.commons diff --git a/src/main/java/aquality/selenium/browser/RemoteBrowserFactory.java b/src/main/java/aquality/selenium/browser/RemoteBrowserFactory.java index 0ddf5ef7..d9ff1e95 100644 --- a/src/main/java/aquality/selenium/browser/RemoteBrowserFactory.java +++ b/src/main/java/aquality/selenium/browser/RemoteBrowserFactory.java @@ -4,7 +4,6 @@ import aquality.selenium.configuration.ITimeoutConfiguration; import aquality.selenium.core.localization.ILocalizedLogger; import aquality.selenium.core.utilities.IActionRetrier; -import com.google.common.collect.ImmutableMap; import org.openqa.selenium.Capabilities; import org.openqa.selenium.WebDriverException; import org.openqa.selenium.remote.CommandExecutor; @@ -13,10 +12,8 @@ import org.openqa.selenium.remote.RemoteWebDriver; import org.openqa.selenium.remote.http.ClientConfig; import org.openqa.selenium.remote.http.HttpClient; -import org.openqa.selenium.remote.http.HttpClient.Factory; import java.net.URL; -import java.time.Duration; public class RemoteBrowserFactory extends BrowserFactory { @@ -36,13 +33,12 @@ public RemoteBrowserFactory(IActionRetrier actionRetrier, IBrowserProfile browse @Override protected RemoteWebDriver getDriver() { Capabilities capabilities = browserProfile.getDriverSettings().getDriverOptions(); + URL url = browserProfile.getRemoteConnectionUrl(); localizedLogger.info("loc.browser.grid"); + ClientConfig config = ClientConfig.defaultConfig().baseUrl(url).readTimeout(timeoutConfiguration.getCommand()); - ClientFactory clientFactory = new ClientFactory(); - CommandExecutor commandExecutor = new HttpCommandExecutor( - ImmutableMap.of(), - browserProfile.getRemoteConnectionUrl(), - clientFactory); + HttpClient.Factory clientFactory = HttpClient.Factory.createDefault(); + CommandExecutor commandExecutor = new HttpCommandExecutor(clientFactory.createClient(config), url); try { RemoteWebDriver driver = new RemoteWebDriver(commandExecutor, capabilities); @@ -55,24 +51,4 @@ protected RemoteWebDriver getDriver() { } } - - class ClientFactory implements Factory { - private final Factory defaultClientFactory = Factory.createDefault(); - private final Duration timeoutCommand = timeoutConfiguration.getCommand(); - - public HttpClient createClient(URL url) { - return defaultClientFactory.createClient(ClientConfig.defaultConfig().baseUrl(url).readTimeout(timeoutCommand)); - } - - @Override - public HttpClient createClient(ClientConfig clientConfig) { - clientConfig.readTimeout(timeoutCommand); - return defaultClientFactory.createClient(clientConfig); - } - - @Override - public void cleanupIdleClients() { - defaultClientFactory.cleanupIdleClients(); - } - } } diff --git a/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java b/src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java index be41d990..4b6683b2 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.v154.performance.Performance; -import org.openqa.selenium.devtools.v154.performance.model.Metric; +import org.openqa.selenium.devtools.latest.performance.Performance; +import org.openqa.selenium.devtools.latest.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 a6e73c9b..2520bcda 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.v154.dom.model.RGBA; -import org.openqa.selenium.devtools.v154.emulation.Emulation; -import org.openqa.selenium.devtools.v154.emulation.model.DevicePosture; -import org.openqa.selenium.devtools.v154.emulation.model.DisplayFeature; -import org.openqa.selenium.devtools.v154.emulation.model.MediaFeature; -import org.openqa.selenium.devtools.v154.emulation.model.ScreenOrientation; -import org.openqa.selenium.devtools.v154.page.model.Viewport; +import org.openqa.selenium.devtools.latest.dom.model.RGBA; +import org.openqa.selenium.devtools.latest.emulation.Emulation; +import org.openqa.selenium.devtools.latest.emulation.model.DevicePosture; +import org.openqa.selenium.devtools.latest.emulation.model.DisplayFeature; +import org.openqa.selenium.devtools.latest.emulation.model.MediaFeature; +import org.openqa.selenium.devtools.latest.emulation.model.ScreenOrientation; +import org.openqa.selenium.devtools.latest.page.model.Viewport; import java.util.Collections; import java.util.List; @@ -136,7 +136,7 @@ public void setDeviceMetricsOverride(Integer width, Integer height, Number devic setDeviceMetricsOverride(width, height, deviceScaleFactor, mobile, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), screenOrientation, Optional.empty(), Optional.empty(), - Optional.empty(), Optional.empty(), Optional.empty()); + Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()); } /** @@ -159,10 +159,17 @@ public void setDeviceMetricsOverride(Integer width, Integer height, Number devic * @param scrollbarType The type of the scrollbars to render (e.g., mobile vs desktop). Ignored if |dontSetVisibleSize| is set. * @param screenOrientationLockEmulation Enables screen orientation lock emulation that intercepts calls to screen.orientation.lock(). */ - public void setDeviceMetricsOverride(Integer width, Integer height, Number deviceScaleFactor, Boolean mobile, Optional scale, Optional screenWidth, Optional screenHeight, Optional positionX, Optional positionY, Optional dontSetVisibleSize, Optional screenOrientation, Optional viewport, Optional displayFeature, Optional devicePosture, Optional scrollbarType, Optional screenOrientationLockEmulation) { + public void setDeviceMetricsOverride(Integer width, Integer height, Number deviceScaleFactor, Boolean mobile, + Optional scale, Optional screenWidth, Optional screenHeight, + Optional positionX, Optional positionY, Optional dontSetVisibleSize, + Optional screenOrientation, Optional viewport, + Optional displayFeature, Optional devicePosture, + Optional scrollbarType, + Optional screenOrientationLockEmulation, + Optional setDeviceMetricsOverrideViewportMeta) { tools.sendCommand(Emulation.setDeviceMetricsOverride(width, height, deviceScaleFactor, mobile, scale, screenWidth, screenHeight, positionX, positionY, dontSetVisibleSize, screenOrientation, viewport, displayFeature, - devicePosture, scrollbarType, screenOrientationLockEmulation)); + devicePosture, scrollbarType, screenOrientationLockEmulation, setDeviceMetricsOverrideViewportMeta)); } /** diff --git a/src/main/java/aquality/selenium/browser/devtools/JavaScriptHandling.java b/src/main/java/aquality/selenium/browser/devtools/JavaScriptHandling.java index cd4b4cfe..a3352502 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.v154.page.Page; -import org.openqa.selenium.devtools.v154.page.model.ScriptIdentifier; -import org.openqa.selenium.devtools.v154.runtime.Runtime; +import org.openqa.selenium.devtools.latest.page.Page; +import org.openqa.selenium.devtools.latest.page.model.ScriptIdentifier; +import org.openqa.selenium.devtools.latest.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 3afd30e5..7f3b7f73 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.v154.network.model.*; +import org.openqa.selenium.devtools.latest.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.v154.network.Network.*; +import static org.openqa.selenium.devtools.latest.network.Network.*; /** * DevTools commands for version-independent network interception. - * For more information, see {@link org.openqa.selenium.devtools.v154.network.Network} and {@link Network}. + * For more information, see {@link org.openqa.selenium.devtools.latest.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/test/java/tests/usecases/devtools/DeviceEmulationTest.java b/src/test/java/tests/usecases/devtools/DeviceEmulationTest.java index 3d1b3d34..389cca39 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.v153.emulation.Emulation; -import org.openqa.selenium.devtools.v153.emulation.model.DisplayFeature; +import org.openqa.selenium.devtools.v155.emulation.Emulation; +import org.openqa.selenium.devtools.v155.emulation.model.DisplayFeature; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -44,7 +44,7 @@ public void setAndClearDeviceMetricsOverrideWithVersionSpecificParametersTest() AqualityServices.getBrowser().devTools().sendCommand(Emulation.setDeviceMetricsOverride( WIDTH, HEIGHT, SCALE_FACTOR, IS_MOBILE, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), - Optional.of(DISPLAY_FEATURE), Optional.empty(), Optional.empty(), Optional.empty() + Optional.of(DISPLAY_FEATURE), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty() )); AqualityServices.getLogger().info("success"); }); diff --git a/src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java b/src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java index 7a87bd2d..185b05ab 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.v154.network.model.ConnectionType; -import org.openqa.selenium.devtools.v154.network.model.NetworkConditions; +import org.openqa.selenium.devtools.latest.network.model.ConnectionType; +import org.openqa.selenium.devtools.latest.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 5619a6ea..3909d840 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.v153.emulation.Emulation; +import org.openqa.selenium.devtools.v155.emulation.Emulation; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test;