refactor: rename IElementFactory to IElementWrapperFactory

Author: egil

src/bunit.generators/Web.AngleSharp/IElementWrapper.cs

@@ -0,0 +1,18 @@
+#nullable enable
+using AngleSharp.Dom;
+using System.CodeDom.Compiler;
+
+namespace Bunit.Web.AngleSharp;
+
+/// <summary>
+/// Represents a wrapper around an <typeparamref name="TElement"/>.
+/// </summary>
+[GeneratedCodeAttribute("Bunit.Web.AngleSharp", "1.0.0.0")]
+internal interface IElementWrapper<out TElement> where TElement : class, IElement
+{
+	/// <summary>
+	/// Gets the wrapped element.
+	/// </summary>
+	TElement WrappedElement { get; }
+}
+#nullable restore

…rators/Web.AngleSharp/IElementFactory.cs …Web.AngleSharp/IElementWrapperFactory.cssrc/bunit.generators/Web.AngleSharp/IElementFactory.cs renamed to src/bunit.generators/Web.AngleSharp/IElementWrapperFactory.cs src/bunit.generators/Web.AngleSharp/IElementFactory.cs renamed to src/bunit.generators/Web.AngleSharp/IElementWrapperFactory.cs

@@ -9,7 +9,7 @@ namespace Bunit.Web.AngleSharp;
 /// Represents an <see cref="IElement"/> factory, used by a <see cref="WrapperBase{TElement}"/>.
 /// </summary>
 [GeneratedCodeAttribute("Bunit.Web.AngleSharp", "1.0.0.0")]
-internal interface IElementFactory
+internal interface IElementWrapperFactory
 {
 	/// <summary>
 	/// A method that returns the latest version of the element to wrap.
@@ -24,16 +24,4 @@ internal interface IElementFactory
 	/// </summary>
 	Action? OnElementReplaced { get; set; }
 }
-
-/// <summary>
-/// Represents a wrapper around an <typeparamref name="TElement"/>.
-/// </summary>
-[GeneratedCodeAttribute("Bunit.Web.AngleSharp", "1.0.0.0")]
-internal interface IElementWrapper<out TElement> where TElement : class, IElement
-{
-	/// <summary>
-	/// Gets the wrapped element.
-	/// </summary>
-	TElement WrappedElement { get; }
-}
 #nullable restore

src/bunit.generators/Web.AngleSharp/WrapperBase.cs

