Handles Long overflow on JsonTypeCoercer (#7423)

Ensures that if a value is an integer, it can be safely casted to Long. Otherwise, it returns a Double. Fixes #7398
SeleniumHQ · Aug 1, 2019 · 9c9661f · 9c9661f
1 parent 85a1010
commit 9c9661f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/java/client/src/org/openqa/selenium/json/JsonTypeCoercer.java b/java/client/src/org/openqa/selenium/json/JsonTypeCoercer.java
@@ -77,8 +77,9 @@ private JsonTypeCoercer(Stream<TypeCoercer<?>> coercers) {
         new NumberCoercer<>(
             Number.class,
             num -> {
-              if (num.doubleValue() % 1 != 0) {
-                return num.doubleValue();
+              Double doubleValue = num.doubleValue();
+              if (doubleValue % 1 != 0 || doubleValue > Long.MAX_VALUE) {
+                return doubleValue;
               }
               return num.longValue();
             }));

diff --git a/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java b/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java
@@ -226,6 +226,14 @@ public void testPassingAndReturningALongShouldReturnAWholeNumber() {
     assertThat(result).isInstanceOfAny(Integer.class, Long.class).isEqualTo(expectedResult);
   }
 
+  @Test
+  public void testReturningOverflownLongShouldReturnADouble() {
+    driver.get(pages.javascriptPage);
+    Double expectedResult = 6.02214129e+23;
+    Object result = executeScript("return arguments[0];", expectedResult);
+    assertThat(result).isInstanceOf(Double.class).isEqualTo(expectedResult);
+  }
+
   @Test
   public void testPassingAndReturningADoubleShouldReturnADecimal() {
     driver.get(pages.javascriptPage);