refactor: Remove RenderedComponentActivator

Author: linkdotnet

src/bunit/Asserting/MarkupMatchesAssertExtensions.cs

@@ -275,7 +275,6 @@ public static void MarkupMatches(this RenderedFragment actual, RenderFragment ex
 		// TODO: This will be obsolete with: https://github.com/bUnit-dev/bUnit/issues/1018
 		// As the renderer would be transient we don't have to new up an instance
 		using var renderer = new BunitRenderer(
-			actual.Services.GetRequiredService<IRenderedComponentActivator>(),
 			actual.Services.GetRequiredService<TestServiceProvider>(),
 			actual.Services.GetRequiredService<ILoggerFactory>());
 		var renderedFragment = renderer.RenderFragment(expected);

src/bunit/ComponentParameterCollectionBuilder.cs

@@ -1,8 +1,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using Bunit.Extensions;
-using Bunit.Rendering;
 
 namespace Bunit;
 

src/bunit/Extensions/BunitRendererExtensions.cs

@@ -24,7 +24,7 @@ public static RenderedComponent<TComponent> Render<TComponent>(this BunitRendere
 		if (resultBase is RenderedComponent<TComponent> result)
 			return result;
 
-		throw new InvalidOperationException($"The renderer did not produce the expected type. Is the test renderer using the expected {nameof(IRenderedComponentActivator)}?");
+		throw new InvalidOperationException($"The renderer did not produce the expected type.");
 	}
 
 	/// <summary>
@@ -45,6 +45,6 @@ public static RenderedComponent<TComponent> Render<TComponent>(this BunitRendere
 		if (resultBase is RenderedComponent<TComponent> result)
 			return result;
 
-		throw new InvalidOperationException($"The renderer did not produce the expected type. Is the test renderer using the expected {nameof(IRenderedComponentActivator)}?");
+		throw new InvalidOperationException($"The renderer did not produce the expected type.");
 	}
 }

src/bunit/Extensions/RenderedComponentRenderExtensions.cs

@@ -1,4 +1,3 @@
-using Bunit.Rendering;
 using System.Runtime.ExceptionServices;
 
 namespace Bunit;

src/bunit/Extensions/TestServiceProviderExtensions.cs

