fixing toJSON of chrome options where equal options become unequal.

Author: lukeis

Diff for: java/client/src/org/openqa/selenium/chrome/ChromeOptions.java

@@ -202,7 +202,12 @@ public Object getExperimentalOption(String name) {
    *     JSON.
    */
   public JSONObject toJson() throws IOException, JSONException {
-    JSONObject options = new JSONObject(experimentalOptions);
+    JSONObject options = new JSONObject();
+    // copy experimental options, instead of passing to the JSONObject constructor
+    // because the JSON library will mutate the map passed in.
+    for (String key : experimentalOptions.keySet()) {
+      options.put(key, experimentalOptions.get(key));
+    }
 
     if (binary != null) {
       options.put("binary", binary);

Diff for: java/client/test/org/openqa/selenium/chrome/ChromeOptionsFunctionalTest.java

@@ -18,8 +18,10 @@
 package org.openqa.selenium.chrome;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.NeedsLocalEnvironment;
@@ -37,6 +39,12 @@ public void tearDown() throws Exception {
     }
   }
 
+  @Before
+  @Override
+  public void createDriver() throws Exception {
+    // do nothing, don't want to have it create a driver for these tests
+  }
+
   @NeedsLocalEnvironment
   @Test
   public void canStartChromeWithCustomOptions() {
@@ -48,4 +56,15 @@ public void canStartChromeWithCustomOptions() {
     Object userAgent = driver.executeScript("return window.navigator.userAgent");
     assertEquals("foo;bar", userAgent);
   }
+
+  @NeedsLocalEnvironment
+  @Test
+  public void optionsStayEqualAfterSerialization() throws Exception {
+    ChromeOptions options1 = new ChromeOptions();
+    ChromeOptions options2 = new ChromeOptions();
+    assertTrue("empty chrome options should be equal", options1.equals(options2));
+    options1.toJson();
+    assertTrue("empty chrome options after one is .toJson() should be equal",
+               options1.equals(options2));
+  }
 }