HtmlUnitWebElement: to handle DomElement

Currently HtmlUnitWebElement supports only
HtmlElement, however there are potential SvgElement
which should be handled.

This is the first step towards implementing SvgElement
clicking, as required by Selenium test suite.

Signed-off-by: Luke Inman-Semerau <[email protected]>

Author: asashour

Diff for: java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java

@@ -780,7 +780,7 @@ private Object parseArgumentIntoJavascriptParameter(
     }
   }
 
-  protected void assertElementNotStale(HtmlElement element) {
+  protected void assertElementNotStale(DomElement element) {
     SgmlPage elementPage = element.getPage();
     Page currentPage = lastPage();
 
@@ -963,7 +963,7 @@ public WebElement findElementByLinkText(String selector) {
     throw new NoSuchElementException("No link found with text: " + expectedText);
   }
 
-  protected WebElement newHtmlUnitWebElement(HtmlElement element) {
+  protected WebElement newHtmlUnitWebElement(DomElement element) {
     return new HtmlUnitWebElement(this, element);
   }
 
@@ -1034,11 +1034,11 @@ public WebElement findElementByCssSelector(String using) {
       throw new NoSuchElementException("Unable to locate element using css", ex);
     }
 
-    if (node instanceof HtmlElement) {
-      return newHtmlUnitWebElement((HtmlElement) node);
+    if (node instanceof DomElement) {
+      return newHtmlUnitWebElement((DomElement) node);
     }
 
-    throw new NoSuchElementException("Returned node was not an HTML element");
+    throw new NoSuchElementException("Returned node was not a DOM element");
   }
 
   @Override
@@ -1058,10 +1058,10 @@ public List<WebElement> findElementsByCssSelector(String using) {
     List<WebElement> toReturn = new ArrayList<>();
 
     for (DomNode node : allNodes) {
-      if (node instanceof HtmlElement) {
-        toReturn.add(newHtmlUnitWebElement((HtmlElement) node));
+      if (node instanceof DomElement) {
+        toReturn.add(newHtmlUnitWebElement((DomElement) node));
       } else {
-        throw new NoSuchElementException("Returned node was not an HTML element");
+        throw new NoSuchElementException("Returned node was not a DOM element");
       }
     }
 
@@ -1240,7 +1240,7 @@ public WebDriver frame(final String nameOrId) {
       try {
         HtmlUnitWebElement element =
             (HtmlUnitWebElement) HtmlUnitDriver.this.findElementById(nameOrId);
-        HtmlElement domElement = element.getElement();
+        DomElement domElement = element.getElement();
         if (domElement instanceof BaseFrameElement) {
           currentWindow = ((BaseFrameElement) domElement).getEnclosedWindow();
           return HtmlUnitDriver.this;
@@ -1260,7 +1260,7 @@ public WebDriver frame(WebElement frameElement) {
       HtmlUnitWebElement webElement = (HtmlUnitWebElement) frameElement;
       webElement.assertElementNotStale();
 
-      HtmlElement domElement = webElement.getElement();
+      DomElement domElement = webElement.getElement();
       if (!(domElement instanceof BaseFrameElement)) {
         throw new NoSuchFrameException(webElement.getTagName() + " is not a frame element.");
       }

Diff for: java/client/src/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java

@@ -25,8 +25,6 @@
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import net.sourceforge.htmlunit.corejs.javascript.Undefined;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.ElementNotVisibleException;
@@ -52,6 +50,7 @@
 import org.w3c.dom.NamedNodeMap;
 
 import com.gargoylesoftware.htmlunit.ScriptResult;
+import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.DomNode;
 import com.gargoylesoftware.htmlunit.html.DomText;
 import com.gargoylesoftware.htmlunit.html.HtmlButton;
@@ -71,13 +70,15 @@
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
 
+import net.sourceforge.htmlunit.corejs.javascript.Undefined;
+
 
 public class HtmlUnitWebElement implements WrapsDriver,
     FindsById, FindsByLinkText, FindsByXPath, FindsByTagName,
     FindsByCssSelector, Locatable, WebElement {
 
   protected final HtmlUnitDriver parent;
-  protected final HtmlElement element;
+  protected final DomElement element;
   private static final char nbspChar = 160;
   private static final String[] blockLevelsTagNames =
   {"p", "h1", "h2", "h3", "h4", "h5", "h6", "dl", "div", "noscript",
@@ -128,7 +129,7 @@ public class HtmlUnitWebElement implements WrapsDriver,
 
   private String toString;
 
-  public HtmlUnitWebElement(HtmlUnitDriver parent, HtmlElement element) {
+  public HtmlUnitWebElement(HtmlUnitDriver parent, DomElement element) {
     this.parent = parent;
     this.element = element;
   }
@@ -166,10 +167,10 @@ public void submit() {
         submitForm((HtmlForm) element);
         return;
       } else if ((element instanceof HtmlSubmitInput) || (element instanceof HtmlImageInput)) {
-        element.click();
+        ((HtmlElement) element).click();
         return;
       } else if (element instanceof HtmlInput) {
-        HtmlForm form = element.getEnclosingForm();
+        HtmlForm form = ((HtmlElement) element).getEnclosingForm();
         if (form == null) {
           throw new NoSuchElementException("Unable to find the containing form");
         }
@@ -297,12 +298,12 @@ private void switchFocusToThisIfNeeded() {
       if (jsEnabled &&
           !oldActiveEqualsCurrent &&
           !isBody) {
-        oldActiveElement.element.blur();
+        ((HtmlElement) oldActiveElement.element).blur();
       }
     } catch (StaleElementReferenceException ex) {
       // old element has gone, do nothing
     }
-    element.focus();
+    ((HtmlElement) element).focus();
   }
 
   void sendKeyDownEvent(CharSequence modifierKey) {
@@ -317,7 +318,7 @@ private void sendSingleKeyEvent(CharSequence modifierKey, String eventDescriptio
     verifyCanInteractWithElement();
     switchFocusToThisIfNeeded();
     HtmlUnitKeyboard keyboard = (HtmlUnitKeyboard) parent.getKeyboard();
-    keyboard.performSingleKeyAction(getElement(), modifierKey, eventDescription);
+    keyboard.performSingleKeyAction((HtmlElement) getElement(), modifierKey, eventDescription);
   }
 
   @Override
@@ -329,7 +330,7 @@ public void sendKeys(CharSequence... value) {
     switchFocusToThisIfNeeded();
 
     HtmlUnitKeyboard keyboard = (HtmlUnitKeyboard) parent.getKeyboard();
-    keyboard.sendKeys(element, getAttribute("value"), keysContainer);
+    keyboard.sendKeys((HtmlElement) element, getAttribute("value"), keysContainer);
 
     if (isInputElement() && keysContainer.wasSubmitKeyFound()) {
       submit();
@@ -540,7 +541,7 @@ protected HtmlUnitDriver getParent() {
     return parent;
   }
 
-  protected HtmlElement getElement() {
+  protected DomElement getElement() {
     return element;
   }
 
@@ -685,7 +686,7 @@ private List<WebElement> findChildNodes(List<WebElement> allElements) {
     List<WebElement> toReturn = new LinkedList<WebElement>();
 
     for (WebElement current : allElements) {
-      HtmlElement candidate = ((HtmlUnitWebElement) current).element;
+      DomElement candidate = ((HtmlUnitWebElement) current).element;
       if (element.isAncestorOf(candidate) && element != candidate) {
         toReturn.add(current);
       }
@@ -765,9 +766,9 @@ public List<WebElement> findElementsByLinkText(String linkText) {
     assertElementNotStale();
 
     String expectedText = linkText.trim();
-    List<? extends HtmlElement> htmlElements = element.getHtmlElementsByTagName("a");
+    List<? extends DomElement> htmlElements = ((HtmlElement) element).getHtmlElementsByTagName("a");
     List<WebElement> webElements = new ArrayList<>();
-    for (HtmlElement e : htmlElements) {
+    for (DomElement e : htmlElements) {
       if (expectedText.equals(e.getTextContent().trim()) && e.getAttribute("href") != null) {
         webElements.add(getParent().newHtmlUnitWebElement(e));
       }
@@ -791,7 +792,7 @@ public WebElement findElementByPartialLinkText(String linkText) {
   public List<WebElement> findElementsByPartialLinkText(String linkText) {
     assertElementNotStale();
 
-    List<? extends HtmlElement> htmlElements = element.getHtmlElementsByTagName("a");
+    List<? extends HtmlElement> htmlElements = ((HtmlElement) element).getHtmlElementsByTagName("a");
     List<WebElement> webElements = new ArrayList<>();
     for (HtmlElement e : htmlElements) {
       if (e.getTextContent().contains(linkText)
@@ -817,7 +818,7 @@ public WebElement findElementByTagName(String name) {
   public List<WebElement> findElementsByTagName(String name) {
     assertElementNotStale();
 
-    List<HtmlElement> elements = element.getHtmlElementsByTagName(name);
+    List<HtmlElement> elements = ((HtmlElement) element).getHtmlElementsByTagName(name);
     List<WebElement> toReturn = new ArrayList<>(elements.size());
     for (HtmlElement element : elements) {
       toReturn.add(parent.newHtmlUnitWebElement(element));
@@ -864,7 +865,7 @@ protected void assertElementNotStale() {
   public String getCssValue(String propertyName) {
     assertElementNotStale();
 
-    return getEffectiveStyle(element, propertyName);
+    return getEffectiveStyle((HtmlElement) element, propertyName);
   }
 
   private String getEffectiveStyle(HtmlElement htmlElement, String propertyName) {