checkpoint

Author: egil

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>3.0.0-preview9.19424.4</AspNetCoreVersion>
+        <AspNetCoreVersion>3.0.0</AspNetCoreVersion>
     </PropertyGroup>
 </Project>

src/AngleSharp.Diffing/Diff.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Egil.RazorComponents.Testing.AngleSharpDiffing
+{
+    public class Diff
+    {
+        
+    }
+}

src/AngleSharp.Diffing/DiffBuilder.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+
+namespace Egil.RazorComponents.Testing.AngleSharpDiffing
+{
+    public class DiffBuilder
+    {
+        private readonly INode _controlNode;
+
+        private DiffBuilder(INode controlNode) {
+            _controlNode = controlNode;
+        }
+
+        public static DiffBuilder Compare(INode controlNode)
+        {
+            if(controlNode is null) throw new ArgumentNullException(nameof(controlNode));
+            return new DiffBuilder(controlNode);
+        }
+
+        public DiffBuilder WithTest(INode testNode)
+        {
+            if(testNode is null) throw new ArgumentNullException(nameof(testNode));
+            return this;
+        }
+
+        public Diff Build() { return null; }
+    }
+
+    public class DifferenceEngine
+    {
+
+    }
+}

src/Egil.RazorComponents.Testing.Library.csproj

@@ -23,6 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AngleSharp" Version="0.13.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.4">

src/Fact.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using AngleSharp.Dom;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;

src/Render/ContainerComponent.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.RenderTree;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
@@ -39,38 +40,35 @@ public Task SetParametersAsync(ParameterView parameters)
             throw new NotImplementedException($"{nameof(ContainerComponent)} shouldn't receive any parameters");
         }
 
-        public (int Id, TComponent Component) FindComponentUnderTest<TComponent>() where TComponent : IComponent
+        public void RenderComponentUnderTest(RenderFragment renderFragment)
+        {
+            _renderer.DispatchAndAssertNoSynchronousErrors(() =>
+            {                
+                _renderHandle.Render(renderFragment);
+            });
+        }
+
+        public List<(int Id, T Component)> Find<T>()
         {
             var ownFrames = _renderer.GetCurrentRenderTreeFrames(_componentId);
             if (ownFrames.Count == 0)
             {
                 throw new InvalidOperationException($"{nameof(ContainerComponent)} hasn't yet rendered");
             }
 
-            ref var childComponentFrame = ref ownFrames.Array[0];
-            if (childComponentFrame.FrameType == RenderTreeFrameType.Component && childComponentFrame.Component is TComponent component)
+            var result = new List<(int Id, T Component)>();
+            for (int i = 0; i < ownFrames.Count; i++)
             {
-                return (childComponentFrame.ComponentId, component);
+                ref var frame = ref ownFrames.Array[i];
+                if (frame.FrameType == RenderTreeFrameType.Component &&
+                    frame.Component != null &&
+                    frame.Component is T factFrame)
+                {
+                    result.Add((frame.ComponentId, factFrame));
+                }
             }
-            else throw new Exception("Component not found");
+            return result;
         }
 
-        public void RenderComponentUnderTest(Type componentType, ParameterView parameters)
-        {
-            _renderer.DispatchAndAssertNoSynchronousErrors(() =>
-            {
-                _renderHandle.Render(builder =>
-                {
-                    builder.OpenComponent(0, componentType);
-
-                    foreach (var parameterValue in parameters)
-                    {
-                        builder.AddAttribute(1, parameterValue.Name, parameterValue.Value);
-                    }
-
-                    builder.CloseComponent();
-                });
-            });
-        }
     }
 }

src/Render/HtmlElementExtensions.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AngleSharp.Html.Dom;
+
+namespace Egil.RazorComponents.Testing.Render
+{
+    public static class HtmlElementExtensions
+    {
+        public static void Click(this IHtmlElement element, string selector) { }
+    }
+}

src/Render/Htmlizer.cs

