[java] Fixing sendKeys to throw if it sees a null somewhere

SeleniumHQ · Aug 9, 2018 · 7c63cea · 7c63cea
1 parent d9f0937
commit 7c63cea
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebElement.java b/java/client/src/org/openqa/selenium/remote/RemoteWebElement.java
@@ -48,6 +48,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 public class RemoteWebElement implements WebElement, FindsByLinkText, FindsById, FindsByName,
                                          FindsByTagName, FindsByClassName, FindsByCssSelector,
@@ -88,9 +89,14 @@ public void submit() {
   }
 
   public void sendKeys(CharSequence... keysToSend) {
-    if (keysToSend == null) {
+    if (keysToSend == null || keysToSend.length == 0) {
       throw new IllegalArgumentException("Keys to send should be a not null CharSequence");
     }
+    for (CharSequence cs : keysToSend) {
+      if (cs == null) {
+        throw new IllegalArgumentException("Keys to send should be a not null CharSequence");
+      }
+    }
     File localFile = fileDetector.getLocalFile(keysToSend);
     if (localFile != null) {
       String remotePath = upload(localFile);

diff --git a/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java
@@ -167,7 +167,39 @@ public void testBasicKeyboardInputOnActiveElement() {
   }
 
   @Test
-  public void testThrowsIllegalArgumentExceptionWithNullKeys() {
+  public void testThrowsIllegalArgumentExceptionWithNoParameters() {
+    driver.get(pages.javascriptPage);
+    Throwable t = catchThrowable(
+        () -> driver.findElement(By.id("keyReporter")).sendKeys());
+    assertThat(t, instanceOf(IllegalArgumentException.class));
+  }
+
+  @Test
+  public void testThrowsIllegalArgumentExceptionWithNullParameter() {
+    driver.get(pages.javascriptPage);
+    Throwable t = catchThrowable(
+        () -> driver.findElement(By.id("keyReporter")).sendKeys(null));
+    assertThat(t, instanceOf(IllegalArgumentException.class));
+  }
+
+  @Test
+  public void testThrowsIllegalArgumentExceptionWithNullInParameters() {
+    driver.get(pages.javascriptPage);
+    Throwable t = catchThrowable(
+        () -> driver.findElement(By.id("keyReporter")).sendKeys("x", null, "y"));
+    assertThat(t, instanceOf(IllegalArgumentException.class));
+  }
+
+  @Test
+  public void testThrowsIllegalArgumentExceptionWithCharSequenceThatContainsNull() {
+    driver.get(pages.javascriptPage);
+    Throwable t = catchThrowable(
+        () -> driver.findElement(By.id("keyReporter")).sendKeys(new CharSequence[] {"x", null, "y"}));
+    assertThat(t, instanceOf(IllegalArgumentException.class));
+  }
+
+  @Test
+  public void testThrowsIllegalArgumentExceptionWithCharSequenceThatContainsNullOnly() {
     driver.get(pages.javascriptPage);
     Throwable t = catchThrowable(
         () -> driver.findElement(By.id("keyReporter")).sendKeys(new CharSequence[] {null}));