From 99fa2d1cd39f94f9bbfa00714b8b56ea592f18fd Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Thu, 13 Apr 2017 11:24:12 -0700
Subject: [PATCH] New version of Microsoft.AspNetCore.Server.IntegrationTesting

---
 build/dependencies.props                      |  2 +-
 ...etCore.Localization.FunctionalTests.csproj |  2 +-
 .../TestRunner.cs                             | 53 +++++++++----------
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 034a8ea27e..6f6e57274b 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
-    <AspNetCoreLabsVersion>0.3.0-*</AspNetCoreLabsVersion>
+    <AspNetIntegrationTestingVersion>0.4.0-*</AspNetIntegrationTestingVersion>
     <CoreFxVersion>4.3.0</CoreFxVersion>
     <InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
     <MoqVersion>4.7.1</MoqVersion>
diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj
index a0dcab7e8b..2776fec3c1 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(AspNetCoreLabsVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(AspNetIntegrationTestingVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="$(AspNetCoreVersion)" />
diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs
index 64c8272dfa..96cbe6ba02 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs
@@ -49,40 +49,37 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
             string environmentName,
             string locale)
         {
-            var logger = new LoggerFactory()
-                            .AddConsole()
-                            .CreateLogger(string.Format("Localization Test Site:{0}:{1}:{2}", ServerType.Kestrel, runtimeFlavor, runtimeArchitecture));
+            var loggerFactory = new LoggerFactory();
 
-            using (logger.BeginScope("LocalizationTest"))
+            var deploymentParameters = new DeploymentParameters(_applicationPath, ServerType.Kestrel, runtimeFlavor, runtimeArchitecture)
             {
-                var deploymentParameters = new DeploymentParameters(_applicationPath, ServerType.Kestrel, runtimeFlavor, runtimeArchitecture)
+                ApplicationBaseUriHint = applicationBaseUrl,
+                EnvironmentName = environmentName,
+                TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0"
+            };
+
+            using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory))
+            {
+                var deploymentResult = await deployer.DeployAsync();
+
+                var cookie = new Cookie(CookieRequestCultureProvider.DefaultCookieName, "c=" + locale + "|uic=" + locale);
+                var cookieContainer = new CookieContainer();
+                cookieContainer.Add(new Uri(deploymentResult.ApplicationBaseUri), cookie);
+
+                var httpClientHandler = new HttpClientHandler();
+                httpClientHandler.CookieContainer = cookieContainer;
+
+                using (var httpClient = new HttpClient(httpClientHandler) { BaseAddress = new Uri(deploymentResult.ApplicationBaseUri) })
                 {
-                    ApplicationBaseUriHint = applicationBaseUrl,
-                    EnvironmentName = environmentName,
-                    TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0"
-                };
+                    var logger = loggerFactory.CreateLogger(string.Format("Localization Test Site:{0}:{1}:{2}", ServerType.Kestrel, runtimeFlavor, runtimeArchitecture));
 
-                using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, logger))
-                {
-                    var deploymentResult = deployer.Deploy();
-
-                    var cookie = new Cookie(CookieRequestCultureProvider.DefaultCookieName, "c=" + locale + "|uic=" + locale);
-                    var cookieContainer = new CookieContainer();
-                    cookieContainer.Add(new Uri(deploymentResult.ApplicationBaseUri), cookie);
-
-                    var httpClientHandler = new HttpClientHandler();
-                    httpClientHandler.CookieContainer = cookieContainer;
-
-                    using (var httpClient = new HttpClient(httpClientHandler) { BaseAddress = new Uri(deploymentResult.ApplicationBaseUri) })
+                    // Request to base address and check if various parts of the body are rendered & measure the cold startup time.
+                    var response = await RetryHelper.RetryRequest(() =>
                     {
-                        // Request to base address and check if various parts of the body are rendered & measure the cold startup time.
-                        var response = await RetryHelper.RetryRequest(() =>
-                        {
-                            return httpClient.GetAsync(string.Empty);
-                        }, logger, deploymentResult.HostShutdownToken);
+                        return httpClient.GetAsync(string.Empty);
+                    }, logger, deploymentResult.HostShutdownToken);
 
-                        return await response.Content.ReadAsStringAsync();
-                    }
+                    return await response.Content.ReadAsStringAsync();
                 }
             }
         }