[java] Allow local driver tests to not depend on actual webdriver implementations

pujagani · web-flow · commit 3ef95ef8495f · 2022-01-07T18:52:47.000+05:30
diff --git a/java/src/org/openqa/selenium/remote/RemoteWebDriverBuilder.java b/java/src/org/openqa/selenium/remote/RemoteWebDriverBuilder.java
@@ -341,7 +341,7 @@ WebDriver getLocalDriver() {
     WebDriver localDriver = first.get().get();
 
     if (localDriver != null && this.useCustomConfig) {
-      throw new IllegalArgumentException("Custom client config is not supported in local drivers");
+      throw new IllegalArgumentException("ClientConfig instances do not work for Local Drivers");
     }
 
     return localDriver;
diff --git a/java/test/org/openqa/selenium/remote/BUILD.bazel b/java/test/org/openqa/selenium/remote/BUILD.bazel
@@ -21,6 +21,7 @@ java_test_suite(
         "no-sandbox",
     ],
     deps = [
+        "//java:auto-service",
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/chrome",
         "//java/src/org/openqa/selenium/firefox",
diff --git a/java/test/org/openqa/selenium/remote/FakeWebDriverInfo.java b/java/test/org/openqa/selenium/remote/FakeWebDriverInfo.java
@@ -0,0 +1,67 @@
+package org.openqa.selenium.remote;
+
+import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+
+import com.google.auto.service.AutoService;
+
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.ImmutableCapabilities;
+import org.openqa.selenium.SessionNotCreatedException;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebDriverInfo;
+
+import java.util.Optional;
+
+@AutoService(WebDriverInfo.class)
+public class FakeWebDriverInfo implements WebDriverInfo {
+
+  @Override
+  public String getDisplayName() {
+    return "selenium-test";
+  }
+
+  @Override
+  public Capabilities getCanonicalCapabilities() {
+    return new ImmutableCapabilities(BROWSER_NAME, "selenium-test");
+  }
+
+  @Override
+  public boolean isSupporting(Capabilities capabilities) {
+    return true;
+  }
+
+  @Override
+  public boolean isSupportingCdp() {
+    return false;
+  }
+
+  @Override
+  public boolean isAvailable() {
+    return true;
+  }
+
+  @Override
+  public int getMaximumSimultaneousSessions() {
+    return Runtime.getRuntime().availableProcessors();
+  }
+
+  @Override
+  public Optional<WebDriver> createDriver(Capabilities capabilities)
+    throws SessionNotCreatedException {
+
+    return Optional.of(new FakeWebDriver());
+  }
+
+  private static class FakeWebDriver extends RemoteWebDriver {
+
+    @Override
+    protected void startSession(Capabilities capabilities) {
+      // no-op
+    }
+
+    @Override
+    public void quit() {
+      // no-op
+    }
+  }
+}
diff --git a/java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java b/java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java
@@ -51,6 +51,7 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.openqa.selenium.json.Json.JSON_UTF_8;
 import static org.openqa.selenium.json.Json.MAP_TYPE;
 import static org.openqa.selenium.remote.Browser.CHROME;
@@ -312,10 +313,13 @@ public void shouldThrowErrorIfCustomConfigIfSetForLocalDriver() {
       .readTimeout(Duration.ofMinutes(4));
 
     RemoteWebDriverBuilder builder = RemoteWebDriver.builder()
-      .oneOf(new FirefoxOptions())
-      .config(config);
+      .oneOf(new ImmutableCapabilities("browser", "selenium-test"))
+      .config(config)
+      .connectingWith(clientConfig -> req -> CANNED_SESSION_RESPONSE);
 
-    assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(builder::build);
+    assertThatIllegalArgumentException()
+      .isThrownBy(builder::build)
+      .withMessage("ClientConfig instances do not work for Local Drivers");
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ WebDriver getLocalDriver() {`
`341`	`341`	`WebDriver localDriver = first.get().get();`
`342`	`342`
`343`	`343`	`if (localDriver != null && this.useCustomConfig) {`
`344`		`- throw new IllegalArgumentException("Custom client config is not supported in local drivers");`
	`344`	`+ throw new IllegalArgumentException("ClientConfig instances do not work for Local Drivers");`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`return localDriver;`