From 23a7aa813d673940bae0a1d7c36e2a3420a22186 Mon Sep 17 00:00:00 2001 From: ianhong Date: Tue, 11 Nov 2014 15:57:08 -0800 Subject: [PATCH] Updating FindView_UsesViewLocationExpandersToLocateViews for IRazorViewFactory. --- .../RazorViewEngineTest.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs index 79a7bfd76e..46a9c474a1 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs @@ -302,7 +302,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test }; } } -/* + [Theory] [MemberData(nameof(FindView_UsesViewLocationExpandersToLocateViewsData))] public void FindView_UsesViewLocationExpandersToLocateViews(IDictionary routeValues, @@ -314,6 +314,10 @@ namespace Microsoft.AspNet.Mvc.Razor.Test .Returns(Mock.Of()) .Verifiable(); + var viewFactory = new Mock(); + viewFactory.Setup(p => p.GetView(It.IsAny(), It.IsAny())) + .Returns(Mock.Of()); + var expander1Result = new[] { "some-seed" }; var expander1 = new Mock(); expander1.Setup(e => e.PopulateValues(It.IsAny())) @@ -343,21 +347,21 @@ namespace Microsoft.AspNet.Mvc.Razor.Test .Returns(new[] { "test-string/{1}.cshtml" }) .Verifiable(); - var viewEngine = CreateViewEngine(pageFactory.Object, + var viewEngine = CreateViewEngine(pageFactory.Object, viewFactory.Object, new[] { expander1.Object, expander2.Object }); - var context = GetActionContext(routeValues); + var context = GetActionContext(routeValues, viewFactory.Object); // Act var result = viewEngine.FindView(context, "test-view"); // Assert Assert.True(result.Success); - Assert.IsAssignableFrom(result.View); + Assert.IsAssignableFrom(result.View); pageFactory.Verify(); expander1.Verify(); expander2.Verify(); } -*/ + [Fact] public void FindView_CachesValuesIfViewWasFound() {