Source input actions as interface

nvborisenko · nvborisenko · commit 55afa4fc7666 · 2024-10-06T17:57:26.000+03:00
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/InputSourceActionsConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/InputSourceActionsConverter.cs
@@ -1,34 +1,36 @@
 using OpenQA.Selenium.BiDi.Modules.Input;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 #nullable enable
 
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 
-internal class InputSourceActionsConverter : JsonConverter<SourceActions>
+internal class InputSourceActionsConverter : JsonConverter<ISourceActions>
 {
-    public override SourceActions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public override ISourceActions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         throw new NotImplementedException();
     }
 
-    public override void Write(Utf8JsonWriter writer, SourceActions value, JsonSerializerOptions options)
+    public override void Write(Utf8JsonWriter writer, ISourceActions value, JsonSerializerOptions options)
     {
         writer.WriteStartObject();
 
         writer.WriteString("id", value.Id);
 
         switch (value)
         {
-            case SourceActions.Keys keys:
+            case KeyActions keys:
                 writer.WriteString("type", "key");
                 writer.WritePropertyName("actions");
-                JsonSerializer.Serialize(writer, keys.Actions, options);
+                JsonSerializer.Serialize(writer, keys.Actions.Select(a => a as Key), options);
 
                 break;
-            case SourceActions.Pointers pointers:
+            case PointerActions pointers:
                 writer.WriteString("type", "pointer");
                 if (pointers.Options is not null)
                 {
@@ -37,23 +39,24 @@ public override void Write(Utf8JsonWriter writer, SourceActions value, JsonSeria
                 }
 
                 writer.WritePropertyName("actions");
-                JsonSerializer.Serialize(writer, pointers.Actions, options);
+                JsonSerializer.Serialize(writer, pointers.Actions.Select(a => a as Pointer), options);
 
                 break;
-            case SourceActions.Wheels wheels:
+            case WheelActions wheels:
                 writer.WriteString("type", "wheel");
                 writer.WritePropertyName("actions");
-                JsonSerializer.Serialize(writer, wheels.Actions, options);
+                JsonSerializer.Serialize(writer, wheels.Actions.Select(a => a as Wheel), options);
 
                 break;
-            case SourceActions.None none:
+            case NoneActions none:
                 writer.WriteString("type", "none");
                 writer.WritePropertyName("actions");
-                JsonSerializer.Serialize(writer, none.Actions, options);
+                JsonSerializer.Serialize(writer, none.Actions.Select(a => a as None), options);
 
                 break;
         }
 
         writer.WriteEndObject();
     }
 }
