Merge branch 'trunk' into driver-factory-test

Author: RenderMichael

dotnet/src/webdriver/DevTools/JavaScript.cs

@@ -20,6 +20,8 @@
 using System;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -30,17 +32,17 @@ public abstract class JavaScript
         /// <summary>
         /// Occurs when a JavaScript script binding is called.
         /// </summary>
-        public event EventHandler<BindingCalledEventArgs> BindingCalled;
+        public event EventHandler<BindingCalledEventArgs>? BindingCalled;
 
         /// <summary>
         /// Occurs when the browser's JavaScript console API is called.
         /// </summary>
-        public event EventHandler<ConsoleApiCalledEventArgs> ConsoleApiCalled;
+        public event EventHandler<ConsoleApiCalledEventArgs>? ConsoleApiCalled;
 
         /// <summary>
         /// Occurs when a JavaScript exception is thrown.
         /// </summary>
-        public event EventHandler<ExceptionThrownEventArgs> ExceptionThrown;
+        public event EventHandler<ExceptionThrownEventArgs>? ExceptionThrown;
 
         /// <summary>
         /// Asynchronously enables the Runtime domain in the DevTools Protocol.

dotnet/src/webdriver/DevTools/Log.cs

@@ -20,6 +20,8 @@
 using System;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -30,7 +32,7 @@ public abstract class Log
         /// <summary>
         /// Occurs when an entry is added to the browser's log.
         /// </summary>
-        public event EventHandler<EntryAddedEventArgs> EntryAdded;
+        public event EventHandler<EntryAddedEventArgs>? EntryAdded;
 
         /// <summary>
         /// Asynchronously enables manipulation of the browser's log.

dotnet/src/webdriver/DevTools/Target.cs

@@ -21,6 +21,8 @@
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -31,12 +33,12 @@ public abstract class Target
         /// <summary>
         /// Occurs when a target is detached.
         /// </summary>
-        public event EventHandler<TargetDetachedEventArgs> TargetDetached;
+        public event EventHandler<TargetDetachedEventArgs>? TargetDetached;
 
         /// <summary>
         /// Occurs when a target is attached.
         /// </summary>
-        public event EventHandler<TargetAttachedEventArgs> TargetAttached;
+        public event EventHandler<TargetAttachedEventArgs>? TargetAttached;
 
         /// <summary>
         /// Asynchronously gets the targets available for this session.
@@ -46,7 +48,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(Object settings = null);
+        public abstract Task<ReadOnlyCollection<TargetInfo>> GetTargets(object? settings = null);
 
         /// <summary>
         /// Asynchronously attaches to a target.
@@ -66,7 +68,7 @@ public abstract class Target
         /// <returns>
         /// A task representing the asynchronous detach operation.
         /// </returns>
-        public abstract Task DetachFromTarget(string sessionId = null, string targetId = null);
+        public abstract Task DetachFromTarget(string? sessionId = null, string? targetId = null);
 
         /// <summary>
         /// Asynchronously sets the DevTools Protocol connection to automatically attach to new targets.

dotnet/src/webdriver/DevTools/TargetInfo.cs

@@ -17,46 +17,69 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
     /// Represents information about the target of a DevTools Protocol command
     /// </summary>
     public class TargetInfo
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TargetInfo"/> type.
+        /// </summary>
+        /// <param name="targetId">The ID of the target.</param>
+        /// <param name="type">The type of target.</param>
+        /// <param name="title">The title of the target.</param>
+        /// <param name="url">The URL of the target.</param>
+        /// <param name="isAttached">Whether the protocol is attached to the target.</param>
+        /// <param name="openerId">The ID of the opener of the target.</param>
+        /// <param name="browserContextId">The browser context ID.</param>
+        public TargetInfo(string targetId, string type, string title, string url, bool isAttached, string? openerId, string? browserContextId)
+        {
+            this.TargetId = targetId;
+            this.Type = type;
+            this.Title = title;
+            this.Url = url;
+            this.IsAttached = isAttached;
+            this.OpenerId = openerId;
+            this.BrowserContextId = browserContextId;
+        }
+
         /// <summary>
         /// Gets the ID of the target.
         /// </summary>
-        public string TargetId { get; internal set; }
+        public string TargetId { get; }
 
         /// <summary>
         /// Gets the type of target.
         /// </summary>
-        public string Type { get; internal set; }
+        public string Type { get; }
 
         /// <summary>
         /// Gets the title of the target.
         /// </summary>
-        public string Title { get; internal set; }
+        public string Title { get; }
 
         /// <summary>
         /// Gets the URL of the target.
         /// </summary>
-        public string Url { get; internal set; }
+        public string Url { get; }
 
         /// <summary>
         /// Gets a value indicating if the protocol is attached to the target.
         /// </summary>
-        public bool IsAttached { get; internal set; }
+        public bool IsAttached { get; }
 
         /// <summary>
         /// Gets the ID of the opener of the target.
         /// </summary>
