From febce3fe428814d4c3c038da7089552ef7f7969f Mon Sep 17 00:00:00 2001 From: Navin Chandra Date: Wed, 12 Mar 2025 17:26:12 +0530 Subject: [PATCH 1/2] use `getBidiSessionStatus` method in tests --- .../selenium/bidi/BiDiSessionCleanUpTest.java | 15 ++++----------- .../org/openqa/selenium/bidi/BiDiSessionTest.java | 3 +-- .../grid/router/RemoteWebDriverBiDiTest.java | 4 +--- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java b/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java index a132a501d0e5f..01b18074d08c3 100644 --- a/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java +++ b/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java @@ -42,8 +42,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 +52,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 +68,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 +76,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..affb64fbbe1a3 100644 --- a/java/test/org/openqa/selenium/bidi/BiDiSessionTest.java +++ b/java/test/org/openqa/selenium/bidi/BiDiSessionTest.java @@ -29,8 +29,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..fd220c1768ac6 100644 --- a/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java +++ b/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java @@ -89,9 +89,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(); } From 9a9b489f2a38607871a2e79cdf71c5b14965fcc8 Mon Sep 17 00:00:00 2001 From: Navin Chandra Date: Wed, 12 Mar 2025 17:43:02 +0530 Subject: [PATCH 2/2] run `format.sh` --- java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java | 1 - java/test/org/openqa/selenium/bidi/BiDiSessionTest.java | 1 - .../openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java b/java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java index 01b18074d08c3..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; diff --git a/java/test/org/openqa/selenium/bidi/BiDiSessionTest.java b/java/test/org/openqa/selenium/bidi/BiDiSessionTest.java index affb64fbbe1a3..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; diff --git a/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java b/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java index fd220c1768ac6..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;