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

Fix issue https://github.com/aspnet/Mvc/issues/1202

This commit is contained in:
YishaiGalatzer 2014-09-30 12:45:00 -07:00
parent 038b8c7f19
commit f82516d155
2 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs
View File

@ -37,12 +37,20 @@ namespace Microsoft.AspNet.Mvc
}
}
public override Task InvokeAsync()
public async override Task InvokeAsync()
{
ActionContext.Controller = _controllerFactory.CreateController(ActionContext);
ActionContext.InputFormatters = _inputFormattersProvider.InputFormatters
.ToList();
return base.InvokeAsync();
var controller = _controllerFactory.CreateController(ActionContext);
try
{
ActionContext.Controller = controller;
ActionContext.InputFormatters = _inputFormattersProvider.InputFormatters
.ToList();
await base.InvokeAsync();
}
finally
{
_controllerFactory.ReleaseController(ActionContext.Controller);
}
}
protected override async Task<IActionResult> InvokeActionAsync(ActionExecutingContext actionExecutingContext)

39
test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs
View File

@ -1272,12 +1272,12 @@ namespace Microsoft.AspNet.Mvc
Assert.Same(input, contentResult.Value);
}
private ReflectedActionInvoker CreateInvoker(IFilter filter, bool actionThrows = false)
private TestReflectedActionInvoker CreateInvoker(IFilter filter, bool actionThrows = false)
{
return CreateInvoker(new[] { filter }, actionThrows);
}
private ReflectedActionInvoker CreateInvoker(IFilter[] filters, bool actionThrows = false)
private TestReflectedActionInvoker CreateInvoker(IFilter[] filters, bool actionThrows = false)
{
var actionDescriptor = new ReflectedActionDescriptor()
{
@ -1319,6 +1319,7 @@ namespace Microsoft.AspNet.Mvc
var controllerFactory = new Mock<IControllerFactory>();
controllerFactory.Setup(c => c.CreateController(It.IsAny<ActionContext>())).Returns(this);
controllerFactory.Setup(m => m.ReleaseController(this)).Verifiable();
var actionBindingContextProvider = new Mock<IActionBindingContextProvider>(MockBehavior.Strict);
actionBindingContextProvider
@ -1333,11 +1334,12 @@ namespace Microsoft.AspNet.Mvc
var inputFormattersProvider = new Mock<IInputFormattersProvider>();
inputFormattersProvider.SetupGet(o => o.InputFormatters)
.Returns(new List<IInputFormatter>());
var invoker = new ReflectedActionInvoker(
var invoker = new TestReflectedActionInvoker(
actionContext,
actionBindingContextProvider.Object,
filterProvider.Object,
controllerFactory.Object,
controllerFactory,
actionDescriptor,
inputFormattersProvider.Object);
@ -1613,5 +1615,34 @@ namespace Microsoft.AspNet.Mvc
return Task.FromResult(0);
}
}
public class TestReflectedActionInvoker : ReflectedActionInvoker
{
private Mock<IControllerFactory> _factoryMock;
public TestReflectedActionInvoker(
ActionContext actionContext,
IActionBindingContextProvider bindingContextProvider,
INestedProviderManager<FilterProviderContext> filterProvider,
Mock<IControllerFactory> controllerFactoryMock,
ReflectedActionDescriptor descriptor,
IInputFormattersProvider inputFormattersProvider) :
base(actionContext,
bindingContextProvider,
filterProvider,
controllerFactoryMock.Object,
descriptor,
inputFormattersProvider)
{
_factoryMock = controllerFactoryMock;
}
public async override Task InvokeAsync()
{
await base.InvokeAsync();
_factoryMock.Verify();
}
}
}
}