Changed ITestContext to have a CreateNodes method instead of HtmlParser property

Author: egil

src/Asserting/CompareToDiffingExtensions.cs

@@ -26,7 +26,7 @@ public static IReadOnlyList<IDiff> CompareTo(this IRenderedFragment actual, stri
             if (expected is null) throw new ArgumentNullException(nameof(expected));
 
             var actualNodes = actual.GetNodes();
-            var expectedNodes = actual.TestContext.HtmlParser.Parse(expected);
+            var expectedNodes = actual.TestContext.CreateNodes(expected);
 
             return actualNodes.CompareTo(expectedNodes);
         }

src/Asserting/MarkupMatchesAssertExtensions.cs

@@ -26,7 +26,7 @@ public static void MarkupMatches(this IRenderedFragment actual, string expected,
             if (expected is null) throw new ArgumentNullException(nameof(expected));
 
             var actualNodes = actual.GetNodes();
-            var expectedNodes = actual.TestContext.HtmlParser.Parse(expected);
+            var expectedNodes = actual.TestContext.CreateNodes(expected);
 
             actualNodes.MarkupMatches(expectedNodes, userMessage);
         }

src/Asserting/ShouldBeTextChangeAssertExtensions.cs

@@ -10,6 +10,9 @@
 
 namespace Egil.RazorComponents.Testing.Asserting
 {
+    /// <summary>
+    /// Verification helpers for text
+    /// </summary>
     public static class ShouldBeTextChangeAssertExtensions
     {
         public static void ShouldHaveSingleTextChange(this IReadOnlyList<IDiff> diffs, string expectedChange, string? userMessage = null)

src/Components/TestComponentBase.cs

@@ -3,6 +3,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+using AngleSharp.Dom;
 using Egil.RazorComponents.Testing.Asserting;
 using Egil.RazorComponents.Testing.Diffing;
 using Microsoft.AspNetCore.Components;
@@ -33,10 +34,6 @@ public override TestServiceProvider Services
         public override TestRenderer Renderer
             => _testContextAdapter.HasActiveContext ? _testContextAdapter.Renderer : base.Renderer;
 
-        /// <inheritdoc/>
-        public override TestHtmlParser HtmlParser
-            => _testContextAdapter.HasActiveContext ? _testContextAdapter.HtmlParser : base.HtmlParser;
-
         /// <inheritdoc/>
         public TestComponentBase()
         {
@@ -61,7 +58,7 @@ public async Task RazorTest()
             await ExecuteFixtureTests(container).ConfigureAwait(false);
             ExecuteSnapshotTests(container);
         }
-
+        
         /// <inheritdoc/>
         public IRenderedFragment GetComponentUnderTest()
             => _testContextAdapter.GetComponentUnderTest();
@@ -78,6 +75,12 @@ public IRenderedFragment GetFragment(string? id = null)
         public IRenderedComponent<TComponent> GetFragment<TComponent>(string? id = null) where TComponent : class, IComponent
             => _testContextAdapter.GetFragment<TComponent>(id);
 
+        /// <inheritdoc/>
+        public override INodeList CreateNodes(string markup)
+            => _testContextAdapter.HasActiveContext
+                ? _testContextAdapter.CreateNodes(markup)
+                : base.CreateNodes(markup);
+
         /// <inheritdoc/>
         public override IRenderedComponent<TComponent> RenderComponent<TComponent>(params ComponentParameter[] parameters)
             => _testContextAdapter.HasActiveContext

src/Components/TestContextAdapter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using AngleSharp.Dom;
 using Egil.RazorComponents.Testing.Diffing;
 using Microsoft.AspNetCore.Components;
 
@@ -14,8 +15,6 @@ internal sealed class TestContextAdapter : IDisposable
 
         public TestRenderer Renderer => _testContext?.Renderer ?? throw new InvalidOperationException("No active test context in the adapter");
 
-        public TestHtmlParser HtmlParser => _testContext?.HtmlParser ?? throw new InvalidOperationException("No active test context in the adapter");
-
         public bool HasActiveContext => !(_testContext is null);
 
         public SnapshotTestContext ActivateSnapshotTestContext(IReadOnlyList<FragmentBase> testData)
@@ -41,6 +40,7 @@ public RazorTestContext ActivateRazorTestContext(IReadOnlyList<FragmentBase> tes
         public void Dispose()
         {
             _testContext?.Dispose();
+            _razorTestContext?.Dispose();
             _testContext = null;
             _razorTestContext = null;
         }
@@ -67,5 +67,8 @@ public void WaitForNextRender(Action renderTrigger, TimeSpan? timeout = null)
 
         public IRenderedComponent<TComponent> RenderComponent<TComponent>(params ComponentParameter[] parameters) where TComponent : class, IComponent
             => _testContext?.RenderComponent<TComponent>(parameters) ?? throw new InvalidOperationException("No active test context in the adapter");
+
+        public INodeList CreateNodes(string markup)
+            => _testContext?.CreateNodes(markup) ?? throw new InvalidOperationException("No active test context in the adapter");
     }    
 }

src/ElementNotFoundException.cs

@@ -23,5 +23,17 @@ public ElementNotFoundException(string cssSelector) : base($"No elements were fo
         {
             CssSelector = cssSelector;
         }
+
+        /// <inheritdoc/>
+        public ElementNotFoundException()
+        {
+            CssSelector = string.Empty;
+        }
+
+        /// <inheritdoc/>
+        public ElementNotFoundException(string message, Exception innerException) : base(message, innerException)
+        {
+            CssSelector = string.Empty;
+        }
     }
 }

