[grid] Firefox CDP version "85" -> "85.0"

This allows matching better and helps when
CDP over Grid for Firefox is done.

Also, switching `isSupportingCdp` to `true`
for Firefox as well, since it works for some
cases.

Author: diemol

java/src/org/openqa/selenium/firefox/FirefoxDriver.java

@@ -17,9 +17,12 @@
 
 package org.openqa.selenium.firefox;
 
+import static org.openqa.selenium.remote.CapabilityType.PROXY;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
@@ -58,8 +61,6 @@
 import java.util.Set;
 import java.util.stream.StreamSupport;
 
-import static org.openqa.selenium.remote.CapabilityType.PROXY;
-
 /**
  * An implementation of the {#link WebDriver} interface that drives Firefox.
  * <p>
@@ -78,107 +79,39 @@
 public class FirefoxDriver extends RemoteWebDriver
   implements WebStorage, HasExtensions, HasFullPageScreenshot, HasContext, HasDevTools {
 
-  public static final class SystemProperty {
-
-    /**
-     * System property that defines the location of the Firefox executable file.
-     */
-    public static final String BROWSER_BINARY = "webdriver.firefox.bin";
-
-    /**
-     * System property that defines the location of the file where Firefox log should be stored.
-     */
-    public static final String BROWSER_LOGFILE = "webdriver.firefox.logfile";
-
-    /**
-     * System property that defines the additional library path (Linux only).
-     */
-    public static final String BROWSER_LIBRARY_PATH = "webdriver.firefox.library.path";
-
-    /**
-     * System property that defines the profile that should be used as a template.
-     * When the driver starts, it will make a copy of the profile it is using,
-     * rather than using that profile directly.
-     */
-    public static final String BROWSER_PROFILE = "webdriver.firefox.profile";
-
-    /**
-     * System property that defines the location of the webdriver.xpi browser extension to install
-     * in the browser. If not set, the prebuilt extension bundled with this class will be used.
-     */
-    public static final String DRIVER_XPI_PROPERTY = "webdriver.firefox.driver";
-
-    /**
-     * Boolean system property that instructs FirefoxDriver to use Marionette backend,
-     * overrides any capabilities specified by the user
-     */
-    public static final String DRIVER_USE_MARIONETTE = "webdriver.firefox.marionette";
-  }
-
   /**
    * @deprecated Use {@link Capability#BINARY}
    */
   @Deprecated
   public static final String BINARY = Capability.BINARY;
-
   /**
    * @deprecated Use {@link Capability#PROFILE}
    */
   @Deprecated
   public static final String PROFILE = Capability.PROFILE;
-
   /**
    * @deprecated Use {@link Capability#MARIONETTE}
    */
   @Deprecated
   public static final String MARIONETTE = Capability.MARIONETTE;
-
-  public static final class Capability {
-    public static final String BINARY = "firefox_binary";
-    public static final String PROFILE = "firefox_profile";
-    public static final String MARIONETTE = "marionette";
-  }
-
-  @Beta
-  public static RemoteWebDriverBuilder builder() {
-    return RemoteWebDriver.builder().oneOf(new FirefoxOptions());
-  }
-
-  private static class FirefoxDriverCommandExecutor extends DriverCommandExecutor {
-    public FirefoxDriverCommandExecutor(DriverService service) {
-      super(service, getExtraCommands());
-    }
-
-    private static Map<String, CommandInfo> getExtraCommands() {
-      return ImmutableMap.<String, CommandInfo>builder()
-        .putAll(new AddHasContext().getAdditionalCommands())
-        .putAll(new AddHasExtensions().getAdditionalCommands())
-        .putAll(new AddHasFullPageScreenshot().getAdditionalCommands())
-        .build();
-    }
-  }
-
   private final Capabilities capabilities;
-  protected FirefoxBinary binary;
   private final RemoteWebStorage webStorage;
   private final HasExtensions extensions;
   private final HasFullPageScreenshot fullPageScreenshot;
   private final HasContext context;
   private final Optional<URI> cdpUri;
+  protected FirefoxBinary binary;
   private DevTools devTools;
-
   public FirefoxDriver() {
     this(new FirefoxOptions());
   }
-
   /**
    * @deprecated Use {@link #FirefoxDriver(FirefoxOptions)}.
    */
   @Deprecated
   public FirefoxDriver(Capabilities desiredCapabilities) {
     this(new FirefoxOptions(Require.nonNull("Capabilities", desiredCapabilities)));
   }
-
   /**
    * @deprecated Use {@link #FirefoxDriver(FirefoxDriverService, FirefoxOptions)}.
    */
@@ -188,7 +121,6 @@ public FirefoxDriver(FirefoxDriverService service, Capabilities desiredCapabilit
         Require.nonNull("Driver service", service),
         new FirefoxOptions(desiredCapabilities));
   }
-
   public FirefoxDriver(FirefoxOptions options) {
     this(toExecutor(options), options);
   }
