2020import static org .assertj .core .api .AssertionsForClassTypes .assertThat ;
2121import static org .assertj .core .api .AssertionsForClassTypes .assertThatExceptionOfType ;
2222
23- import java .util .Collections ;
2423import org .junit .jupiter .api .Test ;
2524import org .openqa .selenium .WebDriverException ;
2625import 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}
0 commit comments