V9.0.0/host consistency and httpcontext improvement

src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/AspNetCoreHostFixture.cs

@@ -80,11 +80,13 @@ public override void ConfigureHost(Test hostTest)
                         .UseSetting(HostDefaults.ApplicationKey, hostTest.CallerType.Assembly.GetName().Name);
                 });
 
+#if NET9_0_OR_GREATER
             hb.UseDefaultServiceProvider(o =>
             {
                 o.ValidateOnBuild = true;
                 o.ValidateScopes = true;
             });
+#endif
 
             ConfigureHostCallback(hb);
 

src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/Http/FakeHttpContextAccessor.cs

@@ -4,6 +4,7 @@
 using Codebelt.Extensions.Xunit.Hosting.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Codebelt.Extensions.Xunit.Hosting.AspNetCore.Http
 {
@@ -13,17 +14,21 @@ namespace Codebelt.Extensions.Xunit.Hosting.AspNetCore.Http
     /// <seealso cref="IHttpContextAccessor" />
     public class FakeHttpContextAccessor : IHttpContextAccessor
     {
-
         /// <summary>
-        /// Initializes a new instance of the <see cref="FakeHttpContextAccessor"/> class.
+        /// Initializes a new instance of the <see cref="FakeHttpContextAccessor" /> class.
         /// </summary>
-        public FakeHttpContextAccessor()
+        /// <param name="factory">An optional <see cref="IServiceScopeFactory"/> for resolving services.</param>
+        public FakeHttpContextAccessor(IServiceScopeFactory factory = null)
         {
+            var context = new DefaultHttpContext();
             var fc = new FeatureCollection();
+            fc.Set<IServiceProvidersFeature>(new RequestServicesFeature(context, factory));
             fc.Set<IHttpResponseFeature>(new FakeHttpResponseFeature());
             fc.Set<IHttpRequestFeature>(new FakeHttpRequestFeature());
             fc.Set<IHttpResponseBodyFeature>(new StreamResponseBodyFeature(MakeGreeting("Hello awesome developers!")));
-            HttpContext = new DefaultHttpContext(fc);
+            context.Uninitialize();
+            context.Initialize(fc);
+            HttpContext = context;
         }
 
         private Stream MakeGreeting(string greeting)

src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/ServiceCollectionExtensions.cs

@@ -16,9 +16,9 @@ public static class ServiceCollectionExtensions
         /// Adds a unit test optimized implementation for the <see cref="IHttpContextAccessor"/> service.
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection" /> to extend.</param>
-        /// <param name="lifetime">The lifetime of the service.</param>
+        /// <param name="lifetime">The lifetime of the service. Default is <see cref="ServiceLifetime.Singleton"/>.</param>
         /// <returns>A reference to <paramref name="services"/> after the operation has completed.</returns>
-        public static IServiceCollection AddFakeHttpContextAccessor(this IServiceCollection services, ServiceLifetime lifetime)
+        public static IServiceCollection AddFakeHttpContextAccessor(this IServiceCollection services, ServiceLifetime lifetime = ServiceLifetime.Singleton)
         {
             switch (lifetime)
             {
@@ -39,8 +39,7 @@ public static IServiceCollection AddFakeHttpContextAccessor(this IServiceCollect
 
         private static IHttpContextAccessor FakeHttpContextAccessorFactory(IServiceProvider provider)
         {
-            var contextAccessor = new FakeHttpContextAccessor { HttpContext = { RequestServices = provider } };
-            return contextAccessor;
+            return new FakeHttpContextAccessor(provider.GetRequiredService<IServiceScopeFactory>());
         }
     }
 }

src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/WebHostTest.cs

@@ -83,7 +83,7 @@ public override void ConfigureServices(IServiceCollection services)
                 hbc.HostingEnvironment = HostingEnvironment;
                 return hbc;
             }), services);
-            services.AddFakeHttpContextAccessor(ServiceLifetime.Singleton);
+            services.AddFakeHttpContextAccessor();
         }
     }
 }

src/Codebelt.Extensions.Xunit.Hosting/HostFixture.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -12,6 +13,8 @@ namespace Codebelt.Extensions.Xunit.Hosting
     /// <seealso cref="IHostFixture" />
     public class HostFixture : IDisposable, IHostFixture
     {
+        private readonly object _lock = new();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="HostFixture"/> class.
         /// </summary>
@@ -54,13 +57,22 @@ public virtual void ConfigureHost(Test hostTest)
                     ConfigureServicesCallback(services);
                 });
 
