HtmlUnit: add text to the end of input fields

This makes the htmlunit driver work as the other drivers do. Signed-off-by: Simon Stewart <simon.m.stewart@gmail.com>
quehanwei · Sep 29, 2014 · b8a5aea · b8a5aea
1 parent e9a90c3
commit b8a5aea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitKeyboard.java b/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitKeyboard.java
@@ -26,7 +26,9 @@
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
+import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
 import com.gargoylesoftware.htmlunit.javascript.host.Event;
 import com.gargoylesoftware.htmlunit.javascript.host.KeyboardEvent;
 
@@ -64,9 +66,22 @@ public void sendKeys(HtmlElement element, String currentValue, InputKeysContaine
 
     if (parent.isJavascriptEnabled() && !(element instanceof HtmlFileInput)) {
       if (element instanceof HtmlTextArea) {
-        String text = ((HtmlTextArea) element).getText();
-        ((HtmlTextArea) element).setSelectionStart(text.length());
-        ((HtmlTextArea) element).setSelectionEnd(text.length());
+        HtmlTextArea area = (HtmlTextArea) element;
+        String text = area.getText();
+        area.setSelectionStart(text.length());
+        area.setSelectionEnd(text.length());
+      }
+      else if (element instanceof HtmlTextInput) {
+        HtmlTextInput input = (HtmlTextInput) element;
+        String text = input.getText();
+        input.setSelectionStart(text.length());
+        input.setSelectionEnd(text.length());
+      }
+      else if (element instanceof HtmlPasswordInput) {
+        HtmlPasswordInput input = (HtmlPasswordInput) element;
+        String text = input.getText();
+        input.setSelectionStart(text.length());
+        input.setSelectionEnd(text.length());
       }
       try {
         element.type(keysToSend.toString());

diff --git a/java/client/test/org/openqa/selenium/FormHandlingTest.java b/java/client/test/org/openqa/selenium/FormHandlingTest.java
@@ -244,7 +244,7 @@ public void testSendingKeyboardEventsShouldAppendTextInInputs() {
     assertThat(value, is("some text"));
   }
 
-  @Ignore(value = {ANDROID, HTMLUNIT, IPHONE, OPERA, OPERA_MOBILE},
+  @Ignore(value = {ANDROID, IPHONE, OPERA, OPERA_MOBILE},
           reason = "iPhone: sendKeys implemented incorrectly")
   @Test
   public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue() {