Skip to content

[java][bidi]: use getBidiSessionStatus method in tests #15403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 19, 2025
Merged

[java][bidi]: use getBidiSessionStatus method in tests #15403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
febce3f
use `getBidiSessionStatus` method in tests
navin772 Mar 12, 2025
9a9b489
run `format.sh`
navin772 Mar 12, 2025
6be8d7b
Merge branch 'trunk' into java-session-status-test-fix
VietND96 Mar 18, 2025
1764e8f
Merge branch 'trunk' into java-session-status-test-fix
navin772 Mar 19, 2025
8b11858
Merge branch 'trunk' into java-session-status-test-fix
navin772 Mar 19, 2025
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
16 changes: 4 additions & 12 deletions java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");

Expand All @@ -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();
Expand All @@ -70,19 +67,14 @@ 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");

driver.close();

// 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());
}
}
4 changes: 1 addition & 3 deletions java/test/org/openqa/selenium/bidi/BiDiSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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();
}
Expand Down
6 changes: 1 addition & 5 deletions java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down
Loading