Skip to content

Commit 401e5dd

Browse files
committed
[java][bidi] Add new fields of BrowsingContextInfo
1 parent 3323450 commit 401e5dd

File tree

2 files changed

+41
-2
lines changed

2 files changed

+41
-2
lines changed

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

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ public class BrowsingContextInfo {
3030

3131
private final List<BrowsingContextInfo> children;
3232

33+
private final String clientWindow;
34+
35+
private final String originalOpener;
36+
37+
private final String userContext;
38+
3339
private final String parentBrowsingContext;
3440

3541
public String getId() {
@@ -44,22 +50,40 @@ public List<BrowsingContextInfo> getChildren() {
4450
return children;
4551
}
4652

53+
public String getClientWindow() {
54+
return clientWindow;
55+
}
56+
57+
public String getOriginalOpener() {
58+
return originalOpener;
59+
}
60+
61+
public String getUserContext() {
62+
return userContext;
63+
}
64+
4765
public String getParentBrowsingContext() {
4866
return parentBrowsingContext;
4967
}
5068

5169
public BrowsingContextInfo(
52-
String id, String url, List<BrowsingContextInfo> children, String parentBrowsingContext) {
70+
String id, String url, List<BrowsingContextInfo> children, String clientWindow, String originalOpener, String userContext, String parentBrowsingContext) {
5371
this.id = id;
5472
this.url = url;
5573
this.children = children;
74+
this.clientWindow = clientWindow;
75+
this.originalOpener = originalOpener;
76+
this.userContext = userContext;
5677
this.parentBrowsingContext = parentBrowsingContext;
5778
}
5879

5980
public static BrowsingContextInfo fromJson(JsonInput input) {
6081
String id = null;
6182
String url = null;
6283
List<BrowsingContextInfo> children = null;
84+
String clientWindow = null;
85+
String originalOpener = null;
86+
String userContext = null;
6387
String parentBrowsingContext = null;
6488

6589
input.beginObject();
@@ -81,6 +105,18 @@ public static BrowsingContextInfo fromJson(JsonInput input) {
81105
parentBrowsingContext = input.read(String.class);
82106
break;
83107

108+
case "clientWindow":
109+
clientWindow = input.read(String.class);
110+
break;
111+
112+
case "originalOpener":
113+
originalOpener = input.read(String.class);
114+
break;
115+
116+
case "userContext":
117+
userContext = input.read(String.class);
118+
break;
119+
84120
default:
85121
input.skipValue();
86122
break;
@@ -89,6 +125,6 @@ public static BrowsingContextInfo fromJson(JsonInput input) {
89125

90126
input.endObject();
91127

92-
return new BrowsingContextInfo(id, url, children, parentBrowsingContext);
128+
return new BrowsingContextInfo(id, url, children, clientWindow, originalOpener, userContext, parentBrowsingContext);
93129
}
94130
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ void canGetTreeWithDepth() {
159159
BrowsingContextInfo info = contextInfoList.get(0);
160160
assertThat(info.getChildren()).isNull(); // since depth is 0
161161
assertThat(info.getId()).isEqualTo(referenceContextId);
162+
assertThat(info.getOriginalOpener()).isNull();
163+
assertThat(info.getClientWindow()).isNotNull();
164+
assertThat(info.getUserContext()).isEqualTo("default");
162165
}
163166

164167
@Test

0 commit comments

Comments
 (0)