huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Clear route values after middleware invocation." 

This reverts commit c54a7209d7.
This commit is contained in:
N. Taylor Mullen 2019-08-12 13:11:21 -07:00
parent e8917fc92f
commit 18391dd2e4
3 changed files with 29 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Http/Routing/src/EndpointRoutingMiddleware.cs
View File

@ -3,10 +3,10 @@
using System;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Routing.Matching;
using Microsoft.Extensions.Logging;
@ -116,9 +116,6 @@ namespace Microsoft.AspNetCore.Routing
{
// This allows a second call in a single request (such as from the ErrorHandlerMiddleware) to perform routing again.
httpContext.SetEndpoint(endpoint: null);
var routeValuesFeature = httpContext.Features.Get<IRouteValuesFeature>();
routeValuesFeature?.RouteValues?.Clear();
}
}

3
src/Http/Routing/test/UnitTests/Builder/EndpointRoutingApplicationBuilderExtensionsTest.cs
View File

@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Builder
}
[Fact]
public async Task UseRouting_ServicesRegistered_Match_DoesNotSetFeature()
public async Task UseRouting_ServicesRegistered_Match_DoesNotSetsFeature()
{
// Arrange
var endpoint = new RouteEndpoint(
@ -104,6 +104,7 @@ namespace Microsoft.AspNetCore.Builder
// Assert
var feature = httpContext.Features.Get<IEndpointFeature>();
Assert.NotNull(feature);
Assert.Same(endpoint, httpContext.GetEndpoint());
}
[Fact]

86
src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs
View File

@ -102,26 +102,6 @@ namespace Microsoft.AspNetCore.Routing
Assert.Null(endpointFeature.Endpoint);
}
[Fact]
public async Task Invoke_OnCall_SetsEndpointFeatureAndResetsRouteValues()
{
// Arrange
var httpContext = CreateHttpContext();
var initialRouteData = new RouteData();
initialRouteData.Values["test"] = true;
httpContext.Features.Set<IRoutingFeature>(new RoutingFeature()
{
RouteData = initialRouteData,
});
var middleware = CreateMiddleware();
// Act
await middleware.Invoke(httpContext);
// Assert
Assert.Null(httpContext.GetRouteValue("test"));
}
[Fact]
public async Task Invoke_SkipsRoutingAndMaintainsEndpoint_IfEndpointSet()
{
@ -182,29 +162,22 @@ namespace Microsoft.AspNetCore.Routing
{
// Arrange
var httpContext = CreateHttpContext();
var nextCalled = false;
var middleware = CreateMiddleware(next: context =>
{
var routeData = httpContext.GetRouteData();
var routeValue = httpContext.GetRouteValue("controller");
var routeValuesFeature = httpContext.Features.Get<IRouteValuesFeature>();
nextCalled = true;
var middleware = CreateMiddleware();
// Assert
Assert.NotNull(routeData);
Assert.Equal("Home", (string)routeValue);
// changing route data value is reflected in endpoint feature values
routeData.Values["testKey"] = "testValue";
Assert.Equal("testValue", routeValuesFeature.RouteValues["testKey"]);
return Task.CompletedTask;
});
// Act & Assert
// Act
await middleware.Invoke(httpContext);
Assert.True(nextCalled);
var routeData = httpContext.GetRouteData();
var routeValue = httpContext.GetRouteValue("controller");
var routeValuesFeature = httpContext.Features.Get<IRouteValuesFeature>();
// Assert
Assert.NotNull(routeData);
Assert.Equal("Home", (string)routeValue);
// changing route data value is reflected in endpoint feature values
routeData.Values["testKey"] = "testValue";
Assert.Equal("testValue", routeValuesFeature.RouteValues["testKey"]);
}
[Fact]
@ -212,29 +185,22 @@ namespace Microsoft.AspNetCore.Routing
{
// Arrange
var httpContext = CreateHttpContext();
var called = false;
var middleware = CreateMiddleware(next: context =>
{
var routeData = httpContext.GetRouteData();
var routeValue = httpContext.GetRouteValue("controller");
var routeValuesFeature = httpContext.Features.Get<IRouteValuesFeature>();
called = true;
var middleware = CreateMiddleware();
// Assert
Assert.NotNull(routeData);
Assert.Equal("Home", (string)routeValue);
// changing route data value is reflected in endpoint feature values
routeData.Values["testKey"] = "testValue";
Assert.Equal("testValue", routeValuesFeature.RouteValues["testKey"]);
return Task.CompletedTask;
});
// Act & Assert
// Act
await middleware.Invoke(httpContext);
Assert.True(called);
var routeData = httpContext.GetRouteData();
var routeValue = httpContext.GetRouteValue("controller");
var routeValuesFeature = httpContext.Features.Get<IRouteValuesFeature>();
// Assert
Assert.NotNull(routeData);
Assert.Equal("Home", (string)routeValue);
// changing route data value is reflected in endpoint feature values
routeData.Values["testKey"] = "testValue";
Assert.Equal("testValue", routeValuesFeature.RouteValues["testKey"]);
}
[Fact]