+
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInputModule.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInputModule.cs
@@ -8,7 +8,7 @@ namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 public class BrowsingContextInputModule(BrowsingContext context, InputModule inputModule)
 {
-    public Task PerformActionsAsync(IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)
+    public Task PerformActionsAsync(IEnumerable<ISourceActions> actions, PerformActionsOptions? options = null)
     {
         return inputModule.PerformActionsAsync(context, actions, options);
     }
diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/InputModule.cs b/dotnet/src/webdriver/BiDi/Modules/Input/InputModule.cs
@@ -8,7 +8,7 @@ namespace OpenQA.Selenium.BiDi.Modules.Input;
 
 public sealed class InputModule(Broker broker) : Module(broker)
 {
-    public async Task PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)
+    public async Task PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<ISourceActions> actions, PerformActionsOptions? options = null)
     {
         var @params = new PerformActionsCommandParameters(context, actions);
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/PerformActionsCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Input/PerformActionsCommand.cs
@@ -7,6 +7,6 @@ namespace OpenQA.Selenium.BiDi.Modules.Input;
 
 internal class PerformActionsCommand(PerformActionsCommandParameters @params) : Command<PerformActionsCommandParameters>(@params);
 
-internal record PerformActionsCommandParameters(BrowsingContext.BrowsingContext Context, IEnumerable<SourceActions> Actions) : CommandParameters;
+internal record PerformActionsCommandParameters(BrowsingContext.BrowsingContext Context, IEnumerable<ISourceActions> Actions) : CommandParameters;
 
 public record PerformActionsOptions : CommandOptions;
diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/SourceActions.cs b/dotnet/src/webdriver/BiDi/Modules/Input/SourceActions.cs
@@ -7,62 +7,45 @@
 
 namespace OpenQA.Selenium.BiDi.Modules.Input;
 
-public abstract record SourceActions
+public interface ISourceActions
 {
-    public string Id { get; } = Guid.NewGuid().ToString();
-
-    public record Keys : SourceActions, IEnumerable<Key>
-    {
-        public IList<Key> Actions { get; set; } = [];
+    string Id { get; }
 
-        public void Add(Key key) => Actions.Add(key);
-
-        public IEnumerator<Key> GetEnumerator() => Actions.GetEnumerator();
-
-        IEnumerator IEnumerable.GetEnumerator() => Actions.GetEnumerator();
-    }
-
-    public record Pointers : SourceActions, IEnumerable<Pointer>
-    {
-        public PointerParameters? Options { get; set; }
-
-        public IList<Pointer> Actions { get; set; } = [];
-
-        public void Add(Pointer pointer) => Actions.Add(pointer);
+    IList<ISourceAction> Actions { get; }
+}
 
-        public IEnumerator<Pointer> GetEnumerator() => Actions.GetEnumerator();
+public abstract record SourceActions<T> : ISourceActions, IEnumerable<ISourceAction>
+{
+    public string Id { get; } = Guid.NewGuid().ToString();
 
-        IEnumerator IEnumerable.GetEnumerator() => Actions.GetEnumerator();
-    }
+    [JsonPropertyName("actions")]
+    public IList<ISourceAction> Actions { get; } = [];
 
-    public record Wheels : SourceActions, IEnumerable<Wheel>
-    {
-        public IList<Wheel> Actions { get; set; } = [];
+    public IEnumerator<ISourceAction> GetEnumerator() => Actions.GetEnumerator();
 
-        public void Add(Wheel wheel) => Actions.Add(wheel);
+    IEnumerator IEnumerable.GetEnumerator() => Actions.GetEnumerator();
 
-        public IEnumerator<Wheel> GetEnumerator() => Actions.GetEnumerator();
+    public void Add(ISourceAction action) => Actions.Add(action);
+}
 
-        IEnumerator IEnumerable.GetEnumerator() => Actions.GetEnumerator();
-    }
+public record KeyActions : SourceActions<Key>, ISourceActions;
 
-    public record None : SourceActions, IEnumerable<Input.None>
-    {
-        public IList<Input.None> Actions { get; set; } = [];
+public record PointerActions : SourceActions<Pointer>, ISourceActions
+{
+    public PointerParameters? Options { get; set; }
+}
 
-        public void Add(Input.None none) => Actions.Add(none);
+public record WheelActions : SourceActions<Wheel>;
 
-        public IEnumerator<Input.None> GetEnumerator() => Actions.GetEnumerator();
+public record NoneActions : SourceActions<None>;
 
-        IEnumerator IEnumerable.GetEnumerator() => Actions.GetEnumerator();
-    }
-}
+public interface ISourceAction;
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 [JsonDerivedType(typeof(Pause), "pause")]
 [JsonDerivedType(typeof(Down), "keyDown")]
 [JsonDerivedType(typeof(Up), "keyUp")]
