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

Force http in tests

This commit is contained in:
Chris Ross (ASP.NET) 2017-12-22 12:40:44 -08:00 committed by Ryan Brandenburg
parent 7511a4da7f
commit 464e08b4f4
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
View File

@ -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
{

9
test/TestSites/CreateDefaultBuilderOfTApp/appsettings.json
View File

@ -1,3 +1,10 @@
{
"settingsKey": "settingsValue"
"settingsKey": "settingsValue",
"Kestrel": {
"Endpoints": {
"HTTP": {
"Url": "http://localhost:5002"
}
}
}
}

1
test/TestSites/DependencyInjectionApp/Program.cs
View File

@ -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<>));