Merge branch 'trunk' into py-browsing-context_events

Author: navin772

java/src/org/openqa/selenium/bidi/browsingcontext/BrowsingContext.java

@@ -148,6 +148,12 @@ public List<BrowsingContextInfo> getTree() {
             "browsingContext.getTree", Map.of("root", id), browsingContextInfoListMapper));
   }
 
+  public List<BrowsingContextInfo> getTree(String root) {
+    return this.bidi.send(
+        new Command<>(
+            "browsingContext.getTree", Map.of("root", root), browsingContextInfoListMapper));
+  }
+
   public List<BrowsingContextInfo> getTree(int maxDepth) {
     return this.bidi.send(
         new Command<>(
@@ -158,6 +164,16 @@ public List<BrowsingContextInfo> getTree(int maxDepth) {
             browsingContextInfoListMapper));
   }
 
+  public List<BrowsingContextInfo> getTree(String root, int maxDepth) {
+    return this.bidi.send(
+        new Command<>(
+            "browsingContext.getTree",
+            Map.of(
+                "root", root,
+                "maxDepth", maxDepth),
+            browsingContextInfoListMapper));
+  }
+
   public List<BrowsingContextInfo> getTopLevelContexts() {
     return this.bidi.send(
         new Command<>("browsingContext.getTree", new HashMap<>(), browsingContextInfoListMapper));

java/src/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInfo.java

@@ -30,6 +30,12 @@ public class BrowsingContextInfo {
 
   private final List<BrowsingContextInfo> children;
 
+  private final String clientWindow;
+
+  private final String originalOpener;
+
+  private final String userContext;
+
   private final String parentBrowsingContext;
 
   public String getId() {
@@ -44,22 +50,46 @@ public List<BrowsingContextInfo> getChildren() {
     return children;
   }
 
+  public String getClientWindow() {
+    return clientWindow;
+  }
+
+  public String getOriginalOpener() {
+    return originalOpener;
+  }
+
+  public String getUserContext() {
+    return userContext;
+  }
+
   public String getParentBrowsingContext() {
     return parentBrowsingContext;
   }
 
   public BrowsingContextInfo(
-      String id, String url, List<BrowsingContextInfo> children, String parentBrowsingContext) {
+      String id,
+      String url,
+      List<BrowsingContextInfo> children,
+      String clientWindow,
+      String originalOpener,
+      String userContext,
+      String parentBrowsingContext) {
     this.id = id;
     this.url = url;
     this.children = children;
+    this.clientWindow = clientWindow;
+    this.originalOpener = originalOpener;
+    this.userContext = userContext;
     this.parentBrowsingContext = parentBrowsingContext;
   }
 
   public static BrowsingContextInfo fromJson(JsonInput input) {
     String id = null;
     String url = null;
     List<BrowsingContextInfo> children = null;
+    String clientWindow = null;
+    String originalOpener = null;
+    String userContext = null;
     String parentBrowsingContext = null;
 
     input.beginObject();
@@ -81,6 +111,18 @@ public static BrowsingContextInfo fromJson(JsonInput input) {
           parentBrowsingContext = input.read(String.class);
           break;
 
+        case "clientWindow":
+          clientWindow = input.read(String.class);
+          break;
+
+        case "originalOpener":
+          originalOpener = input.read(String.class);
+          break;
+
+        case "userContext":
+          userContext = input.read(String.class);
+          break;
+
         default:
           input.skipValue();
           break;
@@ -89,6 +131,7 @@ public static BrowsingContextInfo fromJson(JsonInput input) {
 
     input.endObject();
 
-    return new BrowsingContextInfo(id, url, children, parentBrowsingContext);
+    return new BrowsingContextInfo(
+        id, url, children, clientWindow, originalOpener, userContext, parentBrowsingContext);
   }
 }

java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java

@@ -159,6 +159,52 @@ void canGetTreeWithDepth() {
     BrowsingContextInfo info = contextInfoList.get(0);
     assertThat(info.getChildren()).isNull(); // since depth is 0
     assertThat(info.getId()).isEqualTo(referenceContextId);
+    assertThat(info.getOriginalOpener()).isNull();
+    assertThat(info.getClientWindow()).isNotNull();
+    assertThat(info.getUserContext()).isEqualTo("default");
+  }
+
+  @Test
+  @NeedsFreshDriver
+  void canGetTreeWithRootAndDepth() {
+    String referenceContextId = driver.getWindowHandle();
+    BrowsingContext parentWindow = new BrowsingContext(driver, referenceContextId);
+
+    String url = appServer.whereIs("iframes.html");
+
+    parentWindow.navigate(url, ReadinessState.COMPLETE);
+
+    List<BrowsingContextInfo> contextInfoList = parentWindow.getTree(referenceContextId, 1);
+
+    assertThat(contextInfoList.size()).isEqualTo(1);
+    BrowsingContextInfo info = contextInfoList.get(0);
+    assertThat(info.getChildren()).isNotNull(); // since depth is 1
+    assertThat(info.getId()).isEqualTo(referenceContextId);
+    assertThat(info.getOriginalOpener()).isNull();
+    assertThat(info.getClientWindow()).isNotNull();
+    assertThat(info.getUserContext()).isEqualTo("default");
+  }
+
+  @Test
+  @NeedsFreshDriver
+  void canGetTreeWithRoot() {
+    String referenceContextId = driver.getWindowHandle();
+    BrowsingContext parentWindow = new BrowsingContext(driver, referenceContextId);
+
+    String url = appServer.whereIs("iframes.html");
+
+    parentWindow.navigate(url, ReadinessState.COMPLETE);
+
+    BrowsingContext tab = new BrowsingContext(driver, WindowType.TAB);
+
+    List<BrowsingContextInfo> contextInfoList = parentWindow.getTree(tab.getId());
+
+    assertThat(contextInfoList.size()).isEqualTo(1);
+    BrowsingContextInfo info = contextInfoList.get(0);
+    assertThat(info.getId()).isEqualTo(tab.getId());
+    assertThat(info.getOriginalOpener()).isNull();
+    assertThat(info.getClientWindow()).isNotNull();
+    assertThat(info.getUserContext()).isEqualTo("default");
   }
 
   @Test