diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs index 145fd4afa6..13c691e467 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs @@ -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(); routeData.Routers.Add(Mock.Of()); var actionContext = new ActionContext(httpContext.Object, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs index c0996575a4..d01d433ba7 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs @@ -97,10 +97,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test private static ActionContext GetActionContext(HttpContext httpContext) { - var routeData = new RouteData() - { - Values = new Dictionary(StringComparer.OrdinalIgnoreCase), - }; + var routeData = new RouteData(); routeData.Routers.Add(new Mock().Object); return new ActionContext(httpContext, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/BodyModelBinderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/BodyModelBinderTests.cs index 155b71735f..caa52ec240 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/BodyModelBinderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/BodyModelBinderTests.cs @@ -137,7 +137,6 @@ namespace Microsoft.AspNet.Mvc private static IContextAccessor CreateActionContext(HttpContext context, IRouter router) { var routeData = new RouteData(); - routeData.Values = new Dictionary(StringComparer.OrdinalIgnoreCase); routeData.Routers.Add(router); var actionContext = new ActionContext(context, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs index d315a3bceb..c78ee3da3c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs @@ -608,11 +608,8 @@ namespace Microsoft.AspNet.Mvc { // Arrange var routeContext = new RouteContext(GetHttpContext(verb)); - routeContext.RouteData.Values = new Dictionary - { - { "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() - { - { "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() - { - { "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 - { - { "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 - { - { "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(StringComparer.OrdinalIgnoreCase), - }; - + var routeData = new RouteData(); routeData.Routers.Add(new Mock(MockBehavior.Strict).Object); var httpContext = new Mock(MockBehavior.Strict); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs index a2baf9ca62..dcfd3410dc 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs @@ -569,7 +569,6 @@ namespace Microsoft.AspNet.Mvc.Core.Test private static IContextAccessor CreateActionContext(HttpContext context, IRouter router) { var routeData = new RouteData(); - routeData.Values = new Dictionary(StringComparer.OrdinalIgnoreCase); routeData.Routers.Add(router); var actionContext = new ActionContext(context, diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs index ed9fbc6919..4fa3d1d2da 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs @@ -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(StringComparer.OrdinalIgnoreCase) - }; + var routeData = new RouteData(); routeData.Values["controller"] = controller; if (area != null) { diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs index 9dea394ec9..b8602d9238 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs @@ -461,7 +461,13 @@ namespace Microsoft.AspNet.Mvc.Razor.Test .Returns(razorView ?? Mock.Of()); 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()); } diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs index c76012ca7b..1f520c3c36 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs @@ -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; }