[dotnet] [bidi] Align SetGeolocation polymorphic command (#17338)

Author: nvborisenko

dotnet/src/webdriver/BiDi/Emulation/EmulationModule.cs

@@ -105,22 +105,20 @@ public async Task<SetScrollbarTypeOverrideResult> SetScrollbarTypeOverrideAsync(
         return await ExecuteAsync(SetScrollbarTypeOverrideCommand, @params, options, cancellationToken).ConfigureAwait(false);
     }
 
-    public async Task<SetGeolocationOverrideResult> SetGeolocationCoordinatesOverrideAsync(double latitude, double longitude, SetGeolocationCoordinatesOverrideOptions? options = null, CancellationToken cancellationToken = default)
+    public async Task<SetGeolocationOverrideResult> SetGeolocationOverrideAsync(GeolocationOverride? geolocationOverride, SetGeolocationOverrideOptions? options = null, CancellationToken cancellationToken = default)
     {
-        var coordinates = new GeolocationCoordinates(latitude, longitude, options?.Accuracy, options?.Altitude, options?.AltitudeAccuracy, options?.Heading, options?.Speed);
-        var @params = new SetGeolocationOverrideCoordinatesParameters(coordinates, options?.Contexts, options?.UserContexts);
-        return await ExecuteAsync(SetGeolocationOverrideCommand, @params, options, cancellationToken).ConfigureAwait(false);
-    }
+        SetGeolocationOverrideParameters @params = geolocationOverride switch
+        {
+            GeolocationCoordinatesOverride c => new SetGeolocationOverrideCoordinatesParameters(
+                new GeolocationCoordinates(c.Latitude, c.Longitude, c.Accuracy, c.Altitude, c.AltitudeAccuracy, c.Heading, c.Speed),
+                options?.Contexts, options?.UserContexts),
+            GeolocationPositionErrorOverride => new SetGeolocationOverridePositionErrorParameters(
+                new GeolocationPositionError(), options?.Contexts, options?.UserContexts),
+            null => new SetGeolocationOverrideCoordinatesParameters(
+                null, options?.Contexts, options?.UserContexts),
+            _ => throw new ArgumentException($"Unknown geolocation override type: {geolocationOverride.GetType()}", nameof(geolocationOverride))
+        };
 
-    public async Task<SetGeolocationOverrideResult> SetGeolocationCoordinatesOverrideAsync(SetGeolocationOverrideOptions? options = null, CancellationToken cancellationToken = default)
-    {
-        var @params = new SetGeolocationOverrideCoordinatesParameters(null, options?.Contexts, options?.UserContexts);
-        return await ExecuteAsync(SetGeolocationOverrideCommand, @params, options, cancellationToken).ConfigureAwait(false);
-    }
-
-    public async Task<SetGeolocationOverrideResult> SetGeolocationPositionErrorOverrideAsync(SetGeolocationPositionErrorOverrideOptions? options = null, CancellationToken cancellationToken = default)
-    {
-        var @params = new SetGeolocationOverridePositionErrorParameters(new GeolocationPositionError(), options?.Contexts, options?.UserContexts);
         return await ExecuteAsync(SetGeolocationOverrideCommand, @params, options, cancellationToken).ConfigureAwait(false);
     }
 

dotnet/src/webdriver/BiDi/Emulation/IEmulationModule.cs

@@ -22,9 +22,7 @@ namespace OpenQA.Selenium.BiDi.Emulation;
 public interface IEmulationModule
 {
     Task<SetForcedColorsModeThemeOverrideResult> SetForcedColorsModeThemeOverrideAsync(ForcedColorsModeTheme? theme, SetForcedColorsModeThemeOverrideOptions? options = null, CancellationToken cancellationToken = default);
-    Task<SetGeolocationOverrideResult> SetGeolocationCoordinatesOverrideAsync(double latitude, double longitude, SetGeolocationCoordinatesOverrideOptions? options = null, CancellationToken cancellationToken = default);
-    Task<SetGeolocationOverrideResult> SetGeolocationCoordinatesOverrideAsync(SetGeolocationOverrideOptions? options = null, CancellationToken cancellationToken = default);
-    Task<SetGeolocationOverrideResult> SetGeolocationPositionErrorOverrideAsync(SetGeolocationPositionErrorOverrideOptions? options = null, CancellationToken cancellationToken = default);
+    Task<SetGeolocationOverrideResult> SetGeolocationOverrideAsync(GeolocationOverride? geolocationOverride, SetGeolocationOverrideOptions? options = null, CancellationToken cancellationToken = default);
     Task<SetLocaleOverrideResult> SetLocaleOverrideAsync(string? locale, SetLocaleOverrideOptions? options = null, CancellationToken cancellationToken = default);
     Task<SetNetworkConditionsResult> SetNetworkConditionsAsync(NetworkConditions? networkConditions, SetNetworkConditionsOptions? options = null, CancellationToken cancellationToken = default);
     Task<SetScreenOrientationOverrideResult> SetScreenOrientationOverrideAsync(ScreenOrientation? screenOrientation, SetScreenOrientationOverrideOptions? options = null, CancellationToken cancellationToken = default);

dotnet/src/webdriver/BiDi/Emulation/SetGeolocationOverride.cs

@@ -21,6 +21,19 @@
 
 namespace OpenQA.Selenium.BiDi.Emulation;
 
+public abstract record GeolocationOverride;
+
+public sealed record GeolocationCoordinatesOverride(double Latitude, double Longitude) : GeolocationOverride
+{
+    public double? Accuracy { get; init; }
+    public double? Altitude { get; init; }
+    public double? AltitudeAccuracy { get; init; }
+    public double? Heading { get; init; }
+    public double? Speed { get; init; }
+}
+
+public sealed record GeolocationPositionErrorOverride : GeolocationOverride;
+
 [JsonDerivedType(typeof(SetGeolocationOverrideCoordinatesParameters))]
 [JsonDerivedType(typeof(SetGeolocationOverridePositionErrorParameters))]
 internal abstract record SetGeolocationOverrideParameters(IEnumerable<BrowsingContext.BrowsingContext>? Contexts, IEnumerable<Browser.UserContext>? UserContexts) : Parameters;
@@ -37,22 +50,11 @@ internal sealed record GeolocationPositionError
     internal string Type { get; } = "positionUnavailable";
 }
 
-public record SetGeolocationOverrideOptions : CommandOptions
+public sealed record SetGeolocationOverrideOptions : CommandOptions
 {
     public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; init; }
 
     public IEnumerable<Browser.UserContext>? UserContexts { get; init; }
 }
 
