diff --git a/dotnet/src/webdriver/Chromium/ChromiumOptions.cs b/dotnet/src/webdriver/Chromium/ChromiumOptions.cs index 9c568fc5a811b..63d996f29f6de 100644 --- a/dotnet/src/webdriver/Chromium/ChromiumOptions.cs +++ b/dotnet/src/webdriver/Chromium/ChromiumOptions.cs @@ -105,7 +105,7 @@ private string LoggingPreferencesChromeOption /// /// Gets or sets the location of the Chromium browser's binary executable file. /// - public string BinaryLocation + public override string BinaryLocation { get { return this.binaryLocation; } set { this.binaryLocation = value; } diff --git a/dotnet/src/webdriver/DriverOptions.cs b/dotnet/src/webdriver/DriverOptions.cs index 2cef7f9c04019..a38300194a371 100644 --- a/dotnet/src/webdriver/DriverOptions.cs +++ b/dotnet/src/webdriver/DriverOptions.cs @@ -208,6 +208,16 @@ public bool UseStrictFileInteractability set { this.useStrictFileInteractability = value; } } + /// + /// Set or Get the location of the browser + /// Override in subclass + /// + public virtual string BinaryLocation + { + get { return null; } + set { throw new NotImplementedException(); } + } + /// /// Provides a means to add additional capabilities not yet added as type safe options /// for the specific browser driver. diff --git a/dotnet/src/webdriver/Firefox/FirefoxOptions.cs b/dotnet/src/webdriver/Firefox/FirefoxOptions.cs index 21982d2a033cf..4459f898f80a2 100644 --- a/dotnet/src/webdriver/Firefox/FirefoxOptions.cs +++ b/dotnet/src/webdriver/Firefox/FirefoxOptions.cs @@ -101,6 +101,15 @@ public FirefoxProfile Profile set { this.profile = value; } } + /// + /// Gets or sets the path and file name of the Firefox browser executable. + /// + public override string BinaryLocation + { + get { return this.browserBinaryLocation; } + set { this.browserBinaryLocation = value; } + } + /// /// Gets or sets the path and file name of the Firefox browser executable. /// diff --git a/dotnet/src/webdriver/SeleniumManager.cs b/dotnet/src/webdriver/SeleniumManager.cs index f1ffa158de943..20333ee0aa781 100644 --- a/dotnet/src/webdriver/SeleniumManager.cs +++ b/dotnet/src/webdriver/SeleniumManager.cs @@ -97,7 +97,7 @@ public static string DriverPath(DriverOptions options) argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --browser-version {0}", options.BrowserVersion); } - string browserBinary = BrowserBinary(options); + string browserBinary = options.BinaryLocation; if (!string.IsNullOrEmpty(browserBinary)) { argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --browser-path \"{0}\"", browserBinary); @@ -112,31 +112,23 @@ public static string DriverPath(DriverOptions options) } } - return RunCommand(binaryFullPath, argsBuilder.ToString()); - } - + Dictionary output = RunCommand(binaryFullPath, argsBuilder.ToString()); + string browserPath = (string)output["browser_path"]; + string driverPath = (string)output["driver_path"]; - /// - /// Extracts the browser binary location from the vendor options when present. Only Chrome, Firefox, and Edge. - /// - private static string BrowserBinary(DriverOptions options) - { - ICapabilities capabilities = options.ToCapabilities(); - string[] vendorOptionsCapabilities = { "moz:firefoxOptions", "goog:chromeOptions", "ms:edgeOptions" }; - foreach (string vendorOptionsCapability in vendorOptionsCapabilities) + try { - IDictionary vendorOptions = capabilities.GetCapability(vendorOptionsCapability) as IDictionary; - - if (vendorOptions != null && vendorOptions.TryGetValue("binary", out object browserBinaryPath)) - { - return browserBinaryPath as string; - } + options.BinaryLocation = browserPath; + options.BrowserVersion = null; + } + catch (NotImplementedException e) + { + // Cannot set Browser Location for this driver and that is ok } - return null; + return driverPath; } - /// /// Executes a process with the given arguments. /// @@ -145,7 +137,7 @@ private static string BrowserBinary(DriverOptions options) /// /// the standard output of the execution. /// - private static string RunCommand(string fileName, string arguments) + private static Dictionary RunCommand(string fileName, string arguments) { Process process = new Process(); process.StartInfo.FileName = binaryFullPath; @@ -187,12 +179,11 @@ private static string RunCommand(string fileName, string arguments) } string output = outputBuilder.ToString().Trim(); - string result; + Dictionary result; try { Dictionary deserializedOutput = JsonConvert.DeserializeObject>(output, new ResponseValueJsonConverter()); - Dictionary deserializedResult = deserializedOutput["result"] as Dictionary; - result = deserializedResult["message"] as string; + result = deserializedOutput["result"] as Dictionary; } catch (Exception ex) { diff --git a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs index 5fb310f3f0886..4c841f413c607 100644 --- a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs +++ b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs @@ -18,11 +18,11 @@ public class DevToolsConsoleTest : DevToolsTestFixture [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyMessageAdded() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); string consoleMessage = "Hello Selenium"; ManualResetEventSlim sync = new ManualResetEventSlim(false); - EventHandler messageAddedHandler = (sender, e) => + EventHandler messageAddedHandler = (sender, e) => { Assert.That(e.Message.Text, Is.EqualTo(consoleMessage)); sync.Set(); diff --git a/dotnet/test/common/DevTools/DevToolsLogTest.cs b/dotnet/test/common/DevTools/DevToolsLogTest.cs index 75143797cac3a..f51b99a8ecc8b 100644 --- a/dotnet/test/common/DevTools/DevToolsLogTest.cs +++ b/dotnet/test/common/DevTools/DevToolsLogTest.cs @@ -19,12 +19,12 @@ public class DevToolsLogTest : DevToolsTestFixture [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyEntryAddedAndClearLog() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); ManualResetEventSlim sync = new ManualResetEventSlim(false); - EventHandler entryAddedHandler = (sender, e) => + EventHandler entryAddedHandler = (sender, e) => { Assert.That(e.Entry.Text.Contains("404")); - Assert.That(e.Entry.Level == V115.Log.LogEntryLevelValues.Error); + Assert.That(e.Entry.Level == V114.Log.LogEntryLevelValues.Error); sync.Set(); }; diff --git a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs index 1c5eceb562a95..aca4f13805288 100644 --- a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs +++ b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs @@ -20,8 +20,8 @@ public class DevToolsNetworkTest : DevToolsTestFixture [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public void GetSetDeleteAndClearAllCookies() { - //var domains = session.GetVersionSpecificDomains(); - //await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + //var domains = session.GetVersionSpecificDomains(); + //await domains.Network.Enable(new V114.Network.EnableCommandSettings()); //var allCookieResponse = await domains.Network.GetAllCookies(); //ReadOnlyCollection seleniumCookies = allCookieResponse.Cookies.ToSeleniumCookies(); @@ -36,11 +36,11 @@ public void GetSetDeleteAndClearAllCookies() //seleniumCookies = allCookieResponse.Cookies.ToSeleniumCookies(); //Assert.That(seleniumCookies.Count == 1); - //var cookieResponse = await domains.Network.GetCookies(new V115.Network.GetCookiesCommandSettings()); + //var cookieResponse = await domains.Network.GetCookies(new V114.Network.GetCookiesCommandSettings()); //seleniumCookies = cookieResponse.Cookies.ToSeleniumCookies(); //Assert.That(seleniumCookies.Count == 0); - //await domains.Network.DeleteCookies(new V115.Network.DeleteCookiesCommandSettings() + //await domains.Network.DeleteCookies(new V114.Network.DeleteCookiesCommandSettings() //{ // Name = "name", // Domain = EnvironmentManager.Instance.UrlBuilder.HostName, @@ -67,26 +67,26 @@ public void GetSetDeleteAndClearAllCookies() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task SendRequestWithUrlFiltersAndExtraHeadersAndVerifyRequests() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); - await domains.Network.SetBlockedURLs(new V115.Network.SetBlockedURLsCommandSettings() + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); + await domains.Network.SetBlockedURLs(new V114.Network.SetBlockedURLsCommandSettings() { Urls = new string[] { "*://*/*.css" } }); - var additionalHeaders = new V115.Network.Headers(); + var additionalHeaders = new V114.Network.Headers(); additionalHeaders.Add("headerName", "headerValue"); - await domains.Network.SetExtraHTTPHeaders(new V115.Network.SetExtraHTTPHeadersCommandSettings() + await domains.Network.SetExtraHTTPHeaders(new V114.Network.SetExtraHTTPHeadersCommandSettings() { Headers = additionalHeaders }); ManualResetEventSlim loadingFailedSync = new ManualResetEventSlim(false); - EventHandler loadingFailedHandler = (sender, e) => + EventHandler loadingFailedHandler = (sender, e) => { - if (e.Type == V115.Network.ResourceType.Stylesheet) + if (e.Type == V114.Network.ResourceType.Stylesheet) { - Assert.That(e.BlockedReason == V115.Network.BlockedReason.Inspector); + Assert.That(e.BlockedReason == V114.Network.BlockedReason.Inspector); } loadingFailedSync.Set(); @@ -94,7 +94,7 @@ await domains.Network.SetExtraHTTPHeaders(new V115.Network.SetExtraHTTPHeadersCo domains.Network.LoadingFailed += loadingFailedHandler; ManualResetEventSlim requestSentSync = new ManualResetEventSlim(false); - EventHandler requestWillBeSentHandler = (sender, e) => + EventHandler requestWillBeSentHandler = (sender, e) => { Assert.That(e.Request.Headers.ContainsKey("headerName")); Assert.That(e.Request.Headers["headerName"] == "headerValue"); @@ -103,7 +103,7 @@ await domains.Network.SetExtraHTTPHeaders(new V115.Network.SetExtraHTTPHeadersCo domains.Network.RequestWillBeSent += requestWillBeSentHandler; ManualResetEventSlim dataSync = new ManualResetEventSlim(false); - EventHandler dataReceivedHandler = (sender, e) => + EventHandler dataReceivedHandler = (sender, e) => { Assert.That(e.RequestId, Is.Not.Null); dataSync.Set(); @@ -122,23 +122,23 @@ await domains.Network.SetExtraHTTPHeaders(new V115.Network.SetExtraHTTPHeadersCo [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task EmulateNetworkConditionOffline() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings() + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings() { MaxTotalBufferSize = 100000000 }); - await domains.Network.EmulateNetworkConditions(new V115.Network.EmulateNetworkConditionsCommandSettings() + await domains.Network.EmulateNetworkConditions(new V114.Network.EmulateNetworkConditionsCommandSettings() { Offline = true, Latency = 100, DownloadThroughput = 1000, UploadThroughput = 2000, - ConnectionType = V115.Network.ConnectionType.Cellular3g + ConnectionType = V114.Network.ConnectionType.Cellular3g }); ManualResetEventSlim loadingFailedSync = new ManualResetEventSlim(false); - EventHandler loadingFailedHandler = (sender, e) => + EventHandler loadingFailedHandler = (sender, e) => { Assert.That(e.ErrorText, Is.EqualTo("net::ERR_INTERNET_DISCONNECTED")); loadingFailedSync.Set(); @@ -164,16 +164,16 @@ await domains.Network.EmulateNetworkConditions(new V115.Network.EmulateNetworkCo [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyRequestReceivedFromCacheAndResponseBody() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); string[] requestIdFromCache = new string[1]; - await domains.Network.Enable(new V115.Network.EnableCommandSettings() + await domains.Network.Enable(new V114.Network.EnableCommandSettings() { MaxResourceBufferSize = 100000000 }); ManualResetEventSlim servedFromCacheSync = new ManualResetEventSlim(false); - EventHandler requestServedFromCacheHandler = (sender, e) => + EventHandler requestServedFromCacheHandler = (sender, e) => { Assert.That(e.RequestId, Is.Not.Null); requestIdFromCache[0] = e.RequestId; @@ -182,7 +182,7 @@ await domains.Network.Enable(new V115.Network.EnableCommandSettings() domains.Network.RequestServedFromCache += requestServedFromCacheHandler; ManualResetEventSlim loadingFinishedSync = new ManualResetEventSlim(false); - EventHandler loadingFinishedHandler = (sender, e) => + EventHandler loadingFinishedHandler = (sender, e) => { Assert.That(e.RequestId, Is.Not.Null); loadingFinishedSync.Set(); @@ -194,7 +194,7 @@ await domains.Network.Enable(new V115.Network.EnableCommandSettings() loadingFinishedSync.Wait(TimeSpan.FromSeconds(5)); servedFromCacheSync.Wait(TimeSpan.FromSeconds(5)); - var responseBody = await domains.Network.GetResponseBody(new V115.Network.GetResponseBodyCommandSettings() + var responseBody = await domains.Network.GetResponseBody(new V114.Network.GetResponseBodyCommandSettings() { RequestId = requestIdFromCache[0] }); @@ -209,16 +209,16 @@ await domains.Network.Enable(new V115.Network.EnableCommandSettings() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifySearchInResponseBody() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); string[] requestIds = new string[1]; - await domains.Network.Enable(new V115.Network.EnableCommandSettings() + await domains.Network.Enable(new V114.Network.EnableCommandSettings() { MaxResourceBufferSize = 100000000 }); ManualResetEventSlim responseSync = new ManualResetEventSlim(false); - EventHandler responseReceivedHandler = (sender, e) => + EventHandler responseReceivedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); requestIds[0] = e.RequestId; @@ -229,7 +229,7 @@ await domains.Network.Enable(new V115.Network.EnableCommandSettings() driver.Url = simpleTestPage; responseSync.Wait(TimeSpan.FromSeconds(5)); - var searchResponse = await domains.Network.SearchInResponseBody(new V115.Network.SearchInResponseBodyCommandSettings() + var searchResponse = await domains.Network.SearchInResponseBody(new V114.Network.SearchInResponseBodyCommandSettings() { RequestId = requestIds[0], Query = "/", @@ -244,14 +244,14 @@ await domains.Network.Enable(new V115.Network.EnableCommandSettings() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyCacheDisabledAndClearCache() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings() + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings() { MaxPostDataSize = 100000000 }); ManualResetEventSlim responseSync = new ManualResetEventSlim(false); - EventHandler responseReceivedHandler = (sender, e) => + EventHandler responseReceivedHandler = (sender, e) => { Assert.That(e.Response.FromDiskCache, Is.False); responseSync.Set(); @@ -261,7 +261,7 @@ await domains.Network.Enable(new V115.Network.EnableCommandSettings() driver.Url = simpleTestPage; responseSync.Wait(TimeSpan.FromSeconds(5)); - await domains.Network.SetCacheDisabled(new V115.Network.SetCacheDisabledCommandSettings() + await domains.Network.SetCacheDisabled(new V114.Network.SetCacheDisabledCommandSettings() { CacheDisabled = true }); @@ -277,16 +277,16 @@ await domains.Network.SetCacheDisabled(new V115.Network.SetCacheDisabledCommandS [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyCertificatesAndOverrideUserAgent() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); - await domains.Network.SetUserAgentOverride(new V115.Network.SetUserAgentOverrideCommandSettings() + await domains.Network.SetUserAgentOverride(new V114.Network.SetUserAgentOverrideCommandSettings() { UserAgent = "userAgent" }); ManualResetEventSlim requestSync = new ManualResetEventSlim(false); - EventHandler requestWillBeSentHandler = (sender, e) => + EventHandler requestWillBeSentHandler = (sender, e) => { Assert.That(e.Request.Headers["User-Agent"], Is.EqualTo("userAgent")); requestSync.Set(); @@ -297,7 +297,7 @@ await domains.Network.SetUserAgentOverride(new V115.Network.SetUserAgentOverride driver.Url = origin; requestSync.Wait(TimeSpan.FromSeconds(5)); - var result = await domains.Network.GetCertificate(new V115.Network.GetCertificateCommandSettings() + var result = await domains.Network.GetCertificate(new V114.Network.GetCertificateCommandSettings() { Origin = origin }); @@ -311,10 +311,10 @@ await domains.Network.SetUserAgentOverride(new V115.Network.SetUserAgentOverride [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyResponseReceivedEventAndNetworkDisable() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); ManualResetEventSlim responseSync = new ManualResetEventSlim(false); - EventHandler responseReceivedHandler = (sender, e) => + EventHandler responseReceivedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); responseSync.Set(); @@ -332,34 +332,34 @@ public async Task VerifyResponseReceivedEventAndNetworkDisable() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyWebSocketOperations() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); - EventHandler webSocketCreatedHandler = (sender, e) => + EventHandler webSocketCreatedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); }; domains.Network.WebSocketCreated += webSocketCreatedHandler; - EventHandler webSocketFrameReceivedHandler = (sender, e) => + EventHandler webSocketFrameReceivedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); }; domains.Network.WebSocketFrameReceived += webSocketFrameReceivedHandler; - EventHandlerwebSocketFrameErrorHandler = (sender, e) => + EventHandlerwebSocketFrameErrorHandler = (sender, e) => { Assert.That(e, Is.Not.Null); }; domains.Network.WebSocketFrameError += webSocketFrameErrorHandler; - EventHandler webSocketFrameSentHandler = (sender, e) => + EventHandler webSocketFrameSentHandler = (sender, e) => { Assert.That(e, Is.Not.Null); }; domains.Network.WebSocketFrameSent += webSocketFrameSentHandler; - EventHandler webSocketClosedHandler = (sender, e) => + EventHandler webSocketClosedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); }; @@ -374,13 +374,13 @@ public async Task VerifyWebSocketOperations() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyRequestPostData() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); string[] requestIds = new string[1]; ManualResetEventSlim requestSync = new ManualResetEventSlim(false); - EventHandler requestWillBeSentHandler = (sender, e) => + EventHandler requestWillBeSentHandler = (sender, e) => { Assert.That(e, Is.Not.Null); if (string.Compare(e.Request.Method, "post", StringComparison.OrdinalIgnoreCase) == 0) @@ -395,7 +395,7 @@ public async Task VerifyRequestPostData() driver.FindElement(By.XPath("//form/input")).Click(); requestSync.Wait(TimeSpan.FromSeconds(5)); - var response = await domains.Network.GetRequestPostData(new V115.Network.GetRequestPostDataCommandSettings() + var response = await domains.Network.GetRequestPostData(new V114.Network.GetRequestPostDataCommandSettings() { RequestId = requestIds[0] }); @@ -409,9 +409,9 @@ public async Task VerifyRequestPostData() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task ByPassServiceWorker() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); - await domains.Network.SetBypassServiceWorker(new V115.Network.SetBypassServiceWorkerCommandSettings() + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); + await domains.Network.SetBypassServiceWorker(new V114.Network.SetBypassServiceWorkerCommandSettings() { Bypass = true }); @@ -423,11 +423,11 @@ await domains.Network.SetBypassServiceWorker(new V115.Network.SetBypassServiceWo [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyEventSourceMessage() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); ManualResetEventSlim requestSync = new ManualResetEventSlim(false); - EventHandler eventSourceMessageReceivedHandler = (sender, e) => + EventHandler eventSourceMessageReceivedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); requestSync.Set(); @@ -445,11 +445,11 @@ public async Task VerifyEventSourceMessage() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifySignedExchangeReceived() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); ManualResetEventSlim requestSync = new ManualResetEventSlim(false); - EventHandler signedExchangeReceivedHandler = (sender, e) => + EventHandler signedExchangeReceivedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); requestSync.Set(); @@ -466,11 +466,11 @@ public async Task VerifySignedExchangeReceived() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task VerifyResourceChangedPriority() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); ManualResetEventSlim requestSync = new ManualResetEventSlim(false); - EventHandler resourceChangedPriorityHandler = (sender, e) => + EventHandler resourceChangedPriorityHandler = (sender, e) => { Assert.That(e, Is.Not.Null); requestSync.Set(); @@ -487,13 +487,13 @@ public async Task VerifyResourceChangedPriority() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task InterceptRequestAndContinue() { - var domains = session.GetVersionSpecificDomains(); - await domains.Network.Enable(new V115.Network.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Network.Enable(new V114.Network.EnableCommandSettings()); ManualResetEventSlim requestSync = new ManualResetEventSlim(false); - EventHandler requestInterceptedHandler = (async (sender, e) => + EventHandler requestInterceptedHandler = (async (sender, e) => { - await domains.Network.ContinueInterceptedRequest(new V115.Network.ContinueInterceptedRequestCommandSettings() + await domains.Network.ContinueInterceptedRequest(new V114.Network.ContinueInterceptedRequestCommandSettings() { InterceptionId = e.InterceptionId }); @@ -501,16 +501,16 @@ await domains.Network.ContinueInterceptedRequest(new V115.Network.ContinueInterc }); domains.Network.RequestIntercepted += requestInterceptedHandler; - var pattern = new V115.Network.RequestPattern() + var pattern = new V114.Network.RequestPattern() { UrlPattern = "*.css", - ResourceType = V115.Network.ResourceType.Stylesheet, - InterceptionStage = V115.Network.InterceptionStage.HeadersReceived + ResourceType = V114.Network.ResourceType.Stylesheet, + InterceptionStage = V114.Network.InterceptionStage.HeadersReceived }; - await domains.Network.SetRequestInterception(new V115.Network.SetRequestInterceptionCommandSettings() + await domains.Network.SetRequestInterception(new V114.Network.SetRequestInterceptionCommandSettings() { - Patterns = new V115.Network.RequestPattern[] { pattern } + Patterns = new V114.Network.RequestPattern[] { pattern } }); driver.Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("js/skins/lightgray/content.min.css"); diff --git a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs index 914db7616f589..2c723e12575fd 100644 --- a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs +++ b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs @@ -12,8 +12,8 @@ public class DevToolsPerformanceTest : DevToolsTestFixture [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task EnableAndDisablePerformance() { - var domains = session.GetVersionSpecificDomains(); - await domains.Performance.Enable(new V115.Performance.EnableCommandSettings()); + var domains = session.GetVersionSpecificDomains(); + await domains.Performance.Enable(new V114.Performance.EnableCommandSettings()); driver.Url = simpleTestPage; await domains.Performance.Disable(); } @@ -24,7 +24,7 @@ public async Task EnableAndDisablePerformance() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task DisablePerformance() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Performance.Disable(); driver.Url = simpleTestPage; await domains.Performance.Disable(); @@ -36,13 +36,13 @@ public async Task DisablePerformance() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task SetTimeDomainTimeTickPerformance() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Performance.Disable(); - await domains.Performance.SetTimeDomain(new V115.Performance.SetTimeDomainCommandSettings() + await domains.Performance.SetTimeDomain(new V114.Performance.SetTimeDomainCommandSettings() { TimeDomain = "timeTicks" }); - await domains.Performance.Enable(new V115.Performance.EnableCommandSettings()); + await domains.Performance.Enable(new V114.Performance.EnableCommandSettings()); driver.Url = simpleTestPage; await domains.Performance.Disable(); } @@ -54,13 +54,13 @@ await domains.Performance.SetTimeDomain(new V115.Performance.SetTimeDomainComman [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task SetTimeDomainsThreadTicksPerformance() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Performance.Disable(); - await domains.Performance.SetTimeDomain(new V115.Performance.SetTimeDomainCommandSettings() + await domains.Performance.SetTimeDomain(new V114.Performance.SetTimeDomainCommandSettings() { TimeDomain = "threadTicks" }); - await domains.Performance.Enable(new V115.Performance.EnableCommandSettings()); + await domains.Performance.Enable(new V114.Performance.EnableCommandSettings()); driver.Url = simpleTestPage; await domains.Performance.Disable(); } @@ -71,12 +71,12 @@ await domains.Performance.SetTimeDomain(new V115.Performance.SetTimeDomainComman [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task GetMetricsByTimeTicks() { - var domains = session.GetVersionSpecificDomains(); - await domains.Performance.SetTimeDomain(new V115.Performance.SetTimeDomainCommandSettings() + var domains = session.GetVersionSpecificDomains(); + await domains.Performance.SetTimeDomain(new V114.Performance.SetTimeDomainCommandSettings() { TimeDomain = "timeTicks" }); - await domains.Performance.Enable(new V115.Performance.EnableCommandSettings()); + await domains.Performance.Enable(new V114.Performance.EnableCommandSettings()); driver.Url = simpleTestPage; var response = await domains.Performance.GetMetrics(); var metrics = response.Metrics; @@ -92,12 +92,12 @@ await domains.Performance.SetTimeDomain(new V115.Performance.SetTimeDomainComman [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task GetMetricsByThreadTicks() { - var domains = session.GetVersionSpecificDomains(); - await domains.Performance.SetTimeDomain(new V115.Performance.SetTimeDomainCommandSettings() + var domains = session.GetVersionSpecificDomains(); + await domains.Performance.SetTimeDomain(new V114.Performance.SetTimeDomainCommandSettings() { TimeDomain = "threadTicks" }); - await domains.Performance.Enable(new V115.Performance.EnableCommandSettings()); + await domains.Performance.Enable(new V114.Performance.EnableCommandSettings()); driver.Url = simpleTestPage; var response = await domains.Performance.GetMetrics(); var metrics = response.Metrics; diff --git a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs index 20c567637bae0..71c5ad6f97a88 100644 --- a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs +++ b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs @@ -17,7 +17,7 @@ public class DevToolsProfilerTest : DevToolsTestFixture [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task SimpleStartStopAndGetProfilerTest() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Profiler.Enable(); await domains.Profiler.Start(); var response = await domains.Profiler.Stop(); @@ -32,10 +32,10 @@ public async Task SimpleStartStopAndGetProfilerTest() [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task SampleGetBestEffortProfilerTest() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Profiler.Enable(); driver.Url = simpleTestPage; - await domains.Profiler.SetSamplingInterval(new V115.Profiler.SetSamplingIntervalCommandSettings() + await domains.Profiler.SetSamplingInterval(new V114.Profiler.SetSamplingIntervalCommandSettings() { Interval = 30 }); @@ -53,10 +53,10 @@ await domains.Profiler.SetSamplingInterval(new V115.Profiler.SetSamplingInterval [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task SampleSetStartPreciseCoverageTest() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Profiler.Enable(); driver.Url = simpleTestPage; - await domains.Profiler.StartPreciseCoverage(new V115.Profiler.StartPreciseCoverageCommandSettings() + await domains.Profiler.StartPreciseCoverage(new V114.Profiler.StartPreciseCoverageCommandSettings() { CallCount = true, Detailed = true @@ -78,11 +78,11 @@ await domains.Profiler.StartPreciseCoverage(new V115.Profiler.StartPreciseCovera [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task SampleProfileEvents() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Profiler.Enable(); driver.Url = simpleTestPage; ManualResetEventSlim startSync = new ManualResetEventSlim(false); - EventHandler consoleProfileStartedHandler = (sender, e) => + EventHandler consoleProfileStartedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); startSync.Set(); @@ -94,7 +94,7 @@ public async Task SampleProfileEvents() driver.Navigate().Refresh(); ManualResetEventSlim finishSync = new ManualResetEventSlim(false); - EventHandler consoleProfileFinishedHandler = (sender, e) => + EventHandler consoleProfileFinishedHandler = (sender, e) => { Assert.That(e, Is.Not.Null); finishSync.Set(); @@ -109,7 +109,7 @@ public async Task SampleProfileEvents() await domains.Profiler.Disable(); } - private void ValidateProfile(V115.Profiler.Profile profiler) + private void ValidateProfile(V114.Profiler.Profile profiler) { Assert.That(profiler, Is.Not.Null); Assert.That(profiler.Nodes, Is.Not.Null); diff --git a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs index 5d263acf1dc91..e5db85e2c13e6 100644 --- a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs +++ b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs @@ -18,17 +18,17 @@ public class DevToolsSecurityTest : DevToolsTestFixture [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task LoadInsecureWebsite() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Security.Enable(); - await domains.Security.SetIgnoreCertificateErrors(new V115.Security.SetIgnoreCertificateErrorsCommandSettings() + await domains.Security.SetIgnoreCertificateErrors(new V114.Security.SetIgnoreCertificateErrorsCommandSettings() { Ignore = false }); string summary = null; ManualResetEventSlim sync = new ManualResetEventSlim(false); - EventHandler securityStateChangedHandler = (sender, e) => + EventHandler securityStateChangedHandler = (sender, e) => { summary = e.Summary; sync.Set(); @@ -50,10 +50,10 @@ await domains.Security.SetIgnoreCertificateErrors(new V115.Security.SetIgnoreCer [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task LoadSecureWebsite() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); await domains.Security.Enable(); - await domains.Security.SetIgnoreCertificateErrors(new V115.Security.SetIgnoreCertificateErrorsCommandSettings() + await domains.Security.SetIgnoreCertificateErrors(new V114.Security.SetIgnoreCertificateErrorsCommandSettings() { Ignore = true }); diff --git a/dotnet/test/common/DevTools/DevToolsTargetTest.cs b/dotnet/test/common/DevTools/DevToolsTargetTest.cs index e0f3d03f9e10f..db0aa7084a24c 100644 --- a/dotnet/test/common/DevTools/DevToolsTargetTest.cs +++ b/dotnet/test/common/DevTools/DevToolsTargetTest.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; using NUnit.Framework; -using OpenQA.Selenium.DevTools.V115.Target; +using OpenQA.Selenium.DevTools.V114.Target; using OpenQA.Selenium.Environment; namespace OpenQA.Selenium.DevTools @@ -18,24 +18,24 @@ public class DevToolsTargetTest : DevToolsTestFixture [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task GetTargetActivateAndAttach() { - var domains = session.GetVersionSpecificDomains(); + var domains = session.GetVersionSpecificDomains(); driver.Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("devToolsConsoleTest.html"); var response = await domains.Target.GetTargets(new GetTargetsCommandSettings()); - V115.Target.TargetInfo[] allTargets = response.TargetInfos; - foreach (V115.Target.TargetInfo targetInfo in allTargets) + V114.Target.TargetInfo[] allTargets = response.TargetInfos; + foreach (V114.Target.TargetInfo targetInfo in allTargets) { ValidateTarget(targetInfo); - await domains.Target.ActivateTarget(new V115.Target.ActivateTargetCommandSettings() + await domains.Target.ActivateTarget(new V114.Target.ActivateTargetCommandSettings() { TargetId = targetInfo.TargetId }); - var attachResponse = await domains.Target.AttachToTarget(new V115.Target.AttachToTargetCommandSettings() + var attachResponse = await domains.Target.AttachToTarget(new V114.Target.AttachToTargetCommandSettings() { TargetId = targetInfo.TargetId, Flatten = true }); ValidateSession(attachResponse.SessionId); - var getInfoResponse = await domains.Target.GetTargetInfo(new V115.Target.GetTargetInfoCommandSettings() + var getInfoResponse = await domains.Target.GetTargetInfo(new V114.Target.GetTargetInfoCommandSettings() { TargetId = targetInfo.TargetId }); @@ -49,10 +49,10 @@ await domains.Target.ActivateTarget(new V115.Target.ActivateTargetCommandSetting [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task GetTargetAndSendMessageToTarget() { - var domains = session.GetVersionSpecificDomains(); - V115.Target.TargetInfo[] allTargets = null; + var domains = session.GetVersionSpecificDomains(); + V114.Target.TargetInfo[] allTargets = null; string sessionId = null; - V115.Target.TargetInfo targetInfo = null; + V114.Target.TargetInfo targetInfo = null; driver.Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("devToolsConsoleTest.html"); ManualResetEventSlim sync = new ManualResetEventSlim(false); domains.Target.ReceivedMessageFromTarget += (sender, e) => @@ -65,19 +65,19 @@ public async Task GetTargetAndSendMessageToTarget() ValidateTargetsInfos(allTargets); ValidateTarget(allTargets[0]); targetInfo = allTargets[0]; - await domains.Target.ActivateTarget(new V115.Target.ActivateTargetCommandSettings() + await domains.Target.ActivateTarget(new V114.Target.ActivateTargetCommandSettings() { TargetId = targetInfo.TargetId }); - var attachResponse = await domains.Target.AttachToTarget(new V115.Target.AttachToTargetCommandSettings() + var attachResponse = await domains.Target.AttachToTarget(new V114.Target.AttachToTargetCommandSettings() { TargetId = targetInfo.TargetId, Flatten = false }); sessionId = attachResponse.SessionId; ValidateSession(sessionId); - await domains.Target.SendMessageToTarget(new V115.Target.SendMessageToTargetCommandSettings() + await domains.Target.SendMessageToTarget(new V114.Target.SendMessageToTargetCommandSettings() { Message = "{\"id\":" + id + ",\"method\":\"Page.bringToFront\"}", SessionId = sessionId, @@ -92,32 +92,32 @@ await domains.Target.SendMessageToTarget(new V115.Target.SendMessageToTargetComm [IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")] public async Task CreateAndContentLifeCycle() { - var domains = session.GetVersionSpecificDomains(); - EventHandler targetCreatedHandler = (sender, e) => + var domains = session.GetVersionSpecificDomains(); + EventHandler targetCreatedHandler = (sender, e) => { ValidateTargetInfo(e.TargetInfo); }; domains.Target.TargetCreated += targetCreatedHandler; - EventHandler targetCrashedHandler = (sender, e) => + EventHandler targetCrashedHandler = (sender, e) => { ValidateTargetCrashed(e); }; domains.Target.TargetCrashed += targetCrashedHandler; - EventHandler targetDestroyedHandler = (sender, e) => + EventHandler targetDestroyedHandler = (sender, e) => { ValidateTargetId(e.TargetId); }; domains.Target.TargetDestroyed += targetDestroyedHandler; - EventHandler targetInfoChangedHandler = (sender, e) => + EventHandler targetInfoChangedHandler = (sender, e) => { ValidateTargetInfo(e.TargetInfo); }; domains.Target.TargetInfoChanged += targetInfoChangedHandler; - var response = await domains.Target.CreateTarget(new V115.Target.CreateTargetCommandSettings() + var response = await domains.Target.CreateTarget(new V114.Target.CreateTargetCommandSettings() { Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("devToolsConsoleTest.html"), NewWindow = true, @@ -125,12 +125,12 @@ public async Task CreateAndContentLifeCycle() }); ValidateTargetId(response.TargetId); - await domains.Target.SetDiscoverTargets(new V115.Target.SetDiscoverTargetsCommandSettings() + await domains.Target.SetDiscoverTargets(new V114.Target.SetDiscoverTargetsCommandSettings() { Discover = true }); - var closeResponse = await domains.Target.CloseTarget(new V115.Target.CloseTargetCommandSettings() + var closeResponse = await domains.Target.CloseTarget(new V114.Target.CloseTargetCommandSettings() { TargetId = response.TargetId }); @@ -139,7 +139,7 @@ await domains.Target.SetDiscoverTargets(new V115.Target.SetDiscoverTargetsComman Assert.That(closeResponse.Success, Is.True); } - private void ValidateTargetCrashed(V115.Target.TargetCrashedEventArgs targetCrashed) + private void ValidateTargetCrashed(V114.Target.TargetCrashedEventArgs targetCrashed) { Assert.That(targetCrashed, Is.Not.Null); Assert.That(targetCrashed.ErrorCode, Is.Not.Null); @@ -152,7 +152,7 @@ private void ValidateTargetId(string targetId) Assert.That(targetId, Is.Not.Null); } - private void ValidateMessage(V115.Target.ReceivedMessageFromTargetEventArgs messageFromTarget) + private void ValidateMessage(V114.Target.ReceivedMessageFromTargetEventArgs messageFromTarget) { Assert.That(messageFromTarget, Is.Not.Null); Assert.That(messageFromTarget.Message, Is.Not.Null); @@ -160,7 +160,7 @@ private void ValidateMessage(V115.Target.ReceivedMessageFromTargetEventArgs mess Assert.That(messageFromTarget.Message, Is.EqualTo("{\"id\":" + id + ",\"result\":{}}")); } - private void ValidateTargetInfo(V115.Target.TargetInfo targetInfo) + private void ValidateTargetInfo(V114.Target.TargetInfo targetInfo) { Assert.That(targetInfo, Is.Not.Null); Assert.That(targetInfo.TargetId, Is.Not.Null); @@ -169,13 +169,13 @@ private void ValidateTargetInfo(V115.Target.TargetInfo targetInfo) Assert.That(targetInfo.Url, Is.Not.Null); } - private void ValidateTargetsInfos(V115.Target.TargetInfo[] targets) + private void ValidateTargetsInfos(V114.Target.TargetInfo[] targets) { Assert.That(targets, Is.Not.Null); Assert.That(targets.Length, Is.GreaterThan(0)); } - private void ValidateTarget(V115.Target.TargetInfo targetInfo) + private void ValidateTarget(V114.Target.TargetInfo targetInfo) { Assert.That(targetInfo, Is.Not.Null); Assert.That(targetInfo.TargetId, Is.Not.Null);