[java] Adjusting tests

diemol · titusfortner · commit f949736e68dc · 2023-06-05T10:00:28.000-05:00
diff --git a/java/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java b/java/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java
@@ -70,7 +70,7 @@ class NodeOptionsTest {
   @Test
   void canConfigureNodeWithDriverDetection() {
     // If the driver isn't on the path, we should skip the test
-    assumeTrue(new ChromeDriverInfo().isAvailable(), "ChromeDriver needs to be available");
+    assumeTrue(new ChromeDriverInfo().isPresent(), "ChromeDriver needs to be available");
 
     Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
 
@@ -126,7 +126,7 @@ void ensureManagedDownloadsFlagIsNOTAutoInjectedIntoSafariStereoCapabilitiesWhen
   }
 
   boolean isDownloadEnabled(WebDriverInfo driver, String customMsg) {
-    assumeTrue(driver.isAvailable(), customMsg + " needs to be available");
+    assumeTrue(driver.isPresent(), customMsg + " needs to be available");
     Config config =
         new MapConfig(
             singletonMap(
@@ -213,6 +213,10 @@ void shouldDetectCorrectDriversOnMac() {
 
   @Test
   void platformNameIsAddedByDefault() {
+    assumeTrue(
+        new ChromeDriverInfo().isPresent() || new GeckoDriverInfo().isPresent(),
+        "A driver needs to be available");
+
     Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
 
     List<Capabilities> reported = new ArrayList<>();
@@ -230,7 +234,7 @@ void platformNameIsAddedByDefault() {
 
   @Test
   void vncEnabledCapabilityIsAddedWhenEnvVarIsTrue() {
-    Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
+    Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "false")));
 
     List<Capabilities> reported = new ArrayList<>();
     NodeOptions nodeOptions = new NodeOptions(config);
@@ -252,7 +256,7 @@ void vncEnabledCapabilityIsAddedWhenEnvVarIsTrue() {
 
   @Test
   void vncEnabledCapabilityIsNotAddedWhenEnvVarIsFalse() {
-    Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
+    Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "false")));
 
     List<Capabilities> reported = new ArrayList<>();
     NodeOptions nodeOptions = new NodeOptions(config);
@@ -313,6 +317,10 @@ void shouldThrowConfigExceptionIfDetectDriversIsFalseAndSpecificDriverIsAdded()
 
   @Test
   void detectDriversByDefault() {
+    assumeTrue(
+        new ChromeDriverInfo().isPresent() || new GeckoDriverInfo().isPresent(),
+        "A driver needs to be available");
+
     Config config = new MapConfig(emptyMap());
 
     List<Capabilities> reported = new ArrayList<>();
@@ -583,7 +591,7 @@ void maxSessionsFieldIsOptionalInDriversConfig() {
 
   @Test
   void shouldNotOverrideMaxSessionsByDefault() {
-    assumeTrue(new ChromeDriverInfo().isAvailable(), "ChromeDriver needs to be available");
+    assumeTrue(new ChromeDriverInfo().isPresent(), "ChromeDriver needs to be available");
     int maxRecommendedSessions = Runtime.getRuntime().availableProcessors();
     int overriddenMaxSessions = maxRecommendedSessions + 10;
     Config config =
@@ -608,7 +616,7 @@ void shouldNotOverrideMaxSessionsByDefault() {
 
   @Test
   void canOverrideMaxSessionsWithFlag() {
-    assumeTrue(new ChromeDriverInfo().isAvailable(), "ChromeDriver needs to be available");
+    assumeTrue(new ChromeDriverInfo().isPresent(), "ChromeDriver needs to be available");
     int maxRecommendedSessions = Runtime.getRuntime().availableProcessors();
     int overriddenMaxSessions = maxRecommendedSessions + 10;
     Config config =
