Include OWIN into solution filter (#627)

Author: twsouthwick

Microsoft.AspNetCore.SystemWebAdapters.slnf

@@ -2,16 +2,18 @@
   "solution": {
     "path": "Microsoft.AspNetCore.SystemWebAdapters.slnx",
     "projects": [
+      "src\\Aspire.Hosting.IncrementalMigration\\Aspire.Hosting.IncrementalMigration.csproj",
+      "src\\Aspire.Microsoft.AspNetCore.SystemWebAdapters\\Aspire.Microsoft.AspNetCore.SystemWebAdapters.csproj",
       "src\\Microsoft.AspNetCore.SystemWebAdapters.Abstractions\\Microsoft.AspNetCore.SystemWebAdapters.Abstractions.csproj",
       "src\\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj",
       "src\\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj",
+      "src\\Microsoft.AspNetCore.SystemWebAdapters.Owin\\Microsoft.AspNetCore.SystemWebAdapters.Owin.csproj",
       "src\\Microsoft.AspNetCore.SystemWebAdapters\\Microsoft.AspNetCore.SystemWebAdapters.csproj",
-      "src\\Aspire.Hosting.IncrementalMigration\\Aspire.Hosting.IncrementalMigration.csproj",
-      "src\\Aspire.Microsoft.AspNetCore.SystemWebAdapters\\Aspire.Microsoft.AspNetCore.SystemWebAdapters.csproj",
       "test\\Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests\\Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests.csproj",
       "test\\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests\\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj",
       "test\\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests\\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj",
       "test\\Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests\\Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj",
+      "test\\Microsoft.AspNetCore.SystemWebAdapters.Owin.Tests\\Microsoft.AspNetCore.SystemWebAdapters.Owin.Tests.csproj",
       "test\\Microsoft.AspNetCore.SystemWebAdapters.Tests\\Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj"
     ]
   }

test/Microsoft.AspNetCore.SystemWebAdapters.Owin.Tests/OwinAppTests.cs

@@ -25,13 +25,13 @@ public class OwinAppTests
     public async Task EventIntegration()
     {
         // Arrange
-        var result = new Result();
+        var tcs = new TaskCompletionSource<Result>();
         var builder = WebApplication.CreateSlimBuilder();
 
         builder.Logging.AddDebug();
         builder.WebHost.UseTestServer(options => options.AllowSynchronousIO = true);
 
-        builder.Services.AddSingleton<IStartupFilter>(new ResultWriterStartupFilter(result));
+        builder.Services.AddSingleton<IStartupFilter>(new ResultWriterStartupFilter(tcs));
         builder.Services.AddSystemWebAdapters()
             .AddOwinApp(app =>
             {
@@ -64,6 +64,8 @@ public async Task EventIntegration()
         using var response = await app.GetTestClient().GetAsync(new Uri("/", UriKind.Relative));
 
         // Assert
+        var result = await tcs.Task;
+
         Assert.Equal([
             "Before: AuthN",
             "Before: Owin1a",
@@ -87,12 +89,12 @@ public async Task EventIntegration()
     public async Task UseOwinTests()
     {
         // Arrange
-        var result = new Result();
+        var tcs = new TaskCompletionSource<Result>();
         var builder = WebApplication.CreateSlimBuilder();
 
         builder.WebHost.UseTestServer(options => options.AllowSynchronousIO = true);
 
-        builder.Services.AddSingleton<IStartupFilter>(new ResultWriterStartupFilter(result));
+        builder.Services.AddSingleton<IStartupFilter>(new ResultWriterStartupFilter(tcs));
 
         var app = builder.Build();
 
@@ -125,6 +127,7 @@ public async Task UseOwinTests()
         var response = await app.GetTestClient().GetStringAsync(new Uri("/", UriKind.Relative));
 
         // Assert
+        var result = await tcs.Task;
         Assert.Equal("Hello", response);
         Assert.Equal([
             "Before: a",
@@ -169,14 +172,21 @@ public override Task Invoke(IOwinContext context)
         }
     }
 
-    private sealed class ResultWriterStartupFilter(Result result) : IStartupFilter
+    // Use a TaskCompletionSource to make sure we wait until things are completed
+    private sealed class ResultWriterStartupFilter(TaskCompletionSource<Result> tcs) : IStartupFilter
     {
         public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
             => builder =>
             {
                 builder.Use(async (ctx, next) =>
                 {
+                    var result = new Result();
                     ctx.Features.Set(result);
+                    ctx.Response.OnCompleted(() =>
+                    {
+                        tcs.SetResult(result);
+                        return Task.CompletedTask;
+                    });
                     await next(ctx);
                 });
                 next(builder);