-public abstract record Key
+public abstract record Key : ISourceAction
 {
     public record Pause : Key
     {
@@ -79,7 +62,7 @@ public record Up(string Value) : Key;
 [JsonDerivedType(typeof(Down), "pointerDown")]
 [JsonDerivedType(typeof(Up), "pointerUp")]
 [JsonDerivedType(typeof(Move), "pointerMove")]
-public abstract record Pointer
+public abstract record Pointer : ISourceAction
 {
     public record Pause : Pointer
     {
@@ -118,7 +101,7 @@ public record Move(int X, int Y) : Pointer, IPointerCommonProperties
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 [JsonDerivedType(typeof(Pause), "pause")]
 [JsonDerivedType(typeof(Scroll), "scroll")]
-public abstract record Wheel
+public abstract record Wheel : ISourceAction
 {
     public record Pause : Wheel
     {
@@ -135,7 +118,7 @@ public record Scroll(int X, int Y, int DeltaX, int DeltaY) : Wheel
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 [JsonDerivedType(typeof(Pause), "pause")]
-public abstract record None
+public abstract record None : ISourceAction
 {
     public record Pause : None
     {
diff --git a/dotnet/test/common/BiDi/Input/CombinedInputActionsTest.cs b/dotnet/test/common/BiDi/Input/CombinedInputActionsTest.cs
@@ -14,19 +14,19 @@ public async Task Paint()
 
         await Task.Delay(3000);
 
-        await context.Input.PerformActionsAsync([new SourceActions.Pointers {
+        await context.Input.PerformActionsAsync([new PointerActions {
             new Pointer.Move(300, 300),
             new Pointer.Down(0),
             new Pointer.Move(400, 400) { Duration = 2000, Width = 1, Twist = 1 },
             new Pointer.Up(0),
         }]);
 
-        await context.Input.PerformActionsAsync([new SourceActions.Keys {
+        await context.Input.PerformActionsAsync([new KeyActions {
             new Key.Down("U"),
             new Key.Up("U")
         }]);
 
-        await context.Input.PerformActionsAsync([new SourceActions.Pointers {
+        await context.Input.PerformActionsAsync([new PointerActions {
             new Pointer.Move(300, 300),
             new Pointer.Down(0),
             new Pointer.Move(400, 400) { Duration = 2000 },
@@ -44,7 +44,7 @@ public async Task TestShiftClickingOnMultiSelectionList()
         var options = await context.LocateNodesAsync(new Locator.Css("option"));
 
         await context.Input.PerformActionsAsync([
-            new SourceActions.Pointers
+            new PointerActions
             {
                 new Pointer.Down(1),
                 new Pointer.Up(1),
diff --git a/dotnet/test/common/BiDi/Input/DefaultMouseTest.cs b/dotnet/test/common/BiDi/Input/DefaultMouseTest.cs
@@ -12,23 +12,24 @@ public async Task PerformDragAndDropWithMouse()
         driver.Url = UrlBuilder.WhereIs("draggableLists.html");
 
         await context.Input.PerformActionsAsync([
-            new SourceActions.Keys
+            new KeyActions
             {
                 Actions =
                 {
-                    new Key.Down("A")
+                    new Key.Down("A"),
+                    new Key.Up("B")
                 }
             }
             ]);
 
-        await context.Input.PerformActionsAsync([new SourceActions.Keys
+        await context.Input.PerformActionsAsync([new KeyActions
         {
             new Key.Down("A"),
             new Key.Down("B"),
             new Key.Pause()
         }]);
 
-        await context.Input.PerformActionsAsync([new SourceActions.Pointers
+        await context.Input.PerformActionsAsync([new PointerActions
         {
             new Pointer.Down(0),
             new Pointer.Up(0),

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;`
`8`	`8`
`9`	`9`	`public class BrowsingContextInputModule(BrowsingContext context, InputModule inputModule)`
`10`	`10`	`{`
`11`		`- public Task PerformActionsAsync(IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)`
	`11`	`+ public Task PerformActionsAsync(IEnumerable<ISourceActions> actions, PerformActionsOptions? options = null)`
`12`	`12`	`{`
`13`	`13`	`return inputModule.PerformActionsAsync(context, actions, options);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace OpenQA.Selenium.BiDi.Modules.Input;`
`8`	`8`
`9`	`9`	`public sealed class InputModule(Broker broker) : Module(broker)`
`10`	`10`	`{`
`11`		`- public async Task PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)`
	`11`	`+ public async Task PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<ISourceActions> actions, PerformActionsOptions? options = null)`
`12`	`12`	`{`
`13`	`13`	`var @params = new PerformActionsCommandParameters(context, actions);`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -12,23 +12,24 @@ public async Task PerformDragAndDropWithMouse()`
`12`	`12`	`driver.Url = UrlBuilder.WhereIs("draggableLists.html");`
`13`	`13`
`14`	`14`	`await context.Input.PerformActionsAsync([`
`15`		`- new SourceActions.Keys`
	`15`	`+ new KeyActions`
`16`	`16`	`{`
`17`	`17`	`Actions =`
`18`	`18`	`{`
`19`		`- new Key.Down("A")`
	`19`	`+ new Key.Down("A"),`
	`20`	`+ new Key.Up("B")`
`20`	`21`	`}`
`21`	`22`	`}`
`22`	`23`	`]);`
`23`	`24`
`24`		`- await context.Input.PerformActionsAsync([new SourceActions.Keys`
	`25`	`+ await context.Input.PerformActionsAsync([new KeyActions`
`25`	`26`	`{`
`26`	`27`	`new Key.Down("A"),`
`27`	`28`	`new Key.Down("B"),`
`28`	`29`	`new Key.Pause()`
`29`	`30`	`}]);`
`30`	`31`
`31`		`- await context.Input.PerformActionsAsync([new SourceActions.Pointers`
	`32`	`+ await context.Input.PerformActionsAsync([new PointerActions`
`32`	`33`	`{`
`33`	`34`	`new Pointer.Down(0),`
`34`	`35`	`new Pointer.Up(0),`