@@ -215,30 +147,82 @@ private FirefoxDriver(FirefoxDriverCommandExecutor executor, FirefoxOptions opti
 
     this.cdpUri = cdpUri;
     this.capabilities = cdpUri.map(uri ->
-        new ImmutableCapabilities(
-            new PersistentCapabilities(capabilities)
-                .setCapability("se:cdp", uri.toString())
-                .setCapability("se:cdpVersion", "85")))
-        .orElse(new ImmutableCapabilities(capabilities));
+                                     new ImmutableCapabilities(
+                                       new PersistentCapabilities(capabilities)
+                                         .setCapability("se:cdp", uri.toString())
+                                         .setCapability("se:cdpVersion", "85.0")))
+      .orElse(new ImmutableCapabilities(capabilities));
+  }
+
+  @Beta
+  public static RemoteWebDriverBuilder builder() {
+    return RemoteWebDriver.builder().oneOf(new FirefoxOptions());
   }
 
   private static FirefoxDriverCommandExecutor toExecutor(FirefoxOptions options) {
     Require.nonNull("Options to construct executor from", options);
 
     String sysProperty = System.getProperty(SystemProperty.DRIVER_USE_MARIONETTE);
-    boolean isLegacy = (sysProperty != null && ! Boolean.parseBoolean(sysProperty))
+    boolean isLegacy = (sysProperty != null && !Boolean.parseBoolean(sysProperty))
                        || options.isLegacy();
 
     FirefoxDriverService.Builder<?, ?> builder =
-        StreamSupport.stream(ServiceLoader.load(DriverService.Builder.class).spliterator(), false)
-            .filter(b -> b instanceof FirefoxDriverService.Builder)
-            .map(FirefoxDriverService.Builder.class::cast)
-            .filter(b -> b.isLegacy() == isLegacy)
-            .findFirst().orElseThrow(WebDriverException::new);
+      StreamSupport.stream(ServiceLoader.load(DriverService.Builder.class).spliterator(), false)
+        .filter(b -> b instanceof FirefoxDriverService.Builder)
+        .map(FirefoxDriverService.Builder.class::cast)
+        .filter(b -> b.isLegacy() == isLegacy)
+        .findFirst().orElseThrow(WebDriverException::new);
 
     return new FirefoxDriverCommandExecutor(builder.withOptions(options).build());
   }
 
