Skip to content

Commit 3106f89

Browse files
linkdotnetbUnitBot
linkdotnet
authored and
bUnitBot
committed
refactor: Remove ITestRenderer interface
1 parent b1845d3 commit 3106f89

13 files changed

Lines changed: 26 additions & 107 deletions

‎src/bunit/Diffing/HtmlComparer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace Bunit.Diffing;
99

1010
/// <summary>
11-
/// Represents a test HTML comparer, that is configured to work with markup generated by the <see cref="ITestRenderer"/> and <see cref="Htmlizer"/> classes.
11+
/// Represents a test HTML comparer, that is configured to work with markup generated by the <see cref="TestRenderer"/> and <see cref="Htmlizer"/> classes.
1212
/// </summary>
1313
public sealed class HtmlComparer
1414
{

‎src/bunit/EventDispatchExtensions/TriggerEventDispatchExtensions.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static Task TriggerEventAsync(this IElement element, string eventName, Ev
6363
ArgumentNullException.ThrowIfNull(eventName);
6464

6565
var renderer = element.GetTestContext()?.Renderer
66-
?? throw new InvalidOperationException($"Blazor events can only be raised on elements rendered with the Blazor test renderer '{nameof(ITestRenderer)}'.");
66+
?? throw new InvalidOperationException($"Blazor events can only be raised on elements rendered with the Blazor test renderer '{nameof(TestRenderer)}'.");
6767

6868
// TriggerEventsAsync will traverse the DOM tree to find
6969
// all event handlers that needs to be triggered. This is done
@@ -78,7 +78,7 @@ public static Task TriggerEventAsync(this IElement element, string eventName, Ev
7878
}
7979

8080
[SuppressMessage("Globalization", "CA1308:Normalize strings to uppercase", Justification = "HTML events are standardize to lower case and safe in this context.")]
81-
private static Task TriggerEventsAsync(ITestRenderer renderer, IElement element, string eventName, EventArgs eventArgs)
81+
private static Task TriggerEventsAsync(TestRenderer renderer, IElement element, string eventName, EventArgs eventArgs)
8282
{
8383
var isNonBubblingEvent = NonBubblingEvents.Contains(eventName.ToLowerInvariant());
8484
var unwrappedElement = element.Unwrap();
@@ -88,7 +88,7 @@ private static Task TriggerEventsAsync(ITestRenderer renderer, IElement element,
8888
: TriggerBubblingEventAsync(renderer, unwrappedElement, eventName, eventArgs);
8989
}
9090

91-
private static Task TriggerNonBubblingEventAsync(ITestRenderer renderer, IElement element, string eventName, EventArgs eventArgs)
91+
private static Task TriggerNonBubblingEventAsync(TestRenderer renderer, IElement element, string eventName, EventArgs eventArgs)
9292
{
9393
var eventAttrName = Htmlizer.ToBlazorAttribute(eventName);
9494

@@ -105,7 +105,7 @@ private static Task TriggerNonBubblingEventAsync(ITestRenderer renderer, IElemen
105105
throw new MissingEventHandlerException(element, eventName);
106106
}
107107

108-
private static Task TriggerBubblingEventAsync(ITestRenderer renderer, IElement element, string eventName, EventArgs eventArgs)
108+
private static Task TriggerBubblingEventAsync(TestRenderer renderer, IElement element, string eventName, EventArgs eventArgs)
109109
{
110110
var eventTasks = GetDispatchEventTasks(renderer, element, eventName, eventArgs);
111111

@@ -118,7 +118,7 @@ private static Task TriggerBubblingEventAsync(ITestRenderer renderer, IElement e
118118
}
119119

120120
private static List<Task> GetDispatchEventTasks(
121-
ITestRenderer renderer,
121+
TestRenderer renderer,
122122
IElement element,
123123
string eventName,
124124
EventArgs eventArgs)

‎src/bunit/Extensions/RenderedComponentRenderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static void SetParametersAndRender<TComponent>(this IRenderedComponent<TC
2828
{
2929
ArgumentNullException.ThrowIfNull(renderedComponent);
3030

31-
var renderer = (TestRenderer)renderedComponent.Services.GetRequiredService<TestContext>().Renderer;
31+
var renderer = renderedComponent.Services.GetRequiredService<TestContext>().Renderer;
3232

3333
try
3434
{

‎src/bunit/Extensions/RenderedFragmentInvokeAsyncExtensions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Bunit;
88
public static class RenderedFragmentInvokeAsyncExtensions
99
{
1010
/// <summary>
11-
/// Invokes the given <paramref name="workItem"/> in the context of the associated <see cref="ITestRenderer"/>.
11+
/// Invokes the given <paramref name="workItem"/> in the context of the associated <see cref="TestRenderer"/>.
1212
/// </summary>
1313
/// <param name="renderedFragment">The rendered fragment whose dispatcher to invoke with.</param>
1414
/// <param name="workItem">The work item to execute on the renderer's thread.</param>
@@ -26,7 +26,7 @@ public static Task InvokeAsync(this IRenderedFragment renderedFragment, Action w
2626
}
2727

2828
/// <summary>
29-
/// Invokes the given <paramref name="workItem"/> in the context of the associated <see cref="ITestRenderer"/>.
29+
/// Invokes the given <paramref name="workItem"/> in the context of the associated <see cref="TestRenderer"/>.
3030
/// </summary>
3131
/// <param name="renderedFragment">The rendered component whose dispatcher to invoke with.</param>
3232
/// <param name="workItem">The work item to execute on the renderer's thread.</param>
@@ -44,7 +44,7 @@ public static Task InvokeAsync(this IRenderedFragment renderedFragment, Func<Tas
4444
}
4545

4646
/// <summary>
47-
/// Invokes the given <paramref name="workItem"/> in the context of the associated <see cref="ITestRenderer"/>.
47+
/// Invokes the given <paramref name="workItem"/> in the context of the associated <see cref="TestRenderer"/>.
4848
/// </summary>
4949
/// <param name="renderedFragment">The rendered component whose dispatcher to invoke with.</param>
5050
/// <param name="workItem">The work item to execute on the renderer's thread.</param>
@@ -62,7 +62,7 @@ public static Task<T> InvokeAsync<T>(this IRenderedFragment renderedFragment, Fu
6262
}
6363

6464
/// <summary>
65-
/// Invokes the given <paramref name="workItem"/> in the context of the associated <see cref="ITestRenderer"/>.
65+
/// Invokes the given <paramref name="workItem"/> in the context of the associated <see cref="TestRenderer"/>.
6666
/// </summary>
6767
/// <param name="renderedFragment">The rendered component whose dispatcher to invoke with.</param>
6868
/// <param name="workItem">The work item to execute on the renderer's thread.</param>

‎src/bunit/Extensions/TestRendererExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Bunit.Extensions;
44

55
/// <summary>
6-
/// Helper methods that make it easier to work directly with a <see cref="ITestRenderer"/>
6+
/// Helper methods that make it easier to work directly with a <see cref="TestRenderer"/>
77
/// in bUnit web.
88
/// </summary>
99
public static class TestRendererExtensions
@@ -15,7 +15,7 @@ public static class TestRendererExtensions
1515
/// <param name="renderer">The renderer to use.</param>
1616
/// <param name="parameters">The parameters to pass to the component.</param>
1717
/// <returns>A <see cref="IRenderedComponent{TComponent}"/> that provides access to the rendered component.</returns>
18-
public static IRenderedComponent<TComponent> RenderComponent<TComponent>(this ITestRenderer renderer, params ComponentParameter[] parameters)
18+
public static IRenderedComponent<TComponent> RenderComponent<TComponent>(this TestRenderer renderer, params ComponentParameter[] parameters)
1919
where TComponent : IComponent
2020
{
2121
ArgumentNullException.ThrowIfNull(renderer);
@@ -34,7 +34,7 @@ public static IRenderedComponent<TComponent> RenderComponent<TComponent>(this IT
3434
/// <param name="renderer">The renderer to use.</param>
3535
/// <param name="parameterBuilder">The a builder to create parameters to pass to the component.</param>
3636
/// <returns>A <see cref="IRenderedComponent{TComponent}"/> that provides access to the rendered component.</returns>
37-
public static IRenderedComponent<TComponent> RenderComponent<TComponent>(this ITestRenderer renderer, Action<ComponentParameterCollectionBuilder<TComponent>> parameterBuilder)
37+
public static IRenderedComponent<TComponent> RenderComponent<TComponent>(this TestRenderer renderer, Action<ComponentParameterCollectionBuilder<TComponent>> parameterBuilder)
3838
where TComponent : IComponent
3939
{
4040
ArgumentNullException.ThrowIfNull(renderer);

‎src/bunit/Extensions/WaitForHelpers/WaitForHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected WaitForHelper(
5454
this.completeChecker = completeChecker ?? throw new ArgumentNullException(nameof(completeChecker));
5555

5656
logger = renderedFragment.Services.CreateLogger<WaitForHelper<T>>();
57-
renderer = (TestRenderer)renderedFragment
57+
renderer = renderedFragment
5858
.Services
5959
.GetRequiredService<TestContext>()
6060
.Renderer;

‎src/bunit/IRenderedFragment.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public interface IRenderedFragment : IDisposable
1414
int RenderCount { get; }
1515

1616
/// <summary>
17-
/// Gets a value indicating whether the rendered component or fragment has been disposed by the <see cref="ITestRenderer"/>.
17+
/// Gets a value indicating whether the rendered component or fragment has been disposed by the <see cref="TestRenderer"/>.
1818
/// </summary>
1919
bool IsDisposed { get; }
2020

@@ -24,7 +24,7 @@ public interface IRenderedFragment : IDisposable
2424
int ComponentId { get; }
2525

2626
/// <summary>
27-
/// Called by the owning <see cref="ITestRenderer"/> when it finishes a render.
27+
/// Called by the owning <see cref="TestRenderer"/> when it finishes a render.
2828
/// </summary>
2929
/// <param name="renderEvent">A <see cref="RenderEvent"/> that represents a render.</param>
3030
void OnRender(RenderEvent renderEvent);
@@ -51,6 +51,6 @@ public interface IRenderedFragment : IDisposable
5151
/// <summary>
5252
/// Gets the AngleSharp <see cref="INodeList"/> based
5353
/// on the HTML markup from the rendered fragment/component.
54-
/// </summary>
54+
/// </summary>
5555
INodeList Nodes { get; }
5656
}

‎src/bunit/Rendering/ITestRenderer.cs‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎src/bunit/Rendering/RenderEvent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace Bunit.Rendering;
22

33
/// <summary>
4-
/// Represents an render event from a <see cref="ITestRenderer"/>.
4+
/// Represents an render event from a <see cref="TestRenderer"/>.
55
/// </summary>
66
public sealed class RenderEvent
77
{

‎src/bunit/Rendering/TestRenderer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
namespace Bunit.Rendering;
77

88
/// <summary>
9-
/// Represents a bUnit <see cref="ITestRenderer"/> used to render Blazor components and fragments during bUnit tests.
9+
/// Represents a bUnit <see cref="TestRenderer"/> used to render Blazor components and fragments during bUnit tests.
1010
/// </summary>
11-
public class TestRenderer : Renderer, ITestRenderer
11+
public sealed class TestRenderer : Renderer
1212
{
1313
[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_isBatchInProgress")]
1414
extern static ref bool GetIsBatchInProgressField(Renderer renderer);

0 commit comments

Comments
 (0)