Use AddStub instead of AddGeneratedStub

Author: linkdotnet

src/bunit.generators/README.md

@@ -2,7 +2,7 @@
 
 This package contains source generators for bUnit, to make it easier and more convenient to write tests. 
 
-## `AddGeneratedStub` Generator
+## `AddStub` Generator
 This generator adds the ability to automatically generate stubs for a given type. This comes in handy, when dealing
 with 3rd party components that might need an extensive setup. Here a small example:
 
@@ -28,7 +28,7 @@ public void Text_button_gets_initial_count()
 {
     // This call will automatically generate a stub for the ThirdPartyButton component
     // with the name "ThirdPartyButtonStub"
-    ComponentFactories.AddGeneratedStub<ThirdPartyText>();
+    ComponentFactories.AddStub<ThirdPartyText>();
     var cut = Render<Counter>(@<Counter />);
 
     cut.Find("button").Click();

src/bunit.generators/Web.Stubs/StubGenerator.cs

@@ -20,29 +20,6 @@ public class StubGenerator : IIncrementalGenerator
 	/// <inheritdoc/>
 	public void Initialize(IncrementalGeneratorInitializationContext context)
 	{
-		context.RegisterPostInitializationOutput(
-			ctx => ctx.AddSource("AddGeneratedStub.g.cs",
-				@"namespace Bunit
-{
-    public static class ComponentFactoriesExtensions
-	{
-        /// <summary>
-		/// Marks a component, so that a stub get is generated for it. The stub has the same name as the component, but with the suffix ""Stub"" added.
-		/// </summary>
-		/// <typeparam name=""TComponent"">The type of component to generate a stub for.</typeparam>
-		/// <remarks>
-		/// When <c>ComponentFactories.AddGeneratedStub&lt;MyButton&gt;()</c> is called, a stub component is generated for the component
-		/// with the name <c>MyButtonStub</c>. The stub component is added to the <see cref=""ComponentFactoryCollection""/> and can be used.
-		/// It can also be retrieved via <c>cut.FindComponent&lt;MyButtonStub&gt;()</c>.
-		/// This call does the same as <c>ComponentFactories.Add&lt;MyButton, MyButtonStub&gt;()</c>.
-		/// </remarks>
-		public static ComponentFactoryCollection AddGeneratedStub<TComponent>(this ComponentFactoryCollection factories)
-			where TComponent : Microsoft.AspNetCore.Components.IComponent
-		{
-			return factories.AddGeneratedStubInterceptor<TComponent>();
-		}
-	}
-}"));
 		var classesToStub = context.SyntaxProvider
 			.CreateSyntaxProvider(
 				predicate: static (s, _) => s is InvocationExpressionSyntax,
@@ -71,7 +48,7 @@ private static StubClassInfo GetStubClassInfo(GeneratorSyntaxContext context)
 				var path = GetInterceptorFilePath(context.Node.SyntaxTree, context.SemanticModel.Compilation);
 				var lineSpan = context.SemanticModel.SyntaxTree.GetLineSpan(context.Node.Span);
 				var line = lineSpan.StartLinePosition.Line + 1;
-				var column = lineSpan.Span.Start.Character + context.Node.ToString().IndexOf("AddGeneratedStub", StringComparison.Ordinal);
+				var column = lineSpan.Span.Start.Character + context.Node.ToString().IndexOf("AddStub", StringComparison.Ordinal) + 1;
 
 				return new StubClassInfo
 				{
@@ -80,7 +57,7 @@ private static StubClassInfo GetStubClassInfo(GeneratorSyntaxContext context)
 					TargetType = symbol,
 					Path = path,
 					Line = line,
-					Column = column + 1,
+					Column = column,
 				};
 			}
 		}
@@ -94,7 +71,7 @@ static bool IsComponentFactoryStubMethod(InvocationExpressionSyntax invocation,
 				return false;
 			}
 
-			if (memberAccess.Name.Identifier.Text != "AddGeneratedStub" ||
+			if (memberAccess.Name.Identifier.Text != "AddStub" ||
 			    invocation.ArgumentList.Arguments.Count != 0)
 			{
 				return false;
@@ -132,7 +109,7 @@ private static bool GenerateStubComponent(StubClassInfo classInfo, SourceProduct
 
 		sourceBuilder.AppendLine($"namespace {classInfo.TargetTypeNamespace};");
 		sourceBuilder.AppendLine();
-		sourceBuilder.AppendLine($"internal partial class {classInfo.StubClassName} : Microsoft.AspNetCore.Components.ComponentBase");
+		sourceBuilder.AppendLine($"internal partial class {classInfo.StubClassName} : global::Microsoft.AspNetCore.Components.ComponentBase");
 		sourceBuilder.Append("{");
 
 		foreach (var member in targetTypeSymbol
@@ -222,21 +199,21 @@ public InterceptsLocationAttribute(string filePath, int line, int column)
 		interceptorSource.AppendLine();
 		interceptorSource.AppendLine("namespace Bunit");
 		interceptorSource.AppendLine("{");
-		interceptorSource.AppendLine($"\tstatic class Interceptor{stubbedComponentGroup.StubClassName}");
+		interceptorSource.AppendLine($"\tinternal static class Interceptor{stubbedComponentGroup.StubClassName}");
 		interceptorSource.AppendLine("\t{");
 
 		foreach (var hit in stubClassGrouped)
 		{
 			interceptorSource.AppendLine(
-				$"\t\t[System.Runtime.CompilerServices.InterceptsLocationAttribute(\"{hit.Path}\", {hit.Line}, {hit.Column})]");
+				$"\t\t[global::System.Runtime.CompilerServices.InterceptsLocationAttribute(\"{hit.Path}\", {hit.Line}, {hit.Column})]");
 		}
 
 		interceptorSource.AppendLine(
-			"\t\tpublic static global::Bunit.ComponentFactoryCollection AddGeneratedStubInterceptor<TComponent>(this global::Bunit.ComponentFactoryCollection factories)");
-		interceptorSource.AppendLine("\t\t\twhere TComponent : Microsoft.AspNetCore.Components.IComponent");
+			"\t\tpublic static global::Bunit.ComponentFactoryCollection AddStubInterceptor<TComponent>(this global::Bunit.ComponentFactoryCollection factories)");
+		interceptorSource.AppendLine("\t\t\twhere TComponent : global::Microsoft.AspNetCore.Components.IComponent");
 		interceptorSource.AppendLine("\t\t{");
 		interceptorSource.AppendLine(
-			$"\t\t\treturn factories.Add<global::{stubbedComponentGroup.TargetType.ToDisplayString()}, {stubbedComponentGroup.TargetTypeNamespace}.{stubbedComponentGroup.StubClassName}>();");
+			$"\t\t\treturn factories.Add<global::{stubbedComponentGroup.TargetType.ToDisplayString()}, global::{stubbedComponentGroup.TargetTypeNamespace}.{stubbedComponentGroup.StubClassName}>();");
 		interceptorSource.AppendLine("\t\t}");
 		interceptorSource.AppendLine("\t}");
 		interceptorSource.AppendLine("}");

tests/bunit.generators.tests/Web.Stub/StubTests.cs

@@ -7,7 +7,7 @@ public class StubTests : TestContext
 	[Fact]
 	public void Stubbed_component_has_same_parameters()
 	{
-		ComponentFactories.AddGeneratedStub<CounterComponent>();
+		ComponentFactories.AddStub<CounterComponent>();
 
 		var cut = RenderComponent<ParentComponent>();
 
@@ -18,7 +18,7 @@ public void Stubbed_component_has_same_parameters()
 	[Fact]
 	public void Generated_stub_can_handle_cascading_parameters()
 	{
-		ComponentFactories.AddGeneratedStub<CounterComponent>();
+		ComponentFactories.AddStub<CounterComponent>();
 
 		var cut = RenderComponent<ParentComponent>(p => p.AddCascadingValue("Cascading", 3));
 
@@ -29,7 +29,7 @@ public void Generated_stub_can_handle_cascading_parameters()
 	[Fact]
 	public void Generated_stub_can_handle_unmatched_parameters()
 	{
-		ComponentFactories.AddGeneratedStub<CounterComponent>();
+		ComponentFactories.AddStub<CounterComponent>();
 
 		var cut = Render(builder =>
 		{