@@ -161,7 +161,7 @@ private static int RenderChildren(HtmlRenderingContext context, ArrayRange<Rende
 
         private static int RenderAttributes(
             HtmlRenderingContext context,
-            ArrayRange<RenderTreeFrame> frames, int position, int maxElements, out string capturedValueAttribute)
+            ArrayRange<RenderTreeFrame> frames, int position, int maxElements, out string? capturedValueAttribute)
         {
             capturedValueAttribute = null;
 
@@ -225,7 +225,7 @@ public HtmlRenderingContext(TestRenderer renderer)
 
             public List<string> Result { get; } = new List<string>();
 
-            public string ClosestSelectValueAsString { get; set; }
+            public string? ClosestSelectValueAsString { get; set; }
         }
     }
 }

src/Render/RenderedComponent.cs

@@ -1,23 +1,28 @@
-using Microsoft.AspNetCore.Components;
+using AngleSharp;
+using AngleSharp.Dom;
+using AngleSharp.Html.Parser;
+using AngleSharp.Io;
+using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Egil.RazorComponents.Testing.Render
 {
-    public class RenderedComponent<TComponent> where TComponent : IComponent
+    public class RenderedComponent<TComponent> where TComponent : class, IComponent
     {
+        private readonly IBrowsingContext _browsingContext = BrowsingContext.New(Configuration.Default);
         private readonly TestRenderer _renderer;
         private readonly ContainerComponent _containerTestRootComponent;
         private int _testComponentId;
-        private TComponent _testComponentInstance;
+        private TComponent? _testComponentInstance;
 
         internal RenderedComponent(TestRenderer renderer)
         {
             _renderer = renderer;
             _containerTestRootComponent = new ContainerComponent(_renderer);
         }
 
-        public TComponent Instance => _testComponentInstance;
+        public TComponent? Instance => _testComponentInstance;
 
         public string GetMarkup()
         {
@@ -26,31 +31,30 @@ public string GetMarkup()
 
         internal void SetParametersAndRender(ParameterView parameters)
         {
-            _containerTestRootComponent.RenderComponentUnderTest(typeof(TComponent), parameters);
-            var foundTestComponent = _containerTestRootComponent.FindComponentUnderTest<TComponent>();
-            _testComponentId = foundTestComponent.Id;
-            _testComponentInstance = foundTestComponent.Component;
+            //_containerTestRootComponent.RenderComponentUnderTest(typeof(TComponent), parameters);
+            //(_testComponentId, _testComponentInstance) = _containerTestRootComponent.FindComponentUnderTest<TComponent>();
         }
 
-        public HtmlNode Find(string selector)
+        public IElement Find(string selector)
         {
             return FindAll(selector).FirstOrDefault();
         }
 
-        public ICollection<HtmlNode> FindAll(string selector)
+        public IHtmlCollection<IElement> FindAll(string selector)
         {
-            // Rather than using HTML strings, it would be faster and more powerful
-            // to implement Fizzler's APIs for walking directly over the rendered
-            // frames, since Fizzler's core isn't tied to HTML (or HtmlAgilityPack).
-            // The most awkward part of this will be handling Markup frames, since
-            // they are HTML strings so would need to be parsed, or perhaps you can
-            // pass through those calls into Fizzler.Systems.HtmlAgilityPack.
-
             var markup = GetMarkup();
-            var html = new TestHtmlDocument(_renderer);
 
-            html.LoadHtml(markup);
-            return html.DocumentNode.QuerySelectorAll(selector).ToList();
+            var document = _browsingContext.OpenAsync(x => x.Content(markup)).GetAwaiter().GetResult();
+            return document.QuerySelectorAll(selector);
+
+            //var parser = context.GetService<IHtmlParser>();
+            //var rootElement = document.QuerySelector(root) ?? document.CreateElement(root);
+            //var actualFragment = parser.ParseFragment(actual, rootElement);
+
+            //var html = new TestHtmlDocument(_renderer);
+
+            //html.LoadHtml(markup);
+            //return html.DocumentNode.QuerySelectorAll(selector).ToList();
         }
     }
 }