From 06a0d4f3e1b89a4aee2b52da624cb731bdc64fad Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Thu, 24 Mar 2016 08:46:06 -0700
Subject: [PATCH] Update

---
 test/ServerComparison.FunctionalTests/HelloWorldTest.cs     | 2 +-
 test/ServerComparison.FunctionalTests/Helpers.cs            | 6 +++---
 .../{NtlmAuthentation.config => NtlmAuthentication.config}  | 0
 .../{NtlmAuthentationTest.cs => NtlmAuthenticationTest.cs}  | 2 +-
 test/ServerComparison.FunctionalTests/ResponseTests.cs      | 2 +-
 test/ServerComparison.FunctionalTests/project.json          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename test/ServerComparison.FunctionalTests/{NtlmAuthentation.config => NtlmAuthentication.config} (100%)
 rename test/ServerComparison.FunctionalTests/{NtlmAuthentationTest.cs => NtlmAuthenticationTest.cs} (98%)

diff --git a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
index daa902bb4f..f30a5373e1 100644
--- a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
+++ b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
@@ -70,7 +70,7 @@ namespace ServerComparison.FunctionalTests
                 {
                     ApplicationBaseUriHint = applicationBaseUrl,
                     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
                     PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "netstandardapp1.5"
                 };
diff --git a/test/ServerComparison.FunctionalTests/Helpers.cs b/test/ServerComparison.FunctionalTests/Helpers.cs
index 81c4b3b88f..8f362038b0 100644
--- a/test/ServerComparison.FunctionalTests/Helpers.cs
+++ b/test/ServerComparison.FunctionalTests/Helpers.cs
@@ -13,16 +13,16 @@ namespace ServerComparison.FunctionalTests
             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;
             if (serverType == ServerType.IISExpress)
             {
-                content = File.ReadAllText("Http.config");
+                content = File.ReadAllText(iisConfig);
             }
             else if (serverType == ServerType.Nginx)
             {
-                content = File.ReadAllText("nginx.conf");
+                content = File.ReadAllText(nginxConfig);
             }
 
             return content;
diff --git a/test/ServerComparison.FunctionalTests/NtlmAuthentation.config b/test/ServerComparison.FunctionalTests/NtlmAuthentication.config
similarity index 100%
rename from test/ServerComparison.FunctionalTests/NtlmAuthentation.config
rename to test/ServerComparison.FunctionalTests/NtlmAuthentication.config
diff --git a/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs b/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs
similarity index 98%
rename from test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs
rename to test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs
index 92eecda5cb..e7d05f69e5 100644
--- a/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs
+++ b/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs
@@ -37,7 +37,7 @@ namespace ServerComparison.FunctionalTests
                 {
                     ApplicationBaseUriHint = applicationBaseUrl,
                     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
                 };
 
diff --git a/test/ServerComparison.FunctionalTests/ResponseTests.cs b/test/ServerComparison.FunctionalTests/ResponseTests.cs
index e50c842511..8af4f7dece 100644
--- a/test/ServerComparison.FunctionalTests/ResponseTests.cs
+++ b/test/ServerComparison.FunctionalTests/ResponseTests.cs
@@ -140,7 +140,7 @@ namespace ServerComparison.FunctionalTests
                 {
                     ApplicationBaseUriHint = applicationBaseUrl,
                     EnvironmentName = "Responses",
-                    ServerConfigTemplateContent = Helpers.GetConfigContent(serverType),
+                    ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"),
                     SiteName = "HttpTestSite", // This is configured in the Http.config
                     PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "netstandardapp1.5"
                 };
diff --git a/test/ServerComparison.FunctionalTests/project.json b/test/ServerComparison.FunctionalTests/project.json
index 22968b8871..280c734169 100644
--- a/test/ServerComparison.FunctionalTests/project.json
+++ b/test/ServerComparison.FunctionalTests/project.json
@@ -13,7 +13,7 @@
   "content": [
     "Http.config",
     "nginx.conf",
-    "NtlmAuthentation.config"
+    "NtlmAuthentication.config"
   ],
 
   "frameworks": {