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

Fix for breaking API change from routing

This commit is contained in:
Ryan Nowak 2014-10-31 18:23:19 -07:00
parent 105c99cbf2
commit 0ccfcc4316
8 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs
View File

@ -18,7 +18,6 @@ namespace Microsoft.AspNet.Mvc.Core.Test.ActionResults
httpContext.Setup(o => o.Response).Returns(httpResponse.Object);
var routeData = new RouteData();
routeData.Values = new Dictionary<string, object>();
routeData.Routers.Add(Mock.Of<IRouter>());
var actionContext = new ActionContext(httpContext.Object,

5
test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs
View File

@ -97,10 +97,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test
private static ActionContext GetActionContext(HttpContext httpContext)
{
var routeData = new RouteData()
{
Values = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase),
};
var routeData = new RouteData();
routeData.Routers.Add(new Mock<IRouter>().Object);
return new ActionContext(httpContext,

1
test/Microsoft.AspNet.Mvc.Core.Test/BodyModelBinderTests.cs
View File

@ -137,7 +137,6 @@ namespace Microsoft.AspNet.Mvc
private static IContextAccessor<ActionContext> CreateActionContext(HttpContext context, IRouter router)
{
var routeData = new RouteData();
routeData.Values = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
routeData.Routers.Add(router);
var actionContext = new ActionContext(context,

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

@ -608,11 +608,8 @@ namespace Microsoft.AspNet.Mvc
{
// Arrange
var routeContext = new RouteContext(GetHttpContext(verb));
routeContext.RouteData.Values = new Dictionary<string, object>
{
{ "controller", "HttpMethodAttributeTests_RestOnly" },
{ "action", "Patch" }
};
routeContext.RouteData.Values.Add("controller", "HttpMethodAttributeTests_RestOnly");
routeContext.RouteData.Values.Add("action", "Patch");
// Act
var result = await InvokeActionSelector(routeContext);
@ -631,11 +628,8 @@ namespace Microsoft.AspNet.Mvc
{
// Arrange
var routeContext = new RouteContext(GetHttpContext(verb));
routeContext.RouteData.Values = new Dictionary<string, object>()
{
{ "controller", "HttpMethodAttributeTests_RestOnly" },
{ "action", "Put" }
};
routeContext.RouteData.Values.Add("controller", "HttpMethodAttributeTests_RestOnly");
routeContext.RouteData.Values.Add("action", "Put");
// Act
var result = await InvokeActionSelector(routeContext);
@ -652,10 +646,7 @@ namespace Microsoft.AspNet.Mvc
// Arrange
// Note no action name is passed, hence should return a null action descriptor.
var routeContext = new RouteContext(GetHttpContext(verb));
routeContext.RouteData.Values = new Dictionary<string, object>()
{
{ "controller", "HttpMethodAttributeTests_RestOnly" },
};
routeContext.RouteData.Values.Add("controller", "HttpMethodAttributeTests_RestOnly");
// Act
var result = await InvokeActionSelector(routeContext);
@ -694,11 +685,8 @@ namespace Microsoft.AspNet.Mvc
{
// Arrange
var routeContext = new RouteContext(GetHttpContext(verb));
routeContext.RouteData.Values = new Dictionary<string, object>
{
{ "controller", "ActionName" },
{ "action", "RPCMethodWithHttpGet" }
};
routeContext.RouteData.Values.Add("controller", "ActionName");
routeContext.RouteData.Values.Add("action", "RPCMethodWithHttpGet");
// Act
var result = await InvokeActionSelector(routeContext);
@ -727,11 +715,8 @@ namespace Microsoft.AspNet.Mvc
{
// Arrange
var routeContext = new RouteContext(GetHttpContext(verb));
routeContext.RouteData.Values = new Dictionary<string, object>
{
{ "controller", "ActionName" },
{ "action", actionName }
};
routeContext.RouteData.Values.Add("controller", "ActionName");
routeContext.RouteData.Values.Add("action", actionName);
// Act
var result = await InvokeActionSelector(routeContext);
@ -865,11 +850,7 @@ namespace Microsoft.AspNet.Mvc
private static RouteContext CreateRouteContext(string httpMethod)
{
var routeData = new RouteData()
{
Values = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase),
};
var routeData = new RouteData();
routeData.Routers.Add(new Mock<IRouter>(MockBehavior.Strict).Object);
var httpContext = new Mock<HttpContext>(MockBehavior.Strict);

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

@ -569,7 +569,6 @@ namespace Microsoft.AspNet.Mvc.Core.Test
private static IContextAccessor<ActionContext> CreateActionContext(HttpContext context, IRouter router)
{
var routeData = new RouteData();
routeData.Values = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
routeData.Routers.Add(router);
var actionContext = new ActionContext(context,

5
test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs
View File

@ -115,10 +115,7 @@ namespace Microsoft.AspNet.Mvc.Razor
public static ActionContext GetActionContext(string controller = "mycontroller",
string area = null)
{
var routeData = new RouteData
{
Values = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
};
var routeData = new RouteData();
routeData.Values["controller"] = controller;
if (area != null)
{

8
test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs
View File

@ -461,7 +461,13 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
.Returns(razorView ?? Mock.Of<IRazorView>());
httpContext.RequestServices = serviceProvider.Object;
var routeData = new RouteData { Values = routeValues };
var routeData = new RouteData();
foreach (var kvp in routeValues)
{
routeData.Values.Add(kvp.Key, kvp.Value);
}
return new ActionContext(httpContext, routeData, new ActionDescriptor());
}

8
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs
View File

@ -511,10 +511,12 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim
}
var routeContext = new RouteContext(httpContext);
routeContext.RouteData = new RouteData()
routeContext.RouteData = new RouteData();
foreach (var kvp in new RouteValueDictionary(routeValues))
{
Values = new RouteValueDictionary(routeValues),
};
routeContext.RouteData.Values.Add(kvp.Key, kvp.Value);
}
return routeContext;
}