Skip to content

Commit f949736

Browse files
diemoltitusfortner
authored andcommitted
[java] Adjusting tests
1 parent 10e5fbb commit f949736

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class NodeOptionsTest {
7070
@Test
7171
void canConfigureNodeWithDriverDetection() {
7272
// If the driver isn't on the path, we should skip the test
73-
assumeTrue(new ChromeDriverInfo().isAvailable(), "ChromeDriver needs to be available");
73+
assumeTrue(new ChromeDriverInfo().isPresent(), "ChromeDriver needs to be available");
7474

7575
Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
7676

@@ -126,7 +126,7 @@ void ensureManagedDownloadsFlagIsNOTAutoInjectedIntoSafariStereoCapabilitiesWhen
126126
}
127127

128128
boolean isDownloadEnabled(WebDriverInfo driver, String customMsg) {
129-
assumeTrue(driver.isAvailable(), customMsg + " needs to be available");
129+
assumeTrue(driver.isPresent(), customMsg + " needs to be available");
130130
Config config =
131131
new MapConfig(
132132
singletonMap(
@@ -213,6 +213,10 @@ void shouldDetectCorrectDriversOnMac() {
213213

214214
@Test
215215
void platformNameIsAddedByDefault() {
216+
assumeTrue(
217+
new ChromeDriverInfo().isPresent() || new GeckoDriverInfo().isPresent(),
218+
"A driver needs to be available");
219+
216220
Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
217221

218222
List<Capabilities> reported = new ArrayList<>();
@@ -230,7 +234,7 @@ void platformNameIsAddedByDefault() {
230234

231235
@Test
232236
void vncEnabledCapabilityIsAddedWhenEnvVarIsTrue() {
233-
Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
237+
Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "false")));
234238

235239
List<Capabilities> reported = new ArrayList<>();
236240
NodeOptions nodeOptions = new NodeOptions(config);
@@ -252,7 +256,7 @@ void vncEnabledCapabilityIsAddedWhenEnvVarIsTrue() {
252256

253257
@Test
254258
void vncEnabledCapabilityIsNotAddedWhenEnvVarIsFalse() {
255-
Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
259+
Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "false")));
256260

257261
List<Capabilities> reported = new ArrayList<>();
258262
NodeOptions nodeOptions = new NodeOptions(config);
@@ -313,6 +317,10 @@ void shouldThrowConfigExceptionIfDetectDriversIsFalseAndSpecificDriverIsAdded()
313317

314318
@Test
315319
void detectDriversByDefault() {
320+
assumeTrue(
321+
new ChromeDriverInfo().isPresent() || new GeckoDriverInfo().isPresent(),
322+
"A driver needs to be available");
323+
316324
Config config = new MapConfig(emptyMap());
317325

318326
List<Capabilities> reported = new ArrayList<>();
@@ -583,7 +591,7 @@ void maxSessionsFieldIsOptionalInDriversConfig() {
583591

584592
@Test
585593
void shouldNotOverrideMaxSessionsByDefault() {
586-
assumeTrue(new ChromeDriverInfo().isAvailable(), "ChromeDriver needs to be available");
594+
assumeTrue(new ChromeDriverInfo().isPresent(), "ChromeDriver needs to be available");
587595
int maxRecommendedSessions = Runtime.getRuntime().availableProcessors();
588596
int overriddenMaxSessions = maxRecommendedSessions + 10;
589597
Config config =
@@ -608,7 +616,7 @@ void shouldNotOverrideMaxSessionsByDefault() {
608616

609617
@Test
610618
void canOverrideMaxSessionsWithFlag() {
611-
assumeTrue(new ChromeDriverInfo().isAvailable(), "ChromeDriver needs to be available");
619+
assumeTrue(new ChromeDriverInfo().isPresent(), "ChromeDriver needs to be available");
612620
int maxRecommendedSessions = Runtime.getRuntime().availableProcessors();
613621
int overriddenMaxSessions = maxRecommendedSessions + 10;
614622
Config config =

0 commit comments

Comments
 (0)