diff --git a/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java b/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java index a132a501d0e5f..71b48a16f2cd3 100644 --- a/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java +++ b/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java @@ -20,7 +20,6 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; -import java.util.Collections; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriverException; import org.openqa.selenium.WindowType; @@ -42,8 +41,7 @@ void shouldNotCloseBiDiSessionIfOneWindowIsClosed() { BiDi biDi = driver.getBiDi(); - BiDiSessionStatus status = - biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class)); + BiDiSessionStatus status = biDi.getBidiSessionStatus(); assertThat(status).isNotNull(); assertThat(status.getMessage()).isEqualTo("Session already started"); @@ -53,8 +51,7 @@ void shouldNotCloseBiDiSessionIfOneWindowIsClosed() { driver.close(); - BiDiSessionStatus statusAfterClosing = - biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class)); + BiDiSessionStatus statusAfterClosing = biDi.getBidiSessionStatus(); assertThat(statusAfterClosing).isNotNull(); assertThat(status.getMessage()).isEqualTo("Session already started"); driver.quit(); @@ -70,8 +67,7 @@ void shouldCloseBiDiSessionIfLastWindowIsClosed() { BiDi biDi = driver.getBiDi(); - BiDiSessionStatus status = - biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class)); + BiDiSessionStatus status = biDi.getBidiSessionStatus(); assertThat(status).isNotNull(); assertThat(status.getMessage()).isEqualTo("Session already started"); @@ -79,10 +75,6 @@ void shouldCloseBiDiSessionIfLastWindowIsClosed() { // Closing the last top-level browsing context, closes the WebDriver and BiDi session assertThatExceptionOfType(WebDriverException.class) - .isThrownBy( - () -> - biDi.send( - new Command<>( - "session.status", Collections.emptyMap(), BiDiSessionStatus.class))); + .isThrownBy(() -> biDi.getBidiSessionStatus()); } } diff --git a/java/test/org/openqa/selenium/bidi/BiDiSessionTest.java b/java/test/org/openqa/selenium/bidi/BiDiSessionTest.java index 60044acb5b567..9524ae06ab698 100644 --- a/java/test/org/openqa/selenium/bidi/BiDiSessionTest.java +++ b/java/test/org/openqa/selenium/bidi/BiDiSessionTest.java @@ -19,7 +19,6 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import java.util.Collections; import org.junit.jupiter.api.Test; import org.openqa.selenium.testing.JupiterTestBase; @@ -29,8 +28,7 @@ class BiDiSessionTest extends JupiterTestBase { void shouldBeAbleToCreateABiDiSession() { BiDi biDi = ((HasBiDi) driver).getBiDi(); - BiDiSessionStatus status = - biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class)); + BiDiSessionStatus status = biDi.getBidiSessionStatus(); assertThat(status).isNotNull(); assertThat(status.getMessage()).isNotEmpty(); } diff --git a/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java b/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java index 5538b346022ed..90f071f569524 100644 --- a/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java +++ b/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java @@ -21,7 +21,6 @@ import static org.openqa.selenium.testing.drivers.Browser.*; import java.io.StringReader; -import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -37,7 +36,6 @@ import org.openqa.selenium.WindowType; import org.openqa.selenium.bidi.BiDi; import org.openqa.selenium.bidi.BiDiSessionStatus; -import org.openqa.selenium.bidi.Command; import org.openqa.selenium.bidi.HasBiDi; import org.openqa.selenium.bidi.browsingcontext.BrowsingContext; import org.openqa.selenium.bidi.browsingcontext.NavigationResult; @@ -89,9 +87,7 @@ void setup() { @NotYetImplemented(EDGE) void ensureBiDiSessionCreation() { try (BiDi biDi = ((HasBiDi) driver).getBiDi()) { - BiDiSessionStatus status = - biDi.send( - new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class)); + BiDiSessionStatus status = biDi.getBidiSessionStatus(); assertThat(status).isNotNull(); assertThat(status.getMessage()).isNotEmpty(); }