diff --git a/dotnet/src/webdriver/BiDi/BiDi.cs b/dotnet/src/webdriver/BiDi/BiDi.cs index 478f467012bff..9964b4e59cea8 100644 --- a/dotnet/src/webdriver/BiDi/BiDi.cs +++ b/dotnet/src/webdriver/BiDi/BiDi.cs @@ -27,14 +27,14 @@ public class BiDi : IAsyncDisposable { private readonly Broker _broker; - private readonly Lazy _sessionModule; - private readonly Lazy _browsingContextModule; - private readonly Lazy _browserModule; - private readonly Lazy _networkModule; - private readonly Lazy _inputModule; - private readonly Lazy _scriptModule; - private readonly Lazy _logModule; - private readonly Lazy _storageModule; + private readonly Lazy _sessionModule; + private readonly Lazy _browsingContextModule; + private readonly Lazy _browserModule; + private readonly Lazy _networkModule; + private readonly Lazy _inputModule; + private readonly Lazy _scriptModule; + private readonly Lazy _logModule; + private readonly Lazy _storageModule; internal BiDi(string url) { @@ -42,26 +42,26 @@ internal BiDi(string url) _broker = new Broker(this, uri); - _sessionModule = new Lazy(() => new Modules.Session.SessionModule(_broker)); - _browsingContextModule = new Lazy(() => new Modules.BrowsingContext.BrowsingContextModule(_broker)); - _browserModule = new Lazy(() => new Modules.Browser.BrowserModule(_broker)); - _networkModule = new Lazy(() => new Modules.Network.NetworkModule(_broker)); - _inputModule = new Lazy(() => new Modules.Input.InputModule(_broker)); - _scriptModule = new Lazy(() => new Modules.Script.ScriptModule(_broker)); - _logModule = new Lazy(() => new Modules.Log.LogModule(_broker)); - _storageModule = new Lazy(() => new Modules.Storage.StorageModule(_broker)); + _sessionModule = new Lazy(() => new Session.SessionModule(_broker)); + _browsingContextModule = new Lazy(() => new BrowsingContext.BrowsingContextModule(_broker)); + _browserModule = new Lazy(() => new Browser.BrowserModule(_broker)); + _networkModule = new Lazy(() => new Network.NetworkModule(_broker)); + _inputModule = new Lazy(() => new Input.InputModule(_broker)); + _scriptModule = new Lazy(() => new Script.ScriptModule(_broker)); + _logModule = new Lazy(() => new Log.LogModule(_broker)); + _storageModule = new Lazy(() => new Storage.StorageModule(_broker)); } - internal Modules.Session.SessionModule SessionModule => _sessionModule.Value; - public Modules.BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value; - public Modules.Browser.BrowserModule Browser => _browserModule.Value; - public Modules.Network.NetworkModule Network => _networkModule.Value; - internal Modules.Input.InputModule InputModule => _inputModule.Value; - public Modules.Script.ScriptModule Script => _scriptModule.Value; - public Modules.Log.LogModule Log => _logModule.Value; - public Modules.Storage.StorageModule Storage => _storageModule.Value; + internal Session.SessionModule SessionModule => _sessionModule.Value; + public BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value; + public Browser.BrowserModule Browser => _browserModule.Value; + public Network.NetworkModule Network => _networkModule.Value; + internal Input.InputModule InputModule => _inputModule.Value; + public Script.ScriptModule Script => _scriptModule.Value; + public Log.LogModule Log => _logModule.Value; + public Storage.StorageModule Storage => _storageModule.Value; - public Task StatusAsync() + public Task StatusAsync() { return SessionModule.StatusAsync(); } @@ -75,7 +75,7 @@ public static async Task ConnectAsync(string url) return bidi; } - public Task EndAsync(Modules.Session.EndOptions? options = null) + public Task EndAsync(Session.EndOptions? options = null) { return SessionModule.EndAsync(options); } diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/BrowserModule.cs b/dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/Browser/BrowserModule.cs rename to dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs index fe6b939eb6292..51ce4e082a0de 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/BrowserModule.cs +++ b/dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs @@ -20,7 +20,7 @@ using System.Threading.Tasks; using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; public sealed class BrowserModule(Broker broker) : Module(broker) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindow.cs b/dotnet/src/webdriver/BiDi/Browser/ClientWindow.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindow.cs rename to dotnet/src/webdriver/BiDi/Browser/ClientWindow.cs index fe80e23374bd3..4cbb430d20d09 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindow.cs +++ b/dotnet/src/webdriver/BiDi/Browser/ClientWindow.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; public record ClientWindow { diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs b/dotnet/src/webdriver/BiDi/Browser/ClientWindowInfo.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs rename to dotnet/src/webdriver/BiDi/Browser/ClientWindowInfo.cs index 49478b69d3846..bdab71f7df1fd 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs +++ b/dotnet/src/webdriver/BiDi/Browser/ClientWindowInfo.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; public record ClientWindowInfo(bool Active, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y); diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/CloseCommand.cs b/dotnet/src/webdriver/BiDi/Browser/CloseCommand.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Browser/CloseCommand.cs rename to dotnet/src/webdriver/BiDi/Browser/CloseCommand.cs index fe29a937ec4d4..96af7df29b195 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/CloseCommand.cs +++ b/dotnet/src/webdriver/BiDi/Browser/CloseCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; internal class CloseCommand() : Command(CommandParameters.Empty, "browser.close"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/CreateUserContextCommand.cs b/dotnet/src/webdriver/BiDi/Browser/CreateUserContextCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Browser/CreateUserContextCommand.cs rename to dotnet/src/webdriver/BiDi/Browser/CreateUserContextCommand.cs index fb695faa9d248..1d605740e7ab3 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/CreateUserContextCommand.cs +++ b/dotnet/src/webdriver/BiDi/Browser/CreateUserContextCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; internal class CreateUserContextCommand(CreateUserContextCommandParameters @params) : Command(@params, "browser.createUserContext"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/GetClientWindowsCommand.cs b/dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Browser/GetClientWindowsCommand.cs rename to dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs index 5e6f4f2b65d30..2971ad6246398 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/GetClientWindowsCommand.cs +++ b/dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs @@ -21,7 +21,7 @@ using System.Collections; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; internal class GetClientWindowsCommand() : Command(CommandParameters.Empty, "browser.getClientWindows"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/GetUserContextsCommand.cs b/dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Browser/GetUserContextsCommand.cs rename to dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs index 42891aa3664ba..a56b341143822 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/GetUserContextsCommand.cs +++ b/dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs @@ -21,7 +21,7 @@ using System.Collections; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; internal class GetUserContextsCommand() : Command(CommandParameters.Empty, "browser.getUserContexts"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/RemoveUserContextCommand.cs b/dotnet/src/webdriver/BiDi/Browser/RemoveUserContextCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Browser/RemoveUserContextCommand.cs rename to dotnet/src/webdriver/BiDi/Browser/RemoveUserContextCommand.cs index 7dcfe38c7bb0a..35f23eae0f176 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/RemoveUserContextCommand.cs +++ b/dotnet/src/webdriver/BiDi/Browser/RemoveUserContextCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; internal class RemoveUserContextCommand(RemoveUserContextCommandParameters @params) : Command(@params, "browser.removeUserContext"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/UserContext.cs b/dotnet/src/webdriver/BiDi/Browser/UserContext.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Browser/UserContext.cs rename to dotnet/src/webdriver/BiDi/Browser/UserContext.cs index ad00ef278a20c..42eb769a47f2a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/UserContext.cs +++ b/dotnet/src/webdriver/BiDi/Browser/UserContext.cs @@ -20,7 +20,7 @@ using System; using System.Threading.Tasks; -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; public class UserContext : IAsyncDisposable { diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/UserContextInfo.cs b/dotnet/src/webdriver/BiDi/Browser/UserContextInfo.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Browser/UserContextInfo.cs rename to dotnet/src/webdriver/BiDi/Browser/UserContextInfo.cs index f439f678b3f64..724021671572a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Browser/UserContextInfo.cs +++ b/dotnet/src/webdriver/BiDi/Browser/UserContextInfo.cs @@ -19,6 +19,6 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Browser; +namespace OpenQA.Selenium.BiDi.Browser; public record UserContextInfo(UserContext UserContext) : EmptyResult; diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ActivateCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/ActivateCommand.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ActivateCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/ActivateCommand.cs index 9b091965f8c21..4d57d85789fc6 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ActivateCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/ActivateCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class ActivateCommand(ActivateCommandParameters @params) : Command(@params, "browsingContext.activate"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContext.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContext.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContext.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContext.cs index 0313af37afd73..70ca21320de23 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContext.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContext.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using System; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public class BrowsingContext { diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInfo.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInfo.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInfo.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInfo.cs index 34197be88ee11..ca1f31e135ec5 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInfo.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInfo.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public record BrowsingContextInfo(BiDi BiDi, IReadOnlyList? Children, Browser.ClientWindow ClientWindow, BrowsingContext Context, BrowsingContext? OriginalOpener, string Url, Browser.UserContext UserContext) : BrowsingContextEventArgs(BiDi, Context) diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInputModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInputModule.cs similarity index 94% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInputModule.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInputModule.cs index c4bb5f28fefe2..b3d0dc2391349 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInputModule.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInputModule.cs @@ -18,10 +18,10 @@ // using System.Threading.Tasks; -using OpenQA.Selenium.BiDi.Modules.Input; +using OpenQA.Selenium.BiDi.Input; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public class BrowsingContextInputModule(BrowsingContext context, InputModule inputModule) { diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextLogModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextLogModule.cs similarity index 94% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextLogModule.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextLogModule.cs index f70473c50dea6..8cbb8fcfc8be1 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextLogModule.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextLogModule.cs @@ -17,11 +17,11 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Log; +using OpenQA.Selenium.BiDi.Log; using System.Threading.Tasks; using System; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public class BrowsingContextLogModule(BrowsingContext context, LogModule logModule) { diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextModule.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs index 369325323bd11..e3c8ec83d87b3 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextModule.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs @@ -22,7 +22,7 @@ using System.Threading.Tasks; using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public class BrowsingContextModule(Broker broker) : Module(broker) { diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextNetworkModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextNetworkModule.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextNetworkModule.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextNetworkModule.cs index 13c31ba2cea59..1eb6dd127d9dc 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextNetworkModule.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextNetworkModule.cs @@ -19,9 +19,9 @@ using System.Threading.Tasks; using System; -using OpenQA.Selenium.BiDi.Modules.Network; +using OpenQA.Selenium.BiDi.Network; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public class BrowsingContextNetworkModule(BrowsingContext context, NetworkModule networkModule) { diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextScriptModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextScriptModule.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextScriptModule.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextScriptModule.cs index 53b319042fd4e..4120d2503ac50 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextScriptModule.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextScriptModule.cs @@ -18,10 +18,10 @@ // using System.Threading.Tasks; -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public class BrowsingContextScriptModule(BrowsingContext context, ScriptModule scriptModule) { diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextStorageModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextStorageModule.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextStorageModule.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextStorageModule.cs index 2be053ed7226d..cc00f46de3220 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextStorageModule.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextStorageModule.cs @@ -18,9 +18,9 @@ // using System.Threading.Tasks; -using OpenQA.Selenium.BiDi.Modules.Storage; +using OpenQA.Selenium.BiDi.Storage; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public class BrowsingContextStorageModule(BrowsingContext context, StorageModule storageModule) { diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs index f5d6af884ac3f..c892f8f3eab90 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class CaptureScreenshotCommand(CaptureScreenshotCommandParameters @params) : Command(@params, "browsingContext.captureScreenshot"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CloseCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/CloseCommand.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CloseCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/CloseCommand.cs index 7d7d5c6beb5c5..d2f08818b8d81 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CloseCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/CloseCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class CloseCommand(CloseCommandParameters @params) : Command(@params, "browsingContext.close"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CreateCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/CreateCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CreateCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/CreateCommand.cs index 58900de151e51..3c9d4b405e25e 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CreateCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/CreateCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class CreateCommand(CreateCommandParameters @params) : Command(@params, "browsingContext.create"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/GetTreeCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/GetTreeCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/GetTreeCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/GetTreeCommand.cs index 0c6e0d7dd777a..6c2c10cde7c3b 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/GetTreeCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/GetTreeCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class GetTreeCommand(GetTreeCommandParameters @params) : Command(@params, "browsingContext.getTree"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/HandleUserPromptCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/HandleUserPromptCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/HandleUserPromptCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/HandleUserPromptCommand.cs index cd76961c4cf7f..04cc7fb09d3e7 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/HandleUserPromptCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/HandleUserPromptCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; class HandleUserPromptCommand(HandleUserPromptCommandParameters @params) : Command(@params, "browsingContext.handleUserPrompt"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/LocateNodesCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/LocateNodesCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/LocateNodesCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/LocateNodesCommand.cs index 393cdff1c9e22..916b06694b99f 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/LocateNodesCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/LocateNodesCommand.cs @@ -21,7 +21,7 @@ using System.Collections; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class LocateNodesCommand(LocateNodesCommandParameters @params) : Command(@params, "browsingContext.locateNodes"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Locator.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/Locator.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Locator.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/Locator.cs index c1c6f63405bc4..34be2aeb3a6fe 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Locator.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/Locator.cs @@ -19,7 +19,7 @@ using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")] [JsonDerivedType(typeof(AccessibilityLocator), "accessibility")] diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigateCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/NavigateCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigateCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/NavigateCommand.cs index d624a0646ceb7..210d97831207b 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigateCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/NavigateCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class NavigateCommand(NavigateCommandParameters @params) : Command(@params, "browsingContext.navigate"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Navigation.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/Navigation.cs similarity index 94% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Navigation.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/Navigation.cs index 04784f995ea36..ca17338489bbf 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Navigation.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/Navigation.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public record Navigation(string Id); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigationInfo.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/NavigationInfo.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigationInfo.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/NavigationInfo.cs index 14b0bbef184ae..823f452aff88d 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigationInfo.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/NavigationInfo.cs @@ -19,7 +19,7 @@ using System; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public record NavigationInfo(BiDi BiDi, BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url) : BrowsingContextEventArgs(BiDi, Context); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/PrintCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/PrintCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs index 0e68022eb3f6a..5bcc5325b4a7a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/PrintCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class PrintCommand(PrintCommandParameters @params) : Command(@params, "browsingContext.print"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ReloadCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/ReloadCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ReloadCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/ReloadCommand.cs index bea343a5e9bd1..5dac139f01385 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ReloadCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/ReloadCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class ReloadCommand(ReloadCommandParameters @params) : Command(@params, "browsingContext.reload"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/SetViewportCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/SetViewportCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/SetViewportCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/SetViewportCommand.cs index 0b3437b29d5a7..b6254f3a903b1 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/SetViewportCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/SetViewportCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class SetViewportCommand(SetViewportCommandParameters @params) : Command(@params, "browsingContext.setViewport"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/TraverseHistoryCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/TraverseHistoryCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/TraverseHistoryCommand.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/TraverseHistoryCommand.cs index ed166ad0beae4..3d94f3a9cab86 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/TraverseHistoryCommand.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/TraverseHistoryCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; internal class TraverseHistoryCommand(TraverseHistoryCommandParameters @params) : Command(@params, "browsingContext.traverseHistory"); diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptClosedEventArgs.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/UserPromptClosedEventArgs.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptClosedEventArgs.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/UserPromptClosedEventArgs.cs index cff09c3113b04..f022d58aa0b0f 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptClosedEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/UserPromptClosedEventArgs.cs @@ -19,7 +19,7 @@ using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public record UserPromptClosedEventArgs(BiDi BiDi, BrowsingContext Context, bool Accepted) : BrowsingContextEventArgs(BiDi, Context) diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptOpenedEventArgs.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/UserPromptOpenedEventArgs.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptOpenedEventArgs.cs rename to dotnet/src/webdriver/BiDi/BrowsingContext/UserPromptOpenedEventArgs.cs index 2a748c34a3c9c..dbadd70dab990 100644 --- a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptOpenedEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/BrowsingContext/UserPromptOpenedEventArgs.cs @@ -19,7 +19,7 @@ using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext; +namespace OpenQA.Selenium.BiDi.BrowsingContext; public record UserPromptOpenedEventArgs(BiDi BiDi, BrowsingContext Context, Session.UserPromptHandlerType Handler, UserPromptType Type, string Message) : BrowsingContextEventArgs(BiDi, Context) diff --git a/dotnet/src/webdriver/BiDi/Communication/Broker.cs b/dotnet/src/webdriver/BiDi/Communication/Broker.cs index 503c72b2238d1..db926e3b7228e 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Broker.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Broker.cs @@ -34,7 +34,7 @@ namespace OpenQA.Selenium.BiDi.Communication; public sealed class Broker : IAsyncDisposable { - private readonly ILogger _logger = Log.GetLogger(); + private readonly ILogger _logger = Internal.Logging.Log.GetLogger(); private readonly BiDi _bidi; private readonly ITransport _transport; @@ -273,7 +273,7 @@ public async Task SubscribeAsync(string eventName, Fun } } - public async Task UnsubscribeAsync(Modules.Session.Subscription subscription, EventHandler eventHandler) + public async Task UnsubscribeAsync(Session.Subscription subscription, EventHandler eventHandler) { var eventHandlers = _eventHandlers[eventHandler.EventName]; diff --git a/dotnet/src/webdriver/BiDi/Communication/EventHandler.cs b/dotnet/src/webdriver/BiDi/Communication/EventHandler.cs index fd67f167dbb87..4f291fcb8da08 100644 --- a/dotnet/src/webdriver/BiDi/Communication/EventHandler.cs +++ b/dotnet/src/webdriver/BiDi/Communication/EventHandler.cs @@ -17,23 +17,22 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; using System; using System.Collections.Generic; using System.Threading.Tasks; namespace OpenQA.Selenium.BiDi.Communication; -public abstract class EventHandler(string eventName, Type eventArgsType, IEnumerable? contexts = null) +public abstract class EventHandler(string eventName, Type eventArgsType, IEnumerable? contexts = null) { public string EventName { get; } = eventName; public Type EventArgsType { get; set; } = eventArgsType; - public IEnumerable? Contexts { get; } = contexts; + public IEnumerable? Contexts { get; } = contexts; public abstract ValueTask InvokeAsync(object args); } -internal class AsyncEventHandler(string eventName, Func func, IEnumerable? contexts = null) +internal class AsyncEventHandler(string eventName, Func func, IEnumerable? contexts = null) : EventHandler(eventName, typeof(TEventArgs), contexts) where TEventArgs : EventArgs { private readonly Func _func = func; @@ -44,7 +43,7 @@ public override async ValueTask InvokeAsync(object args) } } -internal class SyncEventHandler(string eventName, Action action, IEnumerable? contexts = null) +internal class SyncEventHandler(string eventName, Action action, IEnumerable? contexts = null) : EventHandler(eventName, typeof(TEventArgs), contexts) where TEventArgs : EventArgs { private readonly Action _action = action; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs b/dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs index dfee51b37a522..0803f13404c3c 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs @@ -23,145 +23,145 @@ namespace OpenQA.Selenium.BiDi.Communication.Json; #region https://github.com/dotnet/runtime/issues/72604 -[JsonSerializable(typeof(Modules.Script.EvaluateResultSuccess))] -[JsonSerializable(typeof(Modules.Script.EvaluateResultException))] - -[JsonSerializable(typeof(Modules.Script.NumberRemoteValue))] -[JsonSerializable(typeof(Modules.Script.BooleanRemoteValue))] -[JsonSerializable(typeof(Modules.Script.BigIntRemoteValue))] -[JsonSerializable(typeof(Modules.Script.StringRemoteValue))] -[JsonSerializable(typeof(Modules.Script.NullRemoteValue))] -[JsonSerializable(typeof(Modules.Script.UndefinedRemoteValue))] -[JsonSerializable(typeof(Modules.Script.SymbolRemoteValue))] -[JsonSerializable(typeof(Modules.Script.ArrayRemoteValue))] -[JsonSerializable(typeof(Modules.Script.ObjectRemoteValue))] -[JsonSerializable(typeof(Modules.Script.FunctionRemoteValue))] -[JsonSerializable(typeof(Modules.Script.RegExpRemoteValue))] -[JsonSerializable(typeof(Modules.Script.DateRemoteValue))] -[JsonSerializable(typeof(Modules.Script.MapRemoteValue))] -[JsonSerializable(typeof(Modules.Script.SetRemoteValue))] -[JsonSerializable(typeof(Modules.Script.WeakMapRemoteValue))] -[JsonSerializable(typeof(Modules.Script.WeakSetRemoteValue))] -[JsonSerializable(typeof(Modules.Script.GeneratorRemoteValue))] -[JsonSerializable(typeof(Modules.Script.ErrorRemoteValue))] -[JsonSerializable(typeof(Modules.Script.ProxyRemoteValue))] -[JsonSerializable(typeof(Modules.Script.PromiseRemoteValue))] -[JsonSerializable(typeof(Modules.Script.TypedArrayRemoteValue))] -[JsonSerializable(typeof(Modules.Script.ArrayBufferRemoteValue))] -[JsonSerializable(typeof(Modules.Script.NodeListRemoteValue))] -[JsonSerializable(typeof(Modules.Script.HtmlCollectionRemoteValue))] -[JsonSerializable(typeof(Modules.Script.NodeRemoteValue))] -[JsonSerializable(typeof(Modules.Script.WindowProxyRemoteValue))] - -[JsonSerializable(typeof(Modules.Script.WindowRealmInfo))] -[JsonSerializable(typeof(Modules.Script.DedicatedWorkerRealmInfo))] -[JsonSerializable(typeof(Modules.Script.SharedWorkerRealmInfo))] -[JsonSerializable(typeof(Modules.Script.ServiceWorkerRealmInfo))] -[JsonSerializable(typeof(Modules.Script.WorkerRealmInfo))] -[JsonSerializable(typeof(Modules.Script.PaintWorkletRealmInfo))] -[JsonSerializable(typeof(Modules.Script.AudioWorkletRealmInfo))] -[JsonSerializable(typeof(Modules.Script.WorkletRealmInfo))] - -[JsonSerializable(typeof(Modules.Log.GenericLogEntry))] -[JsonSerializable(typeof(Modules.Log.ConsoleLogEntry))] -[JsonSerializable(typeof(Modules.Log.JavascriptLogEntry))] +[JsonSerializable(typeof(Script.EvaluateResultSuccess))] +[JsonSerializable(typeof(Script.EvaluateResultException))] + +[JsonSerializable(typeof(Script.NumberRemoteValue))] +[JsonSerializable(typeof(Script.BooleanRemoteValue))] +[JsonSerializable(typeof(Script.BigIntRemoteValue))] +[JsonSerializable(typeof(Script.StringRemoteValue))] +[JsonSerializable(typeof(Script.NullRemoteValue))] +[JsonSerializable(typeof(Script.UndefinedRemoteValue))] +[JsonSerializable(typeof(Script.SymbolRemoteValue))] +[JsonSerializable(typeof(Script.ArrayRemoteValue))] +[JsonSerializable(typeof(Script.ObjectRemoteValue))] +[JsonSerializable(typeof(Script.FunctionRemoteValue))] +[JsonSerializable(typeof(Script.RegExpRemoteValue))] +[JsonSerializable(typeof(Script.DateRemoteValue))] +[JsonSerializable(typeof(Script.MapRemoteValue))] +[JsonSerializable(typeof(Script.SetRemoteValue))] +[JsonSerializable(typeof(Script.WeakMapRemoteValue))] +[JsonSerializable(typeof(Script.WeakSetRemoteValue))] +[JsonSerializable(typeof(Script.GeneratorRemoteValue))] +[JsonSerializable(typeof(Script.ErrorRemoteValue))] +[JsonSerializable(typeof(Script.ProxyRemoteValue))] +[JsonSerializable(typeof(Script.PromiseRemoteValue))] +[JsonSerializable(typeof(Script.TypedArrayRemoteValue))] +[JsonSerializable(typeof(Script.ArrayBufferRemoteValue))] +[JsonSerializable(typeof(Script.NodeListRemoteValue))] +[JsonSerializable(typeof(Script.HtmlCollectionRemoteValue))] +[JsonSerializable(typeof(Script.NodeRemoteValue))] +[JsonSerializable(typeof(Script.WindowProxyRemoteValue))] + +[JsonSerializable(typeof(Script.WindowRealmInfo))] +[JsonSerializable(typeof(Script.DedicatedWorkerRealmInfo))] +[JsonSerializable(typeof(Script.SharedWorkerRealmInfo))] +[JsonSerializable(typeof(Script.ServiceWorkerRealmInfo))] +[JsonSerializable(typeof(Script.WorkerRealmInfo))] +[JsonSerializable(typeof(Script.PaintWorkletRealmInfo))] +[JsonSerializable(typeof(Script.AudioWorkletRealmInfo))] +[JsonSerializable(typeof(Script.WorkletRealmInfo))] + +[JsonSerializable(typeof(Log.GenericLogEntry))] +[JsonSerializable(typeof(Log.ConsoleLogEntry))] +[JsonSerializable(typeof(Log.JavascriptLogEntry))] #endregion [JsonSerializable(typeof(Command))] [JsonSerializable(typeof(EmptyResult))] -[JsonSerializable(typeof(Modules.Session.StatusCommand))] -[JsonSerializable(typeof(Modules.Session.StatusResult))] -[JsonSerializable(typeof(Modules.Session.NewCommand))] -[JsonSerializable(typeof(Modules.Session.NewResult))] -[JsonSerializable(typeof(Modules.Session.EndCommand))] -[JsonSerializable(typeof(Modules.Session.SubscribeCommand))] -[JsonSerializable(typeof(Modules.Session.SubscribeResult))] -[JsonSerializable(typeof(Modules.Session.UnsubscribeByIdCommand))] -[JsonSerializable(typeof(Modules.Session.UnsubscribeByAttributesCommand))] - -[JsonSerializable(typeof(Modules.Browser.CloseCommand), TypeInfoPropertyName = "Browser_CloseCommand")] -[JsonSerializable(typeof(Modules.Browser.CreateUserContextCommand))] -[JsonSerializable(typeof(Modules.Browser.GetUserContextsCommand))] -[JsonSerializable(typeof(Modules.Browser.GetUserContextsResult))] -[JsonSerializable(typeof(Modules.Browser.RemoveUserContextCommand))] -[JsonSerializable(typeof(Modules.Browser.GetClientWindowsCommand))] -[JsonSerializable(typeof(Modules.Browser.GetClientWindowsResult))] -[JsonSerializable(typeof(Modules.Browser.UserContextInfo))] -[JsonSerializable(typeof(IReadOnlyList))] -[JsonSerializable(typeof(IReadOnlyList))] - - -[JsonSerializable(typeof(Modules.BrowsingContext.ActivateCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.CaptureScreenshotCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.CaptureScreenshotResult))] -[JsonSerializable(typeof(Modules.BrowsingContext.CloseCommand), TypeInfoPropertyName = "BrowsingContext_CloseCommand")] -[JsonSerializable(typeof(Modules.BrowsingContext.CreateCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.CreateResult))] -[JsonSerializable(typeof(Modules.BrowsingContext.GetTreeCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.GetTreeResult))] -[JsonSerializable(typeof(Modules.BrowsingContext.HandleUserPromptCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.LocateNodesCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.LocateNodesResult))] -[JsonSerializable(typeof(Modules.BrowsingContext.NavigateCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.NavigateResult))] -[JsonSerializable(typeof(Modules.BrowsingContext.PrintCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.PrintResult))] -[JsonSerializable(typeof(Modules.BrowsingContext.ReloadCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.SetViewportCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.TraverseHistoryCommand))] -[JsonSerializable(typeof(Modules.BrowsingContext.TraverseHistoryResult))] -[JsonSerializable(typeof(Modules.BrowsingContext.BrowsingContextInfo))] -[JsonSerializable(typeof(Modules.BrowsingContext.NavigationInfo))] - -[JsonSerializable(typeof(Modules.BrowsingContext.UserPromptOpenedEventArgs))] -[JsonSerializable(typeof(Modules.BrowsingContext.UserPromptClosedEventArgs))] - -[JsonSerializable(typeof(Modules.Network.AddInterceptCommand))] -[JsonSerializable(typeof(Modules.Network.AddInterceptResult))] -[JsonSerializable(typeof(Modules.Network.ContinueRequestCommand))] -[JsonSerializable(typeof(Modules.Network.ContinueResponseCommand))] -[JsonSerializable(typeof(Modules.Network.ContinueWithAuthCommand))] -[JsonSerializable(typeof(Modules.Network.FailRequestCommand))] -[JsonSerializable(typeof(Modules.Network.ProvideResponseCommand))] -[JsonSerializable(typeof(Modules.Network.RemoveInterceptCommand))] -[JsonSerializable(typeof(Modules.Network.SetCacheBehaviorCommand))] - -[JsonSerializable(typeof(Modules.Network.BeforeRequestSentEventArgs))] -[JsonSerializable(typeof(Modules.Network.ResponseStartedEventArgs))] -[JsonSerializable(typeof(Modules.Network.ResponseCompletedEventArgs))] -[JsonSerializable(typeof(Modules.Network.FetchErrorEventArgs))] -[JsonSerializable(typeof(Modules.Network.AuthRequiredEventArgs))] - -[JsonSerializable(typeof(Modules.Script.AddPreloadScriptCommand))] -[JsonSerializable(typeof(Modules.Script.AddPreloadScriptResult))] -[JsonSerializable(typeof(Modules.Script.DisownCommand))] -[JsonSerializable(typeof(Modules.Script.CallFunctionCommand))] -[JsonSerializable(typeof(Modules.Script.EvaluateCommand))] -[JsonSerializable(typeof(Modules.Script.EvaluateResult))] -[JsonSerializable(typeof(Modules.Script.GetRealmsCommand))] -[JsonSerializable(typeof(Modules.Script.GetRealmsResult))] -[JsonSerializable(typeof(Modules.Script.RemovePreloadScriptCommand))] - -[JsonSerializable(typeof(Modules.Script.MessageEventArgs))] -[JsonSerializable(typeof(Modules.Script.RealmDestroyedEventArgs))] -[JsonSerializable(typeof(IReadOnlyList))] - -[JsonSerializable(typeof(Modules.Log.LogEntry))] - -[JsonSerializable(typeof(Modules.Storage.GetCookiesCommand))] -[JsonSerializable(typeof(Modules.Storage.GetCookiesResult))] -[JsonSerializable(typeof(Modules.Storage.SetCookieCommand))] -[JsonSerializable(typeof(Modules.Storage.SetCookieResult))] -[JsonSerializable(typeof(Modules.Storage.DeleteCookiesCommand))] -[JsonSerializable(typeof(Modules.Storage.DeleteCookiesResult))] - -[JsonSerializable(typeof(Modules.Input.PerformActionsCommand))] -[JsonSerializable(typeof(Modules.Input.ReleaseActionsCommand))] -[JsonSerializable(typeof(Modules.Input.SetFilesCommand))] -[JsonSerializable(typeof(IEnumerable))] -[JsonSerializable(typeof(IEnumerable))] -[JsonSerializable(typeof(IEnumerable))] -[JsonSerializable(typeof(IEnumerable))] +[JsonSerializable(typeof(Session.StatusCommand))] +[JsonSerializable(typeof(Session.StatusResult))] +[JsonSerializable(typeof(Session.NewCommand))] +[JsonSerializable(typeof(Session.NewResult))] +[JsonSerializable(typeof(Session.EndCommand))] +[JsonSerializable(typeof(Session.SubscribeCommand))] +[JsonSerializable(typeof(Session.SubscribeResult))] +[JsonSerializable(typeof(Session.UnsubscribeByIdCommand))] +[JsonSerializable(typeof(Session.UnsubscribeByAttributesCommand))] + +[JsonSerializable(typeof(Browser.CloseCommand), TypeInfoPropertyName = "Browser_CloseCommand")] +[JsonSerializable(typeof(Browser.CreateUserContextCommand))] +[JsonSerializable(typeof(Browser.GetUserContextsCommand))] +[JsonSerializable(typeof(Browser.GetUserContextsResult))] +[JsonSerializable(typeof(Browser.RemoveUserContextCommand))] +[JsonSerializable(typeof(Browser.GetClientWindowsCommand))] +[JsonSerializable(typeof(Browser.GetClientWindowsResult))] +[JsonSerializable(typeof(Browser.UserContextInfo))] +[JsonSerializable(typeof(IReadOnlyList))] +[JsonSerializable(typeof(IReadOnlyList))] + + +[JsonSerializable(typeof(BrowsingContext.ActivateCommand))] +[JsonSerializable(typeof(BrowsingContext.CaptureScreenshotCommand))] +[JsonSerializable(typeof(BrowsingContext.CaptureScreenshotResult))] +[JsonSerializable(typeof(BrowsingContext.CloseCommand), TypeInfoPropertyName = "BrowsingContext_CloseCommand")] +[JsonSerializable(typeof(BrowsingContext.CreateCommand))] +[JsonSerializable(typeof(BrowsingContext.CreateResult))] +[JsonSerializable(typeof(BrowsingContext.GetTreeCommand))] +[JsonSerializable(typeof(BrowsingContext.GetTreeResult))] +[JsonSerializable(typeof(BrowsingContext.HandleUserPromptCommand))] +[JsonSerializable(typeof(BrowsingContext.LocateNodesCommand))] +[JsonSerializable(typeof(BrowsingContext.LocateNodesResult))] +[JsonSerializable(typeof(BrowsingContext.NavigateCommand))] +[JsonSerializable(typeof(BrowsingContext.NavigateResult))] +[JsonSerializable(typeof(BrowsingContext.PrintCommand))] +[JsonSerializable(typeof(BrowsingContext.PrintResult))] +[JsonSerializable(typeof(BrowsingContext.ReloadCommand))] +[JsonSerializable(typeof(BrowsingContext.SetViewportCommand))] +[JsonSerializable(typeof(BrowsingContext.TraverseHistoryCommand))] +[JsonSerializable(typeof(BrowsingContext.TraverseHistoryResult))] +[JsonSerializable(typeof(BrowsingContext.BrowsingContextInfo))] +[JsonSerializable(typeof(BrowsingContext.NavigationInfo))] + +[JsonSerializable(typeof(BrowsingContext.UserPromptOpenedEventArgs))] +[JsonSerializable(typeof(BrowsingContext.UserPromptClosedEventArgs))] + +[JsonSerializable(typeof(Network.AddInterceptCommand))] +[JsonSerializable(typeof(Network.AddInterceptResult))] +[JsonSerializable(typeof(Network.ContinueRequestCommand))] +[JsonSerializable(typeof(Network.ContinueResponseCommand))] +[JsonSerializable(typeof(Network.ContinueWithAuthCommand))] +[JsonSerializable(typeof(Network.FailRequestCommand))] +[JsonSerializable(typeof(Network.ProvideResponseCommand))] +[JsonSerializable(typeof(Network.RemoveInterceptCommand))] +[JsonSerializable(typeof(Network.SetCacheBehaviorCommand))] + +[JsonSerializable(typeof(Network.BeforeRequestSentEventArgs))] +[JsonSerializable(typeof(Network.ResponseStartedEventArgs))] +[JsonSerializable(typeof(Network.ResponseCompletedEventArgs))] +[JsonSerializable(typeof(Network.FetchErrorEventArgs))] +[JsonSerializable(typeof(Network.AuthRequiredEventArgs))] + +[JsonSerializable(typeof(Script.AddPreloadScriptCommand))] +[JsonSerializable(typeof(Script.AddPreloadScriptResult))] +[JsonSerializable(typeof(Script.DisownCommand))] +[JsonSerializable(typeof(Script.CallFunctionCommand))] +[JsonSerializable(typeof(Script.EvaluateCommand))] +[JsonSerializable(typeof(Script.EvaluateResult))] +[JsonSerializable(typeof(Script.GetRealmsCommand))] +[JsonSerializable(typeof(Script.GetRealmsResult))] +[JsonSerializable(typeof(Script.RemovePreloadScriptCommand))] + +[JsonSerializable(typeof(Script.MessageEventArgs))] +[JsonSerializable(typeof(Script.RealmDestroyedEventArgs))] +[JsonSerializable(typeof(IReadOnlyList))] + +[JsonSerializable(typeof(Log.LogEntry))] + +[JsonSerializable(typeof(Storage.GetCookiesCommand))] +[JsonSerializable(typeof(Storage.GetCookiesResult))] +[JsonSerializable(typeof(Storage.SetCookieCommand))] +[JsonSerializable(typeof(Storage.SetCookieResult))] +[JsonSerializable(typeof(Storage.DeleteCookiesCommand))] +[JsonSerializable(typeof(Storage.DeleteCookiesResult))] + +[JsonSerializable(typeof(Input.PerformActionsCommand))] +[JsonSerializable(typeof(Input.ReleaseActionsCommand))] +[JsonSerializable(typeof(Input.SetFilesCommand))] +[JsonSerializable(typeof(IEnumerable))] +[JsonSerializable(typeof(IEnumerable))] +[JsonSerializable(typeof(IEnumerable))] +[JsonSerializable(typeof(IEnumerable))] internal partial class BiDiJsonSerializerContext : JsonSerializerContext; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserClientWindowConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserClientWindowConverter.cs index d04eca3b6b328..5849c3bfe6cf4 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserClientWindowConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserClientWindowConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Browser; +using OpenQA.Selenium.BiDi.Browser; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserUserContextConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserUserContextConverter.cs index 71acc2b8db4d0..3d68e7f5cd150 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserUserContextConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserUserContextConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Browser; +using OpenQA.Selenium.BiDi.Browser; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowsingContextConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowsingContextConverter.cs index c7906e9804484..fc3b3aefd9b7d 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowsingContextConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowsingContextConverter.cs @@ -17,14 +17,13 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; using System; using System.Text.Json; using System.Text.Json.Serialization; namespace OpenQA.Selenium.BiDi.Communication.Json.Converters; -internal class BrowsingContextConverter : JsonConverter +internal class BrowsingContextConverter : JsonConverter { private readonly BiDi _bidi; @@ -33,14 +32,14 @@ public BrowsingContextConverter(BiDi bidi) _bidi = bidi; } - public override BrowsingContext? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override BrowsingContext.BrowsingContext? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { var id = reader.GetString(); - return new BrowsingContext(_bidi, id!); + return new BrowsingContext.BrowsingContext(_bidi, id!); } - public override void Write(Utf8JsonWriter writer, BrowsingContext value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, BrowsingContext.BrowsingContext value, JsonSerializerOptions options) { writer.WriteStringValue(value.Id); } diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/ChannelConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/ChannelConverter.cs index 11f659a4ff739..43110782e8f40 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/ChannelConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/ChannelConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetClientWindowsResultConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetClientWindowsResultConverter.cs index f3184aaa607da..a95315945e639 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetClientWindowsResultConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetClientWindowsResultConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Browser; +using OpenQA.Selenium.BiDi.Browser; using System; using System.Collections.Generic; using System.Text.Json; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetCookiesResultConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetCookiesResultConverter.cs index eb5944eb1719c..62db12fe20ef1 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetCookiesResultConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetCookiesResultConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Storage; +using OpenQA.Selenium.BiDi.Storage; using System; using System.Collections.Generic; using System.Text.Json; @@ -32,7 +32,7 @@ internal class GetCookiesResultConverter : JsonConverter public override GetCookiesResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { using var doc = JsonDocument.ParseValue(ref reader); - var cookies = doc.RootElement.GetProperty("cookies").Deserialize(options.GetTypeInfo>()); + var cookies = doc.RootElement.GetProperty("cookies").Deserialize(options.GetTypeInfo>()); var partitionKey = doc.RootElement.GetProperty("partitionKey").Deserialize((JsonTypeInfo)options.GetTypeInfo(typeof(PartitionKey))); return new GetCookiesResult(cookies!, partitionKey!); diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetRealmsResultConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetRealmsResultConverter.cs index 2759ba6ba6b7f..86f773bbd0e47 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetRealmsResultConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetRealmsResultConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Collections.Generic; using System.Text.Json; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetUserContextsResultConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetUserContextsResultConverter.cs index 55b533e877518..b5d471c4fe4c8 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetUserContextsResultConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetUserContextsResultConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Browser; +using OpenQA.Selenium.BiDi.Browser; using System; using System.Collections.Generic; using System.Text.Json; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/InputSourceActionsConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/InputSourceActionsConverter.cs index 478cdf423cb50..a73f141e086ee 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/InputSourceActionsConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/InputSourceActionsConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Input; +using OpenQA.Selenium.BiDi.Input; using System; using System.Collections.Generic; using System.Linq; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/LocateNodesResultConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/LocateNodesResultConverter.cs index 36afde9ef7094..d60e77b86b3d1 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/LocateNodesResultConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/LocateNodesResultConverter.cs @@ -18,8 +18,8 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.BrowsingContext; +using OpenQA.Selenium.BiDi.Script; using System; using System.Collections.Generic; using System.Text.Json; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/HandleConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/HandleConverter.cs index f57f4d4d73d3c..f2e9af7139840 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/HandleConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/HandleConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InputOriginConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InputOriginConverter.cs index 9ff3a88973670..f47b25bb7ee37 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InputOriginConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InputOriginConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Input; +using OpenQA.Selenium.BiDi.Input; using System; using System.Diagnostics.CodeAnalysis; using System.Text.Json; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InterceptConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InterceptConverter.cs index d182c00b390a4..d789065e8d458 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InterceptConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InterceptConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Network; +using OpenQA.Selenium.BiDi.Network; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InternalIdConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InternalIdConverter.cs index 412d4575b6cd4..ec65181f7c9bb 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InternalIdConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/InternalIdConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/NavigationConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/NavigationConverter.cs index 006671f6a0eba..ce9d27b9a2b63 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/NavigationConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/NavigationConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; +using OpenQA.Selenium.BiDi.BrowsingContext; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/EvaluateResultConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/EvaluateResultConverter.cs index 81da2edda5a2b..25f94b42b4dc7 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/EvaluateResultConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/EvaluateResultConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/LogEntryConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/LogEntryConverter.cs index fc72b2024fedc..53f90772a3b0e 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/LogEntryConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/LogEntryConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Log; +using OpenQA.Selenium.BiDi.Log; using System; using System.Text.Json; using System.Text.Json.Serialization; @@ -26,9 +26,9 @@ namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic; // https://github.com/dotnet/runtime/issues/72604 -internal class LogEntryConverter : JsonConverter +internal class LogEntryConverter : JsonConverter { - public override Modules.Log.LogEntry? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override Log.LogEntry? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { return reader.GetDiscriminator("type") switch { @@ -38,7 +38,7 @@ internal class LogEntryConverter : JsonConverter }; } - public override void Write(Utf8JsonWriter writer, Modules.Log.LogEntry value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, Log.LogEntry value, JsonSerializerOptions options) { throw new NotImplementedException(); } diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RealmInfoConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RealmInfoConverter.cs index 635e2eb79864c..288ffb496a3f8 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RealmInfoConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RealmInfoConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RemoteValueConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RemoteValueConverter.cs index 2daacdf987e4c..6879403266419 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RemoteValueConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RemoteValueConverter.cs @@ -18,7 +18,7 @@ // using OpenQA.Selenium.BiDi.Communication.Json.Internal; -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/PreloadScriptConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/PreloadScriptConverter.cs index 47632238b307c..e7fc7bc4be8ff 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/PreloadScriptConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/PreloadScriptConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/PrintPageRangeConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/PrintPageRangeConverter.cs index 009984cd90919..74b7312125742 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/PrintPageRangeConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/PrintPageRangeConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; +using OpenQA.Selenium.BiDi.BrowsingContext; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RealmConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RealmConverter.cs index 4b7f348124fc0..c99f371a3ea5c 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RealmConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RealmConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RealmTypeConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RealmTypeConverter.cs index 560cb255629c9..5d8cb1d4138e2 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RealmTypeConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RealmTypeConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Script; +using OpenQA.Selenium.BiDi.Script; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RequestConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RequestConverter.cs index 9c45ccc964d6a..3b2265a988a72 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RequestConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/RequestConverter.cs @@ -17,7 +17,7 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.Network; +using OpenQA.Selenium.BiDi.Network; using System; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/SubscriptionConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/SubscriptionConverter.cs index cc7157d48c465..1b9cbfdcfad65 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/SubscriptionConverter.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/SubscriptionConverter.cs @@ -23,16 +23,16 @@ namespace OpenQA.Selenium.BiDi.Communication.Json.Converters; -internal class SubscriptionConverter : JsonConverter +internal class SubscriptionConverter : JsonConverter { - public override Modules.Session.Subscription? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override Session.Subscription? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { var id = reader.GetString(); - return new Modules.Session.Subscription(id!); + return new Session.Subscription(id!); } - public override void Write(Utf8JsonWriter writer, Modules.Session.Subscription value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, Session.Subscription value, JsonSerializerOptions options) { writer.WriteStringValue(value.Id); } diff --git a/dotnet/src/webdriver/BiDi/Communication/Transport/WebSocketTransport.cs b/dotnet/src/webdriver/BiDi/Communication/Transport/WebSocketTransport.cs index be71e07ed774a..f18e630ca8b16 100644 --- a/dotnet/src/webdriver/BiDi/Communication/Transport/WebSocketTransport.cs +++ b/dotnet/src/webdriver/BiDi/Communication/Transport/WebSocketTransport.cs @@ -29,7 +29,7 @@ namespace OpenQA.Selenium.BiDi.Communication.Transport; class WebSocketTransport(Uri _uri) : ITransport, IDisposable { - private readonly static ILogger _logger = Log.GetLogger(); + private readonly static ILogger _logger = Internal.Logging.Log.GetLogger(); private readonly ClientWebSocket _webSocket = new(); private readonly ArraySegment _receiveBuffer = new(new byte[1024 * 8]); diff --git a/dotnet/src/webdriver/BiDi/EventArgs.cs b/dotnet/src/webdriver/BiDi/EventArgs.cs index 5bd9fc9a3ba98..309adddf17a69 100644 --- a/dotnet/src/webdriver/BiDi/EventArgs.cs +++ b/dotnet/src/webdriver/BiDi/EventArgs.cs @@ -17,7 +17,6 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; using System.Text.Json.Serialization; namespace OpenQA.Selenium.BiDi; @@ -28,5 +27,5 @@ public abstract record EventArgs(BiDi BiDi) public BiDi BiDi { get; internal set; } = BiDi; } -public abstract record BrowsingContextEventArgs(BiDi BiDi, BrowsingContext Context) +public abstract record BrowsingContextEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext Context) : EventArgs(BiDi); diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/InputModule.cs b/dotnet/src/webdriver/BiDi/Input/InputModule.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Input/InputModule.cs rename to dotnet/src/webdriver/BiDi/Input/InputModule.cs index d8ad18043ffc0..f0905f32b99d2 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Input/InputModule.cs +++ b/dotnet/src/webdriver/BiDi/Input/InputModule.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace OpenQA.Selenium.BiDi.Modules.Input; +namespace OpenQA.Selenium.BiDi.Input; public sealed class InputModule(Broker broker) : Module(broker) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/Key.cs b/dotnet/src/webdriver/BiDi/Input/Key.cs similarity index 100% rename from dotnet/src/webdriver/BiDi/Modules/Input/Key.cs rename to dotnet/src/webdriver/BiDi/Input/Key.cs diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/Origin.cs b/dotnet/src/webdriver/BiDi/Input/Origin.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Input/Origin.cs rename to dotnet/src/webdriver/BiDi/Input/Origin.cs index 3e0241b810f9f..6a7bd606cb41f 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Input/Origin.cs +++ b/dotnet/src/webdriver/BiDi/Input/Origin.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Input; +namespace OpenQA.Selenium.BiDi.Input; public abstract record Origin; diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/PerformActionsCommand.cs b/dotnet/src/webdriver/BiDi/Input/PerformActionsCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Input/PerformActionsCommand.cs rename to dotnet/src/webdriver/BiDi/Input/PerformActionsCommand.cs index fab508ee77eb8..8df2d01d68825 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Input/PerformActionsCommand.cs +++ b/dotnet/src/webdriver/BiDi/Input/PerformActionsCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Input; +namespace OpenQA.Selenium.BiDi.Input; internal class PerformActionsCommand(PerformActionsCommandParameters @params) : Command(@params, "input.performActions"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/ReleaseActionsCommand.cs b/dotnet/src/webdriver/BiDi/Input/ReleaseActionsCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Input/ReleaseActionsCommand.cs rename to dotnet/src/webdriver/BiDi/Input/ReleaseActionsCommand.cs index e38969a302086..25565e8cc9aaa 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Input/ReleaseActionsCommand.cs +++ b/dotnet/src/webdriver/BiDi/Input/ReleaseActionsCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Input; +namespace OpenQA.Selenium.BiDi.Input; internal class ReleaseActionsCommand(ReleaseActionsCommandParameters @params) : Command(@params, "input.releaseActions"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/SequentialSourceActions.cs b/dotnet/src/webdriver/BiDi/Input/SequentialSourceActions.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/Input/SequentialSourceActions.cs rename to dotnet/src/webdriver/BiDi/Input/SequentialSourceActions.cs index f7082ab080e53..3fd207145bd6e 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Input/SequentialSourceActions.cs +++ b/dotnet/src/webdriver/BiDi/Input/SequentialSourceActions.cs @@ -17,7 +17,7 @@ // under the License. // -//namespace OpenQA.Selenium.BiDi.Modules.Input; +//namespace OpenQA.Selenium.BiDi.Input; //public interface ISequentialSourceActions : IEnumerable //{ diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/SetFilesCommand.cs b/dotnet/src/webdriver/BiDi/Input/SetFilesCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Input/SetFilesCommand.cs rename to dotnet/src/webdriver/BiDi/Input/SetFilesCommand.cs index 65489147d3f40..0c5d5e5b7e50b 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Input/SetFilesCommand.cs +++ b/dotnet/src/webdriver/BiDi/Input/SetFilesCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Input; +namespace OpenQA.Selenium.BiDi.Input; internal class SetFilesCommand(SetFilesCommandParameters @params) : Command(@params, "input.setFiles"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/SourceActions.cs b/dotnet/src/webdriver/BiDi/Input/SourceActions.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/Input/SourceActions.cs rename to dotnet/src/webdriver/BiDi/Input/SourceActions.cs index 45e8e70edf79f..4c957885865b2 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Input/SourceActions.cs +++ b/dotnet/src/webdriver/BiDi/Input/SourceActions.cs @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Input; +namespace OpenQA.Selenium.BiDi.Input; public abstract record SourceActions { diff --git a/dotnet/src/webdriver/BiDi/Modules/Log/LogEntry.cs b/dotnet/src/webdriver/BiDi/Log/LogEntry.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Log/LogEntry.cs rename to dotnet/src/webdriver/BiDi/Log/LogEntry.cs index e8494c3156624..4ddbc6df9ab6a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Log/LogEntry.cs +++ b/dotnet/src/webdriver/BiDi/Log/LogEntry.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Log; +namespace OpenQA.Selenium.BiDi.Log; // https://github.com/dotnet/runtime/issues/72604 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")] diff --git a/dotnet/src/webdriver/BiDi/Modules/Log/LogModule.cs b/dotnet/src/webdriver/BiDi/Log/LogModule.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Log/LogModule.cs rename to dotnet/src/webdriver/BiDi/Log/LogModule.cs index f1442ee1ee358..2f3d7f22d1738 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Log/LogModule.cs +++ b/dotnet/src/webdriver/BiDi/Log/LogModule.cs @@ -21,7 +21,7 @@ using System; using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Log; +namespace OpenQA.Selenium.BiDi.Log; public sealed class LogModule(Broker broker) : Module(broker) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Module.cs b/dotnet/src/webdriver/BiDi/Module.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Module.cs rename to dotnet/src/webdriver/BiDi/Module.cs index a24fea89f2f25..6ab1dc0e9bfaf 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Module.cs +++ b/dotnet/src/webdriver/BiDi/Module.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules; +namespace OpenQA.Selenium.BiDi; public abstract class Module(Broker broker) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/AddInterceptCommand.cs b/dotnet/src/webdriver/BiDi/Network/AddInterceptCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Network/AddInterceptCommand.cs rename to dotnet/src/webdriver/BiDi/Network/AddInterceptCommand.cs index e4237b26bc6e4..0121e427413f4 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/AddInterceptCommand.cs +++ b/dotnet/src/webdriver/BiDi/Network/AddInterceptCommand.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; internal class AddInterceptCommand(AddInterceptCommandParameters @params) : Command(@params, "network.addIntercept"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/AuthChallenge.cs b/dotnet/src/webdriver/BiDi/Network/AuthChallenge.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Network/AuthChallenge.cs rename to dotnet/src/webdriver/BiDi/Network/AuthChallenge.cs index 73c1711b28cbe..0c88da8b42689 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/AuthChallenge.cs +++ b/dotnet/src/webdriver/BiDi/Network/AuthChallenge.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record AuthChallenge(string Scheme, string Realm); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/AuthCredentials.cs b/dotnet/src/webdriver/BiDi/Network/AuthCredentials.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Network/AuthCredentials.cs rename to dotnet/src/webdriver/BiDi/Network/AuthCredentials.cs index f3bd0343a557b..bcae423811af8 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/AuthCredentials.cs +++ b/dotnet/src/webdriver/BiDi/Network/AuthCredentials.cs @@ -19,7 +19,7 @@ using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record AuthCredentials(string Username, string Password) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/AuthRequiredEventArgs.cs b/dotnet/src/webdriver/BiDi/Network/AuthRequiredEventArgs.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/AuthRequiredEventArgs.cs rename to dotnet/src/webdriver/BiDi/Network/AuthRequiredEventArgs.cs index 5185b1d62714f..e933e0e29dfb5 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/AuthRequiredEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/Network/AuthRequiredEventArgs.cs @@ -19,7 +19,7 @@ using System; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record AuthRequiredEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext? Context, bool IsBlocked, BrowsingContext.Navigation? Navigation, long RedirectCount, RequestData Request, DateTimeOffset Timestamp, ResponseData Response) : BaseParametersEventArgs(BiDi, Context, IsBlocked, Navigation, RedirectCount, Request, Timestamp); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/BaseParametersEventArgs.cs b/dotnet/src/webdriver/BiDi/Network/BaseParametersEventArgs.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/BaseParametersEventArgs.cs rename to dotnet/src/webdriver/BiDi/Network/BaseParametersEventArgs.cs index facbe0b9d53ea..a1c990228a2eb 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/BaseParametersEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/Network/BaseParametersEventArgs.cs @@ -21,7 +21,7 @@ using System.Text.Json.Serialization; using System; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public abstract record BaseParametersEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext? Context, bool IsBlocked, BrowsingContext.Navigation? Navigation, long RedirectCount, RequestData Request, DateTimeOffset Timestamp) : BrowsingContextEventArgs(BiDi, Context) diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/BeforeRequestSentEventArgs.cs b/dotnet/src/webdriver/BiDi/Network/BeforeRequestSentEventArgs.cs similarity index 92% rename from dotnet/src/webdriver/BiDi/Modules/Network/BeforeRequestSentEventArgs.cs rename to dotnet/src/webdriver/BiDi/Network/BeforeRequestSentEventArgs.cs index e1e50c257aabf..7524878c2141d 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/BeforeRequestSentEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/Network/BeforeRequestSentEventArgs.cs @@ -17,10 +17,10 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; +using OpenQA.Selenium.BiDi.BrowsingContext; using System; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record BeforeRequestSentEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext? Context, bool IsBlocked, Navigation? Navigation, long RedirectCount, RequestData Request, DateTimeOffset Timestamp, Initiator Initiator) : BaseParametersEventArgs(BiDi, Context, IsBlocked, Navigation, RedirectCount, Request, Timestamp); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/BytesValue.cs b/dotnet/src/webdriver/BiDi/Network/BytesValue.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/BytesValue.cs rename to dotnet/src/webdriver/BiDi/Network/BytesValue.cs index 9b7154b213832..0b1c99c36267b 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/BytesValue.cs +++ b/dotnet/src/webdriver/BiDi/Network/BytesValue.cs @@ -20,7 +20,7 @@ using System; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")] [JsonDerivedType(typeof(StringBytesValue), "string")] diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueRequestCommand.cs b/dotnet/src/webdriver/BiDi/Network/ContinueRequestCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Network/ContinueRequestCommand.cs rename to dotnet/src/webdriver/BiDi/Network/ContinueRequestCommand.cs index 6054610f61022..900a0c2f294aa 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueRequestCommand.cs +++ b/dotnet/src/webdriver/BiDi/Network/ContinueRequestCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; internal class ContinueRequestCommand(ContinueRequestCommandParameters @params) : Command(@params, "network.continueRequest"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueResponseCommand.cs b/dotnet/src/webdriver/BiDi/Network/ContinueResponseCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Network/ContinueResponseCommand.cs rename to dotnet/src/webdriver/BiDi/Network/ContinueResponseCommand.cs index 86127f89ab6e2..db58ef2ddcc61 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueResponseCommand.cs +++ b/dotnet/src/webdriver/BiDi/Network/ContinueResponseCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; internal class ContinueResponseCommand(ContinueResponseCommandParameters @params) : Command(@params, "network.continueResponse"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueWithAuthCommand.cs b/dotnet/src/webdriver/BiDi/Network/ContinueWithAuthCommand.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/Network/ContinueWithAuthCommand.cs rename to dotnet/src/webdriver/BiDi/Network/ContinueWithAuthCommand.cs index 1a7b263b8419c..4415ff26a9949 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueWithAuthCommand.cs +++ b/dotnet/src/webdriver/BiDi/Network/ContinueWithAuthCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; internal class ContinueWithAuthCommand(ContinueWithAuthParameters @params) : Command(@params, "network.continueWithAuth"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/Cookie.cs b/dotnet/src/webdriver/BiDi/Network/Cookie.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/Cookie.cs rename to dotnet/src/webdriver/BiDi/Network/Cookie.cs index 98754195731f2..eb358fa50afe7 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/Cookie.cs +++ b/dotnet/src/webdriver/BiDi/Network/Cookie.cs @@ -20,7 +20,7 @@ using System; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/CookieHeader.cs b/dotnet/src/webdriver/BiDi/Network/CookieHeader.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Network/CookieHeader.cs rename to dotnet/src/webdriver/BiDi/Network/CookieHeader.cs index aa0c26ad15d1f..27e6ebf3c7d47 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/CookieHeader.cs +++ b/dotnet/src/webdriver/BiDi/Network/CookieHeader.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record CookieHeader(string Name, BytesValue Value); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/FailRequestCommand.cs b/dotnet/src/webdriver/BiDi/Network/FailRequestCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/FailRequestCommand.cs rename to dotnet/src/webdriver/BiDi/Network/FailRequestCommand.cs index 8f8f58c86d006..df0177e078dec 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/FailRequestCommand.cs +++ b/dotnet/src/webdriver/BiDi/Network/FailRequestCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; internal class FailRequestCommand(FailRequestCommandParameters @params) : Command(@params, "network.failRequest"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/FetchErrorEventArgs.cs b/dotnet/src/webdriver/BiDi/Network/FetchErrorEventArgs.cs similarity index 92% rename from dotnet/src/webdriver/BiDi/Modules/Network/FetchErrorEventArgs.cs rename to dotnet/src/webdriver/BiDi/Network/FetchErrorEventArgs.cs index ec7cd355a3c57..2fd1e4f38d48e 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/FetchErrorEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/Network/FetchErrorEventArgs.cs @@ -17,10 +17,10 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; +using OpenQA.Selenium.BiDi.BrowsingContext; using System; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record FetchErrorEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext? Context, bool IsBlocked, Navigation? Navigation, long RedirectCount, RequestData Request, DateTimeOffset Timestamp, string ErrorText) : BaseParametersEventArgs(BiDi, Context, IsBlocked, Navigation, RedirectCount, Request, Timestamp); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/FetchTimingInfo.cs b/dotnet/src/webdriver/BiDi/Network/FetchTimingInfo.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/FetchTimingInfo.cs rename to dotnet/src/webdriver/BiDi/Network/FetchTimingInfo.cs index 08729c40ad2c3..adba1444a37fe 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/FetchTimingInfo.cs +++ b/dotnet/src/webdriver/BiDi/Network/FetchTimingInfo.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record FetchTimingInfo(double TimeOrigin, double RequestTime, diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/Header.cs b/dotnet/src/webdriver/BiDi/Network/Header.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Network/Header.cs rename to dotnet/src/webdriver/BiDi/Network/Header.cs index 00d8414cd2d67..e0c3c8e8abcb6 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/Header.cs +++ b/dotnet/src/webdriver/BiDi/Network/Header.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record Header(string Name, BytesValue Value); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/Initiator.cs b/dotnet/src/webdriver/BiDi/Network/Initiator.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/Initiator.cs rename to dotnet/src/webdriver/BiDi/Network/Initiator.cs index c9cc0bf5f0f91..81181216b0649 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/Initiator.cs +++ b/dotnet/src/webdriver/BiDi/Network/Initiator.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record Initiator(InitiatorType Type) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/Intercept.cs b/dotnet/src/webdriver/BiDi/Network/Intercept.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/Network/Intercept.cs rename to dotnet/src/webdriver/BiDi/Network/Intercept.cs index 0f7758511d974..f567b0326f64a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/Intercept.cs +++ b/dotnet/src/webdriver/BiDi/Network/Intercept.cs @@ -22,7 +22,7 @@ using System.Linq; using System.Threading.Tasks; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public class Intercept : IAsyncDisposable { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.HighLevel.cs b/dotnet/src/webdriver/BiDi/Network/NetworkModule.HighLevel.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.HighLevel.cs rename to dotnet/src/webdriver/BiDi/Network/NetworkModule.HighLevel.cs index 57b3da0623b86..336e7b1e8dbc1 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.HighLevel.cs +++ b/dotnet/src/webdriver/BiDi/Network/NetworkModule.HighLevel.cs @@ -20,7 +20,7 @@ using System; using System.Threading.Tasks; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public partial class NetworkModule { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.cs b/dotnet/src/webdriver/BiDi/Network/NetworkModule.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.cs rename to dotnet/src/webdriver/BiDi/Network/NetworkModule.cs index 7d31bc344d41b..ef87b18dd0a0f 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.cs +++ b/dotnet/src/webdriver/BiDi/Network/NetworkModule.cs @@ -22,7 +22,7 @@ using System.Threading.Tasks; using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public sealed partial class NetworkModule(Broker broker) : Module(broker) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ProvideResponseCommand.cs b/dotnet/src/webdriver/BiDi/Network/ProvideResponseCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Network/ProvideResponseCommand.cs rename to dotnet/src/webdriver/BiDi/Network/ProvideResponseCommand.cs index cb11ddd5ffe2d..9ef8ffd223695 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/ProvideResponseCommand.cs +++ b/dotnet/src/webdriver/BiDi/Network/ProvideResponseCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; internal class ProvideResponseCommand(ProvideResponseCommandParameters @params) : Command(@params, "network.provideResponse"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/RemoveInterceptCommand.cs b/dotnet/src/webdriver/BiDi/Network/RemoveInterceptCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/RemoveInterceptCommand.cs rename to dotnet/src/webdriver/BiDi/Network/RemoveInterceptCommand.cs index 32760dbc029f3..199f77f1d4117 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/RemoveInterceptCommand.cs +++ b/dotnet/src/webdriver/BiDi/Network/RemoveInterceptCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; internal class RemoveInterceptCommand(RemoveInterceptCommandParameters @params) : Command(@params, "network.removeIntercept"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/Request.cs b/dotnet/src/webdriver/BiDi/Network/Request.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Network/Request.cs rename to dotnet/src/webdriver/BiDi/Network/Request.cs index 870b6a129db85..d10deaca9070f 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/Request.cs +++ b/dotnet/src/webdriver/BiDi/Network/Request.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public class Request { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/RequestData.cs b/dotnet/src/webdriver/BiDi/Network/RequestData.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/RequestData.cs rename to dotnet/src/webdriver/BiDi/Network/RequestData.cs index 6c304155cfafa..29fd9654af33c 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/RequestData.cs +++ b/dotnet/src/webdriver/BiDi/Network/RequestData.cs @@ -19,6 +19,6 @@ using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record RequestData(Request Request, string Url, string Method, IReadOnlyList
Headers, IReadOnlyList Cookies, long? HeadersSize, long? BodySize, string Destination, string? InitiatorType, FetchTimingInfo Timings); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ResponseCompletedEventArgs.cs b/dotnet/src/webdriver/BiDi/Network/ResponseCompletedEventArgs.cs similarity index 92% rename from dotnet/src/webdriver/BiDi/Modules/Network/ResponseCompletedEventArgs.cs rename to dotnet/src/webdriver/BiDi/Network/ResponseCompletedEventArgs.cs index 096eea190dd81..4e72f73ab98a1 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/ResponseCompletedEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/Network/ResponseCompletedEventArgs.cs @@ -17,10 +17,10 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; +using OpenQA.Selenium.BiDi.BrowsingContext; using System; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record ResponseCompletedEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext? Context, bool IsBlocked, Navigation? Navigation, long RedirectCount, RequestData Request, DateTimeOffset Timestamp, ResponseData Response) : BaseParametersEventArgs(BiDi, Context, IsBlocked, Navigation, RedirectCount, Request, Timestamp); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ResponseContent.cs b/dotnet/src/webdriver/BiDi/Network/ResponseContent.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Network/ResponseContent.cs rename to dotnet/src/webdriver/BiDi/Network/ResponseContent.cs index 0e76e0c90c35d..1bd9ca8b205e8 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/ResponseContent.cs +++ b/dotnet/src/webdriver/BiDi/Network/ResponseContent.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record ResponseContent(long Size); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ResponseData.cs b/dotnet/src/webdriver/BiDi/Network/ResponseData.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Network/ResponseData.cs rename to dotnet/src/webdriver/BiDi/Network/ResponseData.cs index 68063ffc5d269..ec0ae2b7180fe 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/ResponseData.cs +++ b/dotnet/src/webdriver/BiDi/Network/ResponseData.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record ResponseData(string Url, string Protocol, diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ResponseStartedEventArgs.cs b/dotnet/src/webdriver/BiDi/Network/ResponseStartedEventArgs.cs similarity index 92% rename from dotnet/src/webdriver/BiDi/Modules/Network/ResponseStartedEventArgs.cs rename to dotnet/src/webdriver/BiDi/Network/ResponseStartedEventArgs.cs index 4de299dc8abc9..3724474bb7389 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/ResponseStartedEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/Network/ResponseStartedEventArgs.cs @@ -17,10 +17,10 @@ // under the License. // -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; +using OpenQA.Selenium.BiDi.BrowsingContext; using System; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record ResponseStartedEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext? Context, bool IsBlocked, Navigation? Navigation, long RedirectCount, RequestData Request, DateTimeOffset Timestamp, ResponseData Response) : BaseParametersEventArgs(BiDi, Context, IsBlocked, Navigation, RedirectCount, Request, Timestamp); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs b/dotnet/src/webdriver/BiDi/Network/SetCacheBehaviorCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs rename to dotnet/src/webdriver/BiDi/Network/SetCacheBehaviorCommand.cs index 7d49cc35a8947..fbe5540ad786b 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs +++ b/dotnet/src/webdriver/BiDi/Network/SetCacheBehaviorCommand.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; internal class SetCacheBehaviorCommand(SetCacheBehaviorCommandParameters @params) : Command(@params, "network.setCacheBehavior"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/SetCookieHeader.cs b/dotnet/src/webdriver/BiDi/Network/SetCookieHeader.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/SetCookieHeader.cs rename to dotnet/src/webdriver/BiDi/Network/SetCookieHeader.cs index 5e42d4d54f93e..134cf82a88cc4 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/SetCookieHeader.cs +++ b/dotnet/src/webdriver/BiDi/Network/SetCookieHeader.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; public record SetCookieHeader(string Name, BytesValue Value) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/UrlPattern.cs b/dotnet/src/webdriver/BiDi/Network/UrlPattern.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Network/UrlPattern.cs rename to dotnet/src/webdriver/BiDi/Network/UrlPattern.cs index 29823516fcfe0..4f3c29d98344d 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Network/UrlPattern.cs +++ b/dotnet/src/webdriver/BiDi/Network/UrlPattern.cs @@ -19,7 +19,7 @@ using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Network; +namespace OpenQA.Selenium.BiDi.Network; [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")] [JsonDerivedType(typeof(PatternUrlPattern), "pattern")] diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/AddPreloadScriptCommand.cs b/dotnet/src/webdriver/BiDi/Script/AddPreloadScriptCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Script/AddPreloadScriptCommand.cs rename to dotnet/src/webdriver/BiDi/Script/AddPreloadScriptCommand.cs index 68ddc27170de3..d034c8998583d 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/AddPreloadScriptCommand.cs +++ b/dotnet/src/webdriver/BiDi/Script/AddPreloadScriptCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; internal class AddPreloadScriptCommand(AddPreloadScriptCommandParameters @params) : Command(@params, "script.addPreloadScript"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/CallFunctionCommand.cs b/dotnet/src/webdriver/BiDi/Script/CallFunctionCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Script/CallFunctionCommand.cs rename to dotnet/src/webdriver/BiDi/Script/CallFunctionCommand.cs index 7e460baff6547..047750299d067 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/CallFunctionCommand.cs +++ b/dotnet/src/webdriver/BiDi/Script/CallFunctionCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; internal class CallFunctionCommand(CallFunctionCommandParameters @params) : Command(@params, "script.callFunction"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/Channel.cs b/dotnet/src/webdriver/BiDi/Script/Channel.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/Channel.cs rename to dotnet/src/webdriver/BiDi/Script/Channel.cs index 53856b51ad373..2e6361bea5a9a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/Channel.cs +++ b/dotnet/src/webdriver/BiDi/Script/Channel.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record Channel(string Id); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/ChannelProperties.cs b/dotnet/src/webdriver/BiDi/Script/ChannelProperties.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/ChannelProperties.cs rename to dotnet/src/webdriver/BiDi/Script/ChannelProperties.cs index 7cc884254f900..7ef43b6894eaa 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/ChannelProperties.cs +++ b/dotnet/src/webdriver/BiDi/Script/ChannelProperties.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record ChannelProperties(Channel Channel) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/DisownCommand.cs b/dotnet/src/webdriver/BiDi/Script/DisownCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Script/DisownCommand.cs rename to dotnet/src/webdriver/BiDi/Script/DisownCommand.cs index 241b9f5e88048..c7141eb58ecc8 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/DisownCommand.cs +++ b/dotnet/src/webdriver/BiDi/Script/DisownCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; internal class DisownCommand(DisownCommandParameters @params) : Command(@params, "script.disown"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/EvaluateCommand.cs b/dotnet/src/webdriver/BiDi/Script/EvaluateCommand.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/Script/EvaluateCommand.cs rename to dotnet/src/webdriver/BiDi/Script/EvaluateCommand.cs index 2812ba64e0e1c..ac4291ac8fded 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/EvaluateCommand.cs +++ b/dotnet/src/webdriver/BiDi/Script/EvaluateCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; internal class EvaluateCommand(EvaluateCommandParameters @params) : Command(@params, "script.evaluate"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/GetRealmsCommand.cs b/dotnet/src/webdriver/BiDi/Script/GetRealmsCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Script/GetRealmsCommand.cs rename to dotnet/src/webdriver/BiDi/Script/GetRealmsCommand.cs index 641602e4c6ee5..dd6f51ba7bf75 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/GetRealmsCommand.cs +++ b/dotnet/src/webdriver/BiDi/Script/GetRealmsCommand.cs @@ -21,7 +21,7 @@ using System.Collections; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; internal class GetRealmsCommand(GetRealmsCommandParameters @params) : Command(@params, "script.getRealms"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/Handle.cs b/dotnet/src/webdriver/BiDi/Script/Handle.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/Handle.cs rename to dotnet/src/webdriver/BiDi/Script/Handle.cs index 87bf42439b82f..e6fba21111df2 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/Handle.cs +++ b/dotnet/src/webdriver/BiDi/Script/Handle.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public class Handle { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/IRemoteReference.cs b/dotnet/src/webdriver/BiDi/Script/IRemoteReference.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Script/IRemoteReference.cs rename to dotnet/src/webdriver/BiDi/Script/IRemoteReference.cs index 893ceb12549aa..6043612b58d9f 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/IRemoteReference.cs +++ b/dotnet/src/webdriver/BiDi/Script/IRemoteReference.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public interface IRemoteReference; diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/InternalId.cs b/dotnet/src/webdriver/BiDi/Script/InternalId.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/InternalId.cs rename to dotnet/src/webdriver/BiDi/Script/InternalId.cs index 06550e0da98a7..8e458f80000a0 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/InternalId.cs +++ b/dotnet/src/webdriver/BiDi/Script/InternalId.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public class InternalId { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/LocalValue.cs b/dotnet/src/webdriver/BiDi/Script/LocalValue.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/Script/LocalValue.cs rename to dotnet/src/webdriver/BiDi/Script/LocalValue.cs index 0c66ec3c54862..0409f4542b7df 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/LocalValue.cs +++ b/dotnet/src/webdriver/BiDi/Script/LocalValue.cs @@ -25,7 +25,7 @@ using System.Text.Json.Serialization; using System.Text.RegularExpressions; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")] [JsonDerivedType(typeof(NumberLocalValue), "number")] diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/MessageEventArgs.cs b/dotnet/src/webdriver/BiDi/Script/MessageEventArgs.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/MessageEventArgs.cs rename to dotnet/src/webdriver/BiDi/Script/MessageEventArgs.cs index 11743c2ddd316..351a98f7bd002 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/MessageEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/Script/MessageEventArgs.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record MessageEventArgs(BiDi BiDi, Channel Channel, RemoteValue Data, Source Source) : EventArgs(BiDi); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/NodeProperties.cs b/dotnet/src/webdriver/BiDi/Script/NodeProperties.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Script/NodeProperties.cs rename to dotnet/src/webdriver/BiDi/Script/NodeProperties.cs index 804580a7d2fd0..2d9bf23da89ce 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/NodeProperties.cs +++ b/dotnet/src/webdriver/BiDi/Script/NodeProperties.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record NodeProperties(long NodeType, long ChildNodeCount) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/PreloadScript.cs b/dotnet/src/webdriver/BiDi/Script/PreloadScript.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Script/PreloadScript.cs rename to dotnet/src/webdriver/BiDi/Script/PreloadScript.cs index e48f1b7fa886f..cfe0b02fa76ce 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/PreloadScript.cs +++ b/dotnet/src/webdriver/BiDi/Script/PreloadScript.cs @@ -20,7 +20,7 @@ using System; using System.Threading.Tasks; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public class PreloadScript : IAsyncDisposable { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/Realm.cs b/dotnet/src/webdriver/BiDi/Script/Realm.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/Realm.cs rename to dotnet/src/webdriver/BiDi/Script/Realm.cs index 7ecb553e2c798..3f748dc36902e 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/Realm.cs +++ b/dotnet/src/webdriver/BiDi/Script/Realm.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public class Realm { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RealmDestroyedEventArgs.cs b/dotnet/src/webdriver/BiDi/Script/RealmDestroyedEventArgs.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/RealmDestroyedEventArgs.cs rename to dotnet/src/webdriver/BiDi/Script/RealmDestroyedEventArgs.cs index 5c5c9434b0e76..0cc1f35bae572 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/RealmDestroyedEventArgs.cs +++ b/dotnet/src/webdriver/BiDi/Script/RealmDestroyedEventArgs.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record RealmDestroyedEventArgs(BiDi BiDi, Realm Realm) : EventArgs(BiDi); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RealmInfo.cs b/dotnet/src/webdriver/BiDi/Script/RealmInfo.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/Script/RealmInfo.cs rename to dotnet/src/webdriver/BiDi/Script/RealmInfo.cs index ada89d999091c..d79e4a8d45dc4 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/RealmInfo.cs +++ b/dotnet/src/webdriver/BiDi/Script/RealmInfo.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; // https://github.com/dotnet/runtime/issues/72604 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")] diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RealmType.cs b/dotnet/src/webdriver/BiDi/Script/RealmType.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/RealmType.cs rename to dotnet/src/webdriver/BiDi/Script/RealmType.cs index 0958b42929edf..6dc81f1efcd3c 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/RealmType.cs +++ b/dotnet/src/webdriver/BiDi/Script/RealmType.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public enum RealmType { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RegExpValue.cs b/dotnet/src/webdriver/BiDi/Script/RegExpValue.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/Script/RegExpValue.cs rename to dotnet/src/webdriver/BiDi/Script/RegExpValue.cs index eb25c091e8f91..caae933a61d9a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/RegExpValue.cs +++ b/dotnet/src/webdriver/BiDi/Script/RegExpValue.cs @@ -21,7 +21,7 @@ using System.Diagnostics; using System.Text.RegularExpressions; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record RegExpValue(string Pattern) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs b/dotnet/src/webdriver/BiDi/Script/RemoteValue.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs rename to dotnet/src/webdriver/BiDi/Script/RemoteValue.cs index af483e2bfbaab..d1ac8be390be0 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs +++ b/dotnet/src/webdriver/BiDi/Script/RemoteValue.cs @@ -23,7 +23,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; // https://github.com/dotnet/runtime/issues/72604 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")] diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RemovePreloadScriptCommand.cs b/dotnet/src/webdriver/BiDi/Script/RemovePreloadScriptCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Script/RemovePreloadScriptCommand.cs rename to dotnet/src/webdriver/BiDi/Script/RemovePreloadScriptCommand.cs index 123cdcc75f7e1..f962488fe956f 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/RemovePreloadScriptCommand.cs +++ b/dotnet/src/webdriver/BiDi/Script/RemovePreloadScriptCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; internal class RemovePreloadScriptCommand(RemovePreloadScriptCommandParameters @params) : Command(@params, "script.removePreloadScript"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/ResultOwnership.cs b/dotnet/src/webdriver/BiDi/Script/ResultOwnership.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/ResultOwnership.cs rename to dotnet/src/webdriver/BiDi/Script/ResultOwnership.cs index f72d799c061a2..17207584131dd 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/ResultOwnership.cs +++ b/dotnet/src/webdriver/BiDi/Script/ResultOwnership.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public enum ResultOwnership { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/ScriptModule.cs b/dotnet/src/webdriver/BiDi/Script/ScriptModule.cs similarity index 99% rename from dotnet/src/webdriver/BiDi/Modules/Script/ScriptModule.cs rename to dotnet/src/webdriver/BiDi/Script/ScriptModule.cs index 1839d52969a89..1eae83cca9690 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/ScriptModule.cs +++ b/dotnet/src/webdriver/BiDi/Script/ScriptModule.cs @@ -21,7 +21,7 @@ using System; using System.Threading.Tasks; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public sealed class ScriptModule(Broker broker) : Module(broker) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/SerializationOptions.cs b/dotnet/src/webdriver/BiDi/Script/SerializationOptions.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Script/SerializationOptions.cs rename to dotnet/src/webdriver/BiDi/Script/SerializationOptions.cs index ea4dc82c6da9c..1e7c2101219fe 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/SerializationOptions.cs +++ b/dotnet/src/webdriver/BiDi/Script/SerializationOptions.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public class SerializationOptions { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/Source.cs b/dotnet/src/webdriver/BiDi/Script/Source.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/Source.cs rename to dotnet/src/webdriver/BiDi/Script/Source.cs index 561df3f357222..58e01ee34e005 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/Source.cs +++ b/dotnet/src/webdriver/BiDi/Script/Source.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record Source(Realm Realm) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/StackFrame.cs b/dotnet/src/webdriver/BiDi/Script/StackFrame.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/StackFrame.cs rename to dotnet/src/webdriver/BiDi/Script/StackFrame.cs index 150d4c4effc83..b8c796a0a186a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/StackFrame.cs +++ b/dotnet/src/webdriver/BiDi/Script/StackFrame.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record StackFrame(long LineNumber, long ColumnNumber, string Url, string FunctionName); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/StackTrace.cs b/dotnet/src/webdriver/BiDi/Script/StackTrace.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/StackTrace.cs rename to dotnet/src/webdriver/BiDi/Script/StackTrace.cs index aec16270b84b0..b04289f1cf480 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/StackTrace.cs +++ b/dotnet/src/webdriver/BiDi/Script/StackTrace.cs @@ -19,6 +19,6 @@ using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record StackTrace(IReadOnlyList CallFrames); diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/Target.cs b/dotnet/src/webdriver/BiDi/Script/Target.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Script/Target.cs rename to dotnet/src/webdriver/BiDi/Script/Target.cs index 186a15ce18bf1..5590419518a68 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/Target.cs +++ b/dotnet/src/webdriver/BiDi/Script/Target.cs @@ -19,7 +19,7 @@ using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; [JsonDerivedType(typeof(RealmTarget))] [JsonDerivedType(typeof(ContextTarget))] diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/WindowProxyProperties.cs b/dotnet/src/webdriver/BiDi/Script/WindowProxyProperties.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Script/WindowProxyProperties.cs rename to dotnet/src/webdriver/BiDi/Script/WindowProxyProperties.cs index 0219f50b039f2..487f1680ecf2a 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Script/WindowProxyProperties.cs +++ b/dotnet/src/webdriver/BiDi/Script/WindowProxyProperties.cs @@ -17,6 +17,6 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Script; +namespace OpenQA.Selenium.BiDi.Script; public record WindowProxyProperties(BrowsingContext.BrowsingContext Context); diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/CapabilitiesRequest.cs b/dotnet/src/webdriver/BiDi/Session/CapabilitiesRequest.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Session/CapabilitiesRequest.cs rename to dotnet/src/webdriver/BiDi/Session/CapabilitiesRequest.cs index 3740ce75cbb1f..4f1af939bffe4 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/CapabilitiesRequest.cs +++ b/dotnet/src/webdriver/BiDi/Session/CapabilitiesRequest.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; public record CapabilitiesRequest { diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/CapabilityRequest.cs b/dotnet/src/webdriver/BiDi/Session/CapabilityRequest.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Session/CapabilityRequest.cs rename to dotnet/src/webdriver/BiDi/Session/CapabilityRequest.cs index a5878f7597768..6113a5fc9b76d 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/CapabilityRequest.cs +++ b/dotnet/src/webdriver/BiDi/Session/CapabilityRequest.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; public record CapabilityRequest { diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/EndCommand.cs b/dotnet/src/webdriver/BiDi/Session/EndCommand.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Session/EndCommand.cs rename to dotnet/src/webdriver/BiDi/Session/EndCommand.cs index 014e59499572d..e4754361b4c31 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/EndCommand.cs +++ b/dotnet/src/webdriver/BiDi/Session/EndCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; internal class EndCommand() : Command(CommandParameters.Empty, "session.end"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/NewCommand.cs b/dotnet/src/webdriver/BiDi/Session/NewCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Session/NewCommand.cs rename to dotnet/src/webdriver/BiDi/Session/NewCommand.cs index 4490d51207cc8..c1586234b7e93 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/NewCommand.cs +++ b/dotnet/src/webdriver/BiDi/Session/NewCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; internal class NewCommand(NewCommandParameters @params) : Command(@params, "session.new"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/ProxyConfiguration.cs b/dotnet/src/webdriver/BiDi/Session/ProxyConfiguration.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Session/ProxyConfiguration.cs rename to dotnet/src/webdriver/BiDi/Session/ProxyConfiguration.cs index 938cbf0201f9c..6f394709dcbf5 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/ProxyConfiguration.cs +++ b/dotnet/src/webdriver/BiDi/Session/ProxyConfiguration.cs @@ -19,7 +19,7 @@ using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; [JsonPolymorphic(TypeDiscriminatorPropertyName = "proxyType")] [JsonDerivedType(typeof(AutoDetectProxyConfiguration), "autodetect")] diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/SessionModule.cs b/dotnet/src/webdriver/BiDi/Session/SessionModule.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/Session/SessionModule.cs rename to dotnet/src/webdriver/BiDi/Session/SessionModule.cs index e3572966b6833..2a68f0afda1c0 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/SessionModule.cs +++ b/dotnet/src/webdriver/BiDi/Session/SessionModule.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; internal sealed class SessionModule(Broker broker) : Module(broker) { diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/StatusCommand.cs b/dotnet/src/webdriver/BiDi/Session/StatusCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Session/StatusCommand.cs rename to dotnet/src/webdriver/BiDi/Session/StatusCommand.cs index d8bf6035ec272..f1f34fa184416 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/StatusCommand.cs +++ b/dotnet/src/webdriver/BiDi/Session/StatusCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; internal class StatusCommand() : Command(CommandParameters.Empty, "session.status"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/SubscribeCommand.cs b/dotnet/src/webdriver/BiDi/Session/SubscribeCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Session/SubscribeCommand.cs rename to dotnet/src/webdriver/BiDi/Session/SubscribeCommand.cs index 7b0413c2b3445..ddcc6ff2250fe 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/SubscribeCommand.cs +++ b/dotnet/src/webdriver/BiDi/Session/SubscribeCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; internal class SubscribeCommand(SubscribeCommandParameters @params) : Command(@params, "session.subscribe"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/Subscription.cs b/dotnet/src/webdriver/BiDi/Session/Subscription.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Session/Subscription.cs rename to dotnet/src/webdriver/BiDi/Session/Subscription.cs index 60aaf2ddbf90b..89788503a78f8 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/Subscription.cs +++ b/dotnet/src/webdriver/BiDi/Session/Subscription.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; public sealed class Subscription { diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/UnsubscribeCommand.cs b/dotnet/src/webdriver/BiDi/Session/UnsubscribeCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Session/UnsubscribeCommand.cs rename to dotnet/src/webdriver/BiDi/Session/UnsubscribeCommand.cs index 907b42e51c579..af9f43f4fa076 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/UnsubscribeCommand.cs +++ b/dotnet/src/webdriver/BiDi/Session/UnsubscribeCommand.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; internal class UnsubscribeByIdCommand(UnsubscribeByIdCommandParameters @params) : Command(@params, "session.unsubscribe"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/UserPromptHandler.cs b/dotnet/src/webdriver/BiDi/Session/UserPromptHandler.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Session/UserPromptHandler.cs rename to dotnet/src/webdriver/BiDi/Session/UserPromptHandler.cs index edd7a815aeb36..5d5e9866c41bc 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Session/UserPromptHandler.cs +++ b/dotnet/src/webdriver/BiDi/Session/UserPromptHandler.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Session; +namespace OpenQA.Selenium.BiDi.Session; public record UserPromptHandler { diff --git a/dotnet/src/webdriver/BiDi/Modules/Storage/DeleteCookiesCommand.cs b/dotnet/src/webdriver/BiDi/Storage/DeleteCookiesCommand.cs similarity index 96% rename from dotnet/src/webdriver/BiDi/Modules/Storage/DeleteCookiesCommand.cs rename to dotnet/src/webdriver/BiDi/Storage/DeleteCookiesCommand.cs index 1b7a7534754ed..c17d79336ba44 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Storage/DeleteCookiesCommand.cs +++ b/dotnet/src/webdriver/BiDi/Storage/DeleteCookiesCommand.cs @@ -19,7 +19,7 @@ using OpenQA.Selenium.BiDi.Communication; -namespace OpenQA.Selenium.BiDi.Modules.Storage; +namespace OpenQA.Selenium.BiDi.Storage; internal class DeleteCookiesCommand(DeleteCookiesCommandParameters @params) : Command(@params, "storage.deleteCookies"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Storage/GetCookiesCommand.cs b/dotnet/src/webdriver/BiDi/Storage/GetCookiesCommand.cs similarity index 98% rename from dotnet/src/webdriver/BiDi/Modules/Storage/GetCookiesCommand.cs rename to dotnet/src/webdriver/BiDi/Storage/GetCookiesCommand.cs index 5d409c639e64a..c554f929aeefc 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Storage/GetCookiesCommand.cs +++ b/dotnet/src/webdriver/BiDi/Storage/GetCookiesCommand.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace OpenQA.Selenium.BiDi.Modules.Storage; +namespace OpenQA.Selenium.BiDi.Storage; internal class GetCookiesCommand(GetCookiesCommandParameters @params) : Command(@params, "storage.getCookies"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Storage/PartitionKey.cs b/dotnet/src/webdriver/BiDi/Storage/PartitionKey.cs similarity index 95% rename from dotnet/src/webdriver/BiDi/Modules/Storage/PartitionKey.cs rename to dotnet/src/webdriver/BiDi/Storage/PartitionKey.cs index cb5e114c1c916..88f99ce79e2b4 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Storage/PartitionKey.cs +++ b/dotnet/src/webdriver/BiDi/Storage/PartitionKey.cs @@ -17,7 +17,7 @@ // under the License. // -namespace OpenQA.Selenium.BiDi.Modules.Storage; +namespace OpenQA.Selenium.BiDi.Storage; public class PartitionKey { diff --git a/dotnet/src/webdriver/BiDi/Modules/Storage/SetCookieCommand.cs b/dotnet/src/webdriver/BiDi/Storage/SetCookieCommand.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Storage/SetCookieCommand.cs rename to dotnet/src/webdriver/BiDi/Storage/SetCookieCommand.cs index c34196abff93d..77086dc697dde 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Storage/SetCookieCommand.cs +++ b/dotnet/src/webdriver/BiDi/Storage/SetCookieCommand.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System; -namespace OpenQA.Selenium.BiDi.Modules.Storage; +namespace OpenQA.Selenium.BiDi.Storage; internal class SetCookieCommand(SetCookieCommandParameters @params) : Command(@params, "storage.setCookie"); diff --git a/dotnet/src/webdriver/BiDi/Modules/Storage/StorageModule.cs b/dotnet/src/webdriver/BiDi/Storage/StorageModule.cs similarity index 97% rename from dotnet/src/webdriver/BiDi/Modules/Storage/StorageModule.cs rename to dotnet/src/webdriver/BiDi/Storage/StorageModule.cs index 6acf132dcf018..4ebb08c25ca80 100644 --- a/dotnet/src/webdriver/BiDi/Modules/Storage/StorageModule.cs +++ b/dotnet/src/webdriver/BiDi/Storage/StorageModule.cs @@ -20,7 +20,7 @@ using OpenQA.Selenium.BiDi.Communication; using System.Threading.Tasks; -namespace OpenQA.Selenium.BiDi.Modules.Storage; +namespace OpenQA.Selenium.BiDi.Storage; public class StorageModule(Broker broker) : Module(broker) { diff --git a/dotnet/src/webdriver/BiDi/Subscription.cs b/dotnet/src/webdriver/BiDi/Subscription.cs index 59ecb9b74ae60..2e9583833a8eb 100644 --- a/dotnet/src/webdriver/BiDi/Subscription.cs +++ b/dotnet/src/webdriver/BiDi/Subscription.cs @@ -26,11 +26,11 @@ namespace OpenQA.Selenium.BiDi; public class Subscription : IAsyncDisposable { - private readonly Modules.Session.Subscription _subscription; + private readonly Session.Subscription _subscription; private readonly Broker _broker; private readonly Communication.EventHandler _eventHandler; - internal Subscription(Modules.Session.Subscription subscription, Broker broker, Communication.EventHandler eventHandler) + internal Subscription(Session.Subscription subscription, Broker broker, Communication.EventHandler eventHandler) { _subscription = subscription; _broker = broker; @@ -60,5 +60,5 @@ public BrowsingContextsSubscriptionOptions(SubscriptionOptions? options) Timeout = options?.Timeout; } - public IEnumerable? Contexts { get; set; } + public IEnumerable? Contexts { get; set; } } diff --git a/dotnet/test/common/BiDi/BiDiFixture.cs b/dotnet/test/common/BiDi/BiDiFixture.cs index d81501a3df668..ba7574c653f67 100644 --- a/dotnet/test/common/BiDi/BiDiFixture.cs +++ b/dotnet/test/common/BiDi/BiDiFixture.cs @@ -29,7 +29,7 @@ public class BiDiTestFixture { protected IWebDriver driver; protected BiDi bidi; - protected Modules.BrowsingContext.BrowsingContext context; + protected BrowsingContext.BrowsingContext context; protected UrlBuilder UrlBuilder { get; } = EnvironmentManager.Instance.UrlBuilder; diff --git a/dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs b/dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs index 6fabd12e57b62..1ee5cf6216c63 100644 --- a/dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs +++ b/dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; using System.Linq; using System.Threading.Tasks; diff --git a/dotnet/test/common/BiDi/Input/CombinedInputActionsTest.cs b/dotnet/test/common/BiDi/Input/CombinedInputActionsTest.cs index 2a9dcda321e4f..84367fc1d7983 100644 --- a/dotnet/test/common/BiDi/Input/CombinedInputActionsTest.cs +++ b/dotnet/test/common/BiDi/Input/CombinedInputActionsTest.cs @@ -18,8 +18,7 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; -using OpenQA.Selenium.BiDi.Modules.Input; +using OpenQA.Selenium.BiDi.BrowsingContext; using System.Threading.Tasks; namespace OpenQA.Selenium.BiDi.Input; diff --git a/dotnet/test/common/BiDi/Input/SetFilesTest.cs b/dotnet/test/common/BiDi/Input/SetFilesTest.cs index 4e3f2fd6479d0..d93c61e24d594 100644 --- a/dotnet/test/common/BiDi/Input/SetFilesTest.cs +++ b/dotnet/test/common/BiDi/Input/SetFilesTest.cs @@ -18,7 +18,7 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; +using OpenQA.Selenium.BiDi.BrowsingContext; using System.IO; using System.Threading.Tasks; diff --git a/dotnet/test/common/BiDi/Log/LogTest.cs b/dotnet/test/common/BiDi/Log/LogTest.cs index 00d9b1cedc203..d9ec07c268b2c 100644 --- a/dotnet/test/common/BiDi/Log/LogTest.cs +++ b/dotnet/test/common/BiDi/Log/LogTest.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Log; using System; using System.Threading.Tasks; @@ -29,7 +28,7 @@ class LogTest : BiDiTestFixture [Test] public async Task CanListenToConsoleLog() { - TaskCompletionSource tcs = new(); + TaskCompletionSource tcs = new(); await using var subscription = await context.Log.OnEntryAddedAsync(tcs.SetResult); @@ -52,13 +51,13 @@ public async Task CanListenToConsoleLog() Assert.That(consoleLogEntry.Args, Is.Not.Null); Assert.That(consoleLogEntry.Args, Has.Count.EqualTo(1)); - Assert.That(consoleLogEntry.Args[0], Is.AssignableFrom()); + Assert.That(consoleLogEntry.Args[0], Is.AssignableFrom()); } [Test] public async Task CanListenToJavascriptLog() { - TaskCompletionSource tcs = new(); + TaskCompletionSource tcs = new(); await using var subscription = await context.Log.OnEntryAddedAsync(tcs.SetResult); @@ -79,7 +78,7 @@ public async Task CanListenToJavascriptLog() [Test] public async Task CanRetrieveStacktrace() { - TaskCompletionSource tcs = new(); + TaskCompletionSource tcs = new(); await using var subscription = await bidi.Log.OnEntryAddedAsync(tcs.SetResult); diff --git a/dotnet/test/common/BiDi/Network/NetworkEventsTest.cs b/dotnet/test/common/BiDi/Network/NetworkEventsTest.cs index 0de7e247e2b9e..5a8cb5ce609ce 100644 --- a/dotnet/test/common/BiDi/Network/NetworkEventsTest.cs +++ b/dotnet/test/common/BiDi/Network/NetworkEventsTest.cs @@ -18,8 +18,7 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; -using OpenQA.Selenium.BiDi.Modules.Network; +using OpenQA.Selenium.BiDi.BrowsingContext; using System; using System.Threading.Tasks; diff --git a/dotnet/test/common/BiDi/Network/NetworkTest.cs b/dotnet/test/common/BiDi/Network/NetworkTest.cs index 4dc4fc3b044da..91f37e8c9520a 100644 --- a/dotnet/test/common/BiDi/Network/NetworkTest.cs +++ b/dotnet/test/common/BiDi/Network/NetworkTest.cs @@ -18,8 +18,7 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.BrowsingContext; -using OpenQA.Selenium.BiDi.Modules.Network; +using OpenQA.Selenium.BiDi.BrowsingContext; using System.Threading.Tasks; namespace OpenQA.Selenium.BiDi.Network; diff --git a/dotnet/test/common/BiDi/Script/CallFunctionLocalValueTest.cs b/dotnet/test/common/BiDi/Script/CallFunctionLocalValueTest.cs index ae2650426320c..e265e7f4f5d8f 100644 --- a/dotnet/test/common/BiDi/Script/CallFunctionLocalValueTest.cs +++ b/dotnet/test/common/BiDi/Script/CallFunctionLocalValueTest.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Script; using System.Threading.Tasks; namespace OpenQA.Selenium.BiDi.Script; diff --git a/dotnet/test/common/BiDi/Script/CallFunctionParameterTest.cs b/dotnet/test/common/BiDi/Script/CallFunctionParameterTest.cs index d6969e89ba962..d1752fa337584 100644 --- a/dotnet/test/common/BiDi/Script/CallFunctionParameterTest.cs +++ b/dotnet/test/common/BiDi/Script/CallFunctionParameterTest.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Script; using System.Threading.Tasks; namespace OpenQA.Selenium.BiDi.Script; @@ -207,7 +206,7 @@ public async Task CanCallFunctionInASandBox() [Test] public async Task CanCallFunctionInARealm() { - await bidi.BrowsingContext.CreateAsync(Modules.BrowsingContext.ContextType.Tab); + await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Tab); var realms = await bidi.Script.GetRealmsAsync(); diff --git a/dotnet/test/common/BiDi/Script/CallFunctionRemoteValueTest.cs b/dotnet/test/common/BiDi/Script/CallFunctionRemoteValueTest.cs index 96b638e5a0450..bbfb14ac1d155 100644 --- a/dotnet/test/common/BiDi/Script/CallFunctionRemoteValueTest.cs +++ b/dotnet/test/common/BiDi/Script/CallFunctionRemoteValueTest.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Script; using System.Threading.Tasks; namespace OpenQA.Selenium.BiDi.Script; diff --git a/dotnet/test/common/BiDi/Script/EvaluateParametersTest.cs b/dotnet/test/common/BiDi/Script/EvaluateParametersTest.cs index 967037d9a9b06..378fd4f949a7a 100644 --- a/dotnet/test/common/BiDi/Script/EvaluateParametersTest.cs +++ b/dotnet/test/common/BiDi/Script/EvaluateParametersTest.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Script; using System.Threading.Tasks; namespace OpenQA.Selenium.BiDi.Script; @@ -113,7 +112,7 @@ public async Task CanEvaluateInASandBox() [Test] public async Task CanEvaluateInARealm() { - await bidi.BrowsingContext.CreateAsync(Modules.BrowsingContext.ContextType.Tab); + await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Tab); var realms = await bidi.Script.GetRealmsAsync(); diff --git a/dotnet/test/common/BiDi/Script/LocalValueConversionTests.cs b/dotnet/test/common/BiDi/Script/LocalValueConversionTests.cs index 0ef090b7a0bcd..7a19a3c239129 100644 --- a/dotnet/test/common/BiDi/Script/LocalValueConversionTests.cs +++ b/dotnet/test/common/BiDi/Script/LocalValueConversionTests.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Script; using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/dotnet/test/common/BiDi/Script/ScriptCommandsTest.cs b/dotnet/test/common/BiDi/Script/ScriptCommandsTest.cs index 6bb4d0cb78167..ed285fc4b63a4 100644 --- a/dotnet/test/common/BiDi/Script/ScriptCommandsTest.cs +++ b/dotnet/test/common/BiDi/Script/ScriptCommandsTest.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Script; using System; using System.Threading.Tasks; @@ -29,7 +28,7 @@ class ScriptCommandsTest : BiDiTestFixture [Test] public async Task CanGetAllRealms() { - _ = await bidi.BrowsingContext.CreateAsync(Modules.BrowsingContext.ContextType.Window); + _ = await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Window); var realms = await bidi.Script.GetRealmsAsync(); @@ -46,7 +45,7 @@ public async Task CanGetAllRealms() [Test] public async Task CanGetAllRealmsByType() { - _ = await bidi.BrowsingContext.CreateAsync(Modules.BrowsingContext.ContextType.Window); + _ = await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Window); var realms = await bidi.Script.GetRealmsAsync(new() { Type = RealmType.Window }); @@ -63,7 +62,7 @@ public async Task CanGetAllRealmsByType() [Test] public async Task CanGetRealmInBrowsingContext() { - var tab = await bidi.BrowsingContext.CreateAsync(Modules.BrowsingContext.ContextType.Tab); + var tab = await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Tab); var realms = await tab.Script.GetRealmsAsync(); @@ -76,7 +75,7 @@ public async Task CanGetRealmInBrowsingContext() [Test] public async Task CanGetRealmInBrowsingContextByType() { - var tab = await bidi.BrowsingContext.CreateAsync(Modules.BrowsingContext.ContextType.Tab); + var tab = await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Tab); var realms = await tab.Script.GetRealmsAsync(new() { Type = RealmType.Window }); @@ -93,15 +92,15 @@ public async Task CanAddPreloadScript() Assert.That(preloadScript, Is.Not.Null); - TaskCompletionSource tcs = new(); + TaskCompletionSource tcs = new(); await context.Log.OnEntryAddedAsync(tcs.SetResult); - await context.ReloadAsync(new() { Wait = Modules.BrowsingContext.ReadinessState.Interactive }); + await context.ReloadAsync(new() { Wait = BrowsingContext.ReadinessState.Interactive }); var entry = await tcs.Task.WaitAsync(TimeSpan.FromSeconds(5)); - Assert.That(entry.Level, Is.EqualTo(Modules.Log.Level.Info)); + Assert.That(entry.Level, Is.EqualTo(Log.Level.Info)); Assert.That(entry.Text, Is.EqualTo("preload_script_console_text")); } @@ -142,7 +141,7 @@ public async Task CanAddPreloadScriptInASandbox() Assert.That(preloadScript, Is.Not.Null); - await context.ReloadAsync(new() { Wait = Modules.BrowsingContext.ReadinessState.Interactive }); + await context.ReloadAsync(new() { Wait = BrowsingContext.ReadinessState.Interactive }); var bar = await context.Script.EvaluateAsync("window.bar", true, targetOptions: new() { Sandbox = "sandbox" }); @@ -154,7 +153,7 @@ public async Task CanRemovePreloadedScript() { var preloadScript = await context.Script.AddPreloadScriptAsync("() => { window.bar = 2; }"); - await context.ReloadAsync(new() { Wait = Modules.BrowsingContext.ReadinessState.Interactive }); + await context.ReloadAsync(new() { Wait = BrowsingContext.ReadinessState.Interactive }); var bar = await context.Script.EvaluateAsync("window.bar", true); diff --git a/dotnet/test/common/BiDi/Script/ScriptEventsTest.cs b/dotnet/test/common/BiDi/Script/ScriptEventsTest.cs index 98a6c12229216..f17dd0ae62fee 100644 --- a/dotnet/test/common/BiDi/Script/ScriptEventsTest.cs +++ b/dotnet/test/common/BiDi/Script/ScriptEventsTest.cs @@ -18,7 +18,6 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Script; using System; using System.Threading.Tasks; @@ -55,7 +54,7 @@ public async Task CanListenToRealmCreatedEvent() await bidi.Script.OnRealmCreatedAsync(tcs.SetResult); - await bidi.BrowsingContext.CreateAsync(Modules.BrowsingContext.ContextType.Window); + await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Window); var realmInfo = await tcs.Task.WaitAsync(TimeSpan.FromSeconds(5)); @@ -71,7 +70,7 @@ public async Task CanListenToRealmDestroyedEvent() await bidi.Script.OnRealmDestroyedAsync(tcs.SetResult); - var ctx = await bidi.BrowsingContext.CreateAsync(Modules.BrowsingContext.ContextType.Window); + var ctx = await bidi.BrowsingContext.CreateAsync(BrowsingContext.ContextType.Window); await ctx.CloseAsync(); var args = await tcs.Task.WaitAsync(TimeSpan.FromSeconds(5)); diff --git a/dotnet/test/common/BiDi/Storage/StorageTest.cs b/dotnet/test/common/BiDi/Storage/StorageTest.cs index 4f68ddc19de1a..5857d599af513 100644 --- a/dotnet/test/common/BiDi/Storage/StorageTest.cs +++ b/dotnet/test/common/BiDi/Storage/StorageTest.cs @@ -18,7 +18,7 @@ // using NUnit.Framework; -using OpenQA.Selenium.BiDi.Modules.Network; +using OpenQA.Selenium.BiDi.Network; using System; using System.Threading.Tasks;