Merge f1032eb into 68ad984

SeleniumHQ · Apr 4, 2024 · efa4189 · efa4189
2 parents 68ad984 + f1032eb
commit efa4189
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 61 deletions.
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriverInfo.java b/java/src/org/openqa/selenium/chrome/ChromeDriverInfo.java
@@ -60,7 +60,7 @@ public boolean isSupportingCdp() {
 
   @Override
   public boolean isSupportingBiDi() {
-    return false;
+    return true;
   }
 
   @Override

diff --git a/java/test/org/openqa/selenium/bidi/browser/BUILD.bazel b/java/test/org/openqa/selenium/bidi/browser/BUILD.bazel
@@ -6,6 +6,7 @@ java_selenium_test_suite(
     size = "large",
     srcs = glob(["*Test.java"]),
     browsers = [
+        "chrome",
         "firefox",
     ],
     tags = [

diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/BUILD.bazel b/java/test/org/openqa/selenium/bidi/browsingcontext/BUILD.bazel
@@ -6,6 +6,7 @@ java_selenium_test_suite(
     size = "large",
     srcs = glob(["*Test.java"]),
     browsers = [
+        "chrome",
         "firefox",
     ],
     tags = [

diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java b/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java
@@ -52,7 +52,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canListenToWindowBrowsingContextCreatedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
@@ -76,7 +75,6 @@ void canListenToWindowBrowsingContextCreatedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canListenToBrowsingContextDestroyedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
@@ -101,7 +99,6 @@ void canListenToBrowsingContextDestroyedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canListenToTabBrowsingContextCreatedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
@@ -124,7 +121,6 @@ void canListenToTabBrowsingContextCreatedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canListenToDomContentLoadedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
@@ -144,7 +140,6 @@ void canListenToDomContentLoadedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canListenToBrowsingContextLoadedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
@@ -184,7 +179,6 @@ void canListenToNavigationStartedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canListenToFragmentNavigatedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
@@ -208,7 +202,6 @@ void canListenToFragmentNavigatedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canListenToUserPromptOpenedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
@@ -231,7 +224,6 @@ void canListenToUserPromptOpenedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canListenToUserPromptClosedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {

diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java b/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java
@@ -23,7 +23,6 @@
 import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
 import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
 import static org.openqa.selenium.testing.Safely.safelyCall;
-import static org.openqa.selenium.testing.drivers.Browser.CHROME;
 import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
 import static org.openqa.selenium.testing.drivers.Browser.IE;
@@ -77,7 +76,6 @@ void canCreateAWindow() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canCreateAWindowWithAReferenceContext() {
     BrowsingContext browsingContext =
@@ -96,7 +94,6 @@ void canCreateATab() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canCreateATabWithAReferenceContext() {
     BrowsingContext browsingContext =
@@ -133,7 +130,6 @@ void canNavigateToAUrlWithReadinessState() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canGetTreeWithAChild() {
     String referenceContextId = driver.getWindowHandle();
@@ -155,7 +151,6 @@ void canGetTreeWithAChild() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(EDGE)
   void canGetTreeWithDepth() {
     String referenceContextId = driver.getWindowHandle();
@@ -239,7 +234,6 @@ void canReloadABrowsingContext() {
 
     NavigationResult reloadInfo = browsingContext.reload();
 
-    assertThat(reloadInfo.getNavigationId()).isNotNull();
     assertThat(reloadInfo.getUrl()).contains("/bidi/logEntryAdded.html");
   }
 
@@ -410,7 +404,6 @@ void canCaptureScreenshotWithAllParameters() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   void canCaptureScreenshotOfViewport() {
     BrowsingContext browsingContext = new BrowsingContext(driver, driver.getWindowHandle());
 
@@ -429,7 +422,6 @@ void canCaptureScreenshotOfViewport() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   void canCaptureElementScreenshot() {
     BrowsingContext browsingContext = new BrowsingContext(driver, driver.getWindowHandle());
 
@@ -464,7 +456,6 @@ void canSetViewport() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   @NotYetImplemented(FIREFOX)
   void canSetViewportWithDevicePixelRatio() {
     BrowsingContext browsingContext = new BrowsingContext(driver, driver.getWindowHandle());
@@ -508,7 +499,6 @@ void canPrintPage() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   void canNavigateBackInTheBrowserHistory() {
     BrowsingContext browsingContext = new BrowsingContext(driver, driver.getWindowHandle());
     browsingContext.navigate(pages.formPage, ReadinessState.COMPLETE);
@@ -523,7 +513,6 @@ void canNavigateBackInTheBrowserHistory() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(CHROME)
   void canNavigateForwardInTheBrowserHistory() {
     BrowsingContext browsingContext = new BrowsingContext(driver, driver.getWindowHandle());
     browsingContext.navigate(pages.formPage, ReadinessState.COMPLETE);

diff --git a/java/test/org/openqa/selenium/bidi/input/BUILD.bazel b/java/test/org/openqa/selenium/bidi/input/BUILD.bazel
@@ -6,6 +6,7 @@ java_selenium_test_suite(
     size = "large",
     srcs = glob(["*Test.java"]),
     browsers = [
+        "chrome",
         "firefox",
     ],
     data = [

diff --git a/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java b/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java
@@ -260,6 +260,7 @@ private void navigateToClicksPageAndClickLink() {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canMoveMouseToAnElementInAnIframeAndClick() {
     driver.get(appServer.whereIs("click_tests/click_in_iframe.html"));
 

diff --git a/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java b/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java
@@ -224,6 +224,7 @@ void testContextClick() {
   @NeedsFreshDriver
   @Test
   @Ignore(value = FIREFOX, gitHubActions = true)
+  @Ignore(value = CHROME, gitHubActions = true)
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
@@ -263,6 +264,7 @@ void testMoveAndClick() {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void testShouldClickElementInIFrame() {
     driver.get(pages.clicksPage);
     driver.switchTo().frame("source");

diff --git a/java/test/org/openqa/selenium/bidi/log/BUILD.bazel b/java/test/org/openqa/selenium/bidi/log/BUILD.bazel
@@ -6,6 +6,7 @@ java_selenium_test_suite(
     size = "large",
     srcs = glob(["*Test.java"]),
     browsers = [
+        "chrome",
         "firefox",
     ],
     tags = [

diff --git a/java/test/org/openqa/selenium/bidi/network/NetworkCommandsTest.java b/java/test/org/openqa/selenium/bidi/network/NetworkCommandsTest.java
@@ -20,10 +20,7 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.openqa.selenium.testing.Safely.safelyCall;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
-import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
-import static org.openqa.selenium.testing.drivers.Browser.IE;
-import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
+import static org.openqa.selenium.testing.drivers.Browser.*;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
@@ -59,6 +56,7 @@ public void setUp() {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canAddIntercept() {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -71,6 +69,7 @@ void canAddIntercept() {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canContinueRequest() throws InterruptedException {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -105,6 +104,7 @@ void canContinueRequest() throws InterruptedException {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canContinueResponse() throws InterruptedException {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -134,6 +134,7 @@ void canContinueResponse() throws InterruptedException {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canProvideResponse() throws InterruptedException {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -163,6 +164,7 @@ void canProvideResponse() throws InterruptedException {
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
   @NotYetImplemented(FIREFOX)
+  @NotYetImplemented(CHROME)
   // TODO: Browsers are yet to implement all parameters. Once implemented, add exhaustive tests.
   void canProvideResponseWithAllParameters() throws InterruptedException {
     try (Network network = new Network(driver)) {
@@ -198,6 +200,7 @@ void canProvideResponseWithAllParameters() throws InterruptedException {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canRemoveIntercept() {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -212,6 +215,7 @@ void canRemoveIntercept() {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canContinueWithAuthCredentials() {
     try (Network network = new Network(driver)) {
       network.addIntercept(new AddInterceptParameters(InterceptPhase.AUTH_REQUIRED));
@@ -231,6 +235,7 @@ void canContinueWithAuthCredentials() {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canContinueWithoutAuthCredentials() {
     try (Network network = new Network(driver)) {
       network.addIntercept(new AddInterceptParameters(InterceptPhase.AUTH_REQUIRED));
@@ -250,6 +255,7 @@ void canContinueWithoutAuthCredentials() {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canCancelAuth() {
     try (Network network = new Network(driver)) {
       network.addIntercept(new AddInterceptParameters(InterceptPhase.AUTH_REQUIRED));
@@ -268,6 +274,7 @@ void canCancelAuth() {
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canFailRequest() {
     try (Network network = new Network(driver)) {
       network.addIntercept(new AddInterceptParameters(InterceptPhase.BEFORE_REQUEST_SENT));

diff --git a/java/test/org/openqa/selenium/bidi/network/NetworkEventsTest.java b/java/test/org/openqa/selenium/bidi/network/NetworkEventsTest.java
@@ -19,9 +19,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.openqa.selenium.testing.Safely.safelyCall;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
-import static org.openqa.selenium.testing.drivers.Browser.IE;
-import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
+import static org.openqa.selenium.testing.drivers.Browser.*;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -148,6 +146,7 @@ void canListenToResponseCompletedEventWithCookie()
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canListenToOnAuthRequiredEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (Network network = new Network(driver)) {
@@ -172,6 +171,7 @@ void canListenToOnAuthRequiredEvent()
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
   @NotYetImplemented(EDGE)
+  @NotYetImplemented(CHROME)
   void canListenToFetchError() throws ExecutionException, InterruptedException, TimeoutException {
     try (Network network = new Network(driver)) {
       CompletableFuture<FetchError> future = new CompletableFuture<>();

diff --git a/java/test/org/openqa/selenium/bidi/script/BUILD.bazel b/java/test/org/openqa/selenium/bidi/script/BUILD.bazel
@@ -6,6 +6,7 @@ java_selenium_test_suite(
     size = "large",
     srcs = glob(["*Test.java"]),
     browsers = [
+        "chrome",
         "firefox",
     ],
     tags = [