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

Addressed code review comments.

This commit is contained in:
N. Taylor Mullen 2014-05-01 11:11:33 -07:00
parent c986c663e3
commit 4494f40d67
2 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Microsoft.AspNet.Mvc.Razor/ViewEngine/RazorViewEngine.cs
View File

@ -25,19 +25,19 @@ namespace Microsoft.AspNet.Mvc.Razor
{
public class RazorViewEngine : IViewEngine
{
private static readonly string _viewExtension = ".cshtml";
private const string ViewExtension = ".cshtml";
private static readonly string[] _viewLocationFormats =
{
"/Views/{1}/{0}" + _viewExtension,
"/Views/Shared/{0}" + _viewExtension,
"/Views/{1}/{0}" + ViewExtension,
"/Views/Shared/{0}" + ViewExtension,
};
private static readonly string[] _areaViewLocationFormats =
{
"/Areas/{2}/Views/{1}/{0}" + _viewExtension,
"/Areas/{2}/Views/Shared/{0}" + _viewExtension,
"/Views/Shared/{0}" + _viewExtension,
"/Areas/{2}/Views/{1}/{0}" + ViewExtension,
"/Areas/{2}/Views/Shared/{0}" + ViewExtension,
"/Views/Shared/{0}" + ViewExtension,
};
private readonly IVirtualPathViewFactory _virtualPathFactory;
@ -72,7 +72,11 @@ namespace Microsoft.AspNet.Mvc.Razor
if (nameRepresentsPath)
{
EnsureFullPathViewExtension(viewName);
if (!viewName.EndsWith(ViewExtension, StringComparison.OrdinalIgnoreCase))
{
throw new InvalidOperationException(
Resources.FormatViewMustEndInExtension(viewName, ViewExtension));
}
var view = _virtualPathFactory.CreateInstance(viewName);
return view != null ? ViewEngineResult.Found(viewName, view) :
@ -97,15 +101,6 @@ namespace Microsoft.AspNet.Mvc.Razor
}
}
private static void EnsureFullPathViewExtension(string viewName)
{
if(!viewName.EndsWith(_viewExtension))
{
throw new InvalidOperationException(
Resources.FormatViewMustEndInExtension(viewName, _viewExtension));
}
}
private static bool IsSpecificPath(string name)
{
char c = name[0];

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

@ -36,12 +36,20 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
{"controller", "bar"},
};
public static IEnumerable<string[]> InvalidViewNameValues
{
get
{
yield return new[] { "~/foo/bar" };
yield return new[] { "/foo/bar" };
yield return new[] { "~/foo/bar.txt" };
yield return new[] { "/foo/bar.txt" };
}
}
[Theory]
[InlineData("~/foo/bar")]
[InlineData("/foo/bar")]
[InlineData("~/foo/bar.txt")]
[InlineData("/foo/bar.txt")]
public void FindViewFullPathRequiresCshtmlEnding(string viewName)
[MemberData("InvalidViewNameValues")]
public void FindViewFullPathFailsWithNoCshtmlEnding(string viewName)
{
// Arrange
var viewEngine = CreateSearchLocationViewEngineTester();
@ -49,10 +57,18 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
// Act & Assert
Assert.Throws<InvalidOperationException>(() =>
viewEngine.FindView(_controllerTestContext, viewName));
}
// Append .cshtml so we can try and no longer throw.
[Theory]
[MemberData("InvalidViewNameValues")]
public void FindViewFullPathSucceedsWithCshtmlEnding(string viewName)
{
// Arrange
var viewEngine = CreateSearchLocationViewEngineTester();
// Append .cshtml so the viewname is no longer invalid
viewName += ".cshtml";
// Act & Assert
// If this throws then our test case fails
var result = viewEngine.FindPartialView(_controllerTestContext, viewName);
@ -60,22 +76,27 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
}
[Theory]
[InlineData("~/foo/bar")]
[InlineData("/foo/bar")]
[InlineData("~/foo/bar.txt")]
[InlineData("/foo/bar.txt")]
public void FindPartialViewFullPathRequiresCshtmlEnding(string partialViewName)
[MemberData("InvalidViewNameValues")]
public void FindPartialViewFullPathFailsWithNoCshtmlEnding(string partialViewName)
{
// Arrange
var viewEngine = CreateSearchLocationViewEngineTester();
// Act & Assert
Assert.Throws<InvalidOperationException>(() =>
Assert.Throws<InvalidOperationException>(() =>
viewEngine.FindPartialView(_controllerTestContext, partialViewName));
}
// Append .cshtml so we can try and no longer throw.
[Theory]
[MemberData("InvalidViewNameValues")]
public void FindPartialViewFullPathSucceedsWithCshtmlEnding(string partialViewName)
{
// Arrange
var viewEngine = CreateSearchLocationViewEngineTester();
// Append .cshtml so the viewname is no longer invalid
partialViewName += ".cshtml";
// Act & Assert
// If this throws then our test case fails
var result = viewEngine.FindPartialView(_controllerTestContext, partialViewName);
@ -91,7 +112,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
// Act
var result = viewEngine.FindPartialView(_areaTestContext, "partial");
// Assert
Assert.False(result.Success);
Assert.Equal(new[] {