[java] Invoking Selenium Manager only with --browser

Author: diemol

java/src/org/openqa/selenium/chrome/ChromeDriverInfo.java

@@ -65,7 +65,7 @@ public boolean isSupportingBiDi() {
   @Override
   public boolean isAvailable() {
     try {
-      DriverFinder.getPath(ChromeDriverService.createDefaultService());
+      DriverFinder.getPath(ChromeDriverService.createDefaultService(), getCanonicalCapabilities());
       return true;
     } catch (IllegalStateException | WebDriverException e) {
       return false;

java/src/org/openqa/selenium/chrome/ChromeDriverService.java

@@ -146,6 +146,11 @@ public String getDriverProperty() {
     return CHROME_DRIVER_EXE_PROPERTY;
   }
 
+  @Override
+  public Capabilities getDefaultDriverOptions() {
+    return new ChromeOptions();
+  }
+
   /**
    * Configures and returns a new {@link ChromeDriverService} using the default configuration. In
    * this configuration, the service will use the ChromeDriver executable identified by

java/src/org/openqa/selenium/edge/EdgeDriverInfo.java

@@ -66,7 +66,7 @@ public boolean isSupportingBiDi() {
   @Override
   public boolean isAvailable() {
     try {
-      DriverFinder.getPath(EdgeDriverService.createDefaultService());
+      DriverFinder.getPath(EdgeDriverService.createDefaultService(), getCanonicalCapabilities());
       return true;
     } catch (IllegalStateException | WebDriverException e) {
       return false;

java/src/org/openqa/selenium/edge/EdgeDriverService.java

@@ -121,6 +121,11 @@ public String getDriverProperty() {
     return EDGE_DRIVER_EXE_PROPERTY;
   }
 
+  @Override
+  public Capabilities getDefaultDriverOptions() {
+    return new EdgeOptions();
+  }
+
   /**
    * Configures and returns a new {@link EdgeDriverService} using the default configuration. In
    * this configuration, the service will use the MSEdgeDriver executable identified by the

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

@@ -70,7 +70,7 @@ public boolean isSupportingBiDi() {
   @Override
   public boolean isAvailable() {
     try {
-      DriverFinder.getPath(GeckoDriverService.createDefaultService());
+      DriverFinder.getPath(GeckoDriverService.createDefaultService(), getCanonicalCapabilities());
       return true;
     } catch (IllegalStateException | WebDriverException e) {
       return false;

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

@@ -80,6 +80,11 @@ public String getDriverProperty() {
     return GECKO_DRIVER_EXE_PROPERTY;
   }
 
+  @Override
+  public Capabilities getDefaultDriverOptions() {
+    return new FirefoxOptions();
+  }
+
   /**
    * @param executable The GeckoDriver executable.
    * @param port Which port to start the GeckoDriver on.

java/src/org/openqa/selenium/ie/InternetExplorerDriverInfo.java

@@ -66,7 +66,8 @@ public boolean isSupportingBiDi() {
   public boolean isAvailable() {
     try {
       if (Platform.getCurrent().is(Platform.WINDOWS)) {
-        DriverFinder.getPath(InternetExplorerDriverService.createDefaultService());
+        DriverFinder.getPath(InternetExplorerDriverService.createDefaultService(),
+                             getCanonicalCapabilities());
         return true;
       }
       return false;

java/src/org/openqa/selenium/ie/InternetExplorerDriverService.java

@@ -97,6 +97,11 @@ public String getDriverProperty() {
     return IE_DRIVER_EXE_PROPERTY;
   }
 
+  @Override
+  public Capabilities getDefaultDriverOptions() {
+    return new InternetExplorerOptions();
+  }
+
   /**
    * Configures and returns a new {@link InternetExplorerDriverService} using the default configuration. In
    * this configuration, the service will use the IEDriverServer executable identified by the

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

@@ -12,11 +12,8 @@ public class DriverFinder {
 
   private static final Logger LOG = Logger.getLogger(DriverFinder.class.getName());
 
-  public static String getPath(DriverServiceInfo serviceInfo) {
-    return getPath(serviceInfo, null);
-  }
-
   public static String getPath(DriverServiceInfo serviceInfo, Capabilities options) {
+    Require.nonNull("Browser options", options);
     String defaultPath = new ExecutableFinder().find(serviceInfo.getDriverName());
     String exePath = System.getProperty(serviceInfo.getDriverProperty(), defaultPath);
 
@@ -26,11 +23,7 @@ public static String getPath(DriverServiceInfo serviceInfo, Capabilities options
 
     if (exePath == null) {
       try {
-        if (options == null) {
-          exePath = SeleniumManager.getInstance().getDriverPath(serviceInfo.getDriverName());
-        } else {
-          exePath = SeleniumManager.getInstance().getDriverPath(options);
-        }
+        exePath = SeleniumManager.getInstance().getDriverPath(options);
       } catch (Exception e) {
         LOG.warning(String.format("Unable to obtain %s using Selenium Manager: %s",
                                   serviceInfo.getDriverName(), e.getMessage()));

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

@@ -21,6 +21,7 @@
 
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.net.PortProber;
@@ -141,6 +142,10 @@ protected URL getUrl(int port) throws IOException {
     return new URL(String.format("http://localhost:%d", port));
  }
 
+ protected Capabilities getDefaultDriverOptions() {
+   return new ImmutableCapabilities();
+ }
+
   /**
    * @return The base URL for the managed driver server.
    */
@@ -178,7 +183,10 @@ public void start() throws IOException {
         return;
       }
       if (this.executable == null) {
-        this.executable = DriverFinder.getPath(this);
+        if (getDefaultDriverOptions().getBrowserName().isEmpty()) {
+          throw new WebDriverException("Driver executable is null and browser name is not set.");
+        }
+        this.executable = DriverFinder.getPath(this, getDefaultDriverOptions());
       }
       process = new CommandLine(this.executable, args.toArray(new String[]{}));
       process.setEnvironmentVariables(environment);
@@ -272,7 +280,7 @@ public void stop() {
       if (getOutputStream() instanceof FileOutputStream) {
         try {
           getOutputStream().close();
-        } catch (IOException e) {
+        } catch (IOException ignore) {
         }
       }
     } finally {