If JsonParser.parse() fails to parse a string obtained from a reflective call to a toJson() method, assume it is a primitive string.

This is the case for, e.g., FirefoxProfile.toJson(), which returns a base64-encoded zip file. That string likely contains at least one '/', which the Gson parser rejects.

Signed-off-by: Seva Lotoshnikov <[email protected]>

Author: juangj

Diff for: java/client/src/org/openqa/selenium/remote/BeanToJsonConverter.java

@@ -22,6 +22,7 @@
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 
 import org.openqa.selenium.Capabilities;
@@ -122,7 +123,7 @@ private JsonElement convertObject(Object toConvert, int maxDepth) throws Excepti
       }
       return converted;
     }
-    
+
     if (toConvert instanceof SessionLogs) {
       return convertObject(((SessionLogs)toConvert).getAll(), maxDepth - 1);
     }
@@ -203,7 +204,11 @@ private JsonElement convertObject(Object toConvert, int maxDepth) throws Excepti
         if (res instanceof JsonElement) {
           return (JsonElement) res;
         } else {
-          return new JsonParser().parse((String) res);
+          try {
+            return new JsonParser().parse((String) res);
+          } catch (JsonParseException e) {
+            return new JsonPrimitive((String) res);
+          }
         }
       } catch (IllegalArgumentException e) {
         throw new WebDriverException(e);

Diff for: java/client/test/org/openqa/selenium/remote/BeanToJsonConverterTest.java

@@ -22,6 +22,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -180,7 +181,7 @@ public void testShouldBeAbleToConvertASessionId() {
     assertEquals("some id", converted.get("value").getAsString());
   }
 
-  //@Test
+  @Test
   public void testShouldBeAbleToConvertAJsonObject() {
     JsonObject obj = new JsonObject();
     obj.addProperty("key", "value");
@@ -258,10 +259,27 @@ public void testShouldConvertAProxyCorrectly() {
   @Test
   public void testShouldCallToJsonMethodIfPresent() {
     String json = new BeanToJsonConverter().convert(new JsonAware("converted"));
-
     assertEquals("\"converted\"", json);
   }
 
+  @Test
+  public void testConvertsToJsonMethodResultToPrimitiveIfItIsNotJson() {
+    // We want this parsed as a string primitive, but JsonParser will reject it
+    // as malformed because of the slash.
+    String raw = "gnu/linux";
+
+    try {
+      // Make sure that the parser does actually reject this so the test is
+      // meaningful. If this stops failing, choose a different malformed JSON
+      // string.
+      new JsonParser().parse(raw).toString();
+      fail("Expected a parser exception when parsing: " + raw);
+    } catch (JsonSyntaxException expected) {
+    }
+
+    String json = new BeanToJsonConverter().convert(new JsonAware(raw));
+    assertEquals("\"gnu/linux\"", json);
+  }
 
   private void verifyStackTraceInJson(String json, StackTraceElement[] stackTrace) {
     int posOfLastStackTraceElement = 0;