Skip to content

Commit e60ce06

Browse files
authored
[java][bidi]: use getBidiSessionStatus method in tests (#15403)
1 parent ffbfa02 commit e60ce06

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

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

+4-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
2121
import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
2222

23-
import java.util.Collections;
2423
import org.junit.jupiter.api.Test;
2524
import org.openqa.selenium.WebDriverException;
2625
import org.openqa.selenium.WindowType;
@@ -42,8 +41,7 @@ void shouldNotCloseBiDiSessionIfOneWindowIsClosed() {
4241

4342
BiDi biDi = driver.getBiDi();
4443

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

@@ -53,8 +51,7 @@ void shouldNotCloseBiDiSessionIfOneWindowIsClosed() {
5351

5452
driver.close();
5553

56-
BiDiSessionStatus statusAfterClosing =
57-
biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
54+
BiDiSessionStatus statusAfterClosing = biDi.getBidiSessionStatus();
5855
assertThat(statusAfterClosing).isNotNull();
5956
assertThat(status.getMessage()).isEqualTo("Session already started");
6057
driver.quit();
@@ -70,19 +67,14 @@ void shouldCloseBiDiSessionIfLastWindowIsClosed() {
7067

7168
BiDi biDi = driver.getBiDi();
7269

73-
BiDiSessionStatus status =
74-
biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
70+
BiDiSessionStatus status = biDi.getBidiSessionStatus();
7571
assertThat(status).isNotNull();
7672
assertThat(status.getMessage()).isEqualTo("Session already started");
7773

7874
driver.close();
7975

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

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
2121

22-
import java.util.Collections;
2322
import org.junit.jupiter.api.Test;
2423
import org.openqa.selenium.testing.JupiterTestBase;
2524

@@ -29,8 +28,7 @@ class BiDiSessionTest extends JupiterTestBase {
2928
void shouldBeAbleToCreateABiDiSession() {
3029
BiDi biDi = ((HasBiDi) driver).getBiDi();
3130

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

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

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static org.openqa.selenium.testing.drivers.Browser.*;
2222

2323
import java.io.StringReader;
24-
import java.util.Collections;
2524
import java.util.Objects;
2625
import java.util.concurrent.CompletableFuture;
2726
import java.util.concurrent.ExecutionException;
@@ -37,7 +36,6 @@
3736
import org.openqa.selenium.WindowType;
3837
import org.openqa.selenium.bidi.BiDi;
3938
import org.openqa.selenium.bidi.BiDiSessionStatus;
40-
import org.openqa.selenium.bidi.Command;
4139
import org.openqa.selenium.bidi.HasBiDi;
4240
import org.openqa.selenium.bidi.browsingcontext.BrowsingContext;
4341
import org.openqa.selenium.bidi.browsingcontext.NavigationResult;
@@ -89,9 +87,7 @@ void setup() {
8987
@NotYetImplemented(EDGE)
9088
void ensureBiDiSessionCreation() {
9189
try (BiDi biDi = ((HasBiDi) driver).getBiDi()) {
92-
BiDiSessionStatus status =
93-
biDi.send(
94-
new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
90+
BiDiSessionStatus status = biDi.getBidiSessionStatus();
9591
assertThat(status).isNotNull();
9692
assertThat(status.getMessage()).isNotEmpty();
9793
}

0 commit comments

Comments
 (0)