cleanup and more tests

rbri · rbri · commit 168df0f17059 · 2023-04-25T13:15:49.000+02:00
diff --git a/src/test/java/org/openqa/selenium/htmlunit/by/FindByXPathTest.java b/src/test/java/org/openqa/selenium/htmlunit/by/FindByXPathTest.java
@@ -22,6 +22,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
+import org.openqa.selenium.InvalidSelectorException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.htmlunit.WebDriverTestCase;
@@ -104,4 +105,109 @@ public void relativeElementsByXPath() throws Exception {
         assertEquals(1, elements.size());
         assertEquals("testId2", elements.get(0).getAttribute("id"));
     }
+
+    @Test(expected = InvalidSelectorException.class)
+    public void elementsByXPathEmpty() throws Exception {
+        final String html = "<html>\n"
+                        + "<head>\n"
+                        + "</head>\n"
+                        + "<body>\n"
+                        + "  <div id='ctx'>\n"
+                        + "    <div id='testId' class='other'></div>\n"
+                        + "    <div id='testId2' class='testClass'></div>\n"
+                        + "  </div>\n"
+                        + "</body>\n"
+                        + "</html>\n";
+
+        final WebDriver driver = loadPage2(html);
+        final WebElement ctx = driver.findElement(By.id("ctx"));
+        ctx.findElements(By.xpath(""));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void elementsByXPathNull() throws Exception {
+        final String html = "<html>\n"
+                        + "<head>\n"
+                        + "</head>\n"
+                        + "<body>\n"
+                        + "  <div id='ctx'>\n"
+                        + "    <div id='testId' class='other'></div>\n"
+                        + "    <div id='testId2' class='testClass'></div>\n"
+                        + "  </div>\n"
+                        + "</body>\n"
+                        + "</html>\n";
+
+        final WebDriver driver = loadPage2(html);
+        final WebElement ctx = driver.findElement(By.id("ctx"));
+        ctx.findElements(By.xpath(null));
+    }
+
+    @Test(expected = InvalidSelectorException.class)
+    public void elementsByXPathBlank() throws Exception {
+        final String html = "<html>\n"
+                        + "<head>\n"
+                        + "</head>\n"
+                        + "<body>\n"
+                        + "  <div id='ctx'>\n"
+                        + "    <div id='testId' class='other'></div>\n"
+                        + "    <div id='testId2' class='testClass'></div>\n"
+                        + "  </div>\n"
+                        + "</body>\n"
+                        + "</html>\n";
+
+        final WebDriver driver = loadPage2(html);
+        final WebElement ctx = driver.findElement(By.id("ctx"));
+        ctx.findElements(By.xpath("  \t "));
+    }
+
+    @Test(expected = InvalidSelectorException.class)
+    public void elementByXPathEmpty() throws Exception {
+        final String html = "<html>\n"
+                        + "<head>\n"
+                        + "</head>\n"
+                        + "<body>\n"
+                        + "  <div id='ctx'>\n"
+                        + "    <div id='testId' class='other'></div>\n"
+                        + "    <div id='testId2' class='testClass'></div>\n"
+                        + "  </div>\n"
+                        + "</body>\n"
+                        + "</html>\n";
+
+        final WebDriver driver = loadPage2(html);
+        driver.findElement(By.xpath(""));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void elementByXPathNull() throws Exception {
+        final String html = "<html>\n"
+                        + "<head>\n"
+                        + "</head>\n"
+                        + "<body>\n"
+                        + "  <div id='ctx'>\n"
+                        + "    <div id='testId' class='other'></div>\n"
+                        + "    <div id='testId2' class='testClass'></div>\n"
+                        + "  </div>\n"
+                        + "</body>\n"
+                        + "</html>\n";
+
+        final WebDriver driver = loadPage2(html);
+        driver.findElement(By.xpath(null));
+    }
+
+    @Test(expected = InvalidSelectorException.class)
+    public void elementByXPathBlank() throws Exception {
+        final String html = "<html>\n"
+                        + "<head>\n"
+                        + "</head>\n"
+                        + "<body>\n"
+                        + "  <div id='ctx'>\n"
+                        + "    <div id='testId' class='other'></div>\n"
+                        + "    <div id='testId2' class='testClass'></div>\n"
+                        + "  </div>\n"
+                        + "</body>\n"
+                        + "</html>\n";
+
+        final WebDriver driver = loadPage2(html);
+        driver.findElement(By.xpath("  \t "));
+    }
 }
diff --git a/src/test/java/org/openqa/selenium/htmlunit/html/WebClient3Test.java b/src/test/java/org/openqa/selenium/htmlunit/html/WebClient3Test.java
@@ -46,8 +46,6 @@ public void javascriptContentDetectorWithoutContentMixedCase() throws Exception
      */
     @Test
     public void getPageAboutProtocol() throws Exception {
-        final String html = "<html><body>DataUrl Test</body></html>";
-
         final WebDriver driver = getWebDriver();
         driver.get("about:blank");
 
