Fix JSON parsing of unicode escapes

Author: shs96c

java/client/src/org/openqa/selenium/json/JsonInput.java

@@ -19,7 +19,6 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.UncheckedIOException;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
@@ -388,7 +387,7 @@ private void readEscape(StringBuilder builder) {
           result += digit * multiplier;
           multiplier /= 16;
         }
-        builder.append(result);
+        builder.append((char) result);
         break;
 
       case '/':

java/client/test/org/openqa/selenium/json/JsonInputTest.java

@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.openqa.selenium.json.Json.MAP_TYPE;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -29,6 +30,7 @@
 import org.junit.Test;
 
 import java.io.StringReader;
+import java.util.Map;
 
 public class JsonInputTest {
 
@@ -187,6 +189,17 @@ public void nestedMapIsFine() {
     input.endObject();
   }
 
+  @Test
+  public void shouldDecodeUnicodeEscapesProperly() {
+    String raw = "{\"text\": \"\\u003Chtml\"}";
+
+    try (JsonInput in = new JsonInput(new StringReader(raw), new JsonTypeCoercer())) {
+      Map<String, Object> map = in.read(MAP_TYPE);
+
+      assertEquals("<html", map.get("text"));
+    }
+  }
+
   private JsonInput newInput(Object toParse) {
     String raw = new Gson().toJson(toParse);
     StringReader reader = new StringReader(raw);