fix errors

Author: teo-nikolov

src/Bellatrix.Desktop/infrastructure/App.cs

@@ -38,7 +38,7 @@ public class App : IDisposable
 {
     // TODO: Change to be ThreadLocal.
     private static bool _shouldStartLocalService;
-    private static Process _winAppDriverProcess;
+    // private static Process _appiumProcess;
 
     public App()
     {

src/Bellatrix.Desktop/llm/FindByPrompt.cs

@@ -26,6 +26,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+using OpenQA.Selenium;
 
 namespace Bellatrix.Desktop.LLM;
 
@@ -49,43 +50,43 @@ public FindByPrompt(string value, bool tryResolveFromPages = true) : base(value)
     }
 
     /// <summary>
-    /// Locates a single WindowsElement using the resolved XPath.
+    /// Locates a single AppiumElement using the resolved XPath.
     /// </summary>
-    public override WindowsElement FindElement(WindowsDriver<WindowsElement> driver)
+    public override AppiumElement FindElement(WindowsDriver driver)
     {
         var location = driver.CurrentWindowHandle;
         var xpath = ResolveLocator(location, driver);
-        return driver.FindElementByXPath(xpath);
+        return driver.FindElement(By.XPath(xpath));
     }
 
     /// <summary>
-    /// Locates all matching WindowsElements using the resolved XPath.
+    /// Locates all matching AppiumElements using the resolved XPath.
     /// </summary>
-    public override IEnumerable<WindowsElement> FindAllElements(WindowsDriver<WindowsElement> driver)
+    public override IEnumerable<AppiumElement> FindAllElements(WindowsDriver driver)
     {
         var location = driver.CurrentWindowHandle;
         var xpath = ResolveLocator(location, driver);
-        return driver.FindElementsByXPath(xpath);
+        return driver.FindElements(By.XPath(xpath));
     }
 
     /// <summary>
-    /// Locates a single AppiumWebElement in the context of a parent element using the resolved XPath.
+    /// Locates a single AppiumElement in the context of a parent element using the resolved XPath.
     /// </summary>
-    public override AppiumWebElement FindElement(WindowsElement element)
+    public override AppiumElement FindElement(AppiumElement element)
     {
         var location = element.WrappedDriver.CurrentWindowHandle;
-        var xpath = ResolveLocator(location, element.WrappedDriver as WindowsDriver<WindowsElement>);
-        return element.FindElementByXPath(xpath);
+        var xpath = ResolveLocator(location, element.WrappedDriver as WindowsDriver);
+        return element.FindElement(By.XPath(xpath));
     }
 
     /// <summary>
-    /// Locates all matching AppiumWebElements in the context of a parent element using the resolved XPath.
+    /// Locates all matching AppiumElements in the context of a parent element using the resolved XPath.
     /// </summary>
-    public override IEnumerable<AppiumWebElement> FindAllElements(WindowsElement element)
+    public override IEnumerable<AppiumElement> FindAllElements(AppiumElement element)
     {
         var location = element.WrappedDriver.CurrentWindowHandle;
-        var xpath = ResolveLocator(location, element.WrappedDriver as WindowsDriver<WindowsElement>);
-        return element.FindElementsByXPath(xpath);
+        var xpath = ResolveLocator(location, element.WrappedDriver as WindowsDriver);
+        return element.FindElements(By.XPath(xpath));
     }
 
     /// <summary>
@@ -94,7 +95,7 @@ public override IEnumerable<AppiumWebElement> FindAllElements(WindowsElement ele
     /// <param name="location">Desktop app window handle or location identifier.</param>
     /// <param name="driver">WindowsDriver for presence checking.</param>
     /// <returns>A valid XPath string.</returns>
-    private string ResolveLocator(string location, WindowsDriver<WindowsElement> driver)
+    private string ResolveLocator(string location, WindowsDriver driver)
     {
         // Step 1: Try RAG memory (PageObjects index)
         if (_tryResolveFromPages)
@@ -129,7 +130,7 @@ private string ResolveLocator(string location, WindowsDriver<WindowsElement> dri
     /// <param name="instruction">The natural language instruction for the element.</param>
     /// <param name="driver">WindowsDriver for presence checking.</param>
     /// <returns>XPath string if found; otherwise null.</returns>
-    private string TryResolveFromPageObjectMemory(string instruction, WindowsDriver<WindowsElement> driver)
+    private string TryResolveFromPageObjectMemory(string instruction, WindowsDriver driver)
     {
         var match = SemanticKernelService.Memory
             .SearchAsync(instruction, index: "PageObjects", limit: 1)
@@ -160,7 +161,7 @@ private string TryResolveFromPageObjectMemory(string instruction, WindowsDriver<
     /// <param name="driver">WindowsDriver for presence checking.</param>
     /// <param name="maxAttempts">Maximum number of attempts to generate a working selector.</param>
     /// <returns>XPath string if found; otherwise throws InvalidOperationException.</returns>
-    private string ResolveViaPromptFallback(string location, WindowsDriver<WindowsElement> driver, int maxAttempts = 3)
+    private string ResolveViaPromptFallback(string location, WindowsDriver driver, int maxAttempts = 3)
     {
         var viewSnapshotProvider = ServicesCollection.Current.Resolve<IViewSnapshotProvider>();
         var failedSelectors = new List<string>();
@@ -222,9 +223,9 @@ private static string ParsePromptLocatorToXPath(string promptResult)
     /// <param name="driver">The WindowsDriver instance.</param>
     /// <param name="xpath">The XPath locator to check.</param>
     /// <returns>true if at least one element is found; otherwise false.</returns>
-    private static bool IsElementPresent(WindowsDriver<WindowsElement> driver, string xpath)
+    private static bool IsElementPresent(WindowsDriver driver, string xpath)
     {
-        try { return driver.FindElementsByXPath(xpath).Any(); }
+        try { return driver.FindElements(By.XPath(xpath)).Any(); }
         catch { return false; }
     }
 

templates/Bellatrix.Desktop.Tests/WindowsCalculatorTests.cs

@@ -20,7 +20,7 @@ public void Addition()
         App.Components.CreateByName<Button>("Equals").Click();
 
         var calculatorResult = GetCalculatorResultText();
-        Assert.AreEqual("12", calculatorResult);
+        Assert.That(calculatorResult, Is.EqualTo("12"));
     }
 
     ////[TestMethod]
@@ -34,7 +34,7 @@ public void Division()
         App.Components.CreateByAccessibilityId<Button>("num1Button").Click();
         App.Components.CreateByAccessibilityId<Button>("equalButton").Click();
 
-        Assert.AreEqual("8", GetCalculatorResultText());
+        Assert.That(GetCalculatorResultText(), Is.EqualTo("8"));
     }
 
     ////[TestMethod]
@@ -46,7 +46,7 @@ public void Multiplication()
         App.Components.CreateByXPath<Button>("//Button[@Name='Nine']").Click();
         App.Components.CreateByXPath<Button>("//Button[@Name='Equals']").Click();
 
-        Assert.AreEqual("81", GetCalculatorResultText());
+        Assert.That(GetCalculatorResultText(), Is.EqualTo("81"));
     }
 
     ////[TestMethod]
@@ -58,7 +58,7 @@ public void Subtraction()
         App.Components.CreateByXPath<Button>("//Button[@AutomationId='num1Button']").Click();
         App.Components.CreateByXPath<Button>("//Button[@AutomationId='equalButton']").Click();
 
-        Assert.AreEqual("8", GetCalculatorResultText());
+        Assert.That(GetCalculatorResultText(), Is.EqualTo("8"));
     }
 
     private string GetCalculatorResultText()