Skip to content

Commit 9480f0d

Browse files
committed
[dotnet][cdp] implement get targets better
1 parent aa5dfd6 commit 9480f0d

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

dotnet/src/webdriver/DevTools/Target.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public abstract class Target
4040
/// contains the list of <see cref="TargetInfo"/> objects describing the
4141
/// targets available for this session.
4242
/// </returns>
43-
public abstract Task<ReadOnlyCollection<TargetInfo>> GetTargets();
43+
public abstract Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null);
4444

4545
/// <summary>
4646
/// Asynchronously attaches to a target.

dotnet/src/webdriver/DevTools/v105/V105Target.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public V105Target(TargetAdapter adapter)
5050
/// contains the list of <see cref="TargetInfo"/> objects describing the
5151
/// targets available for this session.
5252
/// </returns>
53-
public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets()
53+
public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null)
5454
{
5555
List<TargetInfo> targets = new List<TargetInfo>();
5656
var response = await adapter.GetTargets();

dotnet/src/webdriver/DevTools/v106/V106Target.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ public V106Target(TargetAdapter adapter)
5050
/// contains the list of <see cref="TargetInfo"/> objects describing the
5151
/// targets available for this session.
5252
/// </returns>
53-
public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets()
53+
public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null)
5454

5555
{
5656
List<TargetInfo> targets = new List<TargetInfo>();
57-
var response = await adapter.GetTargets(new GetTargetsCommandSettings());
57+
if (settings == null)
58+
{
59+
settings = new GetTargetsCommandSettings();
60+
}
61+
var response = await adapter.GetTargets((GetTargetsCommandSettings) settings);
5862
for (int i = 0; i < response.TargetInfos.Length; i++)
5963
{
6064
var targetInfo = response.TargetInfos[i];

dotnet/src/webdriver/DevTools/v107/V107Target.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ public V107Target(TargetAdapter adapter)
5050
/// contains the list of <see cref="TargetInfo"/> objects describing the
5151
/// targets available for this session.
5252
/// </returns>
53-
public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets()
53+
public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null)
5454

5555
{
5656
List<TargetInfo> targets = new List<TargetInfo>();
57-
var response = await adapter.GetTargets(new GetTargetsCommandSettings());
57+
if (settings == null)
58+
{
59+
settings = new GetTargetsCommandSettings();
60+
}
61+
var response = await adapter.GetTargets((GetTargetsCommandSettings) settings);
5862
for (int i = 0; i < response.TargetInfos.Length; i++)
5963
{
6064
var targetInfo = response.TargetInfos[i];

dotnet/src/webdriver/DevTools/v85/V85Target.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public V85Target(TargetAdapter adapter)
5050
/// contains the list of <see cref="TargetInfo"/> objects describing the
5151
/// targets available for this session.
5252
/// </returns>
53-
public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets()
53+
public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null)
5454
{
5555
List<TargetInfo> targets = new List<TargetInfo>();
5656
var response = await adapter.GetTargets();

dotnet/test/common/DevTools/DevToolsTargetTest.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
52
using System.Threading;
63
using System.Threading.Tasks;
74
using NUnit.Framework;
5+
using OpenQA.Selenium.DevTools.V107.Target;
86
using OpenQA.Selenium.Environment;
97

108
namespace OpenQA.Selenium.DevTools
@@ -22,7 +20,7 @@ public async Task GetTargetActivateAndAttach()
2220
{
2321
var domains = session.GetVersionSpecificDomains<V107.DevToolsSessionDomains>();
2422
driver.Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("devToolsConsoleTest.html");
25-
var response = await domains.Target.GetTargets();
23+
var response = await domains.Target.GetTargets(new GetTargetsCommandSettings());
2624
V107.Target.TargetInfo[] allTargets = response.TargetInfos;
2725
foreach (V107.Target.TargetInfo targetInfo in allTargets)
2826
{
@@ -62,7 +60,7 @@ public async Task GetTargetAndSendMessageToTarget()
6260
ValidateMessage(e);
6361
sync.Set();
6462
};
65-
var targetsResponse = await domains.Target.GetTargets();
63+
var targetsResponse = await domains.Target.GetTargets(new GetTargetsCommandSettings());
6664
allTargets = targetsResponse.TargetInfos;
6765
ValidateTargetsInfos(allTargets);
6866
ValidateTarget(allTargets[0]);

0 commit comments

Comments
 (0)