-            ConfigureHostCallback(hb);
-
 #if NET9_0_OR_GREATER
-            hb.UseDefaultServiceProvider(o => o.ValidateScopes = false); // this is by intent
+            hb.UseDefaultServiceProvider(o =>
+            {
+                o.ValidateOnBuild = true;
+                o.ValidateScopes = true;
+            });
 #endif
 
-            Host = hb.Build();
+            ConfigureHostCallback(hb);
+
+            var host = hb.Build();
+            Task.Run(() => host.StartAsync().ConfigureAwait(false))
+                .ConfigureAwait(false)
+                .GetAwaiter()
+                .GetResult();
+            Host = host;
         }
 
         /// <summary>
@@ -185,12 +197,16 @@ public void Dispose()
         protected void Dispose(bool disposing)
         {
             if (Disposed) { return; }
-            if (disposing)
+            lock (_lock)
             {
-                OnDisposeManagedResources();
+                if (Disposed) { return; }
+                if (disposing)
+                {
+                    OnDisposeManagedResources();
+                }
+                OnDisposeUnmanagedResources();
+                Disposed = true;
             }
-            OnDisposeUnmanagedResources();
-            Disposed = true;
         }
     }
 }

test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/AspNetCoreHostTestTest.cs

@@ -2,8 +2,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Codebelt.Extensions.Xunit.Hosting.AspNetCore.Assets;
-using Codebelt.Extensions.Xunit.Hosting.AspNetCore.Http;
 using Cuemon.Extensions.IO;
+using Cuemon.Messaging;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@@ -35,8 +35,8 @@ public async Task ShouldHaveResultOfBoolMiddlewareInBody()
 
             Assert.Equal("Hello awesome developers!", context!.Response.Body.ToEncodedString(o => o.LeaveOpen = true));
 
-            var logger = _pipeline.ApplicationServices.GetRequiredService<ILogger<AspNetCoreHostTestTest>>(); 
-            logger.LogInformation("Hello from {0}", nameof(ShouldHaveResultOfBoolMiddlewareInBody)); 
+            var logger = _pipeline.ApplicationServices.GetRequiredService<ILogger<AspNetCoreHostTestTest>>();
+            logger.LogInformation("Hello from {0}", nameof(ShouldHaveResultOfBoolMiddlewareInBody));
 
             await pipeline(context);
 
@@ -50,14 +50,77 @@ public async Task ShouldHaveResultOfBoolMiddlewareInBody()
             Assert.False(options.Value.F);
         }
 
