diff --git a/Rakefile b/Rakefile index 1c4bdda3e9962..eb7b68fa507bd 100644 --- a/Rakefile +++ b/Rakefile @@ -98,7 +98,7 @@ task '//java/test/org/openqa/selenium/environment/webserver:webserver:uber' => [ JAVA_RELEASE_TARGETS = %w[ //java/src/org/openqa/selenium/chrome:chrome.publish //java/src/org/openqa/selenium/chromium:chromium.publish - //java/src/org/openqa/selenium/devtools/v116:v116.publish + //java/src/org/openqa/selenium/devtools/v119:v119.publish //java/src/org/openqa/selenium/devtools/v117:v117.publish //java/src/org/openqa/selenium/devtools/v118:v118.publish //java/src/org/openqa/selenium/devtools/v85:v85.publish diff --git a/dotnet/selenium-dotnet-version.bzl b/dotnet/selenium-dotnet-version.bzl index 1e729af59bf29..e976f18410a63 100644 --- a/dotnet/selenium-dotnet-version.bzl +++ b/dotnet/selenium-dotnet-version.bzl @@ -6,7 +6,7 @@ SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"] SUPPORTED_DEVTOOLS_VERSIONS = [ "v85", - "v116", + "v119", "v117", "v118", ] diff --git a/dotnet/src/webdriver/DevTools/DevToolsDomains.cs b/dotnet/src/webdriver/DevTools/DevToolsDomains.cs index aeb63fe540f83..eb90121a099bc 100644 --- a/dotnet/src/webdriver/DevTools/DevToolsDomains.cs +++ b/dotnet/src/webdriver/DevTools/DevToolsDomains.cs @@ -39,7 +39,7 @@ public abstract class DevToolsDomains { { 118, typeof(V118.V118Domains) }, { 117, typeof(V117.V117Domains) }, - { 116, typeof(V116.V116Domains) }, + { 119, typeof(V119.V119Domains) }, { 85, typeof(V85.V85Domains) } }; diff --git a/dotnet/src/webdriver/DevTools/v116/V116Domains.cs b/dotnet/src/webdriver/DevTools/v119/V119Domains.cs similarity index 79% rename from dotnet/src/webdriver/DevTools/v116/V116Domains.cs rename to dotnet/src/webdriver/DevTools/v119/V119Domains.cs index 71b321d7c2ebc..46df3efc8bf46 100644 --- a/dotnet/src/webdriver/DevTools/v116/V116Domains.cs +++ b/dotnet/src/webdriver/DevTools/v119/V119Domains.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -19,20 +19,20 @@ using System.Collections.Generic; using System.Text; -namespace OpenQA.Selenium.DevTools.V116 +namespace OpenQA.Selenium.DevTools.V119 { /// - /// Class containing the domain implementation for version 116 of the DevTools Protocol. + /// Class containing the domain implementation for version 119 of the DevTools Protocol. /// - public class V116Domains : DevToolsDomains + public class V119Domains : DevToolsDomains { private DevToolsSessionDomains domains; /// - /// Initializes a new instance of the V116Domains class. + /// Initializes a new instance of the V119Domains class. /// /// The DevToolsSession to use with this set of domains. - public V116Domains(DevToolsSession session) + public V119Domains(DevToolsSession session) { this.domains = new DevToolsSessionDomains(session); } @@ -40,7 +40,7 @@ public V116Domains(DevToolsSession session) /// /// Gets the DevTools Protocol version for which this class is valid. /// - public static int DevToolsVersion => 116; + public static int DevToolsVersion => 119; /// /// Gets the version-specific domains for the DevTools session. This value must be cast to a version specific type to be at all useful. @@ -50,21 +50,21 @@ public V116Domains(DevToolsSession session) /// /// Gets the object used for manipulating network information in the browser. /// - public override DevTools.Network Network => new V116Network(domains.Network, domains.Fetch); + public override DevTools.Network Network => new V119Network(domains.Network, domains.Fetch); /// /// Gets the object used for manipulating the browser's JavaScript execution. /// - public override JavaScript JavaScript => new V116JavaScript(domains.Runtime, domains.Page); + public override JavaScript JavaScript => new V119JavaScript(domains.Runtime, domains.Page); /// /// Gets the object used for manipulating DevTools Protocol targets. /// - public override DevTools.Target Target => new V116Target(domains.Target); + public override DevTools.Target Target => new V119Target(domains.Target); /// /// Gets the object used for manipulating the browser's logs. /// - public override DevTools.Log Log => new V116Log(domains.Log); + public override DevTools.Log Log => new V119Log(domains.Log); } } diff --git a/dotnet/src/webdriver/DevTools/v116/V116JavaScript.cs b/dotnet/src/webdriver/DevTools/v119/V119JavaScript.cs similarity index 94% rename from dotnet/src/webdriver/DevTools/v116/V116JavaScript.cs rename to dotnet/src/webdriver/DevTools/v119/V119JavaScript.cs index d554d026c2c4c..f62d2b01499b6 100644 --- a/dotnet/src/webdriver/DevTools/v116/V116JavaScript.cs +++ b/dotnet/src/webdriver/DevTools/v119/V119JavaScript.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -18,25 +18,25 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V116.Page; -using OpenQA.Selenium.DevTools.V116.Runtime; +using OpenQA.Selenium.DevTools.V119.Page; +using OpenQA.Selenium.DevTools.V119.Runtime; -namespace OpenQA.Selenium.DevTools.V116 +namespace OpenQA.Selenium.DevTools.V119 { /// - /// Class containing the JavaScript implementation for version 116 of the DevTools Protocol. + /// Class containing the JavaScript implementation for version 119 of the DevTools Protocol. /// - public class V116JavaScript : JavaScript + public class V119JavaScript : JavaScript { private RuntimeAdapter runtime; private PageAdapter page; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The DevTools Protocol adapter for the Runtime domain. /// The DevTools Protocol adapter for the Page domain. - public V116JavaScript(RuntimeAdapter runtime, PageAdapter page) + public V119JavaScript(RuntimeAdapter runtime, PageAdapter page) { this.runtime = runtime; this.page = page; diff --git a/dotnet/src/webdriver/DevTools/v116/V116Log.cs b/dotnet/src/webdriver/DevTools/v119/V119Log.cs similarity index 89% rename from dotnet/src/webdriver/DevTools/v116/V116Log.cs rename to dotnet/src/webdriver/DevTools/v119/V119Log.cs index bee566c9ba6ef..f25e52634dd4a 100644 --- a/dotnet/src/webdriver/DevTools/v116/V116Log.cs +++ b/dotnet/src/webdriver/DevTools/v119/V119Log.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -20,22 +20,22 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V116.Log; +using OpenQA.Selenium.DevTools.V119.Log; -namespace OpenQA.Selenium.DevTools.V116 +namespace OpenQA.Selenium.DevTools.V119 { /// - /// Class containing the browser's log as referenced by version 116 of the DevTools Protocol. + /// Class containing the browser's log as referenced by version 119 of the DevTools Protocol. /// - public class V116Log : DevTools.Log + public class V119Log : DevTools.Log { private LogAdapter adapter; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Log domain. - public V116Log(LogAdapter adapter) + public V119Log(LogAdapter adapter) { this.adapter = adapter; this.adapter.EntryAdded += OnAdapterEntryAdded; diff --git a/dotnet/src/webdriver/DevTools/v116/V116Network.cs b/dotnet/src/webdriver/DevTools/v119/V119Network.cs similarity index 95% rename from dotnet/src/webdriver/DevTools/v116/V116Network.cs rename to dotnet/src/webdriver/DevTools/v119/V119Network.cs index e1a9c646f8096..b999e4b9459b8 100644 --- a/dotnet/src/webdriver/DevTools/v116/V116Network.cs +++ b/dotnet/src/webdriver/DevTools/v119/V119Network.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -20,25 +20,25 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V116.Fetch; -using OpenQA.Selenium.DevTools.V116.Network; +using OpenQA.Selenium.DevTools.V119.Fetch; +using OpenQA.Selenium.DevTools.V119.Network; -namespace OpenQA.Selenium.DevTools.V116 +namespace OpenQA.Selenium.DevTools.V119 { /// - /// Class providing functionality for manipulating network calls using version 116 of the DevTools Protocol + /// Class providing functionality for manipulating network calls using version 119 of the DevTools Protocol /// - public class V116Network : DevTools.Network + public class V119Network : DevTools.Network { private FetchAdapter fetch; private NetworkAdapter network; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Network domain. /// The adapter for the Fetch domain. - public V116Network(NetworkAdapter network, FetchAdapter fetch) + public V119Network(NetworkAdapter network, FetchAdapter fetch) { this.network = network; this.fetch = fetch; @@ -216,9 +216,9 @@ public override async Task ContinueWithAuth(string requestId, string userName, s await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings() { RequestId = requestId, - AuthChallengeResponse = new V116.Fetch.AuthChallengeResponse() + AuthChallengeResponse = new V119.Fetch.AuthChallengeResponse() { - Response = V116.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials, + Response = V119.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials, Username = userName, Password = password } @@ -235,9 +235,9 @@ public override async Task CancelAuth(string requestId) await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings() { RequestId = requestId, - AuthChallengeResponse = new OpenQA.Selenium.DevTools.V116.Fetch.AuthChallengeResponse() + AuthChallengeResponse = new OpenQA.Selenium.DevTools.V119.Fetch.AuthChallengeResponse() { - Response = V116.Fetch.AuthChallengeResponseResponseValues.CancelAuth + Response = V119.Fetch.AuthChallengeResponseResponseValues.CancelAuth } }).ConfigureAwait(false); } diff --git a/dotnet/src/webdriver/DevTools/v116/V116Target.cs b/dotnet/src/webdriver/DevTools/v119/V119Target.cs similarity index 93% rename from dotnet/src/webdriver/DevTools/v116/V116Target.cs rename to dotnet/src/webdriver/DevTools/v119/V119Target.cs index 77a68d241797c..50f7677c12a69 100644 --- a/dotnet/src/webdriver/DevTools/v116/V116Target.cs +++ b/dotnet/src/webdriver/DevTools/v119/V119Target.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -21,22 +21,22 @@ using System.Collections.ObjectModel; using System.Text; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V116.Target; +using OpenQA.Selenium.DevTools.V119.Target; -namespace OpenQA.Selenium.DevTools.V116 +namespace OpenQA.Selenium.DevTools.V119 { /// - /// Class providing functionality for manipulating targets for version 116 of the DevTools Protocol + /// Class providing functionality for manipulating targets for version 119 of the DevTools Protocol /// - public class V116Target : DevTools.Target + public class V119Target : DevTools.Target { private TargetAdapter adapter; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Target domain. - public V116Target(TargetAdapter adapter) + public V119Target(TargetAdapter adapter) { this.adapter = adapter; adapter.DetachedFromTarget += OnDetachedFromTarget; diff --git a/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd b/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd index e91cbe1deb732..b38e8c9fc0f96 100644 --- a/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd +++ b/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd @@ -27,10 +27,10 @@ if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v85\DevToolsSession popd ) -if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v116\DevToolsSessionDomains.cs" ( - echo Generating CDP code for version 116 +if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v119\DevToolsSessionDomains.cs" ( + echo Generating CDP code for version 119 pushd "%1..\..\.." - bazel build //dotnet/src/webdriver/cdp:generate-v116 + bazel build //dotnet/src/webdriver/cdp:generate-v119 popd ) diff --git a/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh b/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh index a8c48061507e4..288687eaf7cca 100755 --- a/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh +++ b/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh @@ -23,10 +23,10 @@ then bazel build //dotnet/src/webdriver/cdp:generate-v85 fi -if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v116/DevToolsSessionDomains.cs" ]] +if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v119/DevToolsSessionDomains.cs" ]] then - echo "Generating CDP code for version 116" - bazel build //dotnet/src/webdriver/cdp:generate-v116 + echo "Generating CDP code for version 119" + bazel build //dotnet/src/webdriver/cdp:generate-v119 fi if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v117/DevToolsSessionDomains.cs" ]] diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs index 5dc8bdfddd954..a03b389e93911 100644 --- a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs +++ b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs @@ -20,7 +20,7 @@ public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions opti public static ChromeOptions DefaultOptions { - get { return new ChromeOptions() { BrowserVersion = "118" }; } + get { return new ChromeOptions() { BrowserVersion = "119" }; } } } } diff --git a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs index 633c833e97e58..cfeaf8c930c19 100644 --- a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs +++ b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V118; + using CurrentCdpVersion = V119; [TestFixture] public class DevToolsConsoleTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsLogTest.cs b/dotnet/test/common/DevTools/DevToolsLogTest.cs index 05449f8512977..1eeca91cb12bb 100644 --- a/dotnet/test/common/DevTools/DevToolsLogTest.cs +++ b/dotnet/test/common/DevTools/DevToolsLogTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V118; + using CurrentCdpVersion = V119; [TestFixture] public class DevToolsLogTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs index bcde5d8391a3a..5834203e54d50 100644 --- a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs +++ b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V118; + using CurrentCdpVersion = V119; [TestFixture] public class DevToolsNetworkTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs index accaa9575c7b8..a0c1a5fb5bf17 100644 --- a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs +++ b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs @@ -3,7 +3,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V118; + using CurrentCdpVersion = V119; [TestFixture] public class DevToolsPerformanceTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs index 621aa621ed88a..c6415f093c646 100644 --- a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs +++ b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs @@ -5,7 +5,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V118; + using CurrentCdpVersion = V119; [TestFixture] public class DevToolsProfilerTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs index 3d479d294f33f..f041bcea713e2 100644 --- a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs +++ b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V118; + using CurrentCdpVersion = V119; [TestFixture] public class DevToolsSecurityTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsTargetTest.cs b/dotnet/test/common/DevTools/DevToolsTargetTest.cs index 56035b389ddc7..e165cd64bb1f3 100644 --- a/dotnet/test/common/DevTools/DevToolsTargetTest.cs +++ b/dotnet/test/common/DevTools/DevToolsTargetTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V118; + using CurrentCdpVersion = V119; [TestFixture] public class DevToolsTargetTest : DevToolsTestFixture diff --git a/java/src/org/openqa/selenium/devtools/v116/BUILD.bazel b/java/src/org/openqa/selenium/devtools/v119/BUILD.bazel similarity index 98% rename from java/src/org/openqa/selenium/devtools/v116/BUILD.bazel rename to java/src/org/openqa/selenium/devtools/v119/BUILD.bazel index 2f4f5d3d1697c..a213e2008a516 100644 --- a/java/src/org/openqa/selenium/devtools/v116/BUILD.bazel +++ b/java/src/org/openqa/selenium/devtools/v119/BUILD.bazel @@ -2,7 +2,7 @@ load("//common:defs.bzl", "copy_file") load("//java:defs.bzl", "java_export", "java_library") load("//java:version.bzl", "SE_VERSION") -cdp_version = "v116" +cdp_version = "v119" java_export( name = cdp_version, diff --git a/java/src/org/openqa/selenium/devtools/v116/v116CdpInfo.java b/java/src/org/openqa/selenium/devtools/v119/v119CdpInfo.java similarity index 86% rename from java/src/org/openqa/selenium/devtools/v116/v116CdpInfo.java rename to java/src/org/openqa/selenium/devtools/v119/v119CdpInfo.java index 8b948c505e077..288640092e2c7 100644 --- a/java/src/org/openqa/selenium/devtools/v116/v116CdpInfo.java +++ b/java/src/org/openqa/selenium/devtools/v119/v119CdpInfo.java @@ -15,15 +15,15 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v116; +package org.openqa.selenium.devtools.v119; import com.google.auto.service.AutoService; import org.openqa.selenium.devtools.CdpInfo; @AutoService(CdpInfo.class) -public class v116CdpInfo extends CdpInfo { +public class v119CdpInfo extends CdpInfo { - public v116CdpInfo() { - super(116, v116Domains::new); + public v119CdpInfo() { + super(119, v119Domains::new); } } diff --git a/java/src/org/openqa/selenium/devtools/v116/v116Domains.java b/java/src/org/openqa/selenium/devtools/v119/v119Domains.java similarity index 77% rename from java/src/org/openqa/selenium/devtools/v116/v116Domains.java rename to java/src/org/openqa/selenium/devtools/v119/v119Domains.java index 43db86ac21e46..c4ebff219e51b 100644 --- a/java/src/org/openqa/selenium/devtools/v116/v116Domains.java +++ b/java/src/org/openqa/selenium/devtools/v119/v119Domains.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v116; +package org.openqa.selenium.devtools.v119; import org.openqa.selenium.devtools.DevTools; import org.openqa.selenium.devtools.idealized.Domains; @@ -26,21 +26,21 @@ import org.openqa.selenium.devtools.idealized.target.Target; import org.openqa.selenium.internal.Require; -public class v116Domains implements Domains { +public class v119Domains implements Domains { - private final v116Javascript js; - private final v116Events events; - private final v116Log log; - private final v116Network network; - private final v116Target target; + private final v119Javascript js; + private final v119Events events; + private final v119Log log; + private final v119Network network; + private final v119Target target; - public v116Domains(DevTools devtools) { + public v119Domains(DevTools devtools) { Require.nonNull("DevTools", devtools); - events = new v116Events(devtools); - js = new v116Javascript(devtools); - log = new v116Log(); - network = new v116Network(devtools); - target = new v116Target(); + events = new v119Events(devtools); + js = new v119Javascript(devtools); + log = new v119Log(); + network = new v119Network(devtools); + target = new v119Target(); } @Override diff --git a/java/src/org/openqa/selenium/devtools/v116/v116Events.java b/java/src/org/openqa/selenium/devtools/v119/v119Events.java similarity index 86% rename from java/src/org/openqa/selenium/devtools/v116/v116Events.java rename to java/src/org/openqa/selenium/devtools/v119/v119Events.java index f5c73a976478c..474e774c91712 100644 --- a/java/src/org/openqa/selenium/devtools/v116/v116Events.java +++ b/java/src/org/openqa/selenium/devtools/v119/v119Events.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v116; +package org.openqa.selenium.devtools.v119; import java.time.Instant; import java.util.List; @@ -28,15 +28,15 @@ import org.openqa.selenium.devtools.events.ConsoleEvent; import org.openqa.selenium.devtools.idealized.Events; import org.openqa.selenium.devtools.idealized.runtime.model.RemoteObject; -import org.openqa.selenium.devtools.v116.runtime.Runtime; -import org.openqa.selenium.devtools.v116.runtime.model.ConsoleAPICalled; -import org.openqa.selenium.devtools.v116.runtime.model.ExceptionDetails; -import org.openqa.selenium.devtools.v116.runtime.model.ExceptionThrown; -import org.openqa.selenium.devtools.v116.runtime.model.StackTrace; +import org.openqa.selenium.devtools.v119.runtime.Runtime; +import org.openqa.selenium.devtools.v119.runtime.model.ConsoleAPICalled; +import org.openqa.selenium.devtools.v119.runtime.model.ExceptionDetails; +import org.openqa.selenium.devtools.v119.runtime.model.ExceptionThrown; +import org.openqa.selenium.devtools.v119.runtime.model.StackTrace; -public class v116Events extends Events { +public class v119Events extends Events { - public v116Events(DevTools devtools) { + public v119Events(DevTools devtools) { super(devtools); } @@ -77,7 +77,7 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) { protected JavascriptException toJsException(ExceptionThrown event) { ExceptionDetails details = event.getExceptionDetails(); Optional maybeTrace = details.getStackTrace(); - Optional maybeException = + Optional maybeException = details.getException(); String message = diff --git a/java/src/org/openqa/selenium/devtools/v116/v116Javascript.java b/java/src/org/openqa/selenium/devtools/v119/v119Javascript.java similarity index 81% rename from java/src/org/openqa/selenium/devtools/v116/v116Javascript.java rename to java/src/org/openqa/selenium/devtools/v119/v119Javascript.java index 7c645135a8728..1ed097cada99e 100644 --- a/java/src/org/openqa/selenium/devtools/v116/v116Javascript.java +++ b/java/src/org/openqa/selenium/devtools/v119/v119Javascript.java @@ -15,21 +15,21 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v116; +package org.openqa.selenium.devtools.v119; import java.util.Optional; import org.openqa.selenium.devtools.Command; import org.openqa.selenium.devtools.DevTools; import org.openqa.selenium.devtools.Event; import org.openqa.selenium.devtools.idealized.Javascript; -import org.openqa.selenium.devtools.v116.page.Page; -import org.openqa.selenium.devtools.v116.page.model.ScriptIdentifier; -import org.openqa.selenium.devtools.v116.runtime.Runtime; -import org.openqa.selenium.devtools.v116.runtime.model.BindingCalled; +import org.openqa.selenium.devtools.v119.page.Page; +import org.openqa.selenium.devtools.v119.page.model.ScriptIdentifier; +import org.openqa.selenium.devtools.v119.runtime.Runtime; +import org.openqa.selenium.devtools.v119.runtime.model.BindingCalled; -public class v116Javascript extends Javascript { +public class v119Javascript extends Javascript { - public v116Javascript(DevTools devtools) { + public v119Javascript(DevTools devtools) { super(devtools); } @@ -65,7 +65,8 @@ protected Command disablePage() { @Override protected Command addScriptToEvaluateOnNewDocument(String script) { - return Page.addScriptToEvaluateOnNewDocument(script, Optional.empty(), Optional.empty()); + return Page.addScriptToEvaluateOnNewDocument( + script, Optional.empty(), Optional.empty(), Optional.empty()); } @Override diff --git a/java/src/org/openqa/selenium/devtools/v116/v116Log.java b/java/src/org/openqa/selenium/devtools/v119/v119Log.java similarity index 89% rename from java/src/org/openqa/selenium/devtools/v116/v116Log.java rename to java/src/org/openqa/selenium/devtools/v119/v119Log.java index 8a37094d0bda0..0b163ee40045f 100644 --- a/java/src/org/openqa/selenium/devtools/v116/v116Log.java +++ b/java/src/org/openqa/selenium/devtools/v119/v119Log.java @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v116; +package org.openqa.selenium.devtools.v119; import java.util.function.Function; import java.util.logging.Level; import org.openqa.selenium.devtools.Command; import org.openqa.selenium.devtools.ConverterFunctions; import org.openqa.selenium.devtools.Event; -import org.openqa.selenium.devtools.v116.log.Log; -import org.openqa.selenium.devtools.v116.log.model.LogEntry; -import org.openqa.selenium.devtools.v116.runtime.model.Timestamp; +import org.openqa.selenium.devtools.v119.log.Log; +import org.openqa.selenium.devtools.v119.log.model.LogEntry; +import org.openqa.selenium.devtools.v119.runtime.model.Timestamp; import org.openqa.selenium.json.JsonInput; -public class v116Log implements org.openqa.selenium.devtools.idealized.log.Log { +public class v119Log implements org.openqa.selenium.devtools.idealized.log.Log { @Override public Command enable() { diff --git a/java/src/org/openqa/selenium/devtools/v116/v116Network.java b/java/src/org/openqa/selenium/devtools/v119/v119Network.java similarity index 90% rename from java/src/org/openqa/selenium/devtools/v116/v116Network.java rename to java/src/org/openqa/selenium/devtools/v119/v119Network.java index ec3b126411f75..83d2268443a52 100644 --- a/java/src/org/openqa/selenium/devtools/v116/v116Network.java +++ b/java/src/org/openqa/selenium/devtools/v119/v119Network.java @@ -15,19 +15,14 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v116; +package org.openqa.selenium.devtools.v119; import static java.net.HttpURLConnection.HTTP_OK; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.Base64; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.logging.Logger; import org.openqa.selenium.UsernameAndPassword; import org.openqa.selenium.devtools.Command; @@ -35,35 +30,35 @@ import org.openqa.selenium.devtools.DevToolsException; import org.openqa.selenium.devtools.Event; import org.openqa.selenium.devtools.idealized.Network; -import org.openqa.selenium.devtools.v116.fetch.Fetch; -import org.openqa.selenium.devtools.v116.fetch.model.*; -import org.openqa.selenium.devtools.v116.network.model.Request; +import org.openqa.selenium.devtools.v119.fetch.Fetch; +import org.openqa.selenium.devtools.v119.fetch.model.*; +import org.openqa.selenium.devtools.v119.network.model.Request; import org.openqa.selenium.internal.Either; import org.openqa.selenium.remote.http.HttpRequest; import org.openqa.selenium.remote.http.HttpResponse; -public class v116Network extends Network { +public class v119Network extends Network { - private static final Logger LOG = Logger.getLogger(v116Network.class.getName()); + private static final Logger LOG = Logger.getLogger(v119Network.class.getName()); - public v116Network(DevTools devTools) { + public v119Network(DevTools devTools) { super(devTools); } @Override protected Command setUserAgentOverride(UserAgent userAgent) { - return org.openqa.selenium.devtools.v116.network.Network.setUserAgentOverride( + return org.openqa.selenium.devtools.v119.network.Network.setUserAgentOverride( userAgent.userAgent(), userAgent.acceptLanguage(), userAgent.platform(), Optional.empty()); } @Override protected Command enableNetworkCaching() { - return org.openqa.selenium.devtools.v116.network.Network.setCacheDisabled(false); + return org.openqa.selenium.devtools.v119.network.Network.setCacheDisabled(false); } @Override protected Command disableNetworkCaching() { - return org.openqa.selenium.devtools.v116.network.Network.setCacheDisabled(true); + return org.openqa.selenium.devtools.v119.network.Network.setCacheDisabled(true); } @Override diff --git a/java/src/org/openqa/selenium/devtools/v116/v116Target.java b/java/src/org/openqa/selenium/devtools/v119/v119Target.java similarity index 83% rename from java/src/org/openqa/selenium/devtools/v116/v116Target.java rename to java/src/org/openqa/selenium/devtools/v119/v119Target.java index 0c631c347ecc3..e5f78df15c6f2 100644 --- a/java/src/org/openqa/selenium/devtools/v116/v116Target.java +++ b/java/src/org/openqa/selenium/devtools/v119/v119Target.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v116; +package org.openqa.selenium.devtools.v119; import java.util.List; import java.util.Map; @@ -28,21 +28,21 @@ import org.openqa.selenium.devtools.idealized.browser.model.BrowserContextID; import org.openqa.selenium.devtools.idealized.target.model.SessionID; import org.openqa.selenium.devtools.idealized.target.model.TargetID; -import org.openqa.selenium.devtools.v116.target.Target; -import org.openqa.selenium.devtools.v116.target.model.TargetInfo; +import org.openqa.selenium.devtools.v119.target.Target; +import org.openqa.selenium.devtools.v119.target.model.TargetInfo; import org.openqa.selenium.json.JsonInput; import org.openqa.selenium.json.TypeToken; -public class v116Target implements org.openqa.selenium.devtools.idealized.target.Target { +public class v119Target implements org.openqa.selenium.devtools.idealized.target.Target { @Override public Command detachFromTarget( Optional sessionId, Optional targetId) { return Target.detachFromTarget( sessionId.map( - id -> new org.openqa.selenium.devtools.v116.target.model.SessionID(id.toString())), + id -> new org.openqa.selenium.devtools.v119.target.model.SessionID(id.toString())), targetId.map( - id -> new org.openqa.selenium.devtools.v116.target.model.TargetID(id.toString()))); + id -> new org.openqa.selenium.devtools.v119.target.model.TargetID(id.toString()))); } @Override @@ -74,19 +74,19 @@ public Command detachFromTarget( @Override public Command attachToTarget(TargetID targetId) { - Function mapper = + Function mapper = ConverterFunctions.map( - "sessionId", org.openqa.selenium.devtools.v116.target.model.SessionID.class); + "sessionId", org.openqa.selenium.devtools.v119.target.model.SessionID.class); return new Command<>( "Target.attachToTarget", Map.of( "targetId", - new org.openqa.selenium.devtools.v116.target.model.TargetID(targetId.toString()), + new org.openqa.selenium.devtools.v119.target.model.TargetID(targetId.toString()), "flatten", true), input -> { - org.openqa.selenium.devtools.v116.target.model.SessionID id = mapper.apply(input); + org.openqa.selenium.devtools.v119.target.model.SessionID id = mapper.apply(input); return new SessionID(id.toString()); }); } @@ -101,9 +101,9 @@ public Event detached() { return new Event<>( "Target.detachedFromTarget", input -> { - Function converter = + Function converter = ConverterFunctions.map( - "targetId", org.openqa.selenium.devtools.v116.target.model.TargetID.class); + "targetId", org.openqa.selenium.devtools.v119.target.model.TargetID.class); return new TargetID(converter.apply(input).toString()); }); } diff --git a/java/src/org/openqa/selenium/devtools/versions.bzl b/java/src/org/openqa/selenium/devtools/versions.bzl index 98dd41bc8fa74..3291ed0f90a5f 100644 --- a/java/src/org/openqa/selenium/devtools/versions.bzl +++ b/java/src/org/openqa/selenium/devtools/versions.bzl @@ -1,6 +1,6 @@ CDP_VERSIONS = [ "v85", # Required by Firefox - "v116", + "v119", "v117", "v118", ] diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel index e9ad47eae4c33..dd0d70f2e2371 100644 --- a/javascript/node/selenium-webdriver/BUILD.bazel +++ b/javascript/node/selenium-webdriver/BUILD.bazel @@ -4,7 +4,7 @@ load("//common:defs.bzl", "copy_file") BROWSER_VERSIONS = [ "v85", - "v116", + "v119", "v117", "v118", ] diff --git a/py/BUILD.bazel b/py/BUILD.bazel index 24f269499b99f..37d7c12b1abb7 100644 --- a/py/BUILD.bazel +++ b/py/BUILD.bazel @@ -23,7 +23,7 @@ SE_VERSION = "4.14.0" BROWSER_VERSIONS = [ "v85", - "v116", + "v119", "v117", "v118", ] diff --git a/rb/lib/selenium/devtools/BUILD.bazel b/rb/lib/selenium/devtools/BUILD.bazel index 434f76d04b1c9..c203f07068a30 100644 --- a/rb/lib/selenium/devtools/BUILD.bazel +++ b/rb/lib/selenium/devtools/BUILD.bazel @@ -4,7 +4,7 @@ package(default_visibility = ["//rb:__subpackages__"]) CDP_VERSIONS = [ "v85", - "v116", + "v119", "v117", "v118", ] diff --git a/rb/lib/selenium/devtools/version.rb b/rb/lib/selenium/devtools/version.rb index ffca3e530ada6..bd83fee98b5ec 100644 --- a/rb/lib/selenium/devtools/version.rb +++ b/rb/lib/selenium/devtools/version.rb @@ -19,6 +19,6 @@ module Selenium module DevTools - VERSION = '0.118.0' + VERSION = '0.119.0' end # DevTools end # Selenium