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

Fixed test build break.

This commit is contained in:
N. Taylor Mullen 2015-10-22 16:45:21 -07:00
parent faa78a3d91
commit 2b9dae572e
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs
View File

@ -25,7 +25,6 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
var content = @" var content = @"
public class MyTestType {}"; public class MyTestType {}";
var applicationEnvironment = GetApplicationEnvironment(); var applicationEnvironment = GetApplicationEnvironment();
var accessor = GetLoadContextAccessor();
var libraryExporter = GetLibraryExporter(); var libraryExporter = GetLibraryExporter();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@ -38,7 +37,6 @@ public class MyTestType {}";
.Returns(string.Empty); .Returns(string.Empty);
var compilationService = new RoslynCompilationService(applicationEnvironment, var compilationService = new RoslynCompilationService(applicationEnvironment,
accessor,
libraryExporter, libraryExporter,
compilerOptionsProvider.Object, compilerOptionsProvider.Object,
mvcRazorHost.Object, mvcRazorHost.Object,
@ -65,7 +63,6 @@ public class MyTestType {}";
#line 1 ""{viewPath}"" #line 1 ""{viewPath}""
this should fail"; this should fail";
var applicationEnvironment = GetApplicationEnvironment(); var applicationEnvironment = GetApplicationEnvironment();
var accessor = GetLoadContextAccessor();
var libraryExporter = GetLibraryExporter(); var libraryExporter = GetLibraryExporter();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@ -78,7 +75,6 @@ this should fail";
var fileInfo = fileProvider.AddFile(viewPath, fileContent); var fileInfo = fileProvider.AddFile(viewPath, fileContent);
var compilationService = new RoslynCompilationService(applicationEnvironment, var compilationService = new RoslynCompilationService(applicationEnvironment,
accessor,
libraryExporter, libraryExporter,
compilerOptionsProvider.Object, compilerOptionsProvider.Object,
mvcRazorHost, mvcRazorHost,
@ -103,7 +99,6 @@ this should fail";
var fileContent = "file content"; var fileContent = "file content";
var content = @"this should fail"; var content = @"this should fail";
var applicationEnvironment = GetApplicationEnvironment(); var applicationEnvironment = GetApplicationEnvironment();
var accessor = GetLoadContextAccessor();
var libraryExporter = GetLibraryExporter(); var libraryExporter = GetLibraryExporter();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@ -114,7 +109,6 @@ this should fail";
var mvcRazorHost = Mock.Of<IMvcRazorHost>(); var mvcRazorHost = Mock.Of<IMvcRazorHost>();
var compilationService = new RoslynCompilationService(applicationEnvironment, var compilationService = new RoslynCompilationService(applicationEnvironment,
accessor,
libraryExporter, libraryExporter,
compilerOptionsProvider.Object, compilerOptionsProvider.Object,
mvcRazorHost, mvcRazorHost,
@ -143,7 +137,6 @@ this should fail";
#line 1 ""{path}"" #line 1 ""{path}""
this should fail"; this should fail";
var applicationEnvironment = GetApplicationEnvironment(); var applicationEnvironment = GetApplicationEnvironment();
var accessor = GetLoadContextAccessor();
var libraryExporter = GetLibraryExporter(); var libraryExporter = GetLibraryExporter();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@ -160,12 +153,11 @@ this should fail";
fileProvider.AddFile(path, mockFileInfo.Object); fileProvider.AddFile(path, mockFileInfo.Object);
var compilationService = new RoslynCompilationService(applicationEnvironment, var compilationService = new RoslynCompilationService(applicationEnvironment,
accessor,
libraryExporter, libraryExporter,
compilerOptionsProvider.Object, compilerOptionsProvider.Object,
mvcRazorHost, mvcRazorHost,
GetOptions(fileProvider)); GetOptions(fileProvider));
var relativeFileInfo = new RelativeFileInfo(mockFileInfo.Object, path); var relativeFileInfo = new RelativeFileInfo(mockFileInfo.Object, path);
// Act // Act
@ -191,7 +183,6 @@ public class MyNonCustomDefinedClass {}
#endif #endif
"; ";
var applicationEnvironment = GetApplicationEnvironment(); var applicationEnvironment = GetApplicationEnvironment();
var accessor = GetLoadContextAccessor();
var libraryExporter = GetLibraryExporter(); var libraryExporter = GetLibraryExporter();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@ -204,7 +195,6 @@ public class MyNonCustomDefinedClass {}
.Returns("My"); .Returns("My");
var compilationService = new RoslynCompilationService(applicationEnvironment, var compilationService = new RoslynCompilationService(applicationEnvironment,
accessor,
libraryExporter, libraryExporter,
compilerOptionsProvider.Object, compilerOptionsProvider.Object,
mvcRazorHost.Object, mvcRazorHost.Object,
@ -228,7 +218,6 @@ public class MyNonCustomDefinedClass {}
public class RazorPrefixType {} public class RazorPrefixType {}
public class NotRazorPrefixType {}"; public class NotRazorPrefixType {}";
var applicationEnvironment = GetApplicationEnvironment(); var applicationEnvironment = GetApplicationEnvironment();
var accessor = GetLoadContextAccessor();
var libraryExporter = GetLibraryExporter(); var libraryExporter = GetLibraryExporter();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@ -241,7 +230,6 @@ public class NotRazorPrefixType {}";
.Returns("RazorPrefix"); .Returns("RazorPrefix");
var compilationService = new RoslynCompilationService(applicationEnvironment, var compilationService = new RoslynCompilationService(applicationEnvironment,
accessor,
libraryExporter, libraryExporter,
compilerOptionsProvider.Object, compilerOptionsProvider.Object,
mvcRazorHost.Object, mvcRazorHost.Object,
@ -274,7 +262,6 @@ public class NotRazorPrefixType {}";
}); });
var compilationService = new RoslynCompilationService( var compilationService = new RoslynCompilationService(
GetApplicationEnvironment(), GetApplicationEnvironment(),
GetLoadContextAccessor(),
GetLibraryExporter(), GetLibraryExporter(),
Mock.Of<ICompilerOptionsProvider>(), Mock.Of<ICompilerOptionsProvider>(),
Mock.Of<IMvcRazorHost>(), Mock.Of<IMvcRazorHost>(),
@ -378,22 +365,6 @@ public class NotRazorPrefixType {}";
return libraryExporter.Object; return libraryExporter.Object;
} }
private static IAssemblyLoadContextAccessor GetLoadContextAccessor()
{
var loadContext = new Mock<IAssemblyLoadContext>();
loadContext.Setup(s => s.LoadStream(It.IsAny<Stream>(), It.IsAny<Stream>()))
.Returns((Stream stream, Stream pdb) =>
{
var memoryStream = (MemoryStream)stream;
return Assembly.Load(memoryStream.ToArray());
});
var accessor = new Mock<IAssemblyLoadContextAccessor>();
accessor.Setup(a => a.GetLoadContext(typeof(RoslynCompilationService).Assembly))
.Returns(loadContext.Object);
return accessor.Object;
}
private IApplicationEnvironment GetApplicationEnvironment() private IApplicationEnvironment GetApplicationEnvironment()
{ {
var applicationEnvironment = new Mock<IApplicationEnvironment>(); var applicationEnvironment = new Mock<IApplicationEnvironment>();