#310 Do not automatically wrap IFeatureCollections.

aspnet · Oct 7, 2015 · f88b206 · f88b206
1 parent 7441855
commit f88b206
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/src/Microsoft.AspNet.Hosting/Builder/HttpContextFactory.cs b/src/Microsoft.AspNet.Hosting/Builder/HttpContextFactory.cs
@@ -11,7 +11,7 @@ public class HttpContextFactory : IHttpContextFactory
     {
         public HttpContext CreateHttpContext(IFeatureCollection featureCollection)
         {
-            return new DefaultHttpContext(new FeatureCollection(featureCollection));
+            return new DefaultHttpContext(featureCollection);
         }
     }
 }
diff --git a/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs b/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
@@ -308,29 +308,6 @@ public void HostingEngine_CreatesDefaultRequestIdentifierFeature_IfNotPresent()
             Assert.IsType<FastHttpRequestIdentifierFeature>(httpContext.Features.Get<IHttpRequestIdentifierFeature>());
         }
 
-        [Fact]
-        public void Hosting_CreatesDefaultRequestIdentifierFeature_IfNotPresent_ForImmutableFeatureCollection()
-        {
-            // Arrange
-            HttpContext httpContext = null;
-            var requestDelegate = new RequestDelegate(innerHttpContext =>
-            {
-                httpContext = innerHttpContext;
-                return Task.FromResult(0);
-            });
-
-            _featuresSupportedByThisHost = new ReadOnlyFeatureCollection();
-
-            var hostingEngine = CreateHostingEngine(requestDelegate);
-
-            // Act
-            var disposable = hostingEngine.Start();
-
-            // Assert
-            Assert.NotNull(httpContext);
-            Assert.IsType<FastHttpRequestIdentifierFeature>(httpContext.Features.Get<IHttpRequestIdentifierFeature>());
-        }
-
         [Fact]
         public void HostingEngine_DoesNot_CreateDefaultRequestIdentifierFeature_IfPresent()
         {

diff --git a/test/Microsoft.AspNet.Hosting.Tests/HttpContextFactoryFacts.cs b/test/Microsoft.AspNet.Hosting.Tests/HttpContextFactoryFacts.cs
@@ -16,7 +16,7 @@ public void Mutable_FeatureCollection_Wrapped_For_OwinFeatureCollection()
         {
             var env = new Dictionary<string, object>();
             var contextFactory = new HttpContextFactory();
-            var context = contextFactory.CreateHttpContext(new OwinFeatureCollection(env));
+            var context = contextFactory.CreateHttpContext(new FeatureCollection(new OwinFeatureCollection(env)));
 
             // Setting a feature will throw if the above feature collection is not wrapped in a mutable feature collection.
             context.Features.Set<ICustomFeature>(new CustomFeature(100));