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

React to runtime perf changes in functional tests

This commit is contained in:
Wei Wang 2015-02-27 01:58:31 -08:00
parent 69294f06d6
commit 64ddbe0160
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Microsoft.AspNet.Mvc.FunctionalTests/TestApplicationEnvironment.cs
View File

@ -14,16 +14,18 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
{ {
private readonly IApplicationEnvironment _originalAppEnvironment; private readonly IApplicationEnvironment _originalAppEnvironment;
private readonly string _applicationBasePath; private readonly string _applicationBasePath;
private readonly string _applicationName;
public TestApplicationEnvironment(IApplicationEnvironment originalAppEnvironment, string appBasePath) public TestApplicationEnvironment(IApplicationEnvironment originalAppEnvironment, string appBasePath, string appName)
{ {
_originalAppEnvironment = originalAppEnvironment; _originalAppEnvironment = originalAppEnvironment;
_applicationBasePath = appBasePath; _applicationBasePath = appBasePath;
_applicationName = appName;
} }
public string ApplicationName public string ApplicationName
{ {
get { return _originalAppEnvironment.ApplicationName; } get { return _applicationName; }
} }
public string Version public string Version

2
test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddInstance( services.AddInstance(
typeof(IApplicationEnvironment), typeof(IApplicationEnvironment),
new TestApplicationEnvironment(appEnvironment, appBasePath)); new TestApplicationEnvironment(appEnvironment, appBasePath, applicationWebSiteName));
// Injecting a custom assembly provider via configuration setting. It's not good enough to just // Injecting a custom assembly provider via configuration setting. It's not good enough to just
// add the service directly since it's registered by MVC. // add the service directly since it's registered by MVC.

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

@ -24,7 +24,7 @@ public class MyTestType {}";
var libraryManager = GetLibraryManager(); var libraryManager = GetLibraryManager();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
compilerOptionsProvider.Setup(p => p.GetCompilerOptions(applicationEnvironment.ApplicationBasePath, compilerOptionsProvider.Setup(p => p.GetCompilerOptions(applicationEnvironment.ApplicationName,
applicationEnvironment.RuntimeFramework, applicationEnvironment.RuntimeFramework,
applicationEnvironment.Configuration)) applicationEnvironment.Configuration))
.Returns(new CompilerOptions()); .Returns(new CompilerOptions());
@ -63,7 +63,7 @@ public class MyNonCustomDefinedClass {}
var libraryManager = GetLibraryManager(); var libraryManager = GetLibraryManager();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
compilerOptionsProvider.Setup(p => p.GetCompilerOptions(applicationEnvironment.ApplicationBasePath, compilerOptionsProvider.Setup(p => p.GetCompilerOptions(applicationEnvironment.ApplicationName,
applicationEnvironment.RuntimeFramework, applicationEnvironment.RuntimeFramework,
applicationEnvironment.Configuration)) applicationEnvironment.Configuration))
.Returns(new CompilerOptions { Defines = new[] { "MY_CUSTOM_DEFINE" } }); .Returns(new CompilerOptions { Defines = new[] { "MY_CUSTOM_DEFINE" } });
@ -97,7 +97,7 @@ public class NotRazorPrefixType {}";
var libraryManager = GetLibraryManager(); var libraryManager = GetLibraryManager();
var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>(); var compilerOptionsProvider = new Mock<ICompilerOptionsProvider>();
compilerOptionsProvider.Setup(p => p.GetCompilerOptions(applicationEnvironment.ApplicationBasePath, compilerOptionsProvider.Setup(p => p.GetCompilerOptions(applicationEnvironment.ApplicationName,
applicationEnvironment.RuntimeFramework, applicationEnvironment.RuntimeFramework,
applicationEnvironment.Configuration)) applicationEnvironment.Configuration))
.Returns(new CompilerOptions()); .Returns(new CompilerOptions());