Refactor capabilities handling and update tests

- Set `BrowserName` to "Uia" in `UiaOptions` constructor.
- Replace test method with `NewApplicationDriverTest` in `UiaDriverTests`.
- Modify `PublicExtensions` to use `firstMatch` dictionary in `NewSessionModel`.
- Remove `FirstMatch` property from `CapabilitiesModel`.
- Update `SessionModel` to add `FirstMatch` property and remove `DesiredCapabilities` and `Build` method.

Author: gravity-api

src/G4.WebDriver.Remote.Uia/UiaOptions.cs

@@ -17,6 +17,7 @@ public class UiaOptions : WebDriverOptionsBase
         public UiaOptions()
         {
             UiaOptionsDictionary = [];
+            BrowserName = "Uia";
         }
         #endregion
 

src/G4.WebDriver.Tests/UiaDriverTests.cs

@@ -13,39 +13,6 @@ namespace G4.WebDriver.Tests
     [TestCategory("WindowsAppTest")]
     public class UiaDriverTests : TestBase<UiaDriver>
     {
-        [TestMethod]
-        public void Test()
-        {
-            var options = new UiaOptions
-            {
-                App = "notepad.exe"
-            };
-            var driver = new UiaDriver(new Uri("http://localhost:5555/wd/hub"), options);
-            var element = driver.FindElement(By.Xpath("//Document[@Name='Text editor']"));
-            var attribute = element.GetAttribute("Name");
-
-            ((UiaElement)element).MoveToElement();
-            ((UiaElement)element).MoveToElement(new MousePositionInputModel
-            {
-                Alignment = "TopLeft",
-                OffsetX = 100,
-                OffsetY = 100,
-
-            });
-            ((UiaElement)element).MoveToElement(new MousePositionInputModel
-            {
-                Alignment = "TopRight",
-                OffsetX = 100,
-                OffsetY = 100,
-
-            });
-
-            element = driver.FindElement(By.Xpath("//Window[@PartialName='Notepad']//MenuItem[@Name='File']"));
-            ((UiaElement)element).SendClick();
-
-            var b = "";
-        }
-
         [TestMethod(displayName: "Verify that a new application driver can be instantiated and perform UI interactions correctly.")]
         public void NewApplicationDriverTest()
         {

src/G4.WebDriver/Extensions/PublicExtensions.cs

@@ -845,44 +845,20 @@ public static SessionModel NewSessionModel(this CapabilitiesModel model)
         {
             // Initialize the desired capabilities dictionary.
             var desired = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            var firstMatch = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
 
             // Populate the desired capabilities from AlwaysMatch.
             foreach (var capability in model.AlwaysMatch)
             {
                 desired[capability.Key] = capability.Value;
-            }
-
-            // Populate the desired capabilities from FirstMatch.
-            foreach (var capabilities in model.FirstMatch)
-            {
-                foreach (var capability in capabilities)
-                {
-                    desired[capability.Key] = capability.Value;
-                }
-            }
-
-            // If FirstMatch is empty, move the 'browserName' entry to FirstMatch.
-            if (model.FirstMatch?.Any() == false)
-            {
-                const string BrowserName = "browserName";
-                _ = desired.TryGetValue(BrowserName, out object browserNameOut);
-
-                // Create a new entry for FirstMatch.
-                var entry = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
-                {
-                    [BrowserName] = $"{browserNameOut}"
-                };
-
-                // Add the entry to FirstMatch and remove it from AlwaysMatch.
-                model.FirstMatch = model.FirstMatch.Concat([entry]);
-                model.AlwaysMatch.Remove(BrowserName);
+                firstMatch[capability.Key] = capability.Value;
             }
 
             // Return a new SessionModel instance.
             return new SessionModel
             {
                 Capabilities = model,
-                DesiredCapabilities = desired
+                FirstMatch = [firstMatch]
             };
         }
 

src/G4.WebDriver/Models/CapabilitiesModel.cs

@@ -16,7 +16,6 @@ public class CapabilitiesModel
         public CapabilitiesModel()
         {
             AlwaysMatch = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-            FirstMatch = [];
         }
         #endregion
 
@@ -25,11 +24,6 @@ public CapabilitiesModel()
         /// Gets or sets a collection of capabilities that must all be matched.
         /// </summary>
         public IDictionary<string, object> AlwaysMatch { get; set; }
-
-        /// <summary>
-        /// Gets or sets a collection of capabilities that at least one must be matched.
-        /// </summary>
-        public IEnumerable<IDictionary<string, object>> FirstMatch { get; set; }
         #endregion
     }
 }

src/G4.WebDriver/Models/SessionModel.cs

@@ -21,8 +21,8 @@ public SessionModel()
             // Initialize the Capabilities model.
             Capabilities = new CapabilitiesModel();
 
-            // Initialize the DesiredCapabilities dictionary with case-insensitive string keys.
-            DesiredCapabilities = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            // Initialize the FirstMatch dictionary with case-insensitive string keys.
+            FirstMatch = [];
 
             // Set the StartNewSession flag to true by default.
             StartNewSession = true;
@@ -36,10 +36,9 @@ public SessionModel()
         public CapabilitiesModel Capabilities { get; set; }
 
         /// <summary>
-        /// Gets or sets the desired capabilities that specify the desired features for the WebDriver session.
-        /// These capabilities define what the WebDriver session should support.
+        /// Gets or sets a collection of capabilities that at least one must be matched.
         /// </summary>
-        public IDictionary<string, object> DesiredCapabilities { get; set; }
+        public IEnumerable<IDictionary<string, object>> FirstMatch { get; set; }
 
         /// <summary>
         /// Gets or sets the password needed for intermediary node authentication.
@@ -60,33 +59,5 @@ public SessionModel()
         /// </summary>
         public string User { get; set; }
         #endregion
-
-        #region *** Methods      ***
-        /// <summary>
-        /// Builds the session model by merging the capabilities into the desired capabilities.
-        /// Merges both FirstMatch and AlwaysMatch capabilities into the DesiredCapabilities dictionary.
-        /// </summary>
-        /// <returns>Returns the current <see cref="SessionModel"/> instance with updated desired capabilities.</returns>
-        public SessionModel Build()
-        {
-            // Merge capabilities from the FirstMatch list into DesiredCapabilities.
-            for (int i = 0; i < Capabilities.FirstMatch.Count(); i++)
-            {
-                foreach (var item in Capabilities.FirstMatch.ElementAt(i))
-                {
-                    DesiredCapabilities[item.Key] = item.Value;
-                }
-            }
-
-            // Merge capabilities from the AlwaysMatch dictionary into DesiredCapabilities.
-            foreach (var item in Capabilities.AlwaysMatch)
-            {
-                DesiredCapabilities[item.Key] = item.Value;
-            }
-
-            // Return the updated session model instance.
-            return this;
-        }
-        #endregion
     }
 }