[java] updated logic in new getResult method for Driver Finder including validations

titusfortner · titusfortner · commit f3a59a829d52 · 2024-01-07T12:01:15.000-06:00
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriver.java b/java/src/org/openqa/selenium/chrome/ChromeDriver.java
@@ -96,10 +96,11 @@ private static ChromeDriverCommandExecutor generateExecutor(
     Require.nonNull("Driver service", service);
     Require.nonNull("Driver options", options);
     Require.nonNull("Driver clientConfig", clientConfig);
-    Result result = DriverFinder.getPath(service, options);
+    Result result = DriverFinder.getResult(service, options);
     service.setExecutable(result.getDriverPath());
     if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {
       options.setBinary(result.getBrowserPath());
+      options.setCapability("browserVersion", (Object) null);
     }
     return new ChromeDriverCommandExecutor(service, clientConfig);
   }
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriverInfo.java b/java/src/org/openqa/selenium/chrome/ChromeDriverInfo.java
@@ -66,7 +66,7 @@ public boolean isSupportingBiDi() {
   @Override
   public boolean isAvailable() {
     try {
-      DriverFinder.getPath(ChromeDriverService.createDefaultService(), getCanonicalCapabilities());
+      DriverFinder.getResult(ChromeDriverService.createDefaultService(), getCanonicalCapabilities());
       return true;
     } catch (NoSuchDriverException e) {
       return false;
@@ -79,7 +79,7 @@ public boolean isAvailable() {
   @Override
   public boolean isPresent() {
     try {
-      DriverFinder.getPath(
+      DriverFinder.getResult(
           ChromeDriverService.createDefaultService(), getCanonicalCapabilities(), true);
       return true;
     } catch (NoSuchDriverException e) {
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriverService.java b/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
@@ -128,7 +128,7 @@ public Capabilities getDefaultDriverOptions() {
   /**
    * Configures and returns a new {@link ChromeDriverService} using the default configuration. In
    * this configuration, the service will use the ChromeDriver executable identified by {@link
-   * org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}. Each
+   * org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService, Capabilities)}. Each
    * service created by this method will be configured to use a free port on the current system.
    *
    * @return A new ChromeDriverService using the default configuration.
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriver.java b/java/src/org/openqa/selenium/edge/EdgeDriver.java
@@ -68,10 +68,11 @@ private static EdgeDriverCommandExecutor generateExecutor(
     Require.nonNull("Driver service", service);
     Require.nonNull("Driver options", options);
     Require.nonNull("Driver clientConfig", clientConfig);
-    Result result = DriverFinder.getPath(service, options);
+    Result result = DriverFinder.getResult(service, options);
     service.setExecutable(result.getDriverPath());
     if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {
       options.setBinary(result.getBrowserPath());
+      options.setCapability("browserVersion", (Object) null);
     }
     return new EdgeDriverCommandExecutor(service, clientConfig);
   }
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java b/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java
@@ -69,7 +69,7 @@ public boolean isSupportingBiDi() {
   @Override
   public boolean isAvailable() {
     try {
-      DriverFinder.getPath(EdgeDriverService.createDefaultService(), getCanonicalCapabilities());
+      DriverFinder.getResult(EdgeDriverService.createDefaultService(), getCanonicalCapabilities());
       return true;
     } catch (NoSuchDriverException e) {
       return false;
@@ -82,7 +82,7 @@ public boolean isAvailable() {
   @Override
   public boolean isPresent() {
     try {
-      DriverFinder.getPath(
+      DriverFinder.getResult(
           EdgeDriverService.createDefaultService(), getCanonicalCapabilities(), true);
       return true;
     } catch (NoSuchDriverException e) {
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/src/org/openqa/selenium/edge/EdgeDriverService.java
@@ -117,7 +117,7 @@ public Capabilities getDefaultDriverOptions() {
   /**
    * Configures and returns a new {@link EdgeDriverService} using the default configuration. In this
    * configuration, the service will use the MSEdgeDriver executable identified by the {@link
-   * org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}. Each
+   * org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService, Capabilities)}. Each
    * service created by this method will be configured to use a free port on the current system.
    *
    * @return A new EdgeDriverService using the default configuration.
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -138,10 +138,11 @@ private static FirefoxDriverCommandExecutor generateExecutor(
     Require.nonNull("Driver service", service);
     Require.nonNull("Driver options", options);
     Require.nonNull("Driver clientConfig", clientConfig);
-    Result result = DriverFinder.getPath(service, options);
+    Result result = DriverFinder.getResult(service, options);
     service.setExecutable(result.getDriverPath());
     if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {
       options.setBinary(result.getBrowserPath());
+      options.setCapability("browserVersion", (Object) null);
     }
     return new FirefoxDriverCommandExecutor(service, clientConfig);
   }
diff --git a/java/src/org/openqa/selenium/firefox/GeckoDriverInfo.java b/java/src/org/openqa/selenium/firefox/GeckoDriverInfo.java
@@ -69,7 +69,7 @@ public boolean isSupportingBiDi() {
   @Override
   public boolean isAvailable() {
     try {
-      DriverFinder.getPath(GeckoDriverService.createDefaultService(), getCanonicalCapabilities());
+      DriverFinder.getResult(GeckoDriverService.createDefaultService(), getCanonicalCapabilities());
       return true;
     } catch (NoSuchDriverException e) {
       return false;
@@ -82,7 +82,7 @@ public boolean isAvailable() {
   @Override
   public boolean isPresent() {
     try {
-      DriverFinder.getPath(
+      DriverFinder.getResult(
           GeckoDriverService.createDefaultService(), getCanonicalCapabilities(), true);
       return true;
     } catch (NoSuchDriverException e) {
diff --git a/java/src/org/openqa/selenium/firefox/GeckoDriverService.java b/java/src/org/openqa/selenium/firefox/GeckoDriverService.java
@@ -110,7 +110,7 @@ public Capabilities getDefaultDriverOptions() {
   /**
    * Configures and returns a new {@link GeckoDriverService} using the default configuration. In
    * this configuration, the service will use the GeckoDriver executable identified by the {@link
-   * org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}. Each
+   * org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService, Capabilities)}. Each
    * service created by this method will be configured to use a free port on the current system.
    *
    * @return A new GeckoDriverService using the default configuration.
diff --git a/java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java b/java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java
@@ -131,7 +131,7 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
       attributeMap.put(AttributeKey.LOGGER_CLASS.getKey(), this.getClass().getName());
 
       DriverService service = builder.build();
-      Result driverResult = DriverFinder.getPath(service, capabilities);
+      Result driverResult = DriverFinder.getResult(service, capabilities);
       service.setExecutable(driverResult.getDriverPath());
       if (driverResult.getBrowserPath() != null && !driverResult.getBrowserPath().isEmpty()) {
         capabilities = setBrowserBinary(capabilities, driverResult.getBrowserPath());
diff --git a/java/src/org/openqa/selenium/ie/InternetExplorerDriver.java b/java/src/org/openqa/selenium/ie/InternetExplorerDriver.java
@@ -125,7 +125,7 @@ public InternetExplorerDriver(
     if (service == null) {
       service = InternetExplorerDriverService.createDefaultService();
     }
-    Result result = DriverFinder.getPath(service, options);
+    Result result = DriverFinder.getResult(service, options);
     service.setExecutable(result.getDriverPath());
     if (clientConfig == null) {
       clientConfig = ClientConfig.defaultConfig();
diff --git a/java/src/org/openqa/selenium/ie/InternetExplorerDriverInfo.java b/java/src/org/openqa/selenium/ie/InternetExplorerDriverInfo.java
@@ -67,7 +67,7 @@ public boolean isSupportingBiDi() {
   public boolean isAvailable() {
     try {
       if (Platform.getCurrent().is(Platform.WINDOWS)) {
-        DriverFinder.getPath(
+        DriverFinder.getResult(
             InternetExplorerDriverService.createDefaultService(), getCanonicalCapabilities());
         return true;
       }
@@ -84,7 +84,7 @@ public boolean isAvailable() {
   public boolean isPresent() {
     try {
       if (Platform.getCurrent().is(Platform.WINDOWS)) {
-        DriverFinder.getPath(
+        DriverFinder.getResult(
             InternetExplorerDriverService.createDefaultService(), getCanonicalCapabilities(), true);
         return true;
       }
diff --git a/java/src/org/openqa/selenium/ie/InternetExplorerDriverService.java b/java/src/org/openqa/selenium/ie/InternetExplorerDriverService.java
@@ -104,7 +104,7 @@ public Capabilities getDefaultDriverOptions() {
   /**
    * Configures and returns a new {@link InternetExplorerDriverService} using the default
    * configuration. In this configuration, the service will use the IEDriverServer executable
-   * identified by the {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService,
+   * identified by the {@link org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService,
    * Capabilities)}. Each service created by this method will be configured to use a free port on
    * the current system.
    *
diff --git a/java/src/org/openqa/selenium/manager/SeleniumManager.java b/java/src/org/openqa/selenium/manager/SeleniumManager.java
@@ -201,9 +201,7 @@ private synchronized Path getBinary() {
             binary.getParent().toFile().mkdirs();
             Files.copy(inputStream, binary);
           }
-          binary.toFile().setExecutable(true);
         }
-
       } catch (Exception e) {
         throw new WebDriverException("Unable to obtain Selenium Manager Binary", e);
       }
@@ -214,7 +212,6 @@ private synchronized Path getBinary() {
     binary.toFile().setExecutable(true);
 
     LOG.fine(String.format("Selenium Manager binary found at: %s", binary));
-
     return binary;
   }
 
diff --git a/java/src/org/openqa/selenium/manager/SeleniumManagerOutput.java b/java/src/org/openqa/selenium/manager/SeleniumManagerOutput.java
@@ -16,7 +16,11 @@
 // under the License.
 package org.openqa.selenium.manager;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.logging.Level;
 import org.openqa.selenium.internal.Require;
@@ -139,6 +143,29 @@ public String getBrowserPath() {
       return browserPath;
     }
 
+    public void validateDriver() {
+      Map<String, String> entries = Map.of("driver", driverPath);
+      validate(entries);
+    }
+
+    public void validateAll() {
+      Map<String, String> entries =  Map.of("driver", driverPath, "browser", browserPath);
+      validate(entries);
+    }
+
+    private void validate(Map<String, String> entries) {
+      for (Map.Entry<String, String> entry : entries.entrySet()) {
+        Path filePath = Paths.get(entry.getValue());
+        if (!Files.exists(filePath)) {
+          throw new IllegalArgumentException("The path for '" + entry.getKey() +
+            "' is not a valid file: " + entry.getValue());
+        } else if (!Files.isExecutable(filePath)) {
+          throw new IllegalArgumentException("The file at '" + entry.getKey() +
+            "' is not executable: " + entry.getValue());
+        }
+      }
+    }
+
     @Override
     public String toString() {
       return "Result{"
diff --git a/java/src/org/openqa/selenium/remote/NoSuchDriverException.java b/java/src/org/openqa/selenium/remote/NoSuchDriverException.java
@@ -22,7 +22,7 @@
 import org.openqa.selenium.remote.service.DriverService;
 
 /**
- * Thrown by {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService,
+ * Thrown by {@link org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService,
  * Capabilities)}.
  */
 public class NoSuchDriverException extends WebDriverException {
diff --git a/java/src/org/openqa/selenium/remote/service/DriverFinder.java b/java/src/org/openqa/selenium/remote/service/DriverFinder.java
@@ -17,7 +17,8 @@
 
 package org.openqa.selenium.remote.service;
 
-import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -36,10 +37,45 @@ public class DriverFinder {
 
   private static final Logger LOG = Logger.getLogger(DriverFinder.class.getName());
 
+  public static Result getResult(DriverService service, Capabilities options) {
+    return getResult(service, options, false);
+  }
+
+  public static Result getResult(DriverService service, Capabilities options, boolean offline) {
+    Require.nonNull("Driver service", service);
+    Require.nonNull("Browser options", options);
+    String driverName = service.getDriverName();
+
+    try {
+      Result result = new Result(service.getExecutable());
+      if (result.getDriverPath() != null) {
+        LOG.fine(String.format("Skipping Selenium Manager, path to %s specified in Service class: %s", driverName, result.getDriverPath()));
+        result.validateDriver();
+      }
+
+      result = new Result(System.getProperty(service.getDriverProperty()));
+      if (result.getDriverPath() == null) {
+        List<String> arguments = toArguments(options, offline);
+        result = SeleniumManager.getInstance().getResult(arguments);
+        result.validateAll();
+      } else {
+        LOG.fine(String.format("Skipping Selenium Manager, path to %s found in system property: %s", driverName, result.getDriverPath()));
+        result.validateDriver();
+      }
+
+      return result;
+    } catch (RuntimeException e) {
+      throw new NoSuchDriverException(
+        String.format("Unable to obtain: %s, error %s", driverName, e.getMessage()), e);
+    }
+  }
+
+  @Deprecated
   public static Result getPath(DriverService service, Capabilities options) {
     return getPath(service, options, false);
   }
 
+  @Deprecated
   public static Result getPath(DriverService service, Capabilities options, boolean offline) {
     Require.nonNull("Browser options", options);
     Result result = new Result(service.getExecutable());
@@ -70,11 +106,11 @@ public static Result getPath(DriverService service, Capabilities options, boolea
     String message;
     if (result.getDriverPath() == null) {
       message = String.format("Unable to locate or obtain %s", service.getDriverName());
-    } else if (!new File(result.getDriverPath()).exists()) {
+    } else if (!Files.exists(Path.of(result.getDriverPath()))) {
       message =
           String.format(
               "%s at location %s, does not exist", service.getDriverName(), result.getDriverPath());
-    } else if (!new File(result.getDriverPath()).canExecute()) {
+    } else if (!Files.isExecutable(Path.of(result.getDriverPath()))) {
       message =
           String.format(
               "%s located at %s, cannot be executed",
diff --git a/java/src/org/openqa/selenium/remote/service/DriverService.java b/java/src/org/openqa/selenium/remote/service/DriverService.java
@@ -196,7 +196,7 @@ public void start() throws IOException {
         if (getDefaultDriverOptions().getBrowserName().isEmpty()) {
           throw new WebDriverException("Driver executable is null and browser name is not set.");
         }
-        this.executable = DriverFinder.getPath(this, getDefaultDriverOptions()).getDriverPath();
+        this.executable = DriverFinder.getResult(this, getDefaultDriverOptions()).getDriverPath();
       }
       LOG.fine(String.format("Starting driver at %s with %s", this.executable, this.args));
 
diff --git a/java/src/org/openqa/selenium/safari/SafariDriver.java b/java/src/org/openqa/selenium/safari/SafariDriver.java
@@ -92,7 +92,7 @@ private static SafariDriverCommandExecutor generateExecutor(
     Require.nonNull("Driver options", options);
     Require.nonNull("Driver clientConfig", clientConfig);
     if (service.getExecutable() == null) {
-      String path = DriverFinder.getPath(service, options).getDriverPath();
+      String path = DriverFinder.getResult(service, options).getDriverPath();
       service.setExecutable(path);
     }
     return new SafariDriverCommandExecutor(service, clientConfig);
diff --git a/java/src/org/openqa/selenium/safari/SafariDriverInfo.java b/java/src/org/openqa/selenium/safari/SafariDriverInfo.java
@@ -72,7 +72,7 @@ public boolean isSupportingBiDi() {
   public boolean isAvailable() {
     try {
       if (Platform.getCurrent().is(Platform.MAC)) {
-        DriverFinder.getPath(
+        DriverFinder.getResult(
             SafariDriverService.createDefaultService(), getCanonicalCapabilities());
         return true;
       }
@@ -89,7 +89,7 @@ public boolean isAvailable() {
   public boolean isPresent() {
     try {
       if (Platform.getCurrent().is(Platform.MAC)) {
-        DriverFinder.getPath(
+        DriverFinder.getResult(
             SafariDriverService.createDefaultService(), getCanonicalCapabilities(), true);
         return true;
       }
diff --git a/java/src/org/openqa/selenium/safari/SafariDriverService.java b/java/src/org/openqa/selenium/safari/SafariDriverService.java
@@ -95,7 +95,7 @@ protected Capabilities getDefaultDriverOptions() {
   /**
    * Configures and returns a new {@link SafariDriverService} using the default configuration. In
    * this configuration, the service will use the SafariDriver executable identified by the {@link
-   * org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}. Each
+   * org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService, Capabilities)}. Each
    * service created by this method will be configured to use a free port on the current system.
    *
    * @return A new SafariDriverService using the default configuration.
diff --git a/java/src/org/openqa/selenium/safari/SafariTechPreviewDriverInfo.java b/java/src/org/openqa/selenium/safari/SafariTechPreviewDriverInfo.java
@@ -72,7 +72,7 @@ public boolean isSupportingBiDi() {
   public boolean isAvailable() {
     try {
       if (Platform.getCurrent().is(Platform.MAC)) {
-        DriverFinder.getPath(
+        DriverFinder.getResult(
             SafariTechPreviewDriverService.createDefaultService(), getCanonicalCapabilities());
         return true;
       }
@@ -89,7 +89,7 @@ public boolean isAvailable() {
   public boolean isPresent() {
     try {
       if (Platform.getCurrent().is(Platform.MAC)) {
-        DriverFinder.getPath(
+        DriverFinder.getResult(
             SafariTechPreviewDriverService.createDefaultService(),
             getCanonicalCapabilities(),
             true);
diff --git a/java/src/org/openqa/selenium/safari/SafariTechPreviewDriverService.java b/java/src/org/openqa/selenium/safari/SafariTechPreviewDriverService.java
@@ -96,7 +96,7 @@ public Capabilities getDefaultDriverOptions() {
   /**
    * Configures and returns a new {@link SafariTechPreviewDriverService} using the default
    * configuration. In this configuration, the service will use the SafariDriver executable
-   * identified by the {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService,
+   * identified by the {@link org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService,
    * Capabilities)}. Each service created by this method will be configured to use a free port on
    * the current system.
    *

Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,11 @@ private static ChromeDriverCommandExecutor generateExecutor(`
`96`	`96`	`Require.nonNull("Driver service", service);`
`97`	`97`	`Require.nonNull("Driver options", options);`
`98`	`98`	`Require.nonNull("Driver clientConfig", clientConfig);`
`99`		`- Result result = DriverFinder.getPath(service, options);`
	`99`	`+ Result result = DriverFinder.getResult(service, options);`
`100`	`100`	`service.setExecutable(result.getDriverPath());`
`101`	`101`	`if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {`
`102`	`102`	`options.setBinary(result.getBrowserPath());`
	`103`	`+ options.setCapability("browserVersion", (Object) null);`
`103`	`104`	`}`
`104`	`105`	`return new ChromeDriverCommandExecutor(service, clientConfig);`
`105`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public Capabilities getDefaultDriverOptions() {`
`128`	`128`	`/**`
`129`	`129`	`* Configures and returns a new {@link ChromeDriverService} using the default configuration. In`
`130`	`130`	`* this configuration, the service will use the ChromeDriver executable identified by {@link`
`131`		`- * org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}. Each`
	`131`	`+ * org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService, Capabilities)}. Each`
`132`	`132`	`* service created by this method will be configured to use a free port on the current system.`
`133`	`133`	`*`
`134`	`134`	`* @return A new ChromeDriverService using the default configuration.`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,11 @@ private static EdgeDriverCommandExecutor generateExecutor(`
`68`	`68`	`Require.nonNull("Driver service", service);`
`69`	`69`	`Require.nonNull("Driver options", options);`
`70`	`70`	`Require.nonNull("Driver clientConfig", clientConfig);`
`71`		`- Result result = DriverFinder.getPath(service, options);`
	`71`	`+ Result result = DriverFinder.getResult(service, options);`
`72`	`72`	`service.setExecutable(result.getDriverPath());`
`73`	`73`	`if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {`
`74`	`74`	`options.setBinary(result.getBrowserPath());`
	`75`	`+ options.setCapability("browserVersion", (Object) null);`
`75`	`76`	`}`
`76`	`77`	`return new EdgeDriverCommandExecutor(service, clientConfig);`
`77`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public Capabilities getDefaultDriverOptions() {`
`117`	`117`	`/**`
`118`	`118`	`* Configures and returns a new {@link EdgeDriverService} using the default configuration. In this`
`119`	`119`	`* configuration, the service will use the MSEdgeDriver executable identified by the {@link`
`120`		`- * org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}. Each`
	`120`	`+ * org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService, Capabilities)}. Each`
`121`	`121`	`* service created by this method will be configured to use a free port on the current system.`
`122`	`122`	`*`
`123`	`123`	`* @return A new EdgeDriverService using the default configuration.`
Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,11 @@ private static FirefoxDriverCommandExecutor generateExecutor(`
`138`	`138`	`Require.nonNull("Driver service", service);`
`139`	`139`	`Require.nonNull("Driver options", options);`
`140`	`140`	`Require.nonNull("Driver clientConfig", clientConfig);`
`141`		`- Result result = DriverFinder.getPath(service, options);`
	`141`	`+ Result result = DriverFinder.getResult(service, options);`
`142`	`142`	`service.setExecutable(result.getDriverPath());`
`143`	`143`	`if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {`
`144`	`144`	`options.setBinary(result.getBrowserPath());`
	`145`	`+ options.setCapability("browserVersion", (Object) null);`
`145`	`146`	`}`
`146`	`147`	`return new FirefoxDriverCommandExecutor(service, clientConfig);`
`147`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public Capabilities getDefaultDriverOptions() {`
`110`	`110`	`/**`
`111`	`111`	`* Configures and returns a new {@link GeckoDriverService} using the default configuration. In`
`112`	`112`	`* this configuration, the service will use the GeckoDriver executable identified by the {@link`
`113`		`- * org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}. Each`
	`113`	`+ * org.openqa.selenium.remote.service.DriverFinder#getResult(DriverService, Capabilities)}. Each`
`114`	`114`	`* service created by this method will be configured to use a free port on the current system.`
`115`	`115`	`*`
`116`	`116`	`* @return A new GeckoDriverService using the default configuration.`