Fix service providerFixed tests and PR feedback

dotnet · May 15, 2021 · 01d048c · 01d048c
1 parent 2a25069
commit 01d048c
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 8 deletions.
diff --git a/src/Http/Http.Extensions/src/RequestDelegateFactory.cs b/src/Http/Http.Extensions/src/RequestDelegateFactory.cs
@@ -809,7 +809,7 @@ private class FactoryContext
         {
             public Type? JsonRequestBodyType { get; set; }
             public bool AllowEmptyRequestBody { get; set; }
-            public IServiceProvider? ServiceProvider { get; set; }
+            public IServiceProvider? ServiceProvider { get; init; }
 
             public bool UsingTempSourceString { get; set; }
             public List<(ParameterExpression, Expression)> TryParseParams { get; } = new();

diff --git a/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs b/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs
@@ -1200,9 +1200,28 @@ public override void Write(byte[] buffer, int offset, int count)
             }
         }
 
-        private class EmptyServiceProvdier : IServiceProvider
+        private class EmptyServiceProvdier : IServiceScope, IServiceProvider, IServiceScopeFactory
         {
-            public object? GetService(Type serviceType) => null;
+            public IServiceProvider ServiceProvider => this;
+
+            public IServiceScope CreateScope()
+            {
+                return new EmptyServiceProvdier();
+            }
+
+            public void Dispose()
+            {
+
+            }
+
+            public object? GetService(Type serviceType)
+            {
+                if (serviceType == typeof(IServiceScopeFactory))
+                {
+                    return this;
+                }
+                return null;
+            }
         }
 
         private class TestHttpRequestLifetimeFeature : IHttpRequestLifetimeFeature

diff --git a/src/Http/Routing/test/UnitTests/Builder/MinimalActionEndpointRouteBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/Builder/MinimalActionEndpointRouteBuilderExtensionsTest.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
 
@@ -28,7 +29,7 @@ private RouteEndpointBuilder GetRouteEndpointBuilder(IEndpointRouteBuilder endpo
         [Fact]
         public void MapEndpoint_PrecedenceOfMetadata_BuilderMetadataReturned()
         {
-            var builder = new DefaultEndpointRouteBuilder(Mock.Of<IApplicationBuilder>());
+            var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(new EmptyServiceProvdier()));
 
             [HttpMethod("ATTRIBUTE")]
             void TestAction()
@@ -60,7 +61,7 @@ string GetMethod(object metadata)
         [Fact]
         public void MapGet_BuildsEndpointWithCorrectMethod()
         {
-            var builder = new DefaultEndpointRouteBuilder(Mock.Of<IApplicationBuilder>());
+            var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(new EmptyServiceProvdier()));
             _ = builder.MapGet("/", (Action)(() => { }));
 
             var dataSource = GetBuilderEndpointDataSource(builder);
@@ -80,7 +81,7 @@ public void MapGet_BuildsEndpointWithCorrectMethod()
         [Fact]
         public void MapPost_BuildsEndpointWithCorrectMethod()
         {
-            var builder = new DefaultEndpointRouteBuilder(Mock.Of<IApplicationBuilder>());
+            var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(new EmptyServiceProvdier()));
             _ = builder.MapPost("/", (Action)(() => { }));
 
             var dataSource = GetBuilderEndpointDataSource(builder);
@@ -100,7 +101,7 @@ public void MapPost_BuildsEndpointWithCorrectMethod()
         [Fact]
         public void MapPut_BuildsEndpointWithCorrectMethod()
         {
-            var builder = new DefaultEndpointRouteBuilder(Mock.Of<IApplicationBuilder>());
+            var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(new EmptyServiceProvdier()));
             _ = builder.MapPut("/", (Action)(() => { }));
 
             var dataSource = GetBuilderEndpointDataSource(builder);
@@ -120,7 +121,7 @@ public void MapPut_BuildsEndpointWithCorrectMethod()
         [Fact]
         public void MapDelete_BuildsEndpointWithCorrectMethod()
         {
-            var builder = new DefaultEndpointRouteBuilder(Mock.Of<IApplicationBuilder>());
+            var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(new EmptyServiceProvdier()));
             _ = builder.MapDelete("/", (Action)(() => { }));
 
             var dataSource = GetBuilderEndpointDataSource(builder);
@@ -148,5 +149,29 @@ public HttpMethodAttribute(params string[] httpMethods)
                 HttpMethods = httpMethods;
             }
         }
+
+        private class EmptyServiceProvdier : IServiceScope, IServiceProvider, IServiceScopeFactory
+        {
+            public IServiceProvider ServiceProvider => this;
+
+            public IServiceScope CreateScope()
+            {
+                return new EmptyServiceProvdier();
+            }
+
+            public void Dispose()
+            {
+
+            }
+
+            public object? GetService(Type serviceType)
+            {
+                if (serviceType == typeof(IServiceScopeFactory))
+                {
+                    return this;
+                }
+                return null;
+            }
+        }
     }
 }