Application builder now prepares default HTTP features extracted by the middleware, which are injected in every HttpContextMock (#358)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/ApplicationBuilderMock.cs

@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using Http;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Http.Features;
@@ -45,13 +46,6 @@ public ApplicationBuilderMock(IServiceProvider serviceProvider)
             this.CheckForEndpointRouting(serviceProvider);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ApplicationBuilderMock"/> class.
-        /// </summary>
-        /// <param name="builder">Application builder to copy properties from.</param>
-        public ApplicationBuilderMock(IApplicationBuilder builder)
-            => this.Properties = builder.Properties;
-
         /// <summary>
         /// Gets or sets the current application services.
         /// </summary>
@@ -87,9 +81,6 @@ public IServiceProvider ApplicationServices
         /// <returns>The same <see cref="IApplicationBuilder"/>.</returns>
         public IApplicationBuilder Use(Func<RequestDelegate, RequestDelegate> middleware)
         {
-            this.ExtractEndpointRoutes(middleware);
-            this.ExtractLegacyRoutes(middleware);
-
             this.components.Add(middleware);
 
             return this;
@@ -99,10 +90,10 @@ public IApplicationBuilder Use(Func<RequestDelegate, RequestDelegate> middleware
         /// Returns new instance of <see cref="IApplicationBuilder"/>. Not used in the actual testing.
         /// </summary>
         /// <returns>Result of <see cref="IApplicationBuilder"/> type.</returns>
-        public IApplicationBuilder New() => new ApplicationBuilderMock(this);
+        public IApplicationBuilder New() => new ApplicationBuilderMock(this.ApplicationServices);
 
         /// <summary>
-        /// Builds the application delegate, which will process the incoming HTTP requests. Not used in the actual testing.
+        /// Builds the application delegate, which will process the incoming HTTP requests. Prepares the HTTP context used in the tests.
         /// </summary>
         /// <returns>Result of <see cref="RequestDelegate"/> type.</returns>
         public RequestDelegate Build()
@@ -121,6 +112,17 @@ public RequestDelegate Build()
             return app;
         }
 
+        public void ExtractRouteConfiguration()
+        {
+            this.Routes = new RouteCollection();
+
+            this.components.ForEach(component =>
+            {
+                this.ExtractEndpointRoutes(component);
+                this.ExtractLegacyRoutes(component);
+            });
+        }
+
         private T GetProperty<T>(string key)
             => this.Properties.TryGetValue(key, out var value) ? (T)value : default;
 
@@ -178,11 +180,8 @@ private void ExtractEndpointRoutes(Func<RequestDelegate, RequestDelegate> middle
                         }
                     });
 
