working on relative locator support

rbri · rbri · commit d938cc9c304b · 2024-10-30T20:20:44.000+01:00
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitElementFinder.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitElementFinder.java
@@ -605,10 +605,6 @@ private static List<WebElement> convertRawDomElementsToWebElements(
 
     public static class FindByRelativeLocator extends HtmlUnitElementLocator {
 
-        public FindByRelativeLocator() {
-
-        }
-
         @Override
         public List<WebElement> findElements(final HtmlUnitDriver driver, final By locator) {
             return (List<WebElement>) driver.executeScript(FIND_ELEMENTS_JS, asParameter(locator));
diff --git a/src/test/java/org/openqa/selenium/htmlunit/by/RelativeLocatorTest.java b/src/test/java/org/openqa/selenium/htmlunit/by/RelativeLocatorTest.java
@@ -106,6 +106,10 @@ public void shouldBeAbleToFindElementsAboveAnotherWithCssSelector() throws Excep
 
     @Test
     @Alerts({"1", "third"})
+    @HtmlUnitNYI(CHROME = "0",
+            EDGE = "0",
+            FF = "0",
+            FF_ESR = "0")
     public void shouldBeAbleToCombineFilters() throws Exception {
         final String html = getFileContent("relative_locators.html");
         final WebDriver driver = loadPage2(html);
@@ -114,12 +118,19 @@ public void shouldBeAbleToCombineFilters() throws Exception {
                         with(tagName("td")).above(By.id("center")).toRightOf(By.id("second")));
         final List<String> ids = seen.stream().map(e -> e.getAttribute("id")).collect(Collectors.toList());
 
-        assertEquals(Integer.parseInt(getExpectedAlerts()[0]), ids.size());
-        assertTrue(ids.contains(getExpectedAlerts()[1]));
+        final int expectedSize = Integer.parseInt(getExpectedAlerts()[0]);
+        assertEquals(expectedSize, ids.size());
+        if (expectedSize > 0) {
+            assertTrue(ids.contains(getExpectedAlerts()[1]));
+        }
     }
 
     @Test
     @Alerts({"1", "fourth"})
+    @HtmlUnitNYI(CHROME = "0",
+            EDGE = "0",
+            FF = "0",
+            FF_ESR = "0")
     public void shouldBeAbleToCombineFiltersWithXpath() throws Exception {
         final String html = getFileContent("relative_locators.html");
         final WebDriver driver = loadPage2(html);
@@ -128,12 +139,19 @@ public void shouldBeAbleToCombineFiltersWithXpath() throws Exception {
                         with(xpath("//td[1]")).below(By.id("second")).above(By.id("seventh")));
         final List<String> ids = seen.stream().map(e -> e.getAttribute("id")).collect(Collectors.toList());
 
-        assertEquals(Integer.parseInt(getExpectedAlerts()[0]), ids.size());
-        assertTrue(ids.contains(getExpectedAlerts()[1]));
+        final int expectedSize = Integer.parseInt(getExpectedAlerts()[0]);
+        assertEquals(expectedSize, ids.size());
+        if (expectedSize > 0) {
+            assertTrue(ids.contains(getExpectedAlerts()[1]));
+        }
     }
 
     @Test
     @Alerts({"1", "third"})
+    @HtmlUnitNYI(CHROME = "0",
+            EDGE = "0",
+            FF = "0",
+            FF_ESR = "0")
     public void shouldBeAbleToCombineFiltersWithCssSelector() throws Exception {
         final String html = getFileContent("relative_locators.html");
         final WebDriver driver = loadPage2(html);
@@ -142,8 +160,11 @@ public void shouldBeAbleToCombineFiltersWithCssSelector() throws Exception {
                         with(cssSelector("td")).above(By.id("center")).toRightOf(By.id("second")));
         final List<String> ids = seen.stream().map(e -> e.getAttribute("id")).collect(Collectors.toList());
 
-        assertEquals(Integer.parseInt(getExpectedAlerts()[0]), ids.size());
-        assertTrue(ids.contains(getExpectedAlerts()[1]));
+        final int expectedSize = Integer.parseInt(getExpectedAlerts()[0]);
+        assertEquals(expectedSize, ids.size());
+        if (expectedSize > 0) {
+            assertTrue(ids.contains(getExpectedAlerts()[1]));
+        }
     }
 
     @Test
