Refactor DI test constructors and update namespaces #313

Simplifies test class constructors by using C# primary constructor syntax and removes redundant constructor definitions. Updates CalculatorService namespace and type references for consistency. Refactors TestBedFactoryFixture to use collection expressions and improves method invocation logic.

Author: Arash-Sabet

README.md

@@ -79,7 +79,7 @@ T? GetKeyedService<T>([DisallowNull] string key, ITestOutputHelper testOutputHel
 
 ## Constructor Dependency Injection
 
-**New in this version**: The library now supports constructor-style dependency injection while maintaining full backward compatibility with the existing fixture-based approach.
+**New in this version (ver 9.2.0 and beyond)**: The library now supports constructor-style dependency injection while maintaining full backward compatibility with the existing fixture-based approach.
 
 ### Property Injection with TestBedWithDI (Recommended)
 

examples/Xunit.Microsoft.DependencyInjection.ExampleTests/AdvancedDependencyInjectionTests.cs

@@ -7,7 +7,7 @@ namespace Xunit.Microsoft.DependencyInjection.ExampleTests;
 /// <summary>
 /// Example tests demonstrating advanced dependency injection patterns including IOptions, Func&lt;T&gt;, and Action&lt;T&gt;
 /// </summary>
-public class AdvancedDependencyInjectionTests : TestBedWithDI<TestProjectFixture>
+public class AdvancedDependencyInjectionTests(ITestOutputHelper testOutputHelper, TestProjectFixture fixture) : TestBedWithDI<TestProjectFixture>(testOutputHelper, fixture)
 {
     [Inject]
     private IOptions<Options>? Options { get; set; }
@@ -27,11 +27,6 @@ public class AdvancedDependencyInjectionTests : TestBedWithDI<TestProjectFixture
     [Inject]
     private ISingletonService? SingletonService { get; set; }
 
-    public AdvancedDependencyInjectionTests(ITestOutputHelper testOutputHelper, TestProjectFixture fixture)
-        : base(testOutputHelper, fixture)
-    {
-    }
-
     [Fact]
     public void TestIOptionsPatterns()
     {

examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Services/CalculatorService.cs

@@ -1,8 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Xunit.Microsoft.DependencyInjection.Attributes;
 
-namespace Xunit.Microsoft.DependencyInjection.ExampleTests;
+namespace Xunit.Microsoft.DependencyInjection.ExampleTests.Services;
 
 /// <summary>
 /// Example class that demonstrates constructor injection pattern
@@ -12,13 +10,13 @@ namespace Xunit.Microsoft.DependencyInjection.ExampleTests;
 public class CalculatorService
 {
     private readonly ICalculator _calculator;
-    private readonly Services.Options _options;
+    private readonly Options _options;
     private readonly ICarMaker _porsche;
     private readonly ICarMaker _toyota;
 
     internal CalculatorService(
         ICalculator calculator,
-        IOptions<Services.Options> options,
+        IOptions<Options> options,
         [FromKeyedService("Porsche")] ICarMaker porsche,
         [FromKeyedService("Toyota")] ICarMaker toyota)
     {

examples/Xunit.Microsoft.DependencyInjection.ExampleTests/TransientServiceTests.cs

@@ -8,7 +8,7 @@ namespace Xunit.Microsoft.DependencyInjection.ExampleTests;
 /// Example tests demonstrating transient service injection using property injection pattern
 /// Transient services create a new instance for each injection point
 /// </summary>
-public class TransientServiceTests : TestBedWithDI<TestProjectFixture>
+public class TransientServiceTests(ITestOutputHelper testOutputHelper, TestProjectFixture fixture) : TestBedWithDI<TestProjectFixture>(testOutputHelper, fixture)
 {
     [Inject]
     private ITransientService? TransientService1 { get; set; }
@@ -22,11 +22,6 @@ public class TransientServiceTests : TestBedWithDI<TestProjectFixture>
     [Inject]
     private IOptions<Options>? Options { get; set; }
 
-    public TransientServiceTests(ITestOutputHelper testOutputHelper, TestProjectFixture fixture)
-        : base(testOutputHelper, fixture)
-    {
-    }
-
     [Fact]
     public async Task TestTransientServiceCreatesDifferentInstances()
     {
@@ -143,7 +138,7 @@ public void TestTransientServiceWithActionDelegate()
         // Assert - Should have worked with 3 different instances
         Assert.Equal(3, results.Count);
         Assert.Equal(3, instanceIds.Count);
-        Assert.True(instanceIds.Distinct().Count() == 3); // All different
+        Assert.Equal(3, instanceIds.Distinct().Count()); // All different
 
         // Verify results contain expected patterns
         Assert.All(results, result =>

src/Abstracts/TestBedFactoryFixture.cs

@@ -1,4 +1,3 @@
-using Microsoft.Extensions.DependencyInjection;
 using System.Reflection;
 
 namespace Xunit.Microsoft.DependencyInjection.Abstracts;
@@ -51,7 +50,7 @@ private object CreateInstance(Type testType, IServiceProvider serviceProvider, I
 		{
 			var parameters = constructor.GetParameters();
 			var args = new List<object?>();
-			bool canResolveAll = true;
+			var canResolveAll = true;
 
 			foreach (var parameter in parameters)
 			{
@@ -102,9 +101,8 @@ private object CreateInstance(Type testType, IServiceProvider serviceProvider, I
 							// Use the fixture's existing GetKeyedService method instead of reflection
 							try
 							{
-								var getKeyedServiceMethod = GetType().BaseType?.GetMethod("GetKeyedService",
-									new[] { typeof(string), typeof(ITestOutputHelper) })?.MakeGenericMethod(parameter.ParameterType);
-								arg = getKeyedServiceMethod?.Invoke(this, new object[] { key, testOutputHelper });
+								var getKeyedServiceMethod = GetType().BaseType?.GetMethod("GetKeyedService",[typeof(string), typeof(ITestOutputHelper)])?.MakeGenericMethod(parameter.ParameterType);
+								arg = getKeyedServiceMethod?.Invoke(this, [key, testOutputHelper]);
 							}
 							catch
 							{
@@ -141,7 +139,7 @@ private object CreateInstance(Type testType, IServiceProvider serviceProvider, I
 				try
 				{
 					// Use constructor.Invoke for better control over internal constructors
-					return constructor.Invoke(args.ToArray())!;
+					return constructor.Invoke([.. args])!;
 				}
 				catch
 				{