[chromedriver] Fix issue of converting parameter to JSON.

patch.diff

 Index: java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java
 ===================================================================
---- java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java    (revision 17049)
+--- java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java    (revision 18370)
 +++ java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java    (working copy)
 @@ -87,7 +87,7 @@
      if (DesiredCapabilities.android().getBrowserName().equals(name)) {
        className = "org.openqa.selenium.android.AndroidDriver";
      } else if (DesiredCapabilities.chrome().getBrowserName().equals(name)) {
 -      className = "org.openqa.selenium.testing.drivers.TestChromeDriver";
 +      className = "org.openqa.selenium.testing.drivers.TestNewChromeDriver";
      } else if (DesiredCapabilities.firefox().getBrowserName().equals(name)) {
        className = getFirefoxClassName();
      } else if (DesiredCapabilities.htmlUnit().getBrowserName().equals(name)) {
 Index: java/client/test/org/openqa/selenium/testing/drivers/build.desc
 ===================================================================
---- java/client/test/org/openqa/selenium/testing/drivers/build.desc     (revision 17049)
+--- java/client/test/org/openqa/selenium/testing/drivers/build.desc     (revision 18370)
 +++ java/client/test/org/openqa/selenium/testing/drivers/build.desc     (working copy)
 @@ -9,6 +9,7 @@
      "SauceDriver.java",
      "SynthesizedFirefoxDriver.java",
      "TestChromeDriver.java",
 +    "TestNewChromeDriver.java",
      "TestIgnorance.java",
      "TestInternetExplorerDriver.java",
      "WebDriverBuilder.java",
 Index: java/client/test/org/openqa/selenium/testing/drivers/TestNewChromeDriver.java
@@ skipping 50 matching lines @@
 +    DesiredCapabilities capabilities = DesiredCapabilities.chrome();
 +    capabilities.setCapability(ChromeOptions.CAPABILITY, options);
 +
 +    if (originalCapabilities != null) {
 +      capabilities.merge(originalCapabilities);
 +    }
 +
 +    return capabilities;
 +  }
 +}
-\ No newline at end of file
 Index: java/client/src/org/openqa/selenium/chrome/NewCommandExecutor.java
 ===================================================================
 --- java/client/src/org/openqa/selenium/chrome/NewCommandExecutor.java  (revision 0)
 +++ java/client/src/org/openqa/selenium/chrome/NewCommandExecutor.java  (revision 0)
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,53 @@
 +/*
 +Copyright 2012 Selenium committers
 +Copyright 2012 Software Freedom Conservancy
 +
 +Licensed under the Apache License, Version 2.0 (the "License");
 +you may not use this file except in compliance with the License.
 +You may obtain a copy of the License at
 +
 +     http://www.apache.org/licenses/LICENSE-2.0
 +
 +Unless required by applicable law or agreed to in writing, software
 +distributed under the License is distributed on an "AS IS" BASIS,
 +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +See the License for the specific language governing permissions and
 +limitations under the License.
 +*/
 +
 +package org.openqa.selenium.chrome;
 +
-+import org.json.JSONException;
-+import org.json.JSONObject;
 +import org.openqa.selenium.remote.BeanToJsonConverter;
 +import org.openqa.selenium.remote.Command;
 +import org.openqa.selenium.remote.CommandExecutor;
 +import org.openqa.selenium.remote.JsonToBeanConverter;
 +import org.openqa.selenium.remote.Response;
 +
 +import java.io.IOException;
++import java.util.HashMap;
++import java.util.Map;
 +
 +/**
 + * Executes a ChromeDriver command using the new ChromeDriver.
 + */
 +public class NewCommandExecutor implements CommandExecutor {
 +
++  static {
++    System.loadLibrary("chromedriver");
++  }
++
 +  @Override
 +  public Response execute(Command command) throws IOException {
-+    System.loadLibrary("chromedriver");
-+    JSONObject jsonCommand = new JSONObject();
-+    try {
-+      jsonCommand.put("name", command.getName());
-+      jsonCommand.put("parameters", command.getParameters());
-+      String id = "";
-+      if (command.getSessionId() != null)
-+        id = command.getSessionId().toString();
-+      jsonCommand.put("sessionId", id);
-+      String responseText = execute(new BeanToJsonConverter().convert(jsonCommand));
-+      return new JsonToBeanConverter().convert(Response.class, responseText);
-+    } catch (JSONException e) {
-+      throw new IOException(e);
-+    }
++    Map<String, Object> jsonCommand = new HashMap<String, Object>();
++    jsonCommand.put("name", command.getName());
++    jsonCommand.put("parameters", command.getParameters());
++    String id = "";
++    if (command.getSessionId() != null)
++      id = command.getSessionId().toString();
++    jsonCommand.put("sessionId", id);
++    String responseText = execute(new BeanToJsonConverter().convert(jsonCommand));
++    return new JsonToBeanConverter().convert(Response.class, responseText);
 +  }
 +
 +  private static native String execute(String command);
 +}