[java] Selenium Manager generates output from argument list instead of capabilities instance

Author: titusfortner

java/src/org/openqa/selenium/manager/SeleniumManager.java

@@ -72,7 +72,7 @@ public class SeleniumManager {
   private static volatile SeleniumManager manager;
   private final String managerPath = System.getenv("SE_MANAGER_PATH");
   private Path binary = managerPath == null ? null : Paths.get(managerPath);
-  private String seleniumManagerVersion;
+  private final String seleniumManagerVersion;
   private boolean binaryInTemporalFolder = false;
 
   /** Wrapper for the Selenium Manager binary. */
@@ -221,6 +221,8 @@ private synchronized Path getBinary() {
    *
    * @param options browser options used to start the session
    * @return the browser binary path when present, only Chrome/Firefox/Edge
+   * @deprecated see {@see
+   *     org.openqa.selenium.remote.service.DriverFinder#getBrowserBinary(Capabilities)}
    */
   private String getBrowserBinary(Capabilities options) {
     List<String> vendorOptionsCapabilities =
@@ -248,7 +250,9 @@ private String getBrowserBinary(Capabilities options) {
    *
    * @param options Browser Options instance.
    * @return the location of the driver.
+   * @deprecated use {@link #getResult(List)} instead with the list of arguments.
    */
+  @Deprecated
   public Result getDriverPath(Capabilities options, boolean offline) {
     Path binaryFile = getBinary();
     if (binaryFile == null) {
@@ -306,6 +310,25 @@ public Result getDriverPath(Capabilities options, boolean offline) {
     return result;
   }
 
+  /**
+   * Executes Selenium Manager to get the locations of the requested assets
+   *
+   * @param arguments List of command line arguments to send to Selenium Manager binary
+   * @return the locations of the assets from Selenium Manager execution
+   */
+  public Result getResult(List<String> arguments) {
+    arguments.add("--language-binding");
+    arguments.add("java");
+    arguments.add("--output");
+    arguments.add("json");
+
+    if (getLogLevel().intValue() <= Level.FINE.intValue()) {
+      arguments.add("--debug");
+    }
+
+    return runCommand(getBinary(), arguments);
+  }
+
   private Level getLogLevel() {
     Level level = LOG.getLevel();
     if (level == null && LOG.getParent() != null) {

java/src/org/openqa/selenium/remote/service/DriverFinder.java

@@ -18,7 +18,14 @@
 package org.openqa.selenium.remote.service;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
 import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.MutableCapabilities;
+import org.openqa.selenium.Proxy;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.manager.SeleniumManager;
@@ -27,6 +34,8 @@
 
 public class DriverFinder {
 
+  private static final Logger LOG = Logger.getLogger(DriverFinder.class.getName());
+
   public static Result getPath(DriverService service, Capabilities options) {
     return getPath(service, options, false);
   }
@@ -37,7 +46,9 @@ public static Result getPath(DriverService service, Capabilities options, boolea
 
     if (result.getDriverPath() == null) {
       try {
-        result = SeleniumManager.getInstance().getDriverPath(options, offline);
+        List<String> arguments = toArguments(options, offline);
+        result = SeleniumManager.getInstance().getResult(arguments);
+        ((MutableCapabilities) options).setCapability("browserVersion", (String) null);
       } catch (RuntimeException e) {
         throw new WebDriverException(
             String.format("Unable to obtain: %s, error %s", options, e.getMessage()), e);
@@ -62,4 +73,63 @@ public static Result getPath(DriverService service, Capabilities options, boolea
 
     throw new NoSuchDriverException(message);
   }
+
+  private static List<String> toArguments(Capabilities options, boolean offline) {
+    List<String> arguments = new ArrayList<>();
+    arguments.add("--browser");
+    arguments.add(options.getBrowserName());
+
+    if (!options.getBrowserVersion().isEmpty()) {
+      arguments.add("--browser-version");
+      arguments.add(options.getBrowserVersion());
+    }
+
+    String browserBinary = getBrowserBinary(options);
+    if (browserBinary != null && !browserBinary.isEmpty()) {
+      arguments.add("--browser-path");
+      arguments.add(browserBinary);
+    }
+
+    if (offline) {
+      arguments.add("--offline");
+    }
+
+    Proxy proxy = Proxy.extractFrom(options);
+    if (proxy != null) {
+      arguments.add("--proxy");
+      if (proxy.getSslProxy() != null) {
+        arguments.add(proxy.getSslProxy());
+      } else if (proxy.getHttpProxy() != null) {
+        arguments.add(proxy.getHttpProxy());
+      }
+    }
+    return arguments;
+  }
+
+  /**
+   * Returns the browser binary path when present in the vendor options
+   *
+   * @param options browser options used to start the session
+   * @return the browser binary path when present, only Chrome/Firefox/Edge
+   */
+  private static String getBrowserBinary(Capabilities options) {
+    List<String> vendorOptionsCapabilities =
+        Arrays.asList("moz:firefoxOptions", "goog:chromeOptions", "ms:edgeOptions");
+    for (String vendorOptionsCapability : vendorOptionsCapabilities) {
+      if (options.asMap().containsKey(vendorOptionsCapability)) {
+        try {
+          @SuppressWarnings("unchecked")
+          Map<String, Object> vendorOptions =
+              (Map<String, Object>) options.getCapability(vendorOptionsCapability);
+          return (String) vendorOptions.get("binary");
+        } catch (Exception e) {
+          LOG.warning(
+              String.format(
+                  "Exception while retrieving the browser binary path. %s: %s",
+                  options, e.getMessage()));
+        }
+      }
+    }
+    return null;
+  }
 }