Separated part of the logic concerning registering the HTTP context (#358)

Author: ivaylokenov

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

@@ -4,7 +4,6 @@
     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;
@@ -81,6 +80,9 @@ 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;
@@ -112,17 +114,6 @@ 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;
 

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

@@ -3,20 +3,17 @@
     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
         {
@@ -27,15 +24,6 @@ public static IRouter Router
             }
         }
 
-        public static RequestDelegate Pipeline
-        {
-            get
-            {
-                TryLockedInitialization();
-                return pipeline;
-            }
-        }
-
         internal static Action<IRouteBuilder> AdditionalRouting { get; set; }
 
         private static void PrepareApplicationAndRouting()
@@ -57,38 +45,11 @@ 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

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Http/HttpContextMock.cs

@@ -25,7 +25,7 @@ public class HttpContextMock : HttpContext
         public HttpContextMock()
             : this(new FeatureCollection())
         {
-            this.PrepareFeatures();
+            this.PrepareDefaultFeatures();
             this.PrepareDefaultValues();
         }
 
@@ -50,7 +50,7 @@ private HttpContextMock(HttpContext context)
         {
             CommonValidator.CheckForNullReference(context, nameof(HttpContext));
 
-            this.PrepareFeatures();
+            this.PrepareDefaultFeatures();
             this.PrepareData(context);
             this.PrepareDefaultValues();
         }
@@ -119,7 +119,7 @@ public override ClaimsPrincipal User
         public static HttpContextMock From(HttpContext httpContext)
             => new HttpContextMock(httpContext);
 
-        private void PrepareFeatures()
+        private void PrepareDefaultFeatures()
         {
             if (this.Features.Get<IHttpRequestFeature>() == null)
             {

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

@@ -16,8 +16,6 @@ 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>();
 
@@ -28,8 +26,7 @@ public static HttpContextMock CreateHttpContextMock()
         {
             var httpContextFactory = TestServiceProvider.GetService<IHttpContextFactory>();
             var httpContext = httpContextFactory != null
-                ? HttpContextMock.From(httpContextFactory
-                    .Create(new FeatureCollection(DefaultHttpFeatures)))
+                ? HttpContextMock.From(httpContextFactory.Create(new FeatureCollection()))
                 : new HttpContextMock();
 
             SetHttpContextToAccessor(httpContext);

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

@@ -1,4 +1,8 @@
-namespace MyTested.AspNetCore.Mvc.Test
+using Microsoft.AspNetCore.Hosting;
+using MyTested.AspNetCore.Mvc.Test.Setups.Http;
+using MyTested.AspNetCore.Mvc.Test.Setups.StartupFilters;
+
+namespace MyTested.AspNetCore.Mvc.Test
 {
     using System.Collections.Generic;
     using System.Linq;
@@ -41,7 +45,7 @@ public void CustomConfigureOptionsShouldNotOverrideTheDefaultTestOnes()
 
 
         [Fact]
-        public void IHttpContextAccessorShouldWorkCorrectlySynchronously()
+        public void HttpContextAccessorShouldWorkCorrectlySynchronously()
         {
             MyApplication
                 .StartsFrom<DefaultStartup>()
@@ -80,7 +84,7 @@ public void IHttpContextAccessorShouldWorkCorrectlySynchronously()
         }
 
         [Fact]
-        public void IHttpContextAccessorShouldWorkCorrectlyAsynchronously()
+        public void HttpContextAccessorShouldWorkCorrectlyAsynchronously()
         {
             MyApplication
                 .StartsFrom<DefaultStartup>()

test/MyTested.AspNetCore.Mvc.Pipeline.Test/TestStartup.cs

@@ -1,7 +1,5 @@
 namespace MyTested.AspNetCore.Mvc.Test
 {
-    using Microsoft.AspNetCore.Builder;
-    using Microsoft.Extensions.DependencyInjection;
     using Setups;
 
     public class TestStartup : DefaultStartup