Move RequestDelegateFactory tests to be shared with RDG

Author: eerhardt

Diff for: src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs

@@ -2043,7 +2043,6 @@ public static IEnumerable<object[]> JsonContextActions
 
     [JsonSerializable(typeof(Todo))]
     [JsonSerializable(typeof(TodoChild))]
-    [JsonSerializable(typeof(IAsyncEnumerable<JsonTodo>))]
     private partial class TestJsonContext : JsonSerializerContext
     { }
 
@@ -2075,64 +2074,6 @@ public async Task RequestDelegateWritesAsJsonResponseBody_WithJsonSerializerCont
         Assert.Equal("Write even more tests!", deserializedResponseBody!.Name);
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task RequestDelegateWritesAsJsonResponseBody_UnspeakableType(bool useJsonContext)
-    {
-        var httpContext = CreateHttpContext();
-        httpContext.RequestServices = new ServiceCollection()
-            .AddSingleton(LoggerFactory)
-            .ConfigureHttpJsonOptions(o => o.SerializerOptions.TypeInfoResolver = useJsonContext ? TestJsonContext.Default : o.SerializerOptions.TypeInfoResolver)
-            .BuildServiceProvider();
-
-        var responseBodyStream = new MemoryStream();
-        httpContext.Response.Body = responseBodyStream;
-
-        Delegate @delegate = IAsyncEnumerable<JsonTodo> () => GetTodosAsync();
-
-        var rdfOptions = new RequestDelegateFactoryOptions() { ServiceProvider = httpContext.RequestServices };
-        var factoryResult = RequestDelegateFactory.Create(@delegate, rdfOptions);
-        var requestDelegate = factoryResult.RequestDelegate;
-
-        await requestDelegate(httpContext);
-
-        var body = JsonSerializer.Deserialize<JsonTodo[]>(responseBodyStream.ToArray(), new JsonSerializerOptions
-        {
-            PropertyNameCaseInsensitive = true
-        });
-
-        Assert.NotNull(body);
-        Assert.Equal(3, body.Length);
-
-        var one = Assert.IsType<JsonTodo>(body[0]);
-        Assert.Equal(1, one.Id);
-        Assert.True(one.IsComplete);
-        Assert.Equal("One", one.Name);
-
-        var two = Assert.IsType<JsonTodo>(body[1]);
-        Assert.Equal(2, two.Id);
-        Assert.False(two.IsComplete);
-        Assert.Equal("Two", two.Name);
-
-        var three = Assert.IsType<JsonTodoChild>(body[2]);
-        Assert.Equal(3, three.Id);
-        Assert.True(three.IsComplete);
-        Assert.Equal("Three", three.Name);
-        Assert.Equal("ThreeChild", three.Child);
-    }
-
-    private static async IAsyncEnumerable<JsonTodo> GetTodosAsync()
-    {
-        yield return new JsonTodo() { Id = 1, IsComplete = true, Name = "One" };
-
-        // ensure this is async
-        await Task.Yield();
-
-        yield return new JsonTodo() { Id = 2, IsComplete = false, Name = "Two" };
-        yield return new JsonTodoChild() { Id = 3, IsComplete = true, Name = "Three", Child = "ThreeChild" };
-    }
-
     [Fact]
     public void CreateDelegateThrows_WhenGetJsonTypeInfoFail()
     {

Diff for: src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs

@@ -192,8 +192,6 @@ public ServiceProvider CreateServiceProvider(Action<IServiceCollection> configur
     {
         var serviceCollection = new ServiceCollection();
         serviceCollection.AddSingleton(LoggerFactory);
-        var jsonOptions = new JsonOptions();
-        serviceCollection.AddSingleton(Options.Create(jsonOptions));
         if (configureServices is not null)
         {
             configureServices(serviceCollection);

Diff for: src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Responses.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 using Microsoft.AspNetCore.Routing.Internal;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Primitives;
 using System.Text;
@@ -248,4 +249,40 @@ public async Task MapAction_HandlesCompletedTaskReturn()
         await endpoints[1].RequestDelegate(httpContext);
         await VerifyResponseBodyAsync(httpContext, string.Empty);
     }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task RequestDelegateWritesAsJsonResponseBody_UnspeakableType(bool useJsonContext)
+    {
+        var source = """
+app.MapGet("/todos", () => GetTodosAsync());
+
+static async IAsyncEnumerable<JsonTodo> GetTodosAsync()
+{
+    yield return new JsonTodo() { Id = 1, IsComplete = true, Name = "One" };
+
+    // ensure this is async
+    await Task.Yield();
+
+    yield return new JsonTodoChild() { Id = 2, IsComplete = false, Name = "Two", Child = "TwoChild" };
+}
+""";
+        var (_, compilation) = await RunGeneratorAsync(source);
+        var serviceProvider = CreateServiceProvider(serviceCollection =>
+        {
+            if (useJsonContext)
+            {
+                serviceCollection.ConfigureHttpJsonOptions(o => o.SerializerOptions.TypeInfoResolver = SharedTestJsonContext.Default);
+            }
+        });
+        var endpoint = GetEndpointFromCompilation(compilation, serviceProvider: serviceProvider);
+
+        var httpContext = CreateHttpContext(serviceProvider);
+
+        await endpoint.RequestDelegate(httpContext);
+
+        var expectedBody = """[{"id":1,"name":"One","isComplete":true},{"$type":"JsonTodoChild","child":"TwoChild","id":2,"name":"Two","isComplete":false}]""";
+        await VerifyResponseBodyAsync(httpContext, expectedBody);
+    }
 }

Diff for: src/Http/Http.Extensions/test/RequestDelegateGenerator/SharedTypes.cs

@@ -64,6 +64,10 @@ public class JsonTodoChild : JsonTodo
     public string? Child { get; set; }
 }
 
+[JsonSerializable(typeof(IAsyncEnumerable<JsonTodo>))]
+public partial class SharedTestJsonContext : JsonSerializerContext
+{ }
+
 public class CustomFromBodyAttribute : Attribute, IFromBodyMetadata
 {
     public bool AllowEmpty { get; set; }