-                foreach (var routeEndpointData in routeEndpoints)
+                foreach (var (routeName, routeEndpoint) in routeEndpoints)
                 {
-                    var routeName = routeEndpointData.Key;
-                    var routeEndpoint = routeEndpointData.Value;
-
                     var routePattern = routeEndpoint.RoutePattern;
                     var rawRouteText = routePattern.RawText;
 

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationRouter.cs

@@ -3,16 +3,20 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Http;
     using Routing;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Hosting;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Features;
     using Microsoft.AspNetCore.Routing;
     using Microsoft.Extensions.DependencyInjection;
     using Utilities.Extensions;
 
     public static partial class TestApplication
     {
         private static volatile IRouter router;
+        private static volatile RequestDelegate pipeline;
 
         public static IRouter Router
         {
@@ -23,6 +27,15 @@ public static IRouter Router
             }
         }
 
+        public static RequestDelegate Pipeline
+        {
+            get
+            {
+                TryLockedInitialization();
+                return pipeline;
+            }
+        }
+
         internal static Action<IRouteBuilder> AdditionalRouting { get; set; }
 
         private static void PrepareApplicationAndRouting()
@@ -44,6 +57,38 @@ private static void PrepareApplicationAndRouting()
 
             AdditionalApplicationConfiguration?.Invoke(applicationBuilder);
 
+            PreparePipelineAndFeatures(applicationBuilder);
+            PrepareRouter(applicationBuilder);
+        }
+
+        private static void PreparePipelineAndFeatures(IApplicationBuilder applicationBuilder)
+        {
+            pipeline = applicationBuilder.Build();
+
+            var httpContext = new DefaultHttpContext();
+
+            var featuresToRemove = new FeatureCollection(httpContext.Features);
+
+            pipeline(httpContext);
+
+            var defaultFeatures = new FeatureCollection();
+
+            httpContext.Features.ForEach(feature =>
+            {
+                var (type, value) = feature;
+                if (featuresToRemove[type] == null)
+                {
+                    defaultFeatures[type] = value;
+                }
+            });
+
+            TestHelper.DefaultHttpFeatures = defaultFeatures;
+        }
+
+        private static void PrepareRouter(ApplicationBuilderMock applicationBuilder)
+        {
+            applicationBuilder.ExtractRouteConfiguration();
+
             var routeBuilder = new RouteBuilder(applicationBuilder)
             {
                 DefaultHandler = RouteHandlerMock.Null
@@ -54,7 +99,7 @@ private static void PrepareApplicationAndRouting()
                 var route = applicationBuilder.Routes[i];
                 routeBuilder.Routes.Add(route);
             }
-            
+
             AdditionalRouting?.Invoke(routeBuilder);
 
             var routeBuilderRoutes = routeBuilder.Routes;

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Server/TestWebServer.cs

@@ -3,6 +3,7 @@
     using System;
     using Configuration;
     using Microsoft.AspNetCore.Hosting;
+    using Microsoft.Extensions.FileProviders;
 
     public static partial class TestWebServer
     {
@@ -18,7 +19,8 @@ private static IWebHostEnvironment PrepareEnvironment()
             {
                 ApplicationName = ApplicationName,
                 EnvironmentName = ServerTestConfiguration.General.EnvironmentName,
-                ContentRootPath = AppContext.BaseDirectory
+                ContentRootPath = AppContext.BaseDirectory,
+                WebRootFileProvider = new NullFileProvider()
             };
 
         internal static void ResetConfigurationAndAssemblies()

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestHelper.cs

@@ -15,7 +15,9 @@
     public static class TestHelper
     {
         public static Action GlobalTestCleanup { get; set; }
-        
+
+        public static IFeatureCollection DefaultHttpFeatures { get; set; } = new FeatureCollection();
+
         public static ISet<IHttpFeatureRegistrationPlugin> HttpFeatureRegistrationPlugins { get; }
             = new HashSet<IHttpFeatureRegistrationPlugin>();
 
@@ -26,7 +28,8 @@ public static HttpContextMock CreateHttpContextMock()
         {
             var httpContextFactory = TestServiceProvider.GetService<IHttpContextFactory>();
             var httpContext = httpContextFactory != null
-                ? HttpContextMock.From(httpContextFactory.Create(new FeatureCollection()))
+                ? HttpContextMock.From(httpContextFactory
+                    .Create(new FeatureCollection(DefaultHttpFeatures)))
                 : new HttpContextMock();
 
             SetHttpContextToAccessor(httpContext);

test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs

@@ -854,7 +854,7 @@ public void StartupFiltersShouldBeRegisteredAndConsidered()
             var sameStartupFilter = TestServiceProvider.GetService<IStartupFilter>() as CustomStartupFilter;
 
             Assert.NotNull(sameStartupFilter);
-            Assert.True(sameStartupFilter.ConfigurationRegistered);
+            Assert.True(sameStartupFilter.Registered);
 
             MyApplication.StartsFrom<DefaultStartup>();
         }

test/MyTested.AspNetCore.Mvc.Test.Setups/Http/CustomHttpFeature.cs

@@ -2,6 +2,5 @@
 {
     public class CustomHttpFeature
     {
-
     }
 }

test/MyTested.AspNetCore.Mvc.Test.Setups/StartupFilters/CustomStartupFilter.cs

@@ -7,12 +7,12 @@
 
     public class CustomStartupFilter : IStartupFilter
     {
-        public bool ConfigurationRegistered { get; private set; }
+        public bool Registered { get; private set; }
 
         public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
             => app =>
             {
-                this.ConfigurationRegistered = true;
+                this.Registered = true;
 
                 app.Use(async (context, nextMiddleware) =>
                 {