BrowsingContext

Author: nvborisenko

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

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

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

@@ -41,11 +41,11 @@ public async Task<NavigateResult> NavigateAsync(BrowsingContext context, string
         return await Broker.ExecuteCommandAsync(new NavigateCommand(@params), options, JsonContext.NavigateCommand, JsonContext.NavigateResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> ActivateAsync(BrowsingContext context, ActivateOptions? options = null)
+    public async Task<ActivateResult> ActivateAsync(BrowsingContext context, ActivateOptions? options = null)
     {
         var @params = new ActivateParameters(context);
 
-        return await Broker.ExecuteCommandAsync(new ActivateCommand(@params), options, JsonContext.ActivateCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new ActivateCommand(@params), options, JsonContext.ActivateCommand, JsonContext.ActivateResult).ConfigureAwait(false);
     }
 
     public async Task<LocateNodesResult> LocateNodesAsync(BrowsingContext context, Locator locator, LocateNodesOptions? options = null)
@@ -62,11 +62,11 @@ public async Task<CaptureScreenshotResult> CaptureScreenshotAsync(BrowsingContex
         return await Broker.ExecuteCommandAsync(new CaptureScreenshotCommand(@params), options, JsonContext.CaptureScreenshotCommand, JsonContext.CaptureScreenshotResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> CloseAsync(BrowsingContext context, CloseOptions? options = null)
+    public async Task<CloseResult> CloseAsync(BrowsingContext context, CloseOptions? options = null)
     {
         var @params = new CloseParameters(context, options?.PromptUnload);
 
-        return await Broker.ExecuteCommandAsync(new CloseCommand(@params), options, JsonContext.BrowsingContext_CloseCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new CloseCommand(@params), options, JsonContext.BrowsingContext_CloseCommand, JsonContext.BrowsingContext_CloseResult).ConfigureAwait(false);
     }
 
     public async Task<TraverseHistoryResult> TraverseHistoryAsync(BrowsingContext context, int delta, TraverseHistoryOptions? options = null)
@@ -76,18 +76,18 @@ public async Task<TraverseHistoryResult> TraverseHistoryAsync(BrowsingContext co
         return await Broker.ExecuteCommandAsync(new TraverseHistoryCommand(@params), options, JsonContext.TraverseHistoryCommand, JsonContext.TraverseHistoryResult).ConfigureAwait(false);
     }
 
-    public async Task<NavigateResult> ReloadAsync(BrowsingContext context, ReloadOptions? options = null)
+    public async Task<ReloadResult> ReloadAsync(BrowsingContext context, ReloadOptions? options = null)
     {
         var @params = new ReloadParameters(context, options?.IgnoreCache, options?.Wait);
 
-        return await Broker.ExecuteCommandAsync(new ReloadCommand(@params), options, JsonContext.ReloadCommand, JsonContext.NavigateResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new ReloadCommand(@params), options, JsonContext.ReloadCommand, JsonContext.ReloadResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> SetViewportAsync(BrowsingContext context, SetViewportOptions? options = null)
+    public async Task<SetViewportResult> SetViewportAsync(BrowsingContext context, SetViewportOptions? options = null)
     {
         var @params = new SetViewportParameters(context, options?.Viewport, options?.DevicePixelRatio);
 
-        return await Broker.ExecuteCommandAsync(new SetViewportCommand(@params), options, JsonContext.SetViewportCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new SetViewportCommand(@params), options, JsonContext.SetViewportCommand, JsonContext.SetViewportResult).ConfigureAwait(false);
     }
 
     public async Task<GetTreeResult> GetTreeAsync(GetTreeOptions? options = null)
@@ -104,11 +104,11 @@ public async Task<PrintResult> PrintAsync(BrowsingContext context, PrintOptions?
         return await Broker.ExecuteCommandAsync(new PrintCommand(@params), options, JsonContext.PrintCommand, JsonContext.PrintResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> HandleUserPromptAsync(BrowsingContext context, HandleUserPromptOptions? options = null)
+    public async Task<HandleUserPromptResult> HandleUserPromptAsync(BrowsingContext context, HandleUserPromptOptions? options = null)
     {
         var @params = new HandleUserPromptParameters(context, options?.Accept, options?.UserText);
 
-        return await Broker.ExecuteCommandAsync(new HandleUserPromptCommand(@params), options, JsonContext.HandleUserPromptCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new HandleUserPromptCommand(@params), options, JsonContext.HandleUserPromptCommand, JsonContext.HandleUserPromptResult).ConfigureAwait(false);
     }
 
     public async Task<Subscription> OnNavigationStartedAsync(Func<NavigationInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)

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

@@ -22,11 +22,13 @@
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class CloseCommand(CloseParameters @params)
-    : Command<CloseParameters, EmptyResult>(@params, "browsingContext.close");
+    : Command<CloseParameters, CloseResult>(@params, "browsingContext.close");
 
 internal sealed record CloseParameters(BrowsingContext Context, bool? PromptUnload) : Parameters;
 
 public sealed class CloseOptions : CommandOptions
 {
     public bool? PromptUnload { get; set; }
 }
+
+public sealed record CloseResult : EmptyResult;

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

@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class HandleUserPromptCommand(HandleUserPromptParameters @params)
-    : Command<HandleUserPromptParameters, EmptyResult>(@params, "browsingContext.handleUserPrompt");
+    : Command<HandleUserPromptParameters, HandleUserPromptResult>(@params, "browsingContext.handleUserPrompt");
 
 internal sealed record HandleUserPromptParameters(BrowsingContext Context, bool? Accept, string? UserText) : Parameters;
 
@@ -32,3 +32,5 @@ public sealed class HandleUserPromptOptions : CommandOptions
 
     public string? UserText { get; set; }
 }
+
+public sealed record HandleUserPromptResult : EmptyResult;

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

@@ -41,4 +41,4 @@ public enum ReadinessState
     Complete
 }
 
-public sealed record NavigateResult(Navigation? Navigation, string Url) : EmptyResult;
+public record NavigateResult(Navigation? Navigation, string Url) : EmptyResult;

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

@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class ReloadCommand(ReloadParameters @params)
-    : Command<ReloadParameters, NavigateResult>(@params, "browsingContext.reload");
+    : Command<ReloadParameters, ReloadResult>(@params, "browsingContext.reload");
 
 internal sealed record ReloadParameters(BrowsingContext Context, bool? IgnoreCache, ReadinessState? Wait) : Parameters;
 
@@ -32,3 +32,5 @@ public sealed class ReloadOptions : CommandOptions
 
     public ReadinessState? Wait { get; set; }
 }
+
+public sealed record ReloadResult(Navigation? Navigation, string Url) : NavigateResult(Navigation, Url);

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

@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class SetViewportCommand(SetViewportParameters @params)
-    : Command<SetViewportParameters, EmptyResult>(@params, "browsingContext.setViewport");
+    : Command<SetViewportParameters, SetViewportResult>(@params, "browsingContext.setViewport");
 
 internal sealed record SetViewportParameters(BrowsingContext Context, Viewport? Viewport, double? DevicePixelRatio) : Parameters;
 
@@ -34,3 +34,5 @@ public sealed class SetViewportOptions : CommandOptions
 }
 
 public readonly record struct Viewport(long Width, long Height);
+
+public sealed record SetViewportResult : EmptyResult;

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

@@ -98,22 +98,27 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 
 
 [JsonSerializable(typeof(BrowsingContext.ActivateCommand))]
+[JsonSerializable(typeof(BrowsingContext.ActivateResult))]
 [JsonSerializable(typeof(BrowsingContext.CaptureScreenshotCommand))]
 [JsonSerializable(typeof(BrowsingContext.CaptureScreenshotResult))]
 [JsonSerializable(typeof(BrowsingContext.CloseCommand), TypeInfoPropertyName = "BrowsingContext_CloseCommand")]
+[JsonSerializable(typeof(BrowsingContext.CloseResult), TypeInfoPropertyName = "BrowsingContext_CloseResult")]
 [JsonSerializable(typeof(BrowsingContext.CreateCommand))]
 [JsonSerializable(typeof(BrowsingContext.CreateResult))]
 [JsonSerializable(typeof(BrowsingContext.GetTreeCommand))]
 [JsonSerializable(typeof(BrowsingContext.GetTreeResult))]
 [JsonSerializable(typeof(BrowsingContext.HandleUserPromptCommand))]
+[JsonSerializable(typeof(BrowsingContext.HandleUserPromptResult))]
 [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.ReloadResult))]
 [JsonSerializable(typeof(BrowsingContext.SetViewportCommand))]
+[JsonSerializable(typeof(BrowsingContext.SetViewportResult))]
 [JsonSerializable(typeof(BrowsingContext.TraverseHistoryCommand))]
 [JsonSerializable(typeof(BrowsingContext.TraverseHistoryResult))]