diff --git a/samples/RoutingSample/HttpContextRouteEndpoint.cs b/samples/RoutingSample/HttpContextRouteEndpoint.cs index e256b22ed6..d2fc80daff 100644 --- a/samples/RoutingSample/HttpContextRouteEndpoint.cs +++ b/samples/RoutingSample/HttpContextRouteEndpoint.cs @@ -21,7 +21,7 @@ namespace RoutingSample context.IsHandled = true; } - public string BindPath(BindPathContext context) + public string GetVirtualPath(VirtualPathContext context) { // We don't really care what the values look like. context.IsBound = true; diff --git a/samples/RoutingSample/PrefixRoute.cs b/samples/RoutingSample/PrefixRoute.cs index fc51a3dc09..4980a7e41a 100644 --- a/samples/RoutingSample/PrefixRoute.cs +++ b/samples/RoutingSample/PrefixRoute.cs @@ -50,7 +50,7 @@ namespace RoutingSample } } - public string BindPath(BindPathContext context) + public string GetVirtualPath(VirtualPathContext context) { return null; } diff --git a/src/Microsoft.AspNet.Routing/IRouter.cs b/src/Microsoft.AspNet.Routing/IRouter.cs index a77645d382..4d808ae25e 100644 --- a/src/Microsoft.AspNet.Routing/IRouter.cs +++ b/src/Microsoft.AspNet.Routing/IRouter.cs @@ -8,6 +8,6 @@ namespace Microsoft.AspNet.Routing { Task RouteAsync(RouteContext context); - string BindPath(BindPathContext context); + string GetVirtualPath(VirtualPathContext context); } } diff --git a/src/Microsoft.AspNet.Routing/RouteCollection.cs b/src/Microsoft.AspNet.Routing/RouteCollection.cs index 2ba7718846..724ce57523 100644 --- a/src/Microsoft.AspNet.Routing/RouteCollection.cs +++ b/src/Microsoft.AspNet.Routing/RouteCollection.cs @@ -40,13 +40,13 @@ namespace Microsoft.AspNet.Routing } } - public virtual string BindPath(BindPathContext context) + public virtual string GetVirtualPath(VirtualPathContext context) { for (var i = 0; i < Count; i++) { var route = this[i]; - var path = route.BindPath(context); + var path = route.GetVirtualPath(context); if (path != null) { return path; diff --git a/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs b/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs index 6cd55e201e..a331a5ba00 100644 --- a/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs +++ b/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs @@ -78,10 +78,10 @@ namespace Microsoft.AspNet.Routing.Template } } - public string BindPath(BindPathContext context) + public string GetVirtualPath(VirtualPathContext context) { // Validate that the target can accept these values. - var path = _target.BindPath(context); + var path = _target.GetVirtualPath(context); if (path != null) { // If the target generates a value then that can short circuit. diff --git a/src/Microsoft.AspNet.Routing/BindPathContext.cs b/src/Microsoft.AspNet.Routing/VirtualPathContext.cs similarity index 79% rename from src/Microsoft.AspNet.Routing/BindPathContext.cs rename to src/Microsoft.AspNet.Routing/VirtualPathContext.cs index f15b18443a..fe1cfbba78 100644 --- a/src/Microsoft.AspNet.Routing/BindPathContext.cs +++ b/src/Microsoft.AspNet.Routing/VirtualPathContext.cs @@ -5,9 +5,9 @@ using Microsoft.AspNet.Abstractions; namespace Microsoft.AspNet.Routing { - public class BindPathContext + public class VirtualPathContext { - public BindPathContext(HttpContext context, IDictionary ambientValues, IDictionary values) + public VirtualPathContext(HttpContext context, IDictionary ambientValues, IDictionary values) { Context = context; AmbientValues = ambientValues; diff --git a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs index c5303b2a03..aca741a9b4 100644 --- a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs +++ b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs @@ -92,9 +92,9 @@ namespace Microsoft.AspNet.Routing.Tests { var target = new Mock(MockBehavior.Strict); target - .Setup(e => e.BindPath(It.IsAny())) - .Callback(c => c.IsBound = accept) - .Returns(null) + .Setup(e => e.GetVirtualPath(It.IsAny())) + .Callback(c => c.IsBound = accept) + .Returns(null) .Verifiable(); target diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTests.cs index f61368f3e9..d50caf746c 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTests.cs @@ -106,14 +106,14 @@ namespace Microsoft.AspNet.Routing.Template.Tests #region Route Binding [Fact] - public void Bind_Success() + public void GetVirtualPath_Success() { // Arrange var route = CreateRoute("{controller}"); - var context = CreateRouteBindContext(new {controller = "Home"}); + var context = CreateVirtualPathContext(new {controller = "Home"}); // Act - var path = route.BindPath(context); + var path = route.GetVirtualPath(context); // Assert Assert.True(context.IsBound); @@ -121,14 +121,14 @@ namespace Microsoft.AspNet.Routing.Template.Tests } [Fact] - public void Bind_Fail() + public void GetVirtualPath_Fail() { // Arrange var route = CreateRoute("{controller}/{action}"); - var context = CreateRouteBindContext(new { controller = "Home" }); + var context = CreateVirtualPathContext(new { controller = "Home" }); // Act - var path = route.BindPath(context); + var path = route.GetVirtualPath(context); // Assert Assert.False(context.IsBound); @@ -136,14 +136,14 @@ namespace Microsoft.AspNet.Routing.Template.Tests } [Fact] - public void Bind_RejectedByHandler() + public void GetVirtualPath_RejectedByHandler() { // Arrange var route = CreateRoute("{controller}", accept: false); - var context = CreateRouteBindContext(new { controller = "Home" }); + var context = CreateVirtualPathContext(new { controller = "Home" }); // Act - var path = route.BindPath(context); + var path = route.GetVirtualPath(context); // Assert Assert.False(context.IsBound); @@ -151,35 +151,35 @@ namespace Microsoft.AspNet.Routing.Template.Tests } [Fact] - public void Bind_Success_AmbientValues() + public void GetVirtualPath_Success_AmbientValues() { // Arrange var route = CreateRoute("{controller}/{action}"); - var context = CreateRouteBindContext(new { action = "Index"}, new { controller = "Home" }); + var context = CreateVirtualPathContext(new { action = "Index"}, new { controller = "Home" }); // Act - var path = route.BindPath(context); + var path = route.GetVirtualPath(context); // Assert Assert.True(context.IsBound); Assert.Equal("Home/Index", path); } - private static BindPathContext CreateRouteBindContext(object values) + private static VirtualPathContext CreateVirtualPathContext(object values) { - return CreateRouteBindContext(new RouteValueDictionary(values), null); + return CreateVirtualPathContext(new RouteValueDictionary(values), null); } - private static BindPathContext CreateRouteBindContext(object values, object ambientValues) + private static VirtualPathContext CreateVirtualPathContext(object values, object ambientValues) { - return CreateRouteBindContext(new RouteValueDictionary(values), new RouteValueDictionary(ambientValues)); + return CreateVirtualPathContext(new RouteValueDictionary(values), new RouteValueDictionary(ambientValues)); } - private static BindPathContext CreateRouteBindContext(IDictionary values, IDictionary ambientValues) + private static VirtualPathContext CreateVirtualPathContext(IDictionary values, IDictionary ambientValues) { var context = new Mock(MockBehavior.Strict); - return new BindPathContext(context.Object, ambientValues, values); + return new VirtualPathContext(context.Object, ambientValues, values); } #endregion @@ -198,8 +198,9 @@ namespace Microsoft.AspNet.Routing.Template.Tests { var target = new Mock(MockBehavior.Strict); target - .Setup(e => e.BindPath(It.IsAny())) - .Callback(c => c.IsBound = accept); + .Setup(e => e.GetVirtualPath(It.IsAny())) + .Callback(c => c.IsBound = accept) + .Returns(rc => null); target .Setup(e => e.RouteAsync(It.IsAny()))