Skip to content

Commit febce3f

Browse files
committed
use getBidiSessionStatus method in tests
1 parent 9b1e83c commit febce3f

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ void shouldNotCloseBiDiSessionIfOneWindowIsClosed() {
4242

4343
BiDi biDi = driver.getBiDi();
4444

45-
BiDiSessionStatus status =
46-
biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
45+
BiDiSessionStatus status = biDi.getBidiSessionStatus();
4746
assertThat(status).isNotNull();
4847
assertThat(status.getMessage()).isEqualTo("Session already started");
4948

@@ -53,8 +52,7 @@ void shouldNotCloseBiDiSessionIfOneWindowIsClosed() {
5352

5453
driver.close();
5554

56-
BiDiSessionStatus statusAfterClosing =
57-
biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
55+
BiDiSessionStatus statusAfterClosing = biDi.getBidiSessionStatus();
5856
assertThat(statusAfterClosing).isNotNull();
5957
assertThat(status.getMessage()).isEqualTo("Session already started");
6058
driver.quit();
@@ -70,19 +68,14 @@ void shouldCloseBiDiSessionIfLastWindowIsClosed() {
7068

7169
BiDi biDi = driver.getBiDi();
7270

73-
BiDiSessionStatus status =
74-
biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
71+
BiDiSessionStatus status = biDi.getBidiSessionStatus();
7572
assertThat(status).isNotNull();
7673
assertThat(status.getMessage()).isEqualTo("Session already started");
7774

7875
driver.close();
7976

8077
// Closing the last top-level browsing context, closes the WebDriver and BiDi session
8178
assertThatExceptionOfType(WebDriverException.class)
82-
.isThrownBy(
83-
() ->
84-
biDi.send(
85-
new Command<>(
86-
"session.status", Collections.emptyMap(), BiDiSessionStatus.class)));
79+
.isThrownBy(() -> biDi.getBidiSessionStatus());
8780
}
8881
}

java/test/org/openqa/selenium/bidi/BiDiSessionTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ class BiDiSessionTest extends JupiterTestBase {
2929
void shouldBeAbleToCreateABiDiSession() {
3030
BiDi biDi = ((HasBiDi) driver).getBiDi();
3131

32-
BiDiSessionStatus status =
33-
biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
32+
BiDiSessionStatus status = biDi.getBidiSessionStatus();
3433
assertThat(status).isNotNull();
3534
assertThat(status.getMessage()).isNotEmpty();
3635
}

java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ void setup() {
8989
@NotYetImplemented(EDGE)
9090
void ensureBiDiSessionCreation() {
9191
try (BiDi biDi = ((HasBiDi) driver).getBiDi()) {
92-
BiDiSessionStatus status =
93-
biDi.send(
94-
new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
92+
BiDiSessionStatus status = biDi.getBidiSessionStatus();
9593
assertThat(status).isNotNull();
9694
assertThat(status.getMessage()).isNotEmpty();
9795
}

0 commit comments

Comments
 (0)