@@ -50,7 +50,6 @@ public static IServiceCollection AddDefaultTestContextServices(this IServiceColl
 		services.AddSingleton(testContext);
 		services.AddSingleton<HtmlComparer>();
 		services.AddSingleton<BunitHtmlParser>();
-		services.AddSingleton<IRenderedComponentActivator, RenderedComponentActivator>();
 
 		services.AddMemoryCache();
 

src/bunit/Rendering/BunitRenderer.cs

@@ -10,6 +10,8 @@ namespace Bunit.Rendering;
 /// </summary>
 public sealed class BunitRenderer : Renderer
 {
+	private readonly TestServiceProvider services;
+
 	[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_isBatchInProgress")]
 	private static extern ref bool GetIsBatchInProgressField(Renderer renderer);
 
@@ -20,7 +22,6 @@ public sealed class BunitRenderer : Renderer
 	private readonly Dictionary<int, RenderedFragment> renderedComponents = new();
 	private readonly List<RootComponent> rootComponents = new();
 	private readonly ILogger<BunitRenderer> logger;
-	private readonly IRenderedComponentActivator activator;
 	private bool disposed;
 	private TaskCompletionSource<Exception> unhandledExceptionTsc = new(TaskCreationOptions.RunContinuationsAsynchronously);
 	private Exception? capturedUnhandledException;
@@ -56,22 +57,22 @@ private bool IsBatchInProgress
 	/// <summary>
 	/// Initializes a new instance of the <see cref="BunitRenderer"/> class.
 	/// </summary>
-	public BunitRenderer(IRenderedComponentActivator renderedComponentActivator, TestServiceProvider services, ILoggerFactory loggerFactory)
+	public BunitRenderer(TestServiceProvider services, ILoggerFactory loggerFactory)
 		: base(services, loggerFactory, new BunitComponentActivator(services.GetRequiredService<ComponentFactoryCollection>(), null))
 	{
+		this.services = services;
 		logger = loggerFactory.CreateLogger<BunitRenderer>();
-		activator = renderedComponentActivator;
 		ElementReferenceContext = new WebElementReferenceContext(services.GetRequiredService<IJSRuntime>());
 	}
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="BunitRenderer"/> class.
 	/// </summary>
-	public BunitRenderer(IRenderedComponentActivator renderedComponentActivator, TestServiceProvider services, ILoggerFactory loggerFactory, IComponentActivator componentActivator)
+	public BunitRenderer(TestServiceProvider services, ILoggerFactory loggerFactory, IComponentActivator componentActivator)
 		: base(services, loggerFactory, new BunitComponentActivator(services.GetRequiredService<ComponentFactoryCollection>(), componentActivator))
 	{
+		this.services = services;
 		logger = loggerFactory.CreateLogger<BunitRenderer>();
-		activator = renderedComponentActivator;
 		ElementReferenceContext = new WebElementReferenceContext(services.GetRequiredService<IJSRuntime>());
 	}
 
@@ -81,7 +82,7 @@ public BunitRenderer(IRenderedComponentActivator renderedComponentActivator, Tes
 	/// <param name="renderFragment">The <see cref="Microsoft.AspNetCore.Components.RenderFragment"/> to render.</param>
 	/// <returns>A <see cref="RenderedFragment"/> that provides access to the rendered <paramref name="renderFragment"/>.</returns>
 	public RenderedFragment RenderFragment(RenderFragment renderFragment)
-		=> Render(renderFragment, id => activator.CreateRenderedFragment(id));
+		=> Render(renderFragment);
 
 	/// <summary>
 	/// Renders a <typeparamref name="TComponent"/> with the <paramref name="parameters"/> passed to it.
@@ -95,7 +96,7 @@ public RenderedComponent<TComponent> Render<TComponent>(ComponentParameterCollec
 		ArgumentNullException.ThrowIfNull(parameters);
 
 		var renderFragment = parameters.ToRenderFragment<TComponent>();
-		return Render(renderFragment, id => activator.CreateRenderedComponent<TComponent>(id));
+		return Render(renderFragment).FindComponent<TComponent>();
 	}
 
 	/// <summary>
@@ -226,7 +227,6 @@ protected override IComponent ResolveComponentForRenderMode(Type componentType,
 		return componentActivator.CreateInstance(componentType);
 	}
 
-	/// <inheritdoc/>
 	internal Task SetDirectParametersAsync(RenderedFragment renderedComponent, ParameterView parameters)
 	{
 		ObjectDisposedException.ThrowIf(disposed, this);
@@ -434,8 +434,7 @@ protected override void Dispose(bool disposing)
 		}
 	}
 
-	private TResult Render<TResult>(RenderFragment renderFragment, Func<int, TResult> activator)
-		where TResult : RenderedFragment
+	private RenderedFragment Render(RenderFragment renderFragment)
 	{
 		ObjectDisposedException.ThrowIf(disposed, this);
 
@@ -445,14 +444,14 @@ private TResult Render<TResult>(RenderFragment renderFragment, Func<int, TResult
 
 			var root = new RootComponent(renderFragment);
 			var rootComponentId = AssignRootComponentId(root);
-			var result = activator(rootComponentId);
+			var result = new RenderedFragment(rootComponentId, services);
 			renderedComponents.Add(rootComponentId, result);
 			rootComponents.Add(root);
 			root.Render();
 			return result;
 		});
 
-		TResult result;
+		RenderedFragment result;
 
 		if (!renderTask.IsCompleted)
 		{
@@ -527,7 +526,7 @@ private RenderedComponent<TComponent> GetOrCreateRenderedComponent<TComponent>(R
 		}
 
 		LoadRenderTreeFrames(componentId, framesCollection);
-		var result = activator.CreateRenderedComponent(componentId, component, framesCollection);
+		var result = new RenderedComponent<TComponent>(componentId, component, framesCollection, services);
 		renderedComponents.Add(result.ComponentId, result);
 
 		return result;
@@ -558,13 +557,13 @@ private void LoadRenderTreeFrames(int componentId, RenderTreeFrameDictionary fra
 	/// </summary>
 	private ArrayRange<RenderTreeFrame> GetOrLoadRenderTreeFrame(RenderTreeFrameDictionary framesCollection, int componentId)
 	{
-		if (!framesCollection.Contains(componentId))
+		if (!framesCollection.TryGetValue(componentId, out var frames))
 		{
-			var frames = GetCurrentRenderTreeFrames(componentId);
+			frames = GetCurrentRenderTreeFrames(componentId);
 			framesCollection.Add(componentId, frames);
 		}
 
-		return framesCollection[componentId];
+		return frames;
 	}
 
 	/// <inheritdoc/>

src/bunit/Rendering/IRenderedComponentActivator.cs

@@ -177,12 +177,11 @@ protected virtual void BuildRenderTree(RenderTreeBuilder builder) { }
 
 	private BunitRenderer CreateRenderer()
 	{
-		var renderedComponentActivator = Services.GetRequiredService<IRenderedComponentActivator>();
 		var logger = Services.GetRequiredService<ILoggerFactory>();
 
 		var componentActivator = Services.GetService<IComponentActivator>();
 		return componentActivator is null
-			? new BunitRenderer(renderedComponentActivator, Services, logger)
-			: new BunitRenderer(renderedComponentActivator, Services, logger, componentActivator);
+			? new BunitRenderer(Services, logger)
+			: new BunitRenderer(Services, logger, componentActivator);
 	}
 }

src/bunit/Rendering/RenderedComponentActivator.cs

@@ -1,4 +1,3 @@
-@using Bunit.TestAssets.SampleComponents
 @inherits TestContext
 
 @code {