@@ -14,7 +14,7 @@ namespace Bunit.Web.AngleSharp;
 internal abstract class WrapperBase<TElement> : IElementWrapper<TElement>
 	where TElement : class, IElement
 {
-	private readonly IElementFactory elementFactory;
+	private readonly IElementWrapperFactory elementFactory;
 	private TElement? element;
 
 	/// <summary>
@@ -38,7 +38,7 @@ public TElement WrappedElement
 	/// </summary>
 	protected WrapperBase(
 		TElement element,
-		IElementFactory elementFactory)
+		IElementWrapperFactory elementFactory)
 	{
 		this.element = element;
 		this.elementFactory = elementFactory;

src/bunit.generators/Web.AngleSharp/WrapperElementGenerator.cs

@@ -27,7 +27,7 @@ internal static string GenerateWrapperTypeSource(StringBuilder source, INamedTyp
 		source.AppendLine();
 
 		source.AppendLine($$"""
-					internal {{name}}({{wrappedTypeName}} element, Bunit.Web.AngleSharp.IElementFactory elementFactory) : base(element, elementFactory) { }
+					internal {{name}}({{wrappedTypeName}} element, Bunit.Web.AngleSharp.IElementWrapperFactory elementFactory) : base(element, elementFactory) { }
 				""");
 
 		var generatedProperties = new HashSet<string>();

src/bunit.generators/Web.AngleSharp/WrapperElementsGenerator.cs

@@ -36,10 +36,9 @@ private static void GenerateStaticContent(SourceProductionContext context, ISymb
 		if (assembly is not IAssemblySymbol)
 			return;
 
-		var elementFactorySource = ReadEmbeddedResource("Bunit.Web.AngleSharp.IElementFactory.cs");
-		var wrapperBase = ReadEmbeddedResource("Bunit.Web.AngleSharp.WrapperBase.cs");
-		context.AddSource("IElementFactory.g.cs", elementFactorySource);
-		context.AddSource("WrapperBase.g.cs", wrapperBase);
+		context.AddSource("IElementWrapperFactory.g.cs", ReadEmbeddedResource("Bunit.Web.AngleSharp.IElementWrapperFactory.cs"));
+		context.AddSource("IElementWrapper.g.cs", ReadEmbeddedResource("Bunit.Web.AngleSharp.IElementWrapper.cs"));
+		context.AddSource("WrapperBase.g.cs", ReadEmbeddedResource("Bunit.Web.AngleSharp.WrapperBase.cs"));
 	}
 
 	private static void GenerateWrapperTypes(SourceProductionContext context, ISymbol assembly)
@@ -70,7 +69,7 @@ private static void GenerateWrapperFactory(StringBuilder source, IEnumerable<INa
 		source.AppendLine($"internal static class WrapperExtensions");
 		source.AppendLine("{");
 		source.AppendLine();
-		source.AppendLine($"\tpublic static global::AngleSharp.Dom.IElement WrapUsing<TElementFactory>(this global::AngleSharp.Dom.IElement element, TElementFactory elementFactory) where TElementFactory : Bunit.Web.AngleSharp.IElementFactory => element switch");
+		source.AppendLine($"\tpublic static global::AngleSharp.Dom.IElement WrapUsing<TElementFactory>(this global::AngleSharp.Dom.IElement element, TElementFactory elementFactory) where TElementFactory : Bunit.Web.AngleSharp.IElementWrapperFactory => element switch");
 		source.AppendLine("\t{");
 
 		foreach (var elm in elementInterfacetypes)

src/bunit.generators/bunit.generators.csproj

@@ -9,7 +9,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<EmbeddedResource Include="Web.AngleSharp\IElementFactory.cs" />
+		<EmbeddedResource Include="Web.AngleSharp\IElementWrapperFactory.cs" />
+		<EmbeddedResource Include="Web.AngleSharp\IElementWrapper.cs" />
 		<EmbeddedResource Include="Web.AngleSharp\WrapperBase.cs" />
 	</ItemGroup>
 

src/bunit.web/Extensions/Internal/CssSelectorElementFactory.cs

@@ -3,7 +3,7 @@
 
 namespace Bunit;
 
-internal sealed class CssSelectorElementFactory : IElementFactory
+internal sealed class CssSelectorElementFactory : IElementWrapperFactory
 {
 	private readonly IRenderedFragment testTarget;
 	private readonly string cssSelector;

tests/bunit.generators.tests/WrapperElementsGeneratorTest.Generator#ElementWrapper.g.verified.cs

@@ -1,4 +1,4 @@
-//HintName: ElementWrapper.g.cs
+//HintName: ElementWrapper.g.cs
 #nullable enable
 using System.Runtime.CompilerServices;
 
@@ -11,7 +11,7 @@ namespace Bunit.Web.AngleSharp;
 internal sealed class ElementWrapper : WrapperBase<global::AngleSharp.Dom.IElement>, global::AngleSharp.Dom.IElement
 {
 
-	internal ElementWrapper(global::AngleSharp.Dom.IElement element, Bunit.Web.AngleSharp.IElementFactory elementFactory) : base(element, elementFactory) { }
+	internal ElementWrapper(global::AngleSharp.Dom.IElement element, Bunit.Web.AngleSharp.IElementWrapperFactory elementFactory) : base(element, elementFactory) { }
 
 	/// <inheritdoc/>
 	[System.Diagnostics.DebuggerHidden]

tests/bunit.generators.tests/WrapperElementsGeneratorTest.Generator#HtmlAnchorElementWrapper.g.verified.cs

@@ -11,7 +11,7 @@ namespace Bunit.Web.AngleSharp;
 internal sealed class HtmlAnchorElementWrapper : WrapperBase<global::AngleSharp.Html.Dom.IHtmlAnchorElement>, global::AngleSharp.Html.Dom.IHtmlAnchorElement
 {
 
-	internal HtmlAnchorElementWrapper(global::AngleSharp.Html.Dom.IHtmlAnchorElement element, Bunit.Web.AngleSharp.IElementFactory elementFactory) : base(element, elementFactory) { }
+	internal HtmlAnchorElementWrapper(global::AngleSharp.Html.Dom.IHtmlAnchorElement element, Bunit.Web.AngleSharp.IElementWrapperFactory elementFactory) : base(element, elementFactory) { }
 
 	/// <inheritdoc/>
 	public event global::AngleSharp.Dom.DomEventHandler Aborted

tests/bunit.generators.tests/WrapperElementsGeneratorTest.Generator#HtmlAreaElementWrapper.g.verified.cs

@@ -11,7 +11,7 @@ namespace Bunit.Web.AngleSharp;
 internal sealed class HtmlAreaElementWrapper : WrapperBase<global::AngleSharp.Html.Dom.IHtmlAreaElement>, global::AngleSharp.Html.Dom.IHtmlAreaElement
 {
 
-	internal HtmlAreaElementWrapper(global::AngleSharp.Html.Dom.IHtmlAreaElement element, Bunit.Web.AngleSharp.IElementFactory elementFactory) : base(element, elementFactory) { }
+	internal HtmlAreaElementWrapper(global::AngleSharp.Html.Dom.IHtmlAreaElement element, Bunit.Web.AngleSharp.IElementWrapperFactory elementFactory) : base(element, elementFactory) { }
 
 	/// <inheritdoc/>
 	public event global::AngleSharp.Dom.DomEventHandler Aborted