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

Cleaning up VirtualFileResult tests

This commit is contained in:
Pranav K 2016-01-14 12:39:29 -08:00
parent 8765a06b69
commit 00462abe62
1 changed files with 55 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileResultTest.cs
View File

@ -184,10 +184,10 @@ namespace Microsoft.AspNet.Mvc
[Theory] [Theory]
[InlineData("FilePathResultTestFile.txt")] [InlineData("FilePathResultTestFile.txt")]
[InlineData("TestFiles/FilePathResultTestFile.txt")] [InlineData("TestFiles/FilePathResultTestFile.txt")]
[InlineData("TestFiles/../FilePathResultTestFile.txt")]
[InlineData("TestFiles\\FilePathResultTestFile.txt")] [InlineData("TestFiles\\FilePathResultTestFile.txt")]
[InlineData("~/FilePathResultTestFile.txt")] [InlineData("TestFiles\\..\\FilePathResultTestFile.txt")]
[InlineData("~/TestFiles/FilePathResultTestFile.txt")] [InlineData(@"\\..//?><|""&@#\c:\..\? /..txt")]
[InlineData("~/TestFiles\\FilePathResultTestFile.txt")]
public async Task ExecuteResultAsync_ReturnsFiles_ForDifferentPaths(string path) public async Task ExecuteResultAsync_ReturnsFiles_ForDifferentPaths(string path)
{ {
// Arrange // Arrange
@ -208,6 +208,37 @@ namespace Microsoft.AspNet.Mvc
// Assert // Assert
var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync(); var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
Assert.Equal("FilePathResultTestFile contents¡", contents); Assert.Equal("FilePathResultTestFile contents¡", contents);
Mock.Get(result.FileProvider).Verify();
}
[Theory]
[InlineData("~/FilePathResultTestFile.txt")]
[InlineData("~/TestFiles/FilePathResultTestFile.txt")]
[InlineData("~/TestFiles/../FilePathResultTestFile.txt")]
[InlineData("~/TestFiles\\..\\FilePathResultTestFile.txt")]
[InlineData(@"~~~~\\..//?>~<|""&@#\c:\..\? /..txt~~~")]
public async Task ExecuteResultAsync_TrimsTilde_BeforeInvokingFileProvider(string path)
{
// Arrange
var expectedPath = path.Substring(1);
var result = new TestVirtualFileResult(path, "text/plain")
{
FileProvider = GetFileProvider(expectedPath),
};
var httpContext = GetHttpContext();
var memoryStream = new MemoryStream();
httpContext.Response.Body = memoryStream;
var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
// Act
await result.ExecuteResultAsync(context);
httpContext.Response.Body.Position = 0;
// Assert
var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
Assert.Equal("FilePathResultTestFile contents¡", contents);
Mock.Get(result.FileProvider).Verify();
} }
[Fact] [Fact]
@ -241,73 +272,29 @@ namespace Microsoft.AspNet.Mvc
Assert.Equal(expectedData, contents); Assert.Equal(expectedData, contents);
} }
[Theory] [Fact]
// Root of the file system, forward slash and back slash public async Task ExecuteResultAsync_ThrowsFileNotFound_IfFileProviderCanNotFindTheFile()
[InlineData("FilePathResultTestFile.txt")]
[InlineData("/FilePathResultTestFile.txt")]
[InlineData("\\FilePathResultTestFile.txt")]
// '.' has no special meaning
[InlineData("./FilePathResultTestFile.txt")]
[InlineData(".\\FilePathResultTestFile.txt")]
// Traverse to the parent directory and back to the file system directory
[InlineData("..\\TestFiles/FilePathResultTestFile.txt")]
[InlineData("..\\TestFiles\\FilePathResultTestFile.txt")]
[InlineData("..\\TestFiles/SubFolder/SubFolderTestFile.txt")]
[InlineData("..\\TestFiles\\SubFolder\\SubFolderTestFile.txt")]
[InlineData("..\\TestFiles/SubFolder\\SubFolderTestFile.txt")]
[InlineData("..\\TestFiles\\SubFolder/SubFolderTestFile.txt")]
[InlineData("~/FilePathResultTestFile.txt")]
[InlineData("~\\TestFiles\\FilePathResultTestFile.txt")]
public async Task ExecuteResultAsync_ThrowsFileNotFound_IfFileProviderCanNotFindTheFile(string path)
{ {
// Arrange // Arrange
// Point the IFileProvider root to a different subfolder var path = "TestPath.txt";
using (var fileProvider = new PhysicalFileProvider(Path.GetFullPath("./Properties"))) var fileInfo = new Mock<IFileInfo>();
fileInfo.SetupGet(f => f.Exists).Returns(false);
var fileProvider = new Mock<IFileProvider>();
fileProvider.Setup(f => f.GetFileInfo(path)).Returns(fileInfo.Object);
var filePathResult = new VirtualFileResult(path, "text/plain")
{ {
var filePathResult = new VirtualFileResult(path, "text/plain") FileProvider = fileProvider.Object,
{ };
FileProvider = fileProvider,
};
var expectedMessage = "Could not find file: " + path; var expectedMessage = "Could not find file: " + path;
var context = new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor()); var context = new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
// Act // Act
var ex = await Assert.ThrowsAsync<FileNotFoundException>(() => filePathResult.ExecuteResultAsync(context)); var ex = await Assert.ThrowsAsync<FileNotFoundException>(() => filePathResult.ExecuteResultAsync(context));
// Assert // Assert
Assert.Equal(expectedMessage, ex.Message); Assert.Equal(expectedMessage, ex.Message);
Assert.Equal(path, ex.FileName); Assert.Equal(path, ex.FileName);
}
}
[Theory]
[InlineData("/SubFolder/SubFolderTestFile.txt")]
[InlineData("\\SubFolder\\SubFolderTestFile.txt")]
[InlineData("/SubFolder\\SubFolderTestFile.txt")]
[InlineData("\\SubFolder/SubFolderTestFile.txt")]
[InlineData("./SubFolder/SubFolderTestFile.txt")]
[InlineData(".\\SubFolder\\SubFolderTestFile.txt")]
[InlineData("./SubFolder\\SubFolderTestFile.txt")]
[InlineData(".\\SubFolder/SubFolderTestFile.txt")]
[InlineData("~/SubFolder/SubFolderTestFile.txt")]
[InlineData("~/SubFolder\\SubFolderTestFile.txt")]
public void ExecuteResultAsync_ThrowsDirectoryNotFound_IfFileProviderCanNotFindTheDirectory(string path)
{
// Arrange
// Point the IFileProvider root to a different subfolder
using (var fileProvider = new PhysicalFileProvider(Path.GetFullPath("./Properties")))
{
var filePathResult = new VirtualFileResult(path, "text/plain")
{
FileProvider = fileProvider,
};
var context = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
// Act & Assert
Assert.ThrowsAsync<DirectoryNotFoundException>(() => filePathResult.ExecuteResultAsync(context));
}
} }
private static IServiceCollection CreateServices() private static IServiceCollection CreateServices()
@ -333,9 +320,11 @@ namespace Microsoft.AspNet.Mvc
{ {
var fileInfo = new Mock<IFileInfo>(); var fileInfo = new Mock<IFileInfo>();
fileInfo.SetupGet(fi => fi.Exists).Returns(true); fileInfo.SetupGet(fi => fi.Exists).Returns(true);
fileInfo.SetupGet(fi => fi.PhysicalPath).Returns(() => path); fileInfo.SetupGet(fi => fi.PhysicalPath).Returns(path);
var fileProvider = new Mock<IFileProvider>(); var fileProvider = new Mock<IFileProvider>();
fileProvider.Setup(fp => fp.GetFileInfo(It.IsAny<string>())).Returns(fileInfo.Object); fileProvider.Setup(fp => fp.GetFileInfo(path))
.Returns(fileInfo.Object)
.Verifiable();
return fileProvider.Object; return fileProvider.Object;
} }