[java][cdp] Ensure child session is created under browser session (SeleniumHQ#11475)

Related to SeleniumHQ#11437

Author: pujagani

java/src/org/openqa/selenium/devtools/DevTools.java

@@ -65,8 +65,14 @@ public void disconnectSession() {
  if (cdpSession != null) {
  SessionID id = cdpSession;
  cdpSession = null;
- connection.sendAndWait(
- cdpSession, getDomains().target().detachFromTarget(Optional.of(id), Optional.empty()), timeout);
+ try {
+ connection.sendAndWait(
+ cdpSession, getDomains().target().detachFromTarget(Optional.of(id), Optional.empty()),
+ timeout);
+ } catch (Exception e) {
+ // Exceptions should not prevent closing the connection and the web driver
+ log.warning("Exception while detaching from target: " + e.getMessage());
+ }
  }
  }
 
@@ -114,9 +120,14 @@ public void createSession() {
  public void createSession(String windowHandle) {
  TargetID targetId = findTarget(windowHandle);
 
- // Start the session.
+ // Starts the session
+ // CDP creates a parent browser session when websocket connection is made
+ // Create session that is child of parent browser session and not child of already existing child page session
+ // Passing null for session id helps achieve that
+ // Child of already existing child page session throws an error when detaching from the target
+ // CDP allows attaching to child of child session but not detaching. Maybe it does not keep track of it.
  cdpSession = connection
- .sendAndWait(cdpSession, getDomains().target().attachToTarget(targetId), timeout);
+ .sendAndWait(null, getDomains().target().attachToTarget(targetId), timeout);
 
  try {
  // We can do all of these in parallel, and we don't care about the result.

java/test/org/openqa/selenium/devtools/WindowSwitchingTest.java

@@ -21,6 +21,7 @@
 import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
 
 import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WindowType;
 import org.openqa.selenium.devtools.idealized.target.model.TargetInfo;
@@ -53,4 +54,46 @@ public void shouldBeAbleToSwitchWindowsAndCloseTheOriginal() {
 
  assertThat(updatedTargets).isNotEqualTo(originalTargets);
  }
+
+ @Test
+ @Ignore(FIREFOX)
+ public void shouldBeAbleToCreateSessionForANewTab() {
+ WebDriver driver = new Augmenter().augment(this.driver);
+
+ DevTools devTools = ((HasDevTools)driver).getDevTools();
+ devTools.createSession();
+ addConsoleLogListener(devTools);
+
+ driver.get("https://www.selenium.dev/selenium/web/bidi/logEntryAdded.html");
+
+ List<TargetInfo> originalTargets = devTools.send(devTools.getDomains().target().getTargets());
+ driver.findElement(By.id("consoleLog")).click();
+
+ String originalWindowHandle = driver.getWindowHandle();
+
+ String windowHandle = driver.switchTo().newWindow(WindowType.TAB).getWindowHandle();
+
+ devTools.createSession(windowHandle);
+ addConsoleLogListener(devTools);
+
+ driver.get("https://www.selenium.dev/selenium/web/bidi/logEntryAdded.html");
+ driver.findElement(By.id("consoleLog")).click();
+
+ List<TargetInfo> updatedTargets = this.devTools.send(this.devTools.getDomains().target().getTargets());
+
+ assertThat(updatedTargets).isNotEqualTo(originalTargets);
+ driver.close();
+
+ List<TargetInfo> leftoverTargets = devTools.send(devTools.getDomains().target().getTargets());
+
+ assertThat(leftoverTargets.get(0).getTargetId().toString()).isEqualTo(originalTargets.get(0).getTargetId().toString());
+
+ driver.switchTo().window(originalWindowHandle);
+ }
+
+ public static void addConsoleLogListener(DevTools devTools) {
+ devTools.getDomains().events().addConsoleListener(consoleEvent -> {
+ assertThat(consoleEvent.getMessages()).contains("Hello, world!");
+ });
+ }
 }