[dotnet][cdp] implement get targets better

SeleniumHQ · Nov 29, 2022 · 9480f0d · 9480f0d
1 parent aa5dfd6
commit 9480f0d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/dotnet/src/webdriver/DevTools/Target.cs b/dotnet/src/webdriver/DevTools/Target.cs
@@ -40,7 +40,7 @@ public abstract class Target
         /// contains the list of <see cref="TargetInfo"/> objects describing the
         /// targets available for this session.
         /// </returns>
-        public abstract Task<ReadOnlyCollection<TargetInfo>> GetTargets();
+        public abstract Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null);
 
         /// <summary>
         /// Asynchronously attaches to a target.

diff --git a/dotnet/src/webdriver/DevTools/v105/V105Target.cs b/dotnet/src/webdriver/DevTools/v105/V105Target.cs
@@ -50,7 +50,7 @@ public V105Target(TargetAdapter adapter)
         /// contains the list of <see cref="TargetInfo"/> objects describing the
         /// targets available for this session.
         /// </returns>
-        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets()
+        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null)
         {
             List<TargetInfo> targets = new List<TargetInfo>();
             var response = await adapter.GetTargets();

diff --git a/dotnet/src/webdriver/DevTools/v106/V106Target.cs b/dotnet/src/webdriver/DevTools/v106/V106Target.cs
@@ -50,11 +50,15 @@ public V106Target(TargetAdapter adapter)
         /// contains the list of <see cref="TargetInfo"/> objects describing the
         /// targets available for this session.
         /// </returns>
-        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets()
+        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null)
 
         {
             List<TargetInfo> targets = new List<TargetInfo>();
-            var response = await adapter.GetTargets(new GetTargetsCommandSettings());
+            if (settings == null)
+            {
+                settings = new GetTargetsCommandSettings();
+            }
+            var response = await adapter.GetTargets((GetTargetsCommandSettings) settings);
             for (int i = 0; i < response.TargetInfos.Length; i++)
             {
                 var targetInfo = response.TargetInfos[i];

diff --git a/dotnet/src/webdriver/DevTools/v107/V107Target.cs b/dotnet/src/webdriver/DevTools/v107/V107Target.cs
@@ -50,11 +50,15 @@ public V107Target(TargetAdapter adapter)
         /// contains the list of <see cref="TargetInfo"/> objects describing the
         /// targets available for this session.
         /// </returns>
-        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets()
+        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null)
 
         {
             List<TargetInfo> targets = new List<TargetInfo>();
-            var response = await adapter.GetTargets(new GetTargetsCommandSettings());
+            if (settings == null)
+            {
+                settings = new GetTargetsCommandSettings();
+            }
+            var response = await adapter.GetTargets((GetTargetsCommandSettings) settings);
             for (int i = 0; i < response.TargetInfos.Length; i++)
             {
                 var targetInfo = response.TargetInfos[i];

diff --git a/dotnet/src/webdriver/DevTools/v85/V85Target.cs b/dotnet/src/webdriver/DevTools/v85/V85Target.cs
@@ -50,7 +50,7 @@ public V85Target(TargetAdapter adapter)
         /// contains the list of <see cref="TargetInfo"/> objects describing the
         /// targets available for this session.
         /// </returns>
-        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets()
+        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null)
         {
             List<TargetInfo> targets = new List<TargetInfo>();
             var response = await adapter.GetTargets();

diff --git a/dotnet/test/common/DevTools/DevToolsTargetTest.cs b/dotnet/test/common/DevTools/DevToolsTargetTest.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using OpenQA.Selenium.DevTools.V107.Target;
 using OpenQA.Selenium.Environment;
 
 namespace OpenQA.Selenium.DevTools
@@ -22,7 +20,7 @@ public async Task GetTargetActivateAndAttach()
         {
             var domains = session.GetVersionSpecificDomains<V107.DevToolsSessionDomains>();
             driver.Url = EnvironmentManager.Instance.UrlBuilder.WhereIs("devToolsConsoleTest.html");
-            var response = await domains.Target.GetTargets();
+            var response = await domains.Target.GetTargets(new GetTargetsCommandSettings());
             V107.Target.TargetInfo[] allTargets = response.TargetInfos;
             foreach (V107.Target.TargetInfo targetInfo in allTargets)
             {
@@ -62,7 +60,7 @@ public async Task GetTargetAndSendMessageToTarget()
                 ValidateMessage(e);
                 sync.Set();
             };
-            var targetsResponse = await domains.Target.GetTargets();
+            var targetsResponse = await domains.Target.GetTargets(new GetTargetsCommandSettings());
             allTargets = targetsResponse.TargetInfos;
             ValidateTargetsInfos(allTargets);
             ValidateTarget(allTargets[0]);