-public sealed record SetGeolocationCoordinatesOverrideOptions : SetGeolocationOverrideOptions
-{
-    public double? Accuracy { get; init; }
-    public double? Altitude { get; init; }
-    public double? AltitudeAccuracy { get; init; }
-    public double? Heading { get; init; }
-    public double? Speed { get; init; }
-}
-
-public sealed record SetGeolocationPositionErrorOverrideOptions : SetGeolocationOverrideOptions;
-
 public sealed record SetGeolocationOverrideResult : EmptyResult;

dotnet/test/webdriver/BiDi/Emulation/EmulationTests.cs

@@ -198,7 +198,7 @@ public void CanSetGeolocationCoordinatesOverride()
     {
         Assert.That(async () =>
         {
-            await bidi.Emulation.SetGeolocationCoordinatesOverrideAsync(0, 0, new() { Contexts = [context] });
+            await bidi.Emulation.SetGeolocationOverrideAsync(new GeolocationCoordinatesOverride(0, 0), new() { Contexts = [context] });
         },
         Throws.Nothing);
     }
@@ -208,7 +208,7 @@ public void CanSetGeolocationCoordinatesOverrideToDefault()
     {
         Assert.That(async () =>
         {
-            await bidi.Emulation.SetGeolocationCoordinatesOverrideAsync(new() { Contexts = [context] });
+            await bidi.Emulation.SetGeolocationOverrideAsync(null, new() { Contexts = [context] });
         },
         Throws.Nothing);
     }
@@ -219,7 +219,7 @@ public void CanSetGeolocationPositionErrorOverride()
     {
         Assert.That(async () =>
         {
-            await bidi.Emulation.SetGeolocationPositionErrorOverrideAsync(new() { Contexts = [context] });
+            await bidi.Emulation.SetGeolocationOverrideAsync(new GeolocationPositionErrorOverride(), new() { Contexts = [context] });
         },
         Throws.Nothing);
     }