+  private static boolean isLegacy(Capabilities desiredCapabilities) {
+    Boolean forceMarionette = forceMarionetteFromSystemProperty();
+    if (forceMarionette != null) {
+      return !forceMarionette;
+    }
+    Object marionette = desiredCapabilities.getCapability(Capability.MARIONETTE);
+    return marionette instanceof Boolean && !(Boolean) marionette;
+  }
+
+  private static Boolean forceMarionetteFromSystemProperty() {
+    String useMarionette = System.getProperty(SystemProperty.DRIVER_USE_MARIONETTE);
+    if (useMarionette == null) {
+      return null;
+    }
+    return Boolean.valueOf(useMarionette);
+  }
+
+  /**
+   * Drops capabilities that we shouldn't send over the wire.
+   *
+   * Used for capabilities which aren't BeanToJson-convertable, and are only used by the local
+   * launcher.
+   */
+  private static Capabilities dropCapabilities(Capabilities capabilities) {
+    if (capabilities == null) {
+      return new ImmutableCapabilities();
+    }
+
+    MutableCapabilities caps;
+
+    if (isLegacy(capabilities)) {
+      final Set<String> toRemove = Sets.newHashSet(Capability.BINARY, Capability.PROFILE);
+      caps = new MutableCapabilities(
+        Maps.filterKeys(capabilities.asMap(), key -> !toRemove.contains(key)));
+    } else {
+      caps = new MutableCapabilities(capabilities);
+    }
+
+    // Ensure that the proxy is in a state fit to be sent to the extension
+    Proxy proxy = Proxy.extractFrom(capabilities);
+    if (proxy != null) {
+      caps.setCapability(PROXY, proxy);
+    }
+
+    return caps;
+  }
+
   @Override
   public Capabilities getCapabilities() {
     return capabilities;
@@ -247,8 +231,8 @@ public Capabilities getCapabilities() {
   @Override
   public void setFileDetector(FileDetector detector) {
     throw new WebDriverException(
-        "Setting the file detector only works on remote webdriver instances obtained " +
-        "via RemoteWebDriver");
+      "Setting the file detector only works on remote webdriver instances obtained " +
+      "via RemoteWebDriver");
   }
 
   @Override
@@ -261,15 +245,6 @@ public SessionStorage getSessionStorage() {
     return webStorage.getSessionStorage();
   }
 
-  private static boolean isLegacy(Capabilities desiredCapabilities) {
-    Boolean forceMarionette = forceMarionetteFromSystemProperty();
-    if (forceMarionette != null) {
-      return !forceMarionette;
-    }
-    Object marionette = desiredCapabilities.getCapability(Capability.MARIONETTE);
-    return marionette instanceof Boolean && ! (Boolean) marionette;
-  }
-
   @Override
   public String installExtension(Path path) {
     Require.nonNull("Path", path);
@@ -304,53 +279,15 @@ public <X> X getFullPageScreenshotAs(OutputType<X> outputType) throws WebDriverE
     return fullPageScreenshot.getFullPageScreenshotAs(outputType);
   }
 
-  @Override
-  public void setContext(FirefoxCommandContext commandContext) {
-    Require.nonNull("Firefox Command Context", commandContext);
-    context.setContext(commandContext);
-  }
-
   @Override
   public FirefoxCommandContext getContext() {
     return context.getContext();
   }
 
-  private static Boolean forceMarionetteFromSystemProperty() {
-    String useMarionette = System.getProperty(SystemProperty.DRIVER_USE_MARIONETTE);
-    if (useMarionette == null) {
-      return null;
-    }
-    return Boolean.valueOf(useMarionette);
-  }
-
-  /**
-   * Drops capabilities that we shouldn't send over the wire.
-   *
-   * Used for capabilities which aren't BeanToJson-convertable, and are only used by the local
-   * launcher.
-   */
-  private static Capabilities dropCapabilities(Capabilities capabilities) {
-    if (capabilities == null) {
-      return new ImmutableCapabilities();
-    }
-
-    MutableCapabilities caps;
-
-    if (isLegacy(capabilities)) {
-      final Set<String> toRemove = Sets.newHashSet(Capability.BINARY, Capability.PROFILE);
-      caps = new MutableCapabilities(
-          Maps.filterKeys(capabilities.asMap(), key -> !toRemove.contains(key)));
-    } else {
-      caps = new MutableCapabilities(capabilities);
-    }
-
-    // Ensure that the proxy is in a state fit to be sent to the extension
-    Proxy proxy = Proxy.extractFrom(capabilities);
-    if (proxy != null) {
-      caps.setCapability(PROXY, proxy);
-    }
-
-    return caps;
+  @Override
+  public void setContext(FirefoxCommandContext commandContext) {
+    Require.nonNull("Firefox Command Context", commandContext);
+    context.setContext(commandContext);
   }
 
   @Override
@@ -383,6 +320,66 @@ public DevTools getDevTools() {
       throw new DevToolsException("This version of Firefox or geckodriver does not support CDP");
     }
 
-    return maybeGetDevTools().orElseThrow(() -> new DevToolsException("Unable to initialize CDP connection"));
+    return maybeGetDevTools()
+      .orElseThrow(() -> new DevToolsException("Unable to initialize CDP connection"));
+  }
+
+  public static final class SystemProperty {
+
+    /**
+     * System property that defines the location of the Firefox executable file.
+     */
+    public static final String BROWSER_BINARY = "webdriver.firefox.bin";
+
+    /**
+     * System property that defines the location of the file where Firefox log should be stored.
+     */
+    public static final String BROWSER_LOGFILE = "webdriver.firefox.logfile";
+
+    /**
+     * System property that defines the additional library path (Linux only).
+     */
+    public static final String BROWSER_LIBRARY_PATH = "webdriver.firefox.library.path";
+
+    /**
+     * System property that defines the profile that should be used as a template.
+     * When the driver starts, it will make a copy of the profile it is using,
+     * rather than using that profile directly.
+     */
+    public static final String BROWSER_PROFILE = "webdriver.firefox.profile";
+
+    /**
+     * System property that defines the location of the webdriver.xpi browser extension to install
+     * in the browser. If not set, the prebuilt extension bundled with this class will be used.
+     */
+    public static final String DRIVER_XPI_PROPERTY = "webdriver.firefox.driver";
+
+    /**
+     * Boolean system property that instructs FirefoxDriver to use Marionette backend,
+     * overrides any capabilities specified by the user
+     */
+    public static final String DRIVER_USE_MARIONETTE = "webdriver.firefox.marionette";
+  }
+
+  public static final class Capability {
+
+    public static final String BINARY = "firefox_binary";
+    public static final String PROFILE = "firefox_profile";
+    public static final String MARIONETTE = "marionette";
+  }
+
+  private static class FirefoxDriverCommandExecutor extends DriverCommandExecutor {
+
+    public FirefoxDriverCommandExecutor(DriverService service) {
+      super(service, getExtraCommands());
+    }
+
+    private static Map<String, CommandInfo> getExtraCommands() {
+      return ImmutableMap.<String, CommandInfo>builder()
+        .putAll(new AddHasContext().getAdditionalCommands())
+        .putAll(new AddHasExtensions().getAdditionalCommands())
+        .putAll(new AddHasFullPageScreenshot().getAdditionalCommands())
+        .build();
+    }
   }
 }