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

Update

This commit is contained in:
BrennanConroy 2016-03-24 08:46:06 -07:00
parent f272d993de
commit 06a0d4f3e1
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/ServerComparison.FunctionalTests/HelloWorldTest.cs
View File

@ -70,7 +70,7 @@ namespace ServerComparison.FunctionalTests
{ {
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld',
ServerConfigTemplateContent = Helpers.GetConfigContent(serverType), ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"),
SiteName = "HttpTestSite", // This is configured in the Http.config SiteName = "HttpTestSite", // This is configured in the Http.config
PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "netstandardapp1.5" PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "netstandardapp1.5"
}; };

6
test/ServerComparison.FunctionalTests/Helpers.cs
View File

@ -13,16 +13,16 @@ namespace ServerComparison.FunctionalTests
return Path.GetFullPath(Path.Combine("..", "..", "..", "..", "..", "ServerComparison.TestSites")); return Path.GetFullPath(Path.Combine("..", "..", "..", "..", "..", "ServerComparison.TestSites"));
} }
public static string GetConfigContent(ServerType serverType) public static string GetConfigContent(ServerType serverType, string iisConfig, string nginxConfig)
{ {
string content = null; string content = null;
if (serverType == ServerType.IISExpress) if (serverType == ServerType.IISExpress)
{ {
content = File.ReadAllText("Http.config"); content = File.ReadAllText(iisConfig);
} }
else if (serverType == ServerType.Nginx) else if (serverType == ServerType.Nginx)
{ {
content = File.ReadAllText("nginx.conf"); content = File.ReadAllText(nginxConfig);
} }
return content; return content;

0
test/ServerComparison.FunctionalTests/NtlmAuthentation.config → test/ServerComparison.FunctionalTests/NtlmAuthentication.config
View File

2
test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs → test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs
View File

@ -37,7 +37,7 @@ namespace ServerComparison.FunctionalTests
{ {
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication'
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null, ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "NtlmAuthentication.config", nginxConfig: null),
SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config
}; };

2
test/ServerComparison.FunctionalTests/ResponseTests.cs
View File

@ -140,7 +140,7 @@ namespace ServerComparison.FunctionalTests
{ {
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "Responses", EnvironmentName = "Responses",
ServerConfigTemplateContent = Helpers.GetConfigContent(serverType), ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"),
SiteName = "HttpTestSite", // This is configured in the Http.config SiteName = "HttpTestSite", // This is configured in the Http.config
PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "netstandardapp1.5" PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "netstandardapp1.5"
}; };

2
test/ServerComparison.FunctionalTests/project.json
View File

@ -13,7 +13,7 @@
"content": [ "content": [
"Http.config", "Http.config",
"nginx.conf", "nginx.conf",
"NtlmAuthentation.config" "NtlmAuthentication.config"
], ],
"frameworks": { "frameworks": {