-        public string OpenerId { get; internal set; }
+        public string? OpenerId { get; }
 
         /// <summary>
         /// Gets the browser context ID.
         /// </summary>
-        public string BrowserContextId { get; internal set; }
+        public string? BrowserContextId { get; }
     }
 }

dotnet/src/webdriver/DevTools/v130/V130JavaScript.cs

@@ -23,25 +23,28 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools.V130
 {
     /// <summary>
     /// Class containing the JavaScript implementation for version 130 of the DevTools Protocol.
     /// </summary>
     public class V130JavaScript : JavaScript
     {
-        private RuntimeAdapter runtime;
-        private PageAdapter page;
+        private readonly RuntimeAdapter runtime;
+        private readonly PageAdapter page;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="V130JavaScript"/> class.
         /// </summary>
         /// <param name="runtime">The DevTools Protocol adapter for the Runtime domain.</param>
         /// <param name="page">The DevTools Protocol adapter for the Page domain.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="runtime"/> or <paramref name="page"/> are <see langword="null"/>.</exception>
         public V130JavaScript(RuntimeAdapter runtime, PageAdapter page)
         {
-            this.runtime = runtime;
-            this.page = page;
+            this.runtime = runtime ?? throw new ArgumentNullException(nameof(runtime));
+            this.page = page ?? throw new ArgumentNullException(nameof(page));
             this.runtime.BindingCalled += OnRuntimeBindingCalled;
             this.runtime.ConsoleAPICalled += OnRuntimeConsoleApiCalled;
             this.runtime.ExceptionThrown += OnRuntimeExceptionThrown;
@@ -138,7 +141,7 @@ internal override async Task Evaluate(string script)
             await runtime.Evaluate(new EvaluateCommandSettings { Expression = script }).ConfigureAwait(false);
         }
 
-        private void OnRuntimeBindingCalled(object sender, Runtime.BindingCalledEventArgs e)
+        private void OnRuntimeBindingCalled(object? sender, Runtime.BindingCalledEventArgs e)
         {
             BindingCalledEventArgs wrapped = new BindingCalledEventArgs
             (
@@ -150,7 +153,7 @@ private void OnRuntimeBindingCalled(object sender, Runtime.BindingCalledEventArg
             this.OnBindingCalled(wrapped);
         }
 
-        private void OnRuntimeExceptionThrown(object sender, Runtime.ExceptionThrownEventArgs e)
+        private void OnRuntimeExceptionThrown(object? sender, Runtime.ExceptionThrownEventArgs e)
         {
             // TODO: Collect stack trace elements
             var wrapped = new ExceptionThrownEventArgs
@@ -162,12 +165,12 @@ private void OnRuntimeExceptionThrown(object sender, Runtime.ExceptionThrownEven
             this.OnExceptionThrown(wrapped);
         }
 
-        private void OnRuntimeConsoleApiCalled(object sender, ConsoleAPICalledEventArgs e)
+        private void OnRuntimeConsoleApiCalled(object? sender, ConsoleAPICalledEventArgs e)
         {
-            List<ConsoleApiArgument> args = new List<ConsoleApiArgument>();
+            List<ConsoleApiArgument> args = new List<ConsoleApiArgument>(e.Args.Length);
             foreach (var arg in e.Args)
             {
-                string argValue = arg.Value?.ToString();
+                string? argValue = arg.Value?.ToString();
                 args.Add(new ConsoleApiArgument(arg.Type.ToString(), argValue));
             }
 

dotnet/src/webdriver/DevTools/v130/V130Log.cs

@@ -18,24 +18,28 @@
 // </copyright>
 
 using OpenQA.Selenium.DevTools.V130.Log;
+using System;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools.V130
 {
     /// <summary>
     /// Class containing the browser's log as referenced by version 130 of the DevTools Protocol.
     /// </summary>
     public class V130Log : DevTools.Log
     {
-        private LogAdapter adapter;
+        private readonly LogAdapter adapter;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="V130Log"/> class.
         /// </summary>
         /// <param name="adapter">The adapter for the Log domain.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="adapter"/> is <see langword="null"/>.</exception>
         public V130Log(LogAdapter adapter)
         {
-            this.adapter = adapter;
+            this.adapter = adapter ?? throw new ArgumentNullException(nameof(adapter));
             this.adapter.EntryAdded += OnAdapterEntryAdded;
         }
 
@@ -66,14 +70,14 @@ public override async Task Clear()
             await adapter.Clear().ConfigureAwait(false);
         }
 
-        private void OnAdapterEntryAdded(object sender, Log.EntryAddedEventArgs e)
+        private void OnAdapterEntryAdded(object? sender, Log.EntryAddedEventArgs e)
         {
             var entry = new LogEntry(
                 kind: e.Entry.Source.ToString(),
                 message: e.Entry.Text
             );
-            EntryAddedEventArgs propagated = new EntryAddedEventArgs(entry);
-            this.OnEntryAdded(propagated);
+
+            this.OnEntryAdded(new EntryAddedEventArgs(entry));
         }
     }
 }

dotnet/src/webdriver/DevTools/v130/V130Target.cs

@@ -23,22 +23,25 @@
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools.V130
 {
     /// <summary>
     /// Class providing functionality for manipulating targets for version 130 of the DevTools Protocol
     /// </summary>
     public class V130Target : DevTools.Target
     {
-        private TargetAdapter adapter;
+        private readonly TargetAdapter adapter;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="V130Target"/> class.
         /// </summary>
         /// <param name="adapter">The adapter for the Target domain.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="adapter"/> is <see langword="null"/>.</exception>
         public V130Target(TargetAdapter adapter)
         {
-            this.adapter = adapter;
+            this.adapter = adapter ?? throw new ArgumentNullException(nameof(adapter));
             adapter.DetachedFromTarget += OnDetachedFromTarget;
             adapter.AttachedToTarget += OnAttachedToTarget;
         }
@@ -51,28 +54,26 @@ public V130Target(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(Object settings = null)
-
+        public override async Task<ReadOnlyCollection<TargetInfo>> GetTargets(object? settings = null)
         {
-            List<TargetInfo> targets = new List<TargetInfo>();
-            if (settings == null)
-            {
-                settings = new GetTargetsCommandSettings();
-            }
+            settings ??= new GetTargetsCommandSettings();
+
             var response = await adapter.GetTargets((GetTargetsCommandSettings)settings).ConfigureAwait(false);
+
+            List<TargetInfo> targets = new List<TargetInfo>(response.TargetInfos.Length);
             for (int i = 0; i < response.TargetInfos.Length; i++)
             {
                 var targetInfo = response.TargetInfos[i];
-                var mapped = new TargetInfo()
-                {
-                    TargetId = targetInfo.TargetId,
-                    Title = targetInfo.Title,
-                    Type = targetInfo.Type,
-                    Url = targetInfo.Url,
-                    OpenerId = targetInfo.OpenerId,
-                    BrowserContextId = targetInfo.BrowserContextId,
-                    IsAttached = targetInfo.Attached
-                };
+                var mapped = new TargetInfo
+                (
+                    targetId: targetInfo.TargetId,
+                    title: targetInfo.Title,
+                    type: targetInfo.Type,
+                    url: targetInfo.Url,
+                    openerId: targetInfo.OpenerId,
+                    browserContextId: targetInfo.BrowserContextId,
+                    isAttached: targetInfo.Attached
+                );
                 targets.Add(mapped);
             }
 
@@ -99,7 +100,7 @@ public override async Task<string> AttachToTarget(string targetId)
         /// <param name="sessionId">The ID of the session of the target from which to detach.</param>
         /// <param name="targetId">The ID of the target from which to detach.</param>
         /// <returns>A task representing the asynchronous detach operation.</returns>
-        public override async Task DetachFromTarget(string sessionId = null, string targetId = null)
+        public override async Task DetachFromTarget(string? sessionId = null, string? targetId = null)
         {
             await adapter.DetachFromTarget(new DetachFromTargetCommandSettings()
             {
@@ -117,23 +118,23 @@ public override async Task SetAutoAttach()
             await adapter.SetAutoAttach(new SetAutoAttachCommandSettings() { AutoAttach = true, WaitForDebuggerOnStart = false, Flatten = true }).ConfigureAwait(false);
         }
 
-        private void OnDetachedFromTarget(object sender, DetachedFromTargetEventArgs e)
+        private void OnDetachedFromTarget(object? sender, DetachedFromTargetEventArgs e)
         {
             this.OnTargetDetached(new TargetDetachedEventArgs(e.SessionId, e.TargetId));
         }
 
-        private void OnAttachedToTarget(object sender, AttachedToTargetEventArgs e)
+        private void OnAttachedToTarget(object? sender, AttachedToTargetEventArgs e)
         {
             var targetInfo = e.TargetInfo == null ? null : new TargetInfo
-            {
-                BrowserContextId = e.TargetInfo.BrowserContextId,
-                IsAttached = e.TargetInfo.Attached,
-                OpenerId = e.TargetInfo.OpenerId,
-                TargetId = e.TargetInfo.TargetId,
-                Title = e.TargetInfo.Title,
-                Type = e.TargetInfo.Type,
-                Url = e.TargetInfo.Url
-            };
+            (
+                browserContextId: e.TargetInfo.BrowserContextId,
+                isAttached: e.TargetInfo.Attached,
+                openerId: e.TargetInfo.OpenerId,
+                targetId: e.TargetInfo.TargetId,
+                title: e.TargetInfo.Title,
+                type: e.TargetInfo.Type,
+                url: e.TargetInfo.Url
+            );
 
             this.OnTargetAttached(new TargetAttachedEventArgs
             (