Fixing "args" and "prefs" handling in Capabilities to FirefoxOptions converters

Author: barancev

java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java

@@ -134,7 +134,29 @@ public FirefoxOptions(Capabilities source) {
       if (that.profile != null) { setProfile(that.profile); }
     } else if (raw instanceof Map) {
       Map<?, ?> that = (Map<?, ?>) raw;
-      if (that.containsKey("args")) { addArguments((String) that.get("args")); }
+      if (that.containsKey("args")) {
+        Object value = that.get("args");
+        if (value instanceof String) {
+          addArguments((String) that.get("args"));
+        } else if (value instanceof List<?>) {
+          addArguments((List<String>) that.get("args"));
+        } else {
+          // last resort
+          addArguments(that.get("args").toString());
+        }
+      }
+      if (that.containsKey("prefs")) {
+        Map<String, Object> prefs = (Map<String, Object>) that.get("prefs");
+        prefs.forEach((k, v) -> {
+          if (v instanceof String) {
+            stringPrefs.put(k, (String) v);
+          } else if (v instanceof Number) {
+            intPrefs.put(k, ((Number) v).intValue());
+          } else if (v instanceof Boolean) {
+            booleanPrefs.put(k, (Boolean) v);
+          }
+        });
+      }
       if (that.containsKey("binary")) { setBinary((String) that.get("binary")); }
       if (that.containsKey("log")) {
         Map<?, ?> logStruct = (Map<?, ?>) that.get("log");

java/client/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java

@@ -43,6 +43,7 @@
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
+import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.PageLoadStrategy;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
@@ -57,6 +58,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
+import java.util.Arrays;
 import java.util.Map;
 
 public class FirefoxOptionsTest {
@@ -278,4 +280,39 @@ public void canBuildLogLevelFromStringRepresentation() {
     assertEquals(FirefoxDriverLogLevel.fromString("ERROR"), FirefoxDriverLogLevel.ERROR);
   }
 
+  @Test
+  public void canConvertOptionsWithArgsToCapabilitiesAndRestoreBack() {
+    FirefoxOptions options = new FirefoxOptions(
+        new MutableCapabilities(new FirefoxOptions().addArguments("-a", "-b")));
+    Object options2 = options.asMap().get(FirefoxOptions.FIREFOX_OPTIONS);
+    assertNotNull(options2);
+    assertEquals(((Map<String, Object>) options2).get("args"), Arrays.asList("-a", "-b"));
+  }
+
+  @Test
+  public void canConvertOptionsWithPrefsToCapabilitiesAndRestoreBack() {
+    FirefoxOptions options = new FirefoxOptions(
+        new MutableCapabilities(new FirefoxOptions()
+                                    .addPreference("string.pref", "some value")
+                                    .addPreference("int.pref", 42)
+                                    .addPreference("boolean.pref", true)));
+    Object options2 = options.asMap().get(FirefoxOptions.FIREFOX_OPTIONS);
+    assertNotNull(options2);
+    Object prefs = ((Map<String, Object>) options2).get("prefs");
+    assertNotNull(prefs);
+    assertEquals(((Map<String, Object>) prefs).get("string.pref"), "some value");
+    assertEquals(((Map<String, Object>) prefs).get("int.pref"), 42);
+    assertEquals(((Map<String, Object>) prefs).get("boolean.pref"), true);
+  }
+
+  @Test
+  public void canConvertOptionsWithBinaryToCapabilitiesAndRestoreBack() {
+    FirefoxOptions options = new FirefoxOptions(
+        new MutableCapabilities(new FirefoxOptions().setBinary(new FirefoxBinary())));
+    Object options2 = options.asMap().get(FirefoxOptions.FIREFOX_OPTIONS);
+    assertNotNull(options2);
+    assertEquals(((Map<String, Object>) options2).get("binary"),
+                 new FirefoxBinary().getPath().replaceAll("\\\\", "/"));
+  }
+
 }