From 464e08b4f4f00b90e5c082f8e641e2413746e7bc Mon Sep 17 00:00:00 2001
From: "Chris Ross (ASP.NET)" <chrross@microsoft.com>
Date: Fri, 22 Dec 2017 12:40:44 -0800
Subject: [PATCH] Force http in tests

---
 .../WebHostFunctionalTests.cs                     | 15 +++++----------
 .../CreateDefaultBuilderOfTApp/appsettings.json   |  9 ++++++++-
 test/TestSites/DependencyInjectionApp/Program.cs  |  1 +
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
index 3a9ac52e29..b882205779 100644
--- a/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
+++ b/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
@@ -52,9 +52,7 @@ namespace Microsoft.AspNetCore.Tests
             var applicationName = "CreateDefaultBuilderApp";
             await ExecuteTestApp(applicationName, async (deploymentResult, logger) =>
             {
-                var handler = new HttpClientHandler() { ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator };
-                var client = new HttpClient(handler) { BaseAddress = new Uri(deploymentResult.ApplicationBaseUri) };
-                var response = await RetryHelper.RetryRequest(() => client.GetAsync(string.Empty), logger, deploymentResult.HostShutdownToken);
+                var response = await RetryHelper.RetryRequest(() => deploymentResult.HttpClient.GetAsync(string.Empty), logger, deploymentResult.HostShutdownToken);
 
                 var responseText = await response.Content.ReadAsStringAsync();
                 try
@@ -81,16 +79,15 @@ namespace Microsoft.AspNetCore.Tests
             var applicationName = "CreateDefaultBuilderOfTApp";
             await ExecuteTestApp(applicationName, async (deploymentResult, logger) =>
             {
-                var handler = new HttpClientHandler() { ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator };
-                var client = new HttpClient(handler) { BaseAddress = new Uri(deploymentResult.ApplicationBaseUri) };
-                var response = await RetryHelper.RetryRequest(() => client.GetAsync(string.Empty), logger, deploymentResult.HostShutdownToken);
+                var response = await RetryHelper.RetryRequest(() => deploymentResult.HttpClient.GetAsync(string.Empty), logger, deploymentResult.HostShutdownToken);
 
                 var responseText = await response.Content.ReadAsStringAsync();
                 try
                 {
                     // Assert server is Kestrel
                     Assert.Equal("Kestrel", response.Headers.Server.ToString());
-
+                    // Set from default config
+                    Assert.Equal("http://localhost:5002/", deploymentResult.ApplicationBaseUri);
                     // The application name will be sent in response when all asserts succeed in the test app.
                     Assert.Equal(applicationName, responseText);
                 }
@@ -111,9 +108,7 @@ namespace Microsoft.AspNetCore.Tests
             var applicationName = "DependencyInjectionApp";
             await ExecuteTestApp(applicationName, async (deploymentResult, logger) =>
             {
-                var handler = new HttpClientHandler() { ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator };
-                var client = new HttpClient(handler) { BaseAddress = new Uri(deploymentResult.ApplicationBaseUri) };
-                var response = await RetryHelper.RetryRequest(() => client.GetAsync(string.Empty), logger, deploymentResult.HostShutdownToken);
+                var response = await RetryHelper.RetryRequest(() => deploymentResult.HttpClient.GetAsync(string.Empty), logger, deploymentResult.HostShutdownToken);
                 var responseText = await response.Content.ReadAsStringAsync();
                 try
                 {
diff --git a/test/TestSites/CreateDefaultBuilderOfTApp/appsettings.json b/test/TestSites/CreateDefaultBuilderOfTApp/appsettings.json
index bc5ff92c67..393b080efb 100644
--- a/test/TestSites/CreateDefaultBuilderOfTApp/appsettings.json
+++ b/test/TestSites/CreateDefaultBuilderOfTApp/appsettings.json
@@ -1,3 +1,10 @@
 {
-  "settingsKey": "settingsValue"
+  "settingsKey": "settingsValue",
+  "Kestrel": {
+    "Endpoints": {
+      "HTTP": {
+        "Url": "http://localhost:5002"
+      }
+    }
+  }
 }
diff --git a/test/TestSites/DependencyInjectionApp/Program.cs b/test/TestSites/DependencyInjectionApp/Program.cs
index 555dcc7156..6e4850002b 100644
--- a/test/TestSites/DependencyInjectionApp/Program.cs
+++ b/test/TestSites/DependencyInjectionApp/Program.cs
@@ -22,6 +22,7 @@ namespace CreateDefaultBuilderApp
         static void Main(string[] args)
         {
             WebHost.CreateDefaultBuilder()
+                .UseUrls("http://localhost:5002")
                 .ConfigureServices((context, services) =>
                 {
                     services.AddSingleton(typeof(IService<>), typeof(Service<>));