Skip to content

Commit 2d5cde1

Browse files
committed
[java] Changing return type of Target.getTargets from Set to List
Because CDP specification says: "Retrieves a list of available targets."
1 parent fd1fabe commit 2d5cde1

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
import java.io.Closeable;
2929
import java.time.Duration;
30+
import java.util.List;
3031
import java.util.Objects;
3132
import java.util.Optional;
32-
import java.util.Set;
3333
import java.util.concurrent.CompletableFuture;
3434
import java.util.concurrent.ExecutionException;
3535
import java.util.concurrent.TimeoutException;
@@ -71,7 +71,7 @@ public void createSessionIfThereIsNotOne() {
7171

7272
public void createSession() {
7373
// Figure out the targets.
74-
Set<TargetInfo> infos = connection.sendAndWait(cdpSession, Target.getTargets(), timeout);
74+
List<TargetInfo> infos = connection.sendAndWait(cdpSession, Target.getTargets(), timeout);
7575

7676
// Grab the first "page" type, and glom on to that.
7777
// TODO: Find out which one might be the current one

java/client/src/org/openqa/selenium/devtools/target/Target.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.List;
3636
import java.util.Objects;
3737
import java.util.Optional;
38-
import java.util.Set;
3938

4039
import static org.openqa.selenium.devtools.ConverterFunctions.map;
4140

@@ -178,11 +177,11 @@ public static Command<TargetInfo> getTargetInfo(Optional<TargetID> targetId) {
178177
/**
179178
* Retrieves a list of available targets.
180179
*/
181-
public static Command<Set<TargetInfo>> getTargets() {
180+
public static Command<List<TargetInfo>> getTargets() {
182181
return new Command<>(
183182
"Target.getTargets",
184183
ImmutableMap.of(),
185-
ConverterFunctions.map("targetInfos", new TypeToken<Set<TargetInfo>>() {
184+
ConverterFunctions.map("targetInfos", new TypeToken<List<TargetInfo>>() {
186185
}.getType()));
187186
}
188187

java/client/test/org/openqa/selenium/devtools/ChromeDevToolsInspectorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.openqa.selenium.devtools.target.model.SessionID;
2323
import org.openqa.selenium.devtools.target.model.TargetInfo;
2424

25+
import java.util.List;
2526
import java.util.Optional;
26-
import java.util.Set;
2727

2828
import static org.openqa.selenium.devtools.inspector.Inspector.detached;
2929
import static org.openqa.selenium.devtools.inspector.Inspector.disable;
@@ -35,7 +35,7 @@ public class ChromeDevToolsInspectorTest extends DevToolsTestBase {
3535
public void inspectDetached() {
3636
devTools.addListener(detached(), Assert::assertNotNull);
3737
devTools.send(enable());
38-
Set<TargetInfo> targetInfos = devTools.send(Target.getTargets());
38+
List<TargetInfo> targetInfos = devTools.send(Target.getTargets());
3939
targetInfos.forEach(
4040
targetInfo -> {
4141
SessionID sessionId =

java/client/test/org/openqa/selenium/devtools/ChromeDevToolsTargetTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.openqa.selenium.devtools.target.model.TargetInfo;
2727

2828
import java.util.ArrayList;
29+
import java.util.List;
2930
import java.util.Optional;
30-
import java.util.Set;
3131

3232
import static org.junit.Assert.assertEquals;
3333
import static org.junit.Assert.assertFalse;
@@ -57,7 +57,7 @@ public void getTargetActivateAndAttach() {
5757
devTools.addListener(attachedToTarget(), Assert::assertNotNull);
5858

5959
driver.get(appServer.whereIs("devToolsConsoleTest.html"));
60-
Set<TargetInfo> allTargets = devTools.send(getTargets());
60+
List<TargetInfo> allTargets = devTools.send(getTargets());
6161

6262
for (TargetInfo target : allTargets) {
6363
validateTarget(target);
@@ -72,7 +72,7 @@ public void getTargetActivateAndAttach() {
7272

7373
@Test
7474
public void getTargetAndSendMessageToTarget() {
75-
Set<TargetInfo> allTargets = null;
75+
List<TargetInfo> allTargets = null;
7676
SessionID sessionId = null;
7777
TargetInfo targetInfo = null;
7878
driver.get(appServer.whereIs("devToolsConsoleTest.html"));
@@ -143,7 +143,7 @@ private void validateTargetInfo(TargetInfo targetInfo) {
143143
assertNotNull(targetInfo.getUrl());
144144
}
145145

146-
private void validateTargetsInfos(Set<TargetInfo> targets) {
146+
private void validateTargetsInfos(List<TargetInfo> targets) {
147147
assertNotNull(targets);
148148
assertFalse(targets.isEmpty());
149149
}

0 commit comments

Comments
 (0)