src/ITestContext.cs

@@ -1,4 +1,5 @@
 using System;
+using AngleSharp.Dom;
 using Egil.RazorComponents.Testing.Diffing;
 using Microsoft.AspNetCore.Components;
 
@@ -19,11 +20,14 @@ public interface ITestContext : IDisposable
         /// Gets the renderer used to render the components and fragments in this test context.
         /// </summary>
         TestRenderer Renderer { get; }
-        
+
         /// <summary>
-        /// Gets the HTML parser used to parse HTML produced by components and fragments in this test context.
+        /// Parses a markup HTML string using the AngleSharps HTML5 parser
+        /// and returns a list of nodes.
         /// </summary>
-        TestHtmlParser HtmlParser { get; }
+        /// <param name="markup">The markup to parse.</param>
+        /// <returns>The <see cref="INodeList"/>.</returns>
+        INodeList CreateNodes(string markup);
 
         /// <summary>
         /// Instantiates and performs a first render of a component of type <typeparamref name="TComponent"/>.

src/Mocking/JSInterop/JsRuntimeAssertExtensions.cs

@@ -43,6 +43,7 @@ public static JsRuntimeInvocation VerifyInvoke(this MockJsRuntimeInvokeHandler h
         /// </summary>
         /// <param name="handler">Handler to verify against.</param>
         /// <param name="identifier">Identifier of invocation that should have been invoked.</param>
+        /// <param name="calledTimes">The number of times the invocation is expected to have been called.</param>
         /// <param name="userMessage">A custom user message to display if the assertion fails.</param>
         /// <returns>The <see cref="JsRuntimeInvocation"/>.</returns>
         public static IReadOnlyList<JsRuntimeInvocation> VerifyInvoke(this MockJsRuntimeInvokeHandler handler, string identifier, int calledTimes, string? userMessage = null)

src/Mocking/JSInterop/JsRuntimeInvocation.cs

@@ -1,12 +1,14 @@
 using System.Collections.Generic;
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 
 namespace Egil.RazorComponents.Testing
 {
     /// <summary>
     /// Represents an invocation of JavaScript via the JsRuntime Mock
     /// </summary>
+    [SuppressMessage("Design", "CA1068:CancellationToken parameters must come last", Justification = "<Pending>")]
     public readonly struct JsRuntimeInvocation : IEquatable<JsRuntimeInvocation>
     {
         /// <summary>
@@ -24,6 +26,7 @@ namespace Egil.RazorComponents.Testing
         /// </summary>
         public IReadOnlyList<object> Arguments { get; }
 
+
         /// <summary>
         /// Creates an instance of the <see cref="JsRuntimeInvocation"/>.
         /// </summary>

src/Rendering/RenderedFragmentBase.cs

@@ -66,7 +66,7 @@ public IReadOnlyList<IDiff> GetChangesSinceSnapshot()
                 throw new InvalidOperationException($"No snapshot exists to compare with. Call {nameof(SaveSnapshot)} to create one.");
 
             if(_snapshotNodes is null)
-                _snapshotNodes = TestContext.HtmlParser.Parse(_snapshotMarkup);
+                _snapshotNodes = TestContext.CreateNodes(_snapshotMarkup);
 
             return GetNodes().CompareTo(_snapshotNodes);
         }
@@ -76,7 +76,7 @@ public IReadOnlyList<IDiff> GetChangesSinceSnapshot()
         public IReadOnlyList<IDiff> GetChangesSinceFirstRender()
         {
             if (_firstRenderNodes is null)
-                _firstRenderNodes = TestContext.HtmlParser.Parse(FirstRenderMarkup);
+                _firstRenderNodes = TestContext.CreateNodes(FirstRenderMarkup);
             return GetNodes().CompareTo(_firstRenderNodes);
         }
 
@@ -93,7 +93,7 @@ public string GetMarkup()
         public INodeList GetNodes()
         {
             if (_latestRenderNodes is null)
-                _latestRenderNodes = TestContext.HtmlParser.Parse(GetMarkup());
+                _latestRenderNodes = TestContext.CreateNodes(GetMarkup());
             return _latestRenderNodes;
         }