Merge branch 'SeleniumHQ:trunk' into py-selenium-manager-arm-support

Author: cgoldberg

dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs

@@ -31,7 +31,7 @@ public async Task<EmptyResult> CloseAsync(CloseOptions? options = null)
 
     public async Task<UserContextInfo> CreateUserContextAsync(CreateUserContextOptions? options = null)
     {
-        var @params = new CreateUserContextCommandParameters(options?.AcceptInsecureCerts, options?.Proxy, options?.UnhandledPromptBehavior);
+        var @params = new CreateUserContextParameters(options?.AcceptInsecureCerts, options?.Proxy, options?.UnhandledPromptBehavior);
 
         return await Broker.ExecuteCommandAsync<CreateUserContextCommand, UserContextInfo>(new CreateUserContextCommand(@params), options).ConfigureAwait(false);
     }
@@ -43,7 +43,7 @@ public async Task<GetUserContextsResult> GetUserContextsAsync(GetUserContextsOpt
 
     public async Task<EmptyResult> RemoveUserContextAsync(UserContext userContext, RemoveUserContextOptions? options = null)
     {
-        var @params = new RemoveUserContextCommandParameters(userContext);
+        var @params = new RemoveUserContextParameters(userContext);
 
         return await Broker.ExecuteCommandAsync<RemoveUserContextCommand, EmptyResult>(new RemoveUserContextCommand(@params), options).ConfigureAwait(false);
     }

dotnet/src/webdriver/BiDi/Browser/CloseCommand.cs

@@ -22,6 +22,6 @@
 namespace OpenQA.Selenium.BiDi.Browser;
 
 internal sealed class CloseCommand()
-    : Command<CommandParameters, EmptyResult>(CommandParameters.Empty, "browser.close");
+    : Command<Parameters, EmptyResult>(Parameters.Empty, "browser.close");
 
 public sealed class CloseOptions : CommandOptions;

dotnet/src/webdriver/BiDi/Browser/CreateUserContextCommand.cs

@@ -21,10 +21,10 @@
 
 namespace OpenQA.Selenium.BiDi.Browser;
 
-internal sealed class CreateUserContextCommand(CreateUserContextCommandParameters @params)
-    : Command<CreateUserContextCommandParameters, UserContextInfo>(@params, "browser.createUserContext");
+internal sealed class CreateUserContextCommand(CreateUserContextParameters @params)
+    : Command<CreateUserContextParameters, UserContextInfo>(@params, "browser.createUserContext");
 
-internal sealed record CreateUserContextCommandParameters(bool? AcceptInsecureCerts, Session.ProxyConfiguration? Proxy, Session.UserPromptHandler? UnhandledPromptBehavior) : CommandParameters;
+internal sealed record CreateUserContextParameters(bool? AcceptInsecureCerts, Session.ProxyConfiguration? Proxy, Session.UserPromptHandler? UnhandledPromptBehavior) : Parameters;
 
 public sealed class CreateUserContextOptions : CommandOptions
 {

dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs

@@ -24,7 +24,7 @@
 namespace OpenQA.Selenium.BiDi.Browser;
 
 internal sealed class GetClientWindowsCommand()
-    : Command<CommandParameters, GetClientWindowsResult>(CommandParameters.Empty, "browser.getClientWindows");
+    : Command<Parameters, GetClientWindowsResult>(Parameters.Empty, "browser.getClientWindows");
 
 public sealed class GetClientWindowsOptions : CommandOptions;
 

dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs

@@ -24,7 +24,7 @@
 namespace OpenQA.Selenium.BiDi.Browser;
 
 internal sealed class GetUserContextsCommand()
-    : Command<CommandParameters, GetUserContextsResult>(CommandParameters.Empty, "browser.getUserContexts");
+    : Command<Parameters, GetUserContextsResult>(Parameters.Empty, "browser.getUserContexts");
 
 public class GetUserContextsOptions : CommandOptions;
 

dotnet/src/webdriver/BiDi/Browser/RemoveUserContextCommand.cs

@@ -21,9 +21,9 @@
 
 namespace OpenQA.Selenium.BiDi.Browser;
 
-internal sealed class RemoveUserContextCommand(RemoveUserContextCommandParameters @params)
-    : Command<RemoveUserContextCommandParameters, EmptyResult>(@params, "browser.removeUserContext");
+internal sealed class RemoveUserContextCommand(RemoveUserContextParameters @params)
+    : Command<RemoveUserContextParameters, EmptyResult>(@params, "browser.removeUserContext");
 
-internal sealed record RemoveUserContextCommandParameters(UserContext UserContext) : CommandParameters;
+internal sealed record RemoveUserContextParameters(UserContext UserContext) : Parameters;
 
 public sealed class RemoveUserContextOptions : CommandOptions;

dotnet/src/webdriver/BiDi/BrowsingContext/ActivateCommand.cs

@@ -21,9 +21,9 @@
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
-internal sealed class ActivateCommand(ActivateCommandParameters @params)
-    : Command<ActivateCommandParameters, EmptyResult>(@params, "browsingContext.activate");
+internal sealed class ActivateCommand(ActivateParameters @params)
+    : Command<ActivateParameters, EmptyResult>(@params, "browsingContext.activate");
 
-internal sealed record ActivateCommandParameters(BrowsingContext Context) : CommandParameters;
+internal sealed record ActivateParameters(BrowsingContext Context) : Parameters;
 
 public sealed class ActivateOptions : CommandOptions;

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs

@@ -27,7 +27,7 @@ public sealed class BrowsingContextModule(Broker broker) : Module(broker)
 {
     public async Task<BrowsingContext> CreateAsync(ContextType type, CreateOptions? options = null)
     {
-        var @params = new CreateCommandParameters(type, options?.ReferenceContext, options?.Background, options?.UserContext);
+        var @params = new CreateParameters(type, options?.ReferenceContext, options?.Background, options?.UserContext);
 
         var createResult = await Broker.ExecuteCommandAsync<CreateCommand, CreateResult>(new CreateCommand(@params), options).ConfigureAwait(false);
 
@@ -36,77 +36,77 @@ public async Task<BrowsingContext> CreateAsync(ContextType type, CreateOptions?
 
     public async Task<NavigateResult> NavigateAsync(BrowsingContext context, string url, NavigateOptions? options = null)
     {
-        var @params = new NavigateCommandParameters(context, url, options?.Wait);
+        var @params = new NavigateParameters(context, url, options?.Wait);
 
         return await Broker.ExecuteCommandAsync<NavigateCommand, NavigateResult>(new NavigateCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<EmptyResult> ActivateAsync(BrowsingContext context, ActivateOptions? options = null)
     {
-        var @params = new ActivateCommandParameters(context);
+        var @params = new ActivateParameters(context);
 
         return await Broker.ExecuteCommandAsync<ActivateCommand, EmptyResult>(new ActivateCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<LocateNodesResult> LocateNodesAsync(BrowsingContext context, Locator locator, LocateNodesOptions? options = null)
     {
-        var @params = new LocateNodesCommandParameters(context, locator, options?.MaxNodeCount, options?.SerializationOptions, options?.StartNodes);
+        var @params = new LocateNodesParameters(context, locator, options?.MaxNodeCount, options?.SerializationOptions, options?.StartNodes);
 
         return await Broker.ExecuteCommandAsync<LocateNodesCommand, LocateNodesResult>(new LocateNodesCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<CaptureScreenshotResult> CaptureScreenshotAsync(BrowsingContext context, CaptureScreenshotOptions? options = null)
     {
-        var @params = new CaptureScreenshotCommandParameters(context, options?.Origin, options?.Format, options?.Clip);
+        var @params = new CaptureScreenshotParameters(context, options?.Origin, options?.Format, options?.Clip);
 
         return await Broker.ExecuteCommandAsync<CaptureScreenshotCommand, CaptureScreenshotResult>(new CaptureScreenshotCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<EmptyResult> CloseAsync(BrowsingContext context, CloseOptions? options = null)
     {
-        var @params = new CloseCommandParameters(context, options?.PromptUnload);
+        var @params = new CloseParameters(context, options?.PromptUnload);
 
         return await Broker.ExecuteCommandAsync<CloseCommand, EmptyResult>(new CloseCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<TraverseHistoryResult> TraverseHistoryAsync(BrowsingContext context, int delta, TraverseHistoryOptions? options = null)
     {
-        var @params = new TraverseHistoryCommandParameters(context, delta);
+        var @params = new TraverseHistoryParameters(context, delta);
 
         return await Broker.ExecuteCommandAsync<TraverseHistoryCommand, TraverseHistoryResult>(new TraverseHistoryCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<NavigateResult> ReloadAsync(BrowsingContext context, ReloadOptions? options = null)
     {
-        var @params = new ReloadCommandParameters(context, options?.IgnoreCache, options?.Wait);
+        var @params = new ReloadParameters(context, options?.IgnoreCache, options?.Wait);
 
         return await Broker.ExecuteCommandAsync<ReloadCommand, NavigateResult>(new ReloadCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<EmptyResult> SetViewportAsync(BrowsingContext context, SetViewportOptions? options = null)
     {
-        var @params = new SetViewportCommandParameters(context, options?.Viewport, options?.DevicePixelRatio);
+        var @params = new SetViewportParameters(context, options?.Viewport, options?.DevicePixelRatio);
 
         return await Broker.ExecuteCommandAsync<SetViewportCommand, EmptyResult>(new SetViewportCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<GetTreeResult> GetTreeAsync(GetTreeOptions? options = null)
     {
-        var @params = new GetTreeCommandParameters(options?.MaxDepth, options?.Root);
+        var @params = new GetTreeParameters(options?.MaxDepth, options?.Root);
 
         return await Broker.ExecuteCommandAsync<GetTreeCommand, GetTreeResult>(new GetTreeCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<PrintResult> PrintAsync(BrowsingContext context, PrintOptions? options = null)
     {
-        var @params = new PrintCommandParameters(context, options?.Background, options?.Margin, options?.Orientation, options?.Page, options?.PageRanges, options?.Scale, options?.ShrinkToFit);
+        var @params = new PrintParameters(context, options?.Background, options?.Margin, options?.Orientation, options?.Page, options?.PageRanges, options?.Scale, options?.ShrinkToFit);
 
         return await Broker.ExecuteCommandAsync<PrintCommand, PrintResult>(new PrintCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<EmptyResult> HandleUserPromptAsync(BrowsingContext context, HandleUserPromptOptions? options = null)
     {
-        var @params = new HandleUserPromptCommandParameters(context, options?.Accept, options?.UserText);
+        var @params = new HandleUserPromptParameters(context, options?.Accept, options?.UserText);
 
         return await Broker.ExecuteCommandAsync<HandleUserPromptCommand, EmptyResult>(new HandleUserPromptCommand(@params), options).ConfigureAwait(false);
     }

dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs

@@ -22,10 +22,10 @@
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
-internal sealed class CaptureScreenshotCommand(CaptureScreenshotCommandParameters @params)
-    : Command<CaptureScreenshotCommandParameters, CaptureScreenshotResult>(@params, "browsingContext.captureScreenshot");
+internal sealed class CaptureScreenshotCommand(CaptureScreenshotParameters @params)
+    : Command<CaptureScreenshotParameters, CaptureScreenshotResult>(@params, "browsingContext.captureScreenshot");
 
-internal sealed record CaptureScreenshotCommandParameters(BrowsingContext Context, ScreenshotOrigin? Origin, ImageFormat? Format, ClipRectangle? Clip) : CommandParameters;
+internal sealed record CaptureScreenshotParameters(BrowsingContext Context, ScreenshotOrigin? Origin, ImageFormat? Format, ClipRectangle? Clip) : Parameters;
 
 public sealed class CaptureScreenshotOptions : CommandOptions
 {

dotnet/src/webdriver/BiDi/BrowsingContext/CloseCommand.cs

@@ -21,10 +21,10 @@
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
-internal sealed class CloseCommand(CloseCommandParameters @params)
-    : Command<CloseCommandParameters, EmptyResult>(@params, "browsingContext.close");
+internal sealed class CloseCommand(CloseParameters @params)
+    : Command<CloseParameters, EmptyResult>(@params, "browsingContext.close");
 
-internal sealed record CloseCommandParameters(BrowsingContext Context, bool? PromptUnload) : CommandParameters;
+internal sealed record CloseParameters(BrowsingContext Context, bool? PromptUnload) : Parameters;
 
 public sealed class CloseOptions : CommandOptions
 {