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

Fixes for changes in routing 

Routing now requires the RouteOptions in the service provider.
This commit is contained in:
Ryan Nowak 2015-02-11 15:49:27 -08:00
parent 731722ae36
commit 1721d90065
2 changed files with 101 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.AspNet.Mvc.Core.Test/RemoteAttributeTest.cs
View File

@ -577,6 +577,8 @@ namespace Microsoft.AspNet.Mvc
.SetupGet(options => options.Options) .SetupGet(options => options.Options)
.Returns(routeOptions); .Returns(routeOptions);
serviceCollection.AddInstance<IOptions<RouteOptions>>(accessor.Object);
serviceCollection.AddInstance<IInlineConstraintResolver>( serviceCollection.AddInstance<IInlineConstraintResolver>(
new DefaultInlineConstraintResolver(accessor.Object)); new DefaultInlineConstraintResolver(accessor.Object));

161
test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Core;
using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.Internal;
using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
@ -25,7 +26,7 @@ namespace Microsoft.AspNet.Mvc
string expectedPath) string expectedPath)
{ {
// Arrange // Arrange
var context = CreateHttpContext(appRoot); var context = CreateHttpContext(GetServices(), appRoot);
var contextAccessor = CreateActionContext(context); var contextAccessor = CreateActionContext(context);
var urlHelper = CreateUrlHelper(contextAccessor); var urlHelper = CreateUrlHelper(contextAccessor);
@ -48,7 +49,7 @@ namespace Microsoft.AspNet.Mvc
string expectedPath) string expectedPath)
{ {
// Arrange // Arrange
var context = CreateHttpContext(appRoot); var context = CreateHttpContext(GetServices(), appRoot);
var contextAccessor = CreateActionContext(context); var contextAccessor = CreateActionContext(context);
var urlHelper = CreateUrlHelper(contextAccessor); var urlHelper = CreateUrlHelper(contextAccessor);
@ -333,7 +334,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithDictionary() public void RouteUrlWithDictionary()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(values: new RouteValueDictionary( var url = urlHelper.RouteUrl(values: new RouteValueDictionary(
@ -352,7 +354,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithEmptyHostName() public void RouteUrlWithEmptyHostName()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(routeName: "namedroute", var url = urlHelper.RouteUrl(routeName: "namedroute",
@ -374,7 +377,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithEmptyProtocol() public void RouteUrlWithEmptyProtocol()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(routeName: "namedroute", var url = urlHelper.RouteUrl(routeName: "namedroute",
@ -396,7 +400,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithNullProtocol() public void RouteUrlWithNullProtocol()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(routeName: "namedroute", var url = urlHelper.RouteUrl(routeName: "namedroute",
@ -418,7 +423,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithNullProtocolAndNullHostName() public void RouteUrlWithNullProtocolAndNullHostName()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(routeName: "namedroute", var url = urlHelper.RouteUrl(routeName: "namedroute",
@ -440,7 +446,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithObjectProperties() public void RouteUrlWithObjectProperties()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(new { Action = "newaction", Controller = "home2", id = "someid" }); var url = urlHelper.RouteUrl(new { Action = "newaction", Controller = "home2", id = "someid" });
@ -453,7 +460,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithProtocol() public void RouteUrlWithProtocol()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(routeName: "namedroute", var url = urlHelper.RouteUrl(routeName: "namedroute",
@ -473,7 +481,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrl_WithUnicodeHost_DoesNotPunyEncodeTheHost() public void RouteUrl_WithUnicodeHost_DoesNotPunyEncodeTheHost()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(routeName: "namedroute", var url = urlHelper.RouteUrl(routeName: "namedroute",
@ -494,7 +503,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithRouteNameAndDefaults() public void RouteUrlWithRouteNameAndDefaults()
{ {
// Arrange // Arrange
var routeCollection = GetRouter("MyRouteName", "any/url"); var services = GetServices();
var routeCollection = GetRouter(services, "MyRouteName", "any/url");
var urlHelper = CreateUrlHelper("/app", routeCollection); var urlHelper = CreateUrlHelper("/app", routeCollection);
// Act // Act
@ -508,7 +518,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithRouteNameAndDictionary() public void RouteUrlWithRouteNameAndDictionary()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(routeName: "namedroute", var url = urlHelper.RouteUrl(routeName: "namedroute",
@ -528,7 +539,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithRouteNameAndObjectProperties() public void RouteUrlWithRouteNameAndObjectProperties()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl(routeName: "namedroute", var url = urlHelper.RouteUrl(routeName: "namedroute",
@ -547,7 +559,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithUrlRouteContext_ReturnsExpectedResult() public void RouteUrlWithUrlRouteContext_ReturnsExpectedResult()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
var routeContext = new UrlRouteContext() var routeContext = new UrlRouteContext()
{ {
@ -574,7 +587,8 @@ namespace Microsoft.AspNet.Mvc
public void RouteUrlWithAllParameters_ReturnsExpectedResult() public void RouteUrlWithAllParameters_ReturnsExpectedResult()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.RouteUrl( var url = urlHelper.RouteUrl(
@ -597,7 +611,8 @@ namespace Microsoft.AspNet.Mvc
public void UrlAction_RouteValuesAsDictionary_CaseSensitive() public void UrlAction_RouteValuesAsDictionary_CaseSensitive()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// We're using a dictionary with a case-sensitive comparer and loading it with data // We're using a dictionary with a case-sensitive comparer and loading it with data
// using casings differently from the route. This should still successfully generate a link. // using casings differently from the route. This should still successfully generate a link.
@ -624,7 +639,8 @@ namespace Microsoft.AspNet.Mvc
public void UrlAction_WithUnicodeHost_DoesNotPunyEncodeTheHost() public void UrlAction_WithUnicodeHost_DoesNotPunyEncodeTheHost()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.Action( var url = urlHelper.Action(
@ -642,7 +658,8 @@ namespace Microsoft.AspNet.Mvc
public void UrlRouteUrl_RouteValuesAsDictionary_CaseSensitive() public void UrlRouteUrl_RouteValuesAsDictionary_CaseSensitive()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// We're using a dictionary with a case-sensitive comparer and loading it with data // We're using a dictionary with a case-sensitive comparer and loading it with data
// using casings differently from the route. This should still successfully generate a link. // using casings differently from the route. This should still successfully generate a link.
@ -670,7 +687,8 @@ namespace Microsoft.AspNet.Mvc
public void UrlActionWithUrlActionContext_ReturnsExpectedResult() public void UrlActionWithUrlActionContext_ReturnsExpectedResult()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
var actionContext = new UrlActionContext() var actionContext = new UrlActionContext()
{ {
@ -693,7 +711,8 @@ namespace Microsoft.AspNet.Mvc
public void UrlActionWithAllParameters_ReturnsExpectedResult() public void UrlActionWithAllParameters_ReturnsExpectedResult()
{ {
// Arrange // Arrange
var urlHelper = CreateUrlHelperWithRouteCollection("/app"); var services = GetServices();
var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
// Act // Act
var url = urlHelper.Action( var url = urlHelper.Action(
@ -709,26 +728,17 @@ namespace Microsoft.AspNet.Mvc
Assert.Equal("https://remotelyhost/app/home3/contact#somefragment", url); Assert.Equal("https://remotelyhost/app/home3/contact#somefragment", url);
} }
private static HttpContext CreateHttpContext(string appRoot, ILoggerFactory factory = null) private static HttpContext CreateHttpContext(
IServiceProvider services,
string appRoot)
{ {
if (factory == null) var context = new DefaultHttpContext();
{ context.RequestServices = services;
factory = NullLoggerFactory.Instance;
}
var appRootPath = new PathString(appRoot); context.Request.PathBase = new PathString(appRoot);
var request = new Mock<HttpRequest>(); context.Request.Host = new HostString("localhost");
request.SetupGet(r => r.PathBase)
.Returns(appRootPath);
request.SetupGet(r => r.Host)
.Returns(new HostString("localhost"));
var context = new Mock<HttpContext>();
context.Setup(m => m.RequestServices.GetService(typeof(ILoggerFactory)))
.Returns(factory);
context.SetupGet(c => c.Request)
.Returns(request.Object);
return context.Object; return context;
} }
private static IScopedInstance<ActionContext> CreateActionContext(HttpContext context) private static IScopedInstance<ActionContext> CreateActionContext(HttpContext context)
@ -752,7 +762,8 @@ namespace Microsoft.AspNet.Mvc
private static UrlHelper CreateUrlHelper() private static UrlHelper CreateUrlHelper()
{ {
var context = CreateHttpContext(string.Empty); var services = GetServices();
var context = CreateHttpContext(services, string.Empty);
var actionContext = CreateActionContext(context); var actionContext = CreateActionContext(context);
var actionSelector = new Mock<IActionSelector>(MockBehavior.Strict); var actionSelector = new Mock<IActionSelector>(MockBehavior.Strict);
@ -761,7 +772,8 @@ namespace Microsoft.AspNet.Mvc
private static UrlHelper CreateUrlHelper(string host) private static UrlHelper CreateUrlHelper(string host)
{ {
var context = CreateHttpContext(string.Empty); var services = GetServices();
var context = CreateHttpContext(services, string.Empty);
context.Request.Host = new HostString(host); context.Request.Host = new HostString(host);
var actionContext = CreateActionContext(context); var actionContext = CreateActionContext(context);
@ -778,55 +790,80 @@ namespace Microsoft.AspNet.Mvc
private static UrlHelper CreateUrlHelper(string appBase, IRouter router) private static UrlHelper CreateUrlHelper(string appBase, IRouter router)
{ {
var context = CreateHttpContext(appBase); var services = GetServices();
var context = CreateHttpContext(services, appBase);
var actionContext = CreateActionContext(context, router); var actionContext = CreateActionContext(context, router);
var actionSelector = new Mock<IActionSelector>(MockBehavior.Strict); var actionSelector = new Mock<IActionSelector>(MockBehavior.Strict);
return new UrlHelper(actionContext, actionSelector.Object); return new UrlHelper(actionContext, actionSelector.Object);
} }
private static UrlHelper CreateUrlHelperWithRouteCollection(string appPrefix) private static UrlHelper CreateUrlHelperWithRouteCollection(IServiceProvider services, string appPrefix)
{ {
var routeCollection = GetRouter(); var routeCollection = GetRouter(services);
return CreateUrlHelper(appPrefix, routeCollection); return CreateUrlHelper(appPrefix, routeCollection);
} }
private static IRouter GetRouter() private static IRouter GetRouter(IServiceProvider services)
{ {
return GetRouter("mockRoute", "/mockTemplate"); return GetRouter(services, "mockRoute", "/mockTemplate");
} }
private static IRouter GetRouter(string mockRouteName, string mockTemplateValue) private static IServiceProvider GetServices()
{ {
var rt = new RouteBuilder(); var services = new Mock<IServiceProvider>();
var optionsAccessor = new Mock<IOptions<RouteOptions>>();
optionsAccessor
.SetupGet(o => o.Options)
.Returns(new RouteOptions());
services
.Setup(s => s.GetService(typeof(IOptions<RouteOptions>)))
.Returns(optionsAccessor.Object);
services
.Setup(s => s.GetService(typeof(IInlineConstraintResolver)))
.Returns(new DefaultInlineConstraintResolver(optionsAccessor.Object));
services
.Setup(s => s.GetService(typeof(ILoggerFactory)))
.Returns(NullLoggerFactory.Instance);
return services.Object;
}
private static IRouter GetRouter(
IServiceProvider services,
string mockRouteName,
string mockTemplateValue)
{
var routeBuilder = new RouteBuilder();
routeBuilder.ServiceProvider = services;
var target = new Mock<IRouter>(MockBehavior.Strict); var target = new Mock<IRouter>(MockBehavior.Strict);
target target
.Setup(router => router.GetVirtualPath(It.IsAny<VirtualPathContext>())) .Setup(router => router.GetVirtualPath(It.IsAny<VirtualPathContext>()))
.Callback<VirtualPathContext>(context => context.IsBound = true) .Callback<VirtualPathContext>(context => context.IsBound = true)
.Returns<VirtualPathContext>(context => null); .Returns<VirtualPathContext>(context => null);
rt.DefaultHandler = target.Object; routeBuilder.DefaultHandler = target.Object;
var serviceProviderMock = new Mock<IServiceProvider>();
var accessorMock = new Mock<IOptions<RouteOptions>>();
accessorMock.SetupGet(o => o.Options).Returns(new RouteOptions());
serviceProviderMock.Setup(o => o.GetService(typeof(IInlineConstraintResolver)))
.Returns(new DefaultInlineConstraintResolver(accessorMock.Object));
rt.ServiceProvider = serviceProviderMock.Object; routeBuilder.MapRoute(string.Empty,
rt.MapRoute(string.Empty,
"{controller}/{action}/{id}", "{controller}/{action}/{id}",
new RouteValueDictionary(new { id = "defaultid" })); new RouteValueDictionary(new { id = "defaultid" }));
rt.MapRoute("namedroute",
routeBuilder.MapRoute("namedroute",
"named/{controller}/{action}/{id}", "named/{controller}/{action}/{id}",
new RouteValueDictionary(new { id = "defaultid" })); new RouteValueDictionary(new { id = "defaultid" }));
var mockHttpRoute = new Mock<IRouter>(); var mockHttpRoute = new Mock<IRouter>();
mockHttpRoute.Setup(mock => mockHttpRoute
mock.GetVirtualPath(It.Is<VirtualPathContext>(c => string.Equals(c.RouteName, .Setup(mock => mock.GetVirtualPath(It.Is<VirtualPathContext>(c => string.Equals(c.RouteName, mockRouteName))))
mockRouteName) .Callback<VirtualPathContext>(c => c.IsBound = true)
))) .Returns(mockTemplateValue);
.Returns(mockTemplateValue);
rt.Routes.Add(mockHttpRoute.Object); routeBuilder.Routes.Add(mockHttpRoute.Object);
return rt.Build(); return routeBuilder.Build();
} }
} }
} }