[java] Adding more tests for ImmutableCapabilities

quehanwei · May 22, 2020 · 979f02a · 979f02a
1 parent d9426c7
commit 979f02a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/java/client/src/org/openqa/selenium/ImmutableCapabilities.java b/java/client/src/org/openqa/selenium/ImmutableCapabilities.java
@@ -74,9 +74,7 @@ public ImmutableCapabilities(Capabilities other) {
 
   public ImmutableCapabilities(Map<?, ?> capabilities) {
     capabilities.forEach((key, value) -> {
-      if (!(key instanceof String)) {
-        throw new IllegalArgumentException("Key values must be strings");
-      }
+      Require.argument("Key", key).instanceOf(String.class);
       setCapability(String.valueOf(key), value);
     });
   }

diff --git a/java/client/test/org/openqa/selenium/ImmutableCapabilitiesTest.java b/java/client/test/org/openqa/selenium/ImmutableCapabilitiesTest.java
@@ -18,11 +18,15 @@
 package org.openqa.selenium;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import com.google.common.collect.ImmutableMap;
 
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class ImmutableCapabilitiesTest {
 
   @Test
@@ -76,4 +80,12 @@ public void canCompareCapabilities() {
     assertThat(new ImmutableCapabilities(caps2)).isEqualTo(new ImmutableCapabilities(caps1));
   }
 
+  @Test
+  public void shouldCheckKeyType() {
+    Map<Object, Object> map = new HashMap<>();
+    map.put(new Object(), new Object());
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> new ImmutableCapabilities(map));
+  }
+
 }