Fix wrapping of maps with null values. Fixes #3380

SeleniumHQ · Aug 21, 2017 · 91eb004 · khatchad · Aug 20, 2019 · 91eb004
1 parent 10229a9
commit 91eb004
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/java/client/src/org/openqa/selenium/support/events/EventFiringWebDriver.java b/java/client/src/org/openqa/selenium/support/events/EventFiringWebDriver.java
@@ -274,9 +274,10 @@ private Object wrapResult(Object result) {
       return ((List) result).stream().map(this::wrapResult).collect(Collectors.toList());
     }
     if (result instanceof Map) {
-      return ((Map<String, Object>) result).entrySet().stream().collect(Collectors.toMap(
-          e -> e.getKey(), e -> wrapResult(e.getValue())
-      ));
+      return ((Map<String, Object>) result).entrySet().stream().collect(
+          HashMap::new,
+          (m, e) -> m.put(e.getKey(), e.getValue()),
+          Map::putAll);
     }
 
     return result;

diff --git a/java/client/test/org/openqa/selenium/support/events/EventFiringWebDriverTest.java b/java/client/test/org/openqa/selenium/support/events/EventFiringWebDriverTest.java
@@ -25,6 +25,7 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -52,7 +53,9 @@
 import org.openqa.selenium.internal.WrapsElement;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Michael Tamm
@@ -318,6 +321,22 @@ public void shouldWrapMultipleElementsFoundWhenCallingScripts() {
     assertSame(stubbedElement2, ((WrapsElement) resList.get(1)).getWrappedElement());
   }
 
+  @Test
+  public void shouldWrapMapsWithNullValues() {
+    Map<String, Object> map = new HashMap<>();
+    map.put("a", null);
+    final WebDriver mockedDriver = mock(WebDriver.class,
+                                        withSettings().extraInterfaces(JavascriptExecutor.class));
+    when(((JavascriptExecutor) mockedDriver).executeScript("foo")).thenReturn(map);
+
+    EventFiringWebDriver testedDriver = new EventFiringWebDriver(mockedDriver);
+
+    Object res = testedDriver.executeScript("foo");
+    verify((JavascriptExecutor) mockedDriver).executeScript("foo");
+    assertThat(res, instanceOf(Map.class));
+    assertThat(((Map<String, Object>) res).get("a"), is(nullValue()));
+  }
+
   @Test
   public void testShouldUnpackMapOfElementArgsWhenCallingScripts() {
     final WebDriver mockedDriver = mock(WebDriver.class,