Merge pull request #39 from aristotelos/fix-find-elements-empty

Return empty list from Find elements
FlaUI · May 8, 2024 · 4857093 · 4857093
2 parents c87c586 + cbc3f04
commit 4857093
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/src/FlaUI.WebDriver.UITests/FindElementsTests.cs b/src/FlaUI.WebDriver.UITests/FindElementsTests.cs
@@ -119,7 +119,7 @@ public void FindElement_ByTagName_ReturnsElement()
         }
 
         [Test]
-        public void FindElement_NotExisting_TimesOut()
+        public void FindElement_NotExisting_ThrowsNoSuchElementException()
         {
             var driverOptions = FlaUIDriverOptions.TestApp();
             using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
@@ -142,7 +142,7 @@ public void FindElementFromElement_InsideElement_ReturnsElement()
         }
 
         [Test]
-        public void FindElementFromElement_OutsideElement_TimesOut()
+        public void FindElementFromElement_OutsideElement_ThrowsNoSuchElementException()
         {
             var driverOptions = FlaUIDriverOptions.TestApp();
             using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
@@ -166,15 +166,15 @@ public void FindElementsFromElement_InsideElement_ReturnsElement()
         }
 
         [Test]
-        public void FindElementsFromElement_OutsideElement_TimesOut()
+        public void FindElementsFromElement_OutsideElement_ReturnsEmptyList()
         {
             var driverOptions = FlaUIDriverOptions.TestApp();
             using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
             var fromElement = driver.FindElement(ExtendedBy.AccessibilityId("ListBox"));
 
-            var findElements = () => fromElement.FindElements(ExtendedBy.AccessibilityId("TextBox"));
+            var foundElements = fromElement.FindElements(ExtendedBy.AccessibilityId("TextBox"));
 
-            Assert.That(findElements, Throws.TypeOf<NoSuchElementException>());
+            Assert.That(foundElements, Is.Empty);
         }
 
         [Test]
@@ -189,18 +189,18 @@ public void FindElements_Default_ReturnsElements()
         }
 
         [Test]
-        public void FindElements_NotExisting_TimesOut()
+        public void FindElements_NotExisting_ReturnsEmptyList()
         {
             var driverOptions = FlaUIDriverOptions.TestApp();
             using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
 
-            var findElements = () => driver.FindElements(ExtendedBy.AccessibilityId("NotExisting"));
+            var foundElements = driver.FindElements(ExtendedBy.AccessibilityId("NotExisting"));
 
-            Assert.That(findElements, Throws.TypeOf<NoSuchElementException>());
+            Assert.That(foundElements, Is.Empty);
         }
 
         [Test]
-        public void FindElement_InOtherWindow_TimesOut()
+        public void FindElement_InOtherWindow_ThrowsNoSuchElementException()
         {
             var driverOptions = FlaUIDriverOptions.TestApp();
             using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
@@ -214,15 +214,15 @@ public void FindElement_InOtherWindow_TimesOut()
         }
 
         [Test]
-        public void FindElements_InOtherWindow_TimesOut()
+        public void FindElements_InOtherWindow_ReturnsEmptyList()
         {
             var driverOptions = FlaUIDriverOptions.TestApp();
             using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
             OpenAndSwitchToAnotherWindow(driver);
 
-            var findElements = () => driver.FindElements(ExtendedBy.AccessibilityId("TextBox"));
+            var foundElements = driver.FindElements(ExtendedBy.AccessibilityId("TextBox"));
 
-            Assert.That(findElements, Throws.TypeOf<NoSuchElementException>());
+            Assert.That(foundElements, Is.Empty);
             var elementsInNewWindow = driver.FindElements(ExtendedBy.AccessibilityId("Window1TextBox"));
             Assert.That(elementsInNewWindow, Has.Count.EqualTo(1));
         }

diff --git a/src/FlaUI.WebDriver/Controllers/FindElementsController.cs b/src/FlaUI.WebDriver/Controllers/FindElementsController.cs
@@ -88,11 +88,6 @@ private static async Task<ActionResult> FindElementsFrom(Func<AutomationElement>
                 elements = await Wait.Until(() => startNode().FindAllDescendants(condition), elements => elements.Length > 0, session.ImplicitWaitTimeout);
             }
 
-            if (elements.Length == 0)
-            {
-                return NoSuchElement(findElementRequest);
-            }
-
             var knownElements = elements.Select(session.GetOrAddKnownElement);
             return await Task.FromResult(WebDriverResult.Success(