Fixed test build break.

Halfnhav4 · Oct 22, 2015 · 2b9dae5 · 2b9dae5
1 parent faa78a3
commit 2b9dae5
Showing 1 changed file with 1 addition and 30 deletions.
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs
@@ -25,7 +25,6 @@ public void Compile_ReturnsUncachedCompilationResultWithCompiledContent()
             var content = @"
 public class MyTestType  {}";
             var applicationEnvironment = GetApplicationEnvironment();
-            var accessor = GetLoadContextAccessor();
             var libraryExporter = GetLibraryExporter();
 
             var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@@ -38,7 +37,6 @@ public class MyTestType  {}";
                         .Returns(string.Empty);
 
             var compilationService = new RoslynCompilationService(applicationEnvironment,
-                                                                  accessor,
                                                                   libraryExporter,
                                                                   compilerOptionsProvider.Object,
                                                                   mvcRazorHost.Object,
@@ -65,7 +63,6 @@ public void Compile_ReturnsCompilationFailureWithPathsFromLinePragmas()
 #line 1 ""{viewPath}""
 this should fail";
             var applicationEnvironment = GetApplicationEnvironment();
-            var accessor = GetLoadContextAccessor();
             var libraryExporter = GetLibraryExporter();
 
             var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@@ -78,7 +75,6 @@ public void Compile_ReturnsCompilationFailureWithPathsFromLinePragmas()
             var fileInfo = fileProvider.AddFile(viewPath, fileContent);
 
             var compilationService = new RoslynCompilationService(applicationEnvironment,
-                                                                  accessor,
                                                                   libraryExporter,
                                                                   compilerOptionsProvider.Object,
                                                                   mvcRazorHost,
@@ -103,7 +99,6 @@ public void Compile_ReturnsGeneratedCodePath_IfLinePragmaIsNotAvailable()
             var fileContent = "file content";
             var content = @"this should fail";
             var applicationEnvironment = GetApplicationEnvironment();
-            var accessor = GetLoadContextAccessor();
             var libraryExporter = GetLibraryExporter();
 
             var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@@ -114,7 +109,6 @@ public void Compile_ReturnsGeneratedCodePath_IfLinePragmaIsNotAvailable()
             var mvcRazorHost = Mock.Of<IMvcRazorHost>();
 
             var compilationService = new RoslynCompilationService(applicationEnvironment,
-                                                                  accessor,
                                                                   libraryExporter,
                                                                   compilerOptionsProvider.Object,
                                                                   mvcRazorHost,
@@ -143,7 +137,6 @@ public void Compile_DoesNotThrow_IfFileCannotBeRead()
 #line 1 ""{path}""
 this should fail";
             var applicationEnvironment = GetApplicationEnvironment();
-            var accessor = GetLoadContextAccessor();
             var libraryExporter = GetLibraryExporter();
 
             var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@@ -160,12 +153,11 @@ public void Compile_DoesNotThrow_IfFileCannotBeRead()
             fileProvider.AddFile(path, mockFileInfo.Object);
 
             var compilationService = new RoslynCompilationService(applicationEnvironment,
-                                                                  accessor,
                                                                   libraryExporter,
                                                                   compilerOptionsProvider.Object,
                                                                   mvcRazorHost,
                                                                   GetOptions(fileProvider));
-            
+
             var relativeFileInfo = new RelativeFileInfo(mockFileInfo.Object, path);
 
             // Act
@@ -191,7 +183,6 @@ public class MyNonCustomDefinedClass {}
 #endif
 ";
             var applicationEnvironment = GetApplicationEnvironment();
-            var accessor = GetLoadContextAccessor();
             var libraryExporter = GetLibraryExporter();
 
             var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@@ -204,7 +195,6 @@ public class MyNonCustomDefinedClass {}
                         .Returns("My");
 
             var compilationService = new RoslynCompilationService(applicationEnvironment,
-                                                                  accessor,
                                                                   libraryExporter,
                                                                   compilerOptionsProvider.Object,
                                                                   mvcRazorHost.Object,
@@ -228,7 +218,6 @@ public void Compile_ReturnsSingleTypeThatStartsWithMainClassNamePrefix()
 public class RazorPrefixType  {}
 public class NotRazorPrefixType {}";
             var applicationEnvironment = GetApplicationEnvironment();
-            var accessor = GetLoadContextAccessor();
             var libraryExporter = GetLibraryExporter();
 
             var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
@@ -241,7 +230,6 @@ public class NotRazorPrefixType {}";
                         .Returns("RazorPrefix");
 
             var compilationService = new RoslynCompilationService(applicationEnvironment,
-                                                                  accessor,
                                                                   libraryExporter,
                                                                   compilerOptionsProvider.Object,
                                                                   mvcRazorHost.Object,
@@ -274,7 +262,6 @@ public void GetCompilationFailedResult_ReturnsCompilationResult_WithGroupedMessa
                 });
             var compilationService = new RoslynCompilationService(
                 GetApplicationEnvironment(),
-                GetLoadContextAccessor(),
                 GetLibraryExporter(),
                 Mock.Of<ICompilerOptionsProvider>(),
                 Mock.Of<IMvcRazorHost>(),
@@ -378,22 +365,6 @@ private static ILibraryExporter GetLibraryExporter()
             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()
         {
             var applicationEnvironment = new Mock<IApplicationEnvironment>();