Ensure tests work with pinned browsers

This removes the requirement for the small and medium java tests to
have firefox, chrome, or edge installed, provided the `--pin_browsers`
flag is passed to bazel.

Author: shs96c

java/client/test/org/openqa/selenium/environment/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
+load("//common/private:selenium_test.bzl", "BROWSERS")
 load("//java:defs.bzl", "java_binary", "java_library", "java_test_suite")
 
 filegroup(
@@ -98,13 +99,18 @@ java_library(
     ],
 )
 
+firefox = BROWSERS["firefox"]
+
 java_test_suite(
     name = "MediumTests",
     size = "medium",
     srcs = glob(["**/*Test.java"]),
+    data = firefox["data"],
+    jvm_flags = firefox["jvm_flags"],
+    tags = firefox["tags"],
     deps = [
         ":environment",
         ":test-base",
         artifact("junit:junit"),
-    ],
+    ] + firefox["deps"],
 )

java/client/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java

@@ -305,13 +305,16 @@ public void canConvertOptionsWithPrefsToCapabilitiesAndRestoreBack() {
   }
 
   @Test
-  public void canConvertOptionsWithBinaryToCapabilitiesAndRestoreBack() {
+  public void canConvertOptionsWithBinaryToCapabilitiesAndRestoreBack() throws IOException {
+    // Don't assume Firefox is actually installed and available
+    Path tempFile = Files.createTempFile("firefoxoptions", "test");
+
     FirefoxOptions options = new FirefoxOptions(
-      new MutableCapabilities(new FirefoxOptions().setBinary(new FirefoxBinary())));
+      new MutableCapabilities(new FirefoxOptions().setBinary(new FirefoxBinary(tempFile.toFile()))));
     Object options2 = options.asMap().get(FirefoxOptions.FIREFOX_OPTIONS);
     assertThat(options2)
       .asInstanceOf(InstanceOfAssertFactories.MAP)
-      .containsEntry("binary", new FirefoxBinary().getPath().replaceAll("\\\\", "/"));
+      .containsEntry("binary", new FirefoxBinary(tempFile.toFile()).getPath().replaceAll("\\\\", "/"));
   }
 
   @Test

java/client/test/org/openqa/selenium/ie/BUILD.bazel

@@ -12,6 +12,9 @@ java_test_suite(
         ["*.java"],
         exclude = LARGE_TESTS,
     ),
+    tags = [
+        "requires-network",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/ie",
         "//java/client/src/org/openqa/selenium/json",

java/server/test/com/thoughtworks/selenium/webdriven/BUILD.bazel

@@ -1,16 +1,22 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
+load("//common/private:selenium_test.bzl", "BROWSERS")
 load("//java:defs.bzl", "java_test_suite")
 
+firefox = BROWSERS["firefox"]
+
 java_test_suite(
     name = "MediumTests",
     size = "medium",
     srcs = glob(["*Test.java"]),
+    data = firefox["data"],
     javacopts = [
         "-source",
         "11",
         "-target",
         "11",
     ],
+    jvm_flags = firefox["jvm_flags"],
+    tags = firefox["tags"],
     deps = [
         "//java/client/src/com/thoughtworks/selenium",
         "//java/client/src/org/openqa/selenium/remote",
@@ -23,5 +29,5 @@ java_test_suite(
         "//java/server/src/org/openqa/selenium/remote/server",
         artifact("io.opentelemetry:opentelemetry-api"),
         artifact("junit:junit"),
-    ],
+    ] + firefox["deps"],
 )

java/server/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.grid.node.config;
 
+import com.google.common.collect.ImmutableMap;
 import org.assertj.core.api.Condition;
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
@@ -50,8 +51,6 @@
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
-import com.google.common.collect.ImmutableMap;
-
 @SuppressWarnings("DuplicatedCode")
 public class NodeOptionsTest {
 
@@ -115,11 +114,9 @@ public void shouldDetectCorrectDriversOnMac() {
       return Collections.emptySet();
     });
 
-    assertThat(reported).is(supporting("chrome"));
-    assertThat(reported).is(supporting("firefox"));
-    assertThat(reported).isNot(supporting("internet explorer"));
-    assertThat(reported).is(supporting("MicrosoftEdge"));
+    // There may be more drivers available, but we know that these are meant to be here.
     assertThat(reported).is(supporting("safari"));
+    assertThat(reported).isNot(supporting("internet explorer"));
   }
 
   @Test

java/server/test/org/openqa/selenium/server/htmlrunner/BUILD.bazel

@@ -1,21 +1,26 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
+load("//common/private:selenium_test.bzl", "BROWSERS")
 load("//java:defs.bzl", "java_test_suite")
 
+firefox = BROWSERS["firefox"]
+
 java_test_suite(
     name = "MediumTests",
     size = "medium",
     srcs = glob(["*.java"]),
-    jvm_flags = [
+    data = firefox["data"],
+    jvm_flags = firefox["jvm_flags"] + [
         "-Dselenium.browser=*firefox",
     ],
     tags = [
         "no-sandbox",
     ],
     deps = [
+        "//java/client/src/org/openqa/selenium/chrome",
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/test/org/openqa/selenium/environment",
         "//java/server/src/org/openqa/selenium/server/htmlrunner",
         artifact("com.google.guava:guava"),
         artifact("junit:junit"),
-    ],
+    ] + firefox["deps"],
 )

java/server/test/org/openqa/selenium/server/htmlrunner/CoreSelfTest.java

@@ -21,9 +21,10 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.openqa.selenium.chrome.ChromeDriverInfo;
 import org.openqa.selenium.environment.webserver.AppServer;
 import org.openqa.selenium.environment.webserver.NettyAppServer;
-import org.openqa.selenium.os.ExecutableFinder;
+import org.openqa.selenium.firefox.GeckoDriverInfo;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -46,11 +47,11 @@ public void detectBrowser() {
 
     switch (browser) {
       case "*firefox":
-        assumeNotNull(new ExecutableFinder().find("geckodriver"));
+        assumeNotNull(new GeckoDriverInfo().isAvailable());
         break;
 
       case "*googlechrome":
-        assumeNotNull(new ExecutableFinder().find("chromedriver"));
+        assumeNotNull(new ChromeDriverInfo().isAvailable());
         break;
 
       default: