Skip to content

Fix namespace conflict, use display format with global namespace style #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dreamescaper merged 1 commit into from
Mar 25, 2025
Merged

Fix namespace conflict, use display format with global namespace style #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions ServiceScan.SourceGenerator.Tests/AddServicesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public class MyService2 : IService { }

var registrations = $"""
return services
.Add{lifetime}<GeneratorTests.IService, GeneratorTests.MyService1>()
.Add{lifetime}<GeneratorTests.IService, GeneratorTests.MyService2>();
.Add{lifetime}<global::GeneratorTests.IService, global::GeneratorTests.MyService1>()
.Add{lifetime}<global::GeneratorTests.IService, global::GeneratorTests.MyService2>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -53,8 +53,8 @@ public void AddServicesFromAnotherAssembly()

var registrations = $"""
return services
.AddTransient<External.IExternalService, External.ExternalService1>()
.AddTransient<External.IExternalService, External.ExternalService2>();
.AddTransient<global::External.IExternalService, global::External.ExternalService1>()
.AddTransient<global::External.IExternalService, global::External.ExternalService2>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -82,8 +82,8 @@ public class MyService2 : AbstractService { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService1>()
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService2>();
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService1>()
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService2>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -111,8 +111,8 @@ public class MyService2 : AbstractService { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.BaseType, GeneratorTests.MyService1>()
.AddTransient<GeneratorTests.BaseType, GeneratorTests.MyService2>();
.AddTransient<global::GeneratorTests.BaseType, global::GeneratorTests.MyService1>()
.AddTransient<global::GeneratorTests.BaseType, global::GeneratorTests.MyService2>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -139,8 +139,8 @@ public class MyStringService : IService<string> { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.IService<int>, GeneratorTests.MyIntService>()
.AddTransient<GeneratorTests.IService<string>, GeneratorTests.MyStringService>();
.AddTransient<global::GeneratorTests.IService<int>, global::GeneratorTests.MyIntService>()
.AddTransient<global::GeneratorTests.IService<string>, global::GeneratorTests.MyStringService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -167,7 +167,7 @@ public class MyStringService : IService<string> { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.IService<int>, GeneratorTests.MyIntService>();
.AddTransient<global::GeneratorTests.IService<int>, global::GeneratorTests.MyIntService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -194,8 +194,8 @@ public class MyService2 : AbstractService { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.AbstractService, GeneratorTests.MyService1>()
.AddTransient<GeneratorTests.AbstractService, GeneratorTests.MyService2>();
.AddTransient<global::GeneratorTests.AbstractService, global::GeneratorTests.MyService1>()
.AddTransient<global::GeneratorTests.AbstractService, global::GeneratorTests.MyService2>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -222,8 +222,8 @@ public class MyService2 : AbstractService { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.MyService1, GeneratorTests.MyService1>()
.AddTransient<GeneratorTests.MyService2, GeneratorTests.MyService2>();
.AddTransient<global::GeneratorTests.MyService1, global::GeneratorTests.MyService1>()
.AddTransient<global::GeneratorTests.MyService2, global::GeneratorTests.MyService2>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -248,7 +248,7 @@ public class MyService { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.MyService, GeneratorTests.MyService>();
.AddTransient<global::GeneratorTests.MyService, global::GeneratorTests.MyService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -275,8 +275,8 @@ public class MyStringService : AbstractService<string> { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.AbstractService<int>, GeneratorTests.MyIntService>()
.AddTransient<GeneratorTests.AbstractService<string>, GeneratorTests.MyStringService>();
.AddTransient<global::GeneratorTests.AbstractService<int>, global::GeneratorTests.MyIntService>()
.AddTransient<global::GeneratorTests.AbstractService<string>, global::GeneratorTests.MyStringService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -303,8 +303,8 @@ public class MyService2<T> : IGenericService<T> { }

var registrations = $"""
return services
.AddTransient(typeof(GeneratorTests.IGenericService<>), typeof(GeneratorTests.MyService1<>))
.AddTransient(typeof(GeneratorTests.IGenericService<>), typeof(GeneratorTests.MyService2<>));
.AddTransient(typeof(global::GeneratorTests.IGenericService<>), typeof(global::GeneratorTests.MyService1<>))
.AddTransient(typeof(global::GeneratorTests.IGenericService<>), typeof(global::GeneratorTests.MyService2<>));
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand All @@ -331,8 +331,8 @@ public class MyService2<T> : IService { }

var registrations = $"""
return services
.AddTransient(typeof(GeneratorTests.IService), typeof(GeneratorTests.MyService1<>))
.AddTransient(typeof(GeneratorTests.IService), typeof(GeneratorTests.MyService2<>));
.AddTransient(typeof(global::GeneratorTests.IService), typeof(global::GeneratorTests.MyService1<>))
.AddTransient(typeof(global::GeneratorTests.IService), typeof(global::GeneratorTests.MyService2<>));
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -360,8 +360,8 @@ public class ServiceWithNonMatchingName {}

var registrations = $"""
return services
.AddTransient<GeneratorTests.MyFirstService, GeneratorTests.MyFirstService>()
.AddTransient<GeneratorTests.MySecondService, GeneratorTests.MySecondService>();
.AddTransient<global::GeneratorTests.MyFirstService, global::GeneratorTests.MyFirstService>()
.AddTransient<global::GeneratorTests.MySecondService, global::GeneratorTests.MySecondService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -397,8 +397,8 @@ public class ServiceWithoutAttribute {}

var registrations = $"""
return services
.AddTransient<GeneratorTests.MyFirstService, GeneratorTests.MyFirstService>()
.AddTransient<GeneratorTests.MySecondService, GeneratorTests.MySecondService>();
.AddTransient<global::GeneratorTests.MyFirstService, global::GeneratorTests.MyFirstService>()
.AddTransient<global::GeneratorTests.MySecondService, global::GeneratorTests.MySecondService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -433,7 +433,7 @@ public class ServiceWithNonMatchingName {}

var registrations = $"""
return services
.AddTransient<GeneratorTests.MyFirstService, GeneratorTests.MyFirstService>();
.AddTransient<global::GeneratorTests.MyFirstService, global::GeneratorTests.MyFirstService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -461,8 +461,8 @@ public class ServiceWithNonMatchingName {}

var registrations = $"""
return services
.AddTransient<GeneratorTests.MyFirstService, GeneratorTests.MyFirstService>()
.AddTransient<GeneratorTests.MySecondService, GeneratorTests.MySecondService>();
.AddTransient<global::GeneratorTests.MyFirstService, global::GeneratorTests.MyFirstService>()
.AddTransient<global::GeneratorTests.MySecondService, global::GeneratorTests.MySecondService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -492,9 +492,9 @@ public class InterfacelessService {}

var registrations = $"""
return services
.AddTransient<GeneratorTests.IServiceA, GeneratorTests.MyFirstService>()
.AddTransient<GeneratorTests.IServiceB, GeneratorTests.MySecondService>()
.AddTransient<GeneratorTests.IServiceC, GeneratorTests.MySecondService>();
.AddTransient<global::GeneratorTests.IServiceA, global::GeneratorTests.MyFirstService>()
.AddTransient<global::GeneratorTests.IServiceB, global::GeneratorTests.MySecondService>()
.AddTransient<global::GeneratorTests.IServiceC, global::GeneratorTests.MySecondService>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -527,9 +527,9 @@ public class MyService: IServiceA, IServiceB {}

var registrations = $"""
return services
.AddSingleton<GeneratorTests.MyService, GeneratorTests.MyService>()
.AddSingleton<GeneratorTests.IServiceA>(s => s.GetRequiredService<GeneratorTests.MyService>())
.AddSingleton<GeneratorTests.IServiceB>(s => s.GetRequiredService<GeneratorTests.MyService>());
.AddSingleton<global::GeneratorTests.MyService, global::GeneratorTests.MyService>()
.AddSingleton<global::GeneratorTests.IServiceA>(s => s.GetRequiredService<global::GeneratorTests.MyService>())
.AddSingleton<global::GeneratorTests.IServiceB>(s => s.GetRequiredService<global::GeneratorTests.MyService>());
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -563,9 +563,9 @@ public class MyService1 : IService { }

var registrations = $"""
return services
.AddTransient<GeneratorTests.IService, GeneratorTests.ParentType1.MyService1>()
.AddTransient<GeneratorTests.IService, GeneratorTests.ParentType1.MyService2>()
.AddTransient<GeneratorTests.IService, GeneratorTests.ParentType2.MyService1>();
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.ParentType1.MyService1>()
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.ParentType1.MyService2>()
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.ParentType2.MyService1>();
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -595,8 +595,8 @@ public class MyService2 : IService { }

var registrations = $"""
return services
.AddKeyedTransient<GeneratorTests.IService, GeneratorTests.MyService1>(GetName<GeneratorTests.MyService1>())
.AddKeyedTransient<GeneratorTests.IService, GeneratorTests.MyService2>(GetName<GeneratorTests.MyService2>());
.AddKeyedTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService1>(GetName<global::GeneratorTests.MyService1>())
.AddKeyedTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService2>(GetName<global::GeneratorTests.MyService2>());
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -626,8 +626,8 @@ public class MyService2 : IService { }

var registrations = $"""
return services
.AddKeyedTransient<GeneratorTests.IService, GeneratorTests.MyService1>(GetName(typeof(GeneratorTests.MyService1)))
.AddKeyedTransient<GeneratorTests.IService, GeneratorTests.MyService2>(GetName(typeof(GeneratorTests.MyService2)));
.AddKeyedTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService1>(GetName(typeof(global::GeneratorTests.MyService1)))
.AddKeyedTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService2>(GetName(typeof(global::GeneratorTests.MyService2)));
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down Expand Up @@ -662,8 +662,8 @@ public class MyService2 : IService

var registrations = $"""
return services
.AddKeyedTransient<GeneratorTests.IService, GeneratorTests.MyService1>(GeneratorTests.MyService1.Key)
.AddKeyedTransient<GeneratorTests.IService, GeneratorTests.MyService2>(GeneratorTests.MyService2.Key);
.AddKeyedTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService1>(global::GeneratorTests.MyService1.Key)
.AddKeyedTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService2>(global::GeneratorTests.MyService2.Key);
""";
Assert.Equal(Sources.GetMethodImplementation(registrations), results.GeneratedTrees[1].ToString());
}
Expand Down
16 changes: 8 additions & 8 deletions ServiceScan.SourceGenerator.Tests/CustomHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public static partial class ServicesExtensions
{
public static partial void ProcessServices()
{
HandleType<GeneratorTests.MyService1>();
HandleType<GeneratorTests.MyService2>();
HandleType<global::GeneratorTests.MyService1>();
HandleType<global::GeneratorTests.MyService2>();
}
}
""";
Expand Down Expand Up @@ -97,8 +97,8 @@ public static partial class ServicesExtensions
{
public static partial void ProcessServices( string value, decimal number)
{
HandleType<GeneratorTests.MyFirstService>(value, number);
HandleType<GeneratorTests.MySecondService>(value, number);
HandleType<global::GeneratorTests.MyFirstService>(value, number);
HandleType<global::GeneratorTests.MySecondService>(value, number);
}
}
""";
Expand Down Expand Up @@ -150,8 +150,8 @@ public static partial class ServicesExtensions
{
public static partial GeneratorTests.IServices ProcessServices(this GeneratorTests.IServices services)
{
HandleType<GeneratorTests.MyService1>(services);
HandleType<GeneratorTests.MyService2>(services);
HandleType<global::GeneratorTests.MyService1>(services);
HandleType<global::GeneratorTests.MyService2>(services);
return services;
}
}
Expand Down Expand Up @@ -208,8 +208,8 @@ public static partial class ServicesExtensions
{
public static partial IServiceCollection ProcessServices(this IServiceCollection services, decimal number)
{
HandleType<GeneratorTests.MyFirstService>(services, number);
HandleType<GeneratorTests.MySecondService>(services, number);
HandleType<global::GeneratorTests.MyFirstService>(services, number);
HandleType<global::GeneratorTests.MySecondService>(services, number);
return services;
}
}
Expand Down
12 changes: 6 additions & 6 deletions ServiceScan.SourceGenerator.Tests/GeneratedMethodTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace GeneratorTests;
{{methodAccessModifier}} static partial IServiceCollection AddServices(this IServiceCollection services)
{
return services
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService>();
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService>();
}
}
""";
Expand Down Expand Up @@ -92,7 +92,7 @@ public static partial class ServicesExtensions
public static partial void AddServices(this IServiceCollection services)
{
services
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService>();
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService>();
}
}
""";
Expand Down Expand Up @@ -132,7 +132,7 @@ public static partial class ServicesExtensions
public static partial IServiceCollection AddServices( IServiceCollection services)
{
return services
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService>();
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService>();
}
}
""";
Expand Down Expand Up @@ -172,7 +172,7 @@ public partial class ServiceType
private partial void AddServices( IServiceCollection services)
{
services
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService>();
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService>();
}
}
""";
Expand Down Expand Up @@ -211,7 +211,7 @@ public static partial class ServicesExtensions
public static partial IServiceCollection AddServices(this IServiceCollection services)
{
return services
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService>();
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService>();
}
}
""";
Expand Down Expand Up @@ -251,7 +251,7 @@ public static partial class ServicesExtensions
public static partial IServiceCollection AddServices(this IServiceCollection strangeServices)
{
return strangeServices
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService>();
.AddTransient<global::GeneratorTests.IService, global::GeneratorTests.MyService>();
}
}
""";
Expand Down
Loading
Loading