Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions java/src/org/openqa/selenium/remote/RemoteWebDriver.java
Original file line number Diff line number Diff line change
Expand Up @@ -868,6 +868,17 @@ public String toString() {
getClass().getSimpleName(), caps.getBrowserName(), platformName, getSessionId());
}

/**
* Returns the browser version from the capabilities.
* Compatible with Java 11 and Selenium 4.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All methods in Selenium 4 are compatible with Selenium 4 (and Java 11).

*
* @return The browser version as a String, or empty string if not available.
*/
public String getBrowserVersion() {
Object version = getCapabilities().getCapability("browserVersion");
return version != null ? version.toString() : "";
}

public enum When {
BEFORE,
AFTER,
Expand Down
18 changes: 18 additions & 0 deletions java/test/org/openqa/selenium/remote/RemoteWebDriverUnitTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -825,4 +825,22 @@ void getDownloadableFilesReturnsType() {

fixture.verifyCommands(new CommandPayload(DriverCommand.GET_DOWNLOADABLE_FILES, emptyMap()));
}

/**
* Tests that getBrowserVersion() returns the correct version from capabilities.
* Ensures compatibility and correct extraction of browser version.
*/
@Test
void canGetBrowserVersionFromCapabilities() {
// Arrange: create capabilities with browserVersion
String expectedVersion = "123.45.67";
ImmutableCapabilities capabilities = new ImmutableCapabilities("browserVersion", expectedVersion);
WebDriverFixture fixture = new WebDriverFixture(capabilities, WebDriverFixture.validSessionResponder);

// Act: get browser version
String actualVersion = ((RemoteWebDriver) fixture.driver).getBrowserVersion();

// Assert: verify the version matches
assertThat(actualVersion).isEqualTo(expectedVersion);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.openqa.selenium.remote;

import org.junit.jupiter.api.Test;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.Capabilities;
import static org.assertj.core.api.Assertions.assertThat;

public class ShowBrowserVersionIntegrationTest {
@Test
void showBrowserVersion() {
// Start a real Chrome session
WebDriver driver = new ChromeDriver();
try {
Capabilities caps = ((ChromeDriver) driver).getCapabilities();
String version = caps.getBrowserVersion();
System.out.println("Browser version: " + version);
assertThat(version).isNotEmpty();
assertThat(version).isNotNull();
} finally {
driver.quit();
}
}
}
13 changes: 13 additions & 0 deletions java/test/org/openqa/selenium/remote/WebDriverFixture.java
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,17 @@ public static Function<Command, Response> errorResponder(String state, Object va
response.setSessionId(UUID.randomUUID().toString());
return response;
};

public static final Function<Command, Response> validSessionResponder = cmd -> {
if (DriverCommand.NEW_SESSION.equals(cmd.getName())) {
Response response = new Response();
response.setState("success");
response.setSessionId("mock-session-id");
// Capabilities con browserVersion
response.setValue(Map.of("browserVersion", "123.45.67"));
return response;
}
// Para otros comandos, devolver null o como se requiera
return null;
};
}