[dotnet] [bidi] Make Locator types as not nested (SeleniumHQ#15429)

Author: nvborisenko

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Locator.cs

@@ -22,37 +22,42 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
-[JsonDerivedType(typeof(Accessibility), "accessibility")]
-[JsonDerivedType(typeof(Css), "css")]
-[JsonDerivedType(typeof(InnerText), "innerText")]
-[JsonDerivedType(typeof(XPath), "xpath")]
-public abstract record Locator
+[JsonDerivedType(typeof(AccessibilityLocator), "accessibility")]
+[JsonDerivedType(typeof(CssLocator), "css")]
+[JsonDerivedType(typeof(ContextLocator), "context")]
+[JsonDerivedType(typeof(InnerTextLocator), "innerText")]
+[JsonDerivedType(typeof(XPathLocator), "xpath")]
+public abstract record Locator;
+
+public record AccessibilityLocator(AccessibilityLocator.AccessibilityLocatorValue Value) : Locator
 {
-    public record Accessibility(Accessibility.AccessibilityValue Value) : Locator
+    public record AccessibilityLocatorValue
     {
-        public record AccessibilityValue
-        {
-            public string? Name { get; set; }
-            public string? Role { get; set; }
-        }
+        public string? Name { get; set; }
+        public string? Role { get; set; }
     }
+}
 
-    public record Css(string Value) : Locator;
+public record CssLocator(string Value) : Locator;
 
-    public record InnerText(string Value) : Locator
-    {
-        public bool? IgnoreCase { get; set; }
+public record ContextLocator(ContextLocator.ContextLocatorValue Value) : Locator
+{
+    public record ContextLocatorValue(BrowsingContext Context);
+}
 
-        public MatchType? MatchType { get; set; }
+public record InnerTextLocator(string Value) : Locator
+{
+    public bool? IgnoreCase { get; set; }
 
-        public long? MaxDepth { get; set; }
-    }
+    public Match? MatchType { get; set; }
 
-    public record XPath(string Value) : Locator;
-}
+    public long? MaxDepth { get; set; }
 
-public enum MatchType
-{
-    Full,
-    Partial
+    public enum Match
+    {
+        Full,
+        Partial
+    }
 }
+
+public record XPathLocator(string Value) : Locator;

dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs

@@ -285,7 +285,7 @@ public async Task CanCaptureScreenshotOfElement()
     {
         await context.NavigateAsync(UrlBuilder.WhereIs("formPage.html"), new() { Wait = ReadinessState.Complete });
 
-        var nodes = await context.LocateNodesAsync(new Locator.Css("#checky"));
+        var nodes = await context.LocateNodesAsync(new CssLocator("#checky"));
 
         var screenshot = await context.CaptureScreenshotAsync(new()
         {

dotnet/test/common/BiDi/Input/CombinedInputActionsTest.cs

@@ -61,7 +61,7 @@ public async Task TestShiftClickingOnMultiSelectionList()
     {
         driver.Url = UrlBuilder.WhereIs("formSelectionPage.html");
 
-        var options = await context.LocateNodesAsync(new Locator.Css("option"));
+        var options = await context.LocateNodesAsync(new CssLocator("option"));
 
         await context.Input.PerformActionsAsync([
             new PointerActions

dotnet/test/common/BiDi/Input/SetFilesTest.cs

@@ -45,7 +45,7 @@ public async Task CanSetFiles()
     {
         driver.Url = UrlBuilder.WhereIs("formPage.html");
 
-        var nodes = await context.LocateNodesAsync(new Locator.Css("[id='upload']"));
+        var nodes = await context.LocateNodesAsync(new CssLocator("[id='upload']"));
 
         await context.Input.SetFilesAsync(nodes[0], [_tempFile]);