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

React to options rename

This commit is contained in:
Hao Kung 2015-08-04 13:29:05 -07:00
parent 6b432e4e0e
commit 3cab10cfd7
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Routing/DefaultInlineConstraintResolver.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Routing
/// </param> /// </param>
public DefaultInlineConstraintResolver(IOptions<RouteOptions> routeOptions) public DefaultInlineConstraintResolver(IOptions<RouteOptions> routeOptions)
{ {
_inlineConstraintMap = routeOptions.Options.ConstraintMap; _inlineConstraintMap = routeOptions.Value.ConstraintMap;
} }
/// <inheritdoc /> /// <inheritdoc />

5
src/Microsoft.AspNet.Routing/RouteCollection.cs
View File

@ -6,11 +6,8 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Routing.Logging;
using Microsoft.AspNet.Routing.Logging.Internal;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.Internal; using Microsoft.Framework.Internal;
using Microsoft.Framework.Logging;
using Microsoft.Framework.OptionsModel; using Microsoft.Framework.OptionsModel;
namespace Microsoft.AspNet.Routing namespace Microsoft.AspNet.Routing
@ -238,7 +235,7 @@ namespace Microsoft.AspNet.Routing
{ {
if (_options == null) if (_options == null)
{ {
_options = context.RequestServices.GetRequiredService<IOptions<RouteOptions>>().Options; _options = context.RequestServices.GetRequiredService<IOptions<RouteOptions>>().Value;
} }
} }
} }

2
test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs
View File

@ -327,7 +327,7 @@ namespace Microsoft.AspNet.Routing.Tests
private IInlineConstraintResolver GetInlineConstraintResolver(RouteOptions routeOptions) private IInlineConstraintResolver GetInlineConstraintResolver(RouteOptions routeOptions)
{ {
var optionsAccessor = new Mock<IOptions<RouteOptions>>(); var optionsAccessor = new Mock<IOptions<RouteOptions>>();
optionsAccessor.SetupGet(o => o.Options).Returns(routeOptions); optionsAccessor.SetupGet(o => o.Value).Returns(routeOptions);
return new DefaultInlineConstraintResolver(optionsAccessor.Object); return new DefaultInlineConstraintResolver(optionsAccessor.Object);
} }

6
test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs
View File

@ -805,7 +805,7 @@ namespace Microsoft.AspNet.Routing
var request = new Mock<HttpRequest>(MockBehavior.Strict); var request = new Mock<HttpRequest>(MockBehavior.Strict);
var optionsAccessor = new Mock<IOptions<RouteOptions>>(MockBehavior.Strict); var optionsAccessor = new Mock<IOptions<RouteOptions>>(MockBehavior.Strict);
optionsAccessor.SetupGet(o => o.Options).Returns(options); optionsAccessor.SetupGet(o => o.Value).Returns(options);
var context = new Mock<HttpContext>(MockBehavior.Strict); var context = new Mock<HttpContext>(MockBehavior.Strict);
context.Setup(m => m.RequestServices.GetService(typeof(ILoggerFactory))) context.Setup(m => m.RequestServices.GetService(typeof(ILoggerFactory)))
@ -823,7 +823,7 @@ namespace Microsoft.AspNet.Routing
string routeName = null) string routeName = null)
{ {
var optionsAccessor = new Mock<IOptions<RouteOptions>>(MockBehavior.Strict); var optionsAccessor = new Mock<IOptions<RouteOptions>>(MockBehavior.Strict);
optionsAccessor.SetupGet(o => o.Options).Returns(options); optionsAccessor.SetupGet(o => o.Value).Returns(options);
var context = new Mock<HttpContext>(MockBehavior.Strict); var context = new Mock<HttpContext>(MockBehavior.Strict);
context.Setup(m => m.RequestServices.GetService(typeof(IOptions<RouteOptions>))) context.Setup(m => m.RequestServices.GetService(typeof(IOptions<RouteOptions>)))
@ -857,7 +857,7 @@ namespace Microsoft.AspNet.Routing
request.SetupGet(r => r.Path).Returns(new PathString(requestPath)); request.SetupGet(r => r.Path).Returns(new PathString(requestPath));
var optionsAccessor = new Mock<IOptions<RouteOptions>>(MockBehavior.Strict); var optionsAccessor = new Mock<IOptions<RouteOptions>>(MockBehavior.Strict);
optionsAccessor.SetupGet(o => o.Options).Returns(options); optionsAccessor.SetupGet(o => o.Value).Returns(options);
var context = new Mock<HttpContext>(MockBehavior.Strict); var context = new Mock<HttpContext>(MockBehavior.Strict);
context.Setup(m => m.RequestServices.GetService(typeof(ILoggerFactory))) context.Setup(m => m.RequestServices.GetService(typeof(ILoggerFactory)))

2
test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs
View File

@ -181,7 +181,7 @@ namespace Microsoft.AspNet.Routing
{ {
var options = new Mock<IOptions<RouteOptions>>(MockBehavior.Strict); var options = new Mock<IOptions<RouteOptions>>(MockBehavior.Strict);
options options
.SetupGet(o => o.Options) .SetupGet(o => o.Value)
.Returns(new RouteOptions()); .Returns(new RouteOptions());
var inlineConstraintResolver = new DefaultInlineConstraintResolver(options.Object); var inlineConstraintResolver = new DefaultInlineConstraintResolver(options.Object);

2
test/Microsoft.AspNet.Routing.Tests/RouteOptionsTests.cs
View File

@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Routing.Tests
// Assert // Assert
var accessor = serviceProvider.GetRequiredService<IOptions<RouteOptions>>(); var accessor = serviceProvider.GetRequiredService<IOptions<RouteOptions>>();
Assert.Equal("TestRouteConstraint", accessor.Options.ConstraintMap["foo"].Name); Assert.Equal("TestRouteConstraint", accessor.Value.ConstraintMap["foo"].Name);
} }
private class TestRouteConstraint : IRouteConstraint private class TestRouteConstraint : IRouteConstraint