+#if NET9_0_OR_GREATER
+        [Fact]
+        public void ShouldThrowInvalidOperationException_BecauseOneOfTheServicesIsScoped()
+        {
+            var ex = Assert.Throws<InvalidOperationException>(() => _provider.GetServices<ICorrelationToken>());
+
+            TestOutput.WriteLine(ex.Message);
+
+            Assert.Contains("from root provider because it requires scoped service", ex.Message);
+        }
+#endif
+
+        [Fact]
+        public void ShouldHaveAccessToCorrelationTokens_UsingScopedProvider()
+        {
+            using var scope = _provider.CreateScope();
+
+            var firstRequest = scope.ServiceProvider.GetServices<ICorrelationToken>().ToList();
+            var secondRequest = scope.ServiceProvider.GetServices<ICorrelationToken>().ToList();
+
+            TestOutput.WriteLine("----");
+            TestOutput.WriteLines(firstRequest);
+            TestOutput.WriteLine("----");
+            TestOutput.WriteLines(secondRequest);
+
+            Assert.Equal(3, firstRequest.Count);
+            Assert.Equal(3, secondRequest.Count);
+
+            Assert.Same(firstRequest[0], secondRequest[0]);
+            Assert.NotSame(firstRequest[1], secondRequest[1]);
+            Assert.Same(firstRequest[2], secondRequest[2]);
+
+            Assert.Equal(firstRequest[0].CorrelationId, secondRequest[0].CorrelationId);
+            Assert.NotEqual(firstRequest[1].CorrelationId, secondRequest[1].CorrelationId);
+            Assert.Equal(firstRequest[2].CorrelationId, secondRequest[2].CorrelationId);
+        }
+
+        [Fact]
+        public void ShouldHaveAccessToCorrelationTokens_UsingRequestServices() // reference: https://github.com/dotnet/aspnetcore/blob/main/src/Http/Http/src/Features/RequestServicesFeature.cs
+        {
+            var context = _provider.GetRequiredService<IHttpContextAccessor>().HttpContext!;
+
+            var firstRequest = context.RequestServices.GetServices<ICorrelationToken>().ToList();
+            var secondRequest = context.RequestServices.GetServices<ICorrelationToken>().ToList();
+
+            TestOutput.WriteLine("----");
+            TestOutput.WriteLines(firstRequest);
+            TestOutput.WriteLine("----");
+            TestOutput.WriteLines(secondRequest);
+
+            Assert.Equal(3, firstRequest.Count);
+            Assert.Equal(3, secondRequest.Count);
+
+            Assert.Same(firstRequest[0], secondRequest[0]);
+            Assert.NotSame(firstRequest[1], secondRequest[1]);
+            Assert.Same(firstRequest[2], secondRequest[2]);
+
+            Assert.Equal(firstRequest[0].CorrelationId, secondRequest[0].CorrelationId);
+            Assert.NotEqual(firstRequest[1].CorrelationId, secondRequest[1].CorrelationId);
+            Assert.Equal(firstRequest[2].CorrelationId, secondRequest[2].CorrelationId);
+        }
+
         [Fact]
         public void ShouldLogToXunitTestLogging()
         {
+            var context = _provider.GetRequiredService<IHttpContextAccessor>().HttpContext;
             var logger = _pipeline.ApplicationServices.GetRequiredService<ILogger<AspNetCoreHostTestTest>>();
             logger.LogInformation("Hello from {0}", nameof(ShouldLogToXunitTestLogging));
             var store = _pipeline.ApplicationServices.GetRequiredService<ILogger<AspNetCoreHostTestTest>>().GetTestStore();
             var entry = store.Query(entry => entry.Message.Contains("Hello from", StringComparison.OrdinalIgnoreCase)).SingleOrDefault();
-            
+
             Assert.NotNull(entry);
             Assert.Equal("Information: Hello from ShouldLogToXunitTestLogging", entry.Message);
         }
@@ -70,7 +133,7 @@ public override void ConfigureApplication(IApplicationBuilder app)
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddTransient<IHttpContextAccessor, FakeHttpContextAccessor>();
+            services.AddFakeHttpContextAccessor();
             services.Configure<BoolOptions>(o =>
             {
                 o.A = true;
@@ -79,6 +142,10 @@ public override void ConfigureServices(IServiceCollection services)
             });
             services.AddXunitTestLoggingOutputHelperAccessor();
             services.AddXunitTestLogging(TestOutput);
+
+            services.AddSingleton<ICorrelationToken, SingletonCorrelation>();
+            services.AddTransient<ICorrelationToken, TransientCorrelation>();
+            services.AddScoped<ICorrelationToken, ScopedCorrelation>();
         }
     }
 }

test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/Assets/ScopedCorrelation.cs

@@ -0,0 +1,8 @@
+using Cuemon.Messaging;
+
+namespace Codebelt.Extensions.Xunit.Hosting.AspNetCore.Assets
+{
+    public sealed record ScopedCorrelation : CorrelationToken
+    {
+    }
+}

test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/Assets/SingletonCorrelation.cs

@@ -0,0 +1,8 @@
+using Cuemon.Messaging;
+
+namespace Codebelt.Extensions.Xunit.Hosting.AspNetCore.Assets
+{
+    public sealed record SingletonCorrelation : CorrelationToken
+    {
+    }
+}

test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/Assets/TransientCorrelation.cs

@@ -0,0 +1,8 @@
+using Cuemon.Messaging;
+
+namespace Codebelt.Extensions.Xunit.Hosting.AspNetCore.Assets
+{
+    public sealed record TransientCorrelation : CorrelationToken
+    {
+    }
+}

test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cuemon.Extensions.AspNetCore" Version="9.0.0-preview.9" />
-    <PackageReference Include="Cuemon.Extensions.IO" Version="9.0.0-preview.9" />
+    <PackageReference Include="Cuemon.Extensions.AspNetCore" Version="9.0.0-preview.10" />
+    <PackageReference Include="Cuemon.Extensions.IO" Version="9.0.0-preview.10" />
   </ItemGroup>
 
   <ItemGroup>

test/Codebelt.Extensions.Xunit.Hosting.Tests/Codebelt.Extensions.Xunit.Hosting.Tests.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cuemon.Core" Version="9.0.0-preview.9" />
+    <PackageReference Include="Cuemon.Core" Version="9.0.0-preview.10" />
     <PackageReference Include="Xunit.Priority" Version="1.1.6" />
   </ItemGroup>
 

test/Codebelt.Extensions.Xunit.Hosting.Tests/HostTestTest.cs

@@ -14,16 +14,18 @@ namespace Codebelt.Extensions.Xunit.Hosting
     [TestCaseOrderer(PriorityOrderer.Name, PriorityOrderer.Assembly)]
     public class HostTestTest : HostTest<HostFixture>
     {
+        private readonly IServiceScope _scope;
         private readonly Func<IList<ICorrelationToken>> _correlationsFactory;
-        private static readonly ConcurrentBag<ICorrelationToken> ScopedCorrelations = new ConcurrentBag<ICorrelationToken>();
+        private static readonly ConcurrentBag<ICorrelationToken> ScopedCorrelations = new();
 
         public HostTestTest(HostFixture hostFixture, ITestOutputHelper output) : base(hostFixture, output)
         {
-            _correlationsFactory = () => hostFixture.ServiceProvider.GetServices<ICorrelationToken>().ToList();
+            _scope = hostFixture.ServiceProvider.CreateScope();
+            _correlationsFactory = () => _scope.ServiceProvider.GetServices<ICorrelationToken>().ToList();
         }
 
         [Fact, Priority(1)]
-        public void Test_SingletonShouldBeSame()
+        public void Test_SingletonShouldBeSame() // simulate a request
         {
             ScopedCorrelations.Add(_correlationsFactory().Single(c => c is ScopedCorrelation));
             var c1 = _correlationsFactory().Single(c => c is SingletonCorrelation);
@@ -32,7 +34,7 @@ public void Test_SingletonShouldBeSame()
         }
 
         [Fact, Priority(2)]
-        public void Test_TransientShouldBeDifferent()
+        public void Test_TransientShouldBeDifferent() // simulate a request
         {
             ScopedCorrelations.Add(_correlationsFactory().Single(c => c is ScopedCorrelation));
             var c1 = _correlationsFactory().Single(c => c is TransientCorrelation);
@@ -41,23 +43,14 @@ public void Test_TransientShouldBeDifferent()
         }
 
         [Fact, Priority(3)]
-        public void Test_ScopedShouldBeSame()
+        public void Test_ScopedShouldBeSame() // simulate a request
         {
             ScopedCorrelations.Add(_correlationsFactory().Single(c => c is ScopedCorrelation));
             var c1 = _correlationsFactory().Single(c => c is ScopedCorrelation);
             var c2 = _correlationsFactory().Single(c => c is ScopedCorrelation);
             Assert.Equal(c1.CorrelationId, c2.CorrelationId);
         }
 
-        [Fact]
-        public void Test_ScopedShouldBeSameInLastTestRun()
-        {
-            var c1 = _correlationsFactory().Single(c => c is ScopedCorrelation);
-            if (ScopedCorrelations.IsEmpty) { return; }
-            Assert.Equal(3, ScopedCorrelations.Count);
-            Assert.All(ScopedCorrelations, c => Assert.Equal(c1.CorrelationId, c.CorrelationId));
-        }
-
         [Fact]
         public void Test_ShouldHaveConfigurationEntry()
         {
@@ -70,11 +63,16 @@ public void Test_ShouldHaveEnvironmentOfDevelopment()
             Assert.Equal("Development", HostingEnvironment.EnvironmentName);
         }
 
+        protected override void OnDisposeManagedResources()
+        {
+            _scope?.Dispose();
+        }
+
         public override void ConfigureServices(IServiceCollection services)
         {
             services.AddSingleton<ICorrelationToken, SingletonCorrelation>();
             services.AddTransient<ICorrelationToken, TransientCorrelation>();
             services.AddScoped<ICorrelationToken, ScopedCorrelation>();
         }
     }
-}
+}