From b82649123440f278d7d2afff36b2a71242608b0a Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 7 Jan 2016 11:54:27 -0800 Subject: [PATCH] Reacting to new hosting API --- .../AddressRegistrationTests.cs | 6 ++++-- .../PathBaseTests.cs | 6 ++++-- .../RequestTests.cs | 18 ++++++++++++------ .../ResponseTests.cs | 12 ++++++++---- .../ThreadCountTests.cs | 7 ++++--- 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs index da0cd8d1f9..6a936ea3db 100644 --- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs +++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs @@ -42,11 +42,13 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var applicationBuilder = new WebApplicationBuilder() .UseConfiguration(config) - .UseServerFactory("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNet.Server.Kestrel") .Configure(ConfigureEchoAddress); - using (var app = applicationBuilder.Build().Start()) + using (var app = applicationBuilder.Build()) { + app.Start(); + using (var client = new HttpClient()) { foreach (var testUrl in testUrls) diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/PathBaseTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/PathBaseTests.cs index 700150e2aa..ddad81932e 100644 --- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/PathBaseTests.cs +++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/PathBaseTests.cs @@ -81,7 +81,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var builder = new WebApplicationBuilder() .UseConfiguration(config) - .UseServerFactory("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNet.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -94,8 +94,10 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests }); }); - using (var app = builder.Build().Start()) + using (var app = builder.Build()) { + app.Start(); + using (var client = new HttpClient()) { var response = await client.GetAsync(requestAddress); diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs index a74f999eaf..623e85c8ff 100644 --- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs +++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var applicationBuilder = new WebApplicationBuilder() .UseConfiguration(config) - .UseServerFactory("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNet.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -54,8 +54,10 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests }); }); - using (var app = applicationBuilder.Build().Start()) + using (var app = applicationBuilder.Build()) { + app.Start(); + using (var client = new HttpClient()) { var bytes = new byte[1024 * 1024]; @@ -100,7 +102,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var builder = new WebApplicationBuilder() .UseConfiguration(config) - .UseServerFactory("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNet.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -110,9 +112,11 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests }); }); - using (var app = builder.Build().Start()) + using (var app = builder.Build()) using (var client = new HttpClient()) { + app.Start(); + client.DefaultRequestHeaders.Connection.Clear(); client.DefaultRequestHeaders.Connection.Add("close"); @@ -130,7 +134,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var builder = new WebApplicationBuilder() .UseConfiguration(config) - .UseServerFactory("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNet.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -147,9 +151,11 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests }); }); - using (var app = builder.Build().Start()) + using (var app = builder.Build()) using (var client = new HttpClient()) { + app.Start(); + var response = await client.GetAsync($"http://{requestAddress}:{port}/"); response.EnsureSuccessStatusCode(); diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs index b1db1a5091..0caf5e5101 100644 --- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs +++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var applicationBuilder = new WebApplicationBuilder() .UseConfiguration(config) - .UseServerFactory("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNet.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -50,8 +50,10 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests }); }); - using (var app = applicationBuilder.Build().Start()) + using (var app = applicationBuilder.Build()) { + app.Start(); + using (var client = new HttpClient()) { var response = await client.GetAsync("http://localhost:8792/"); @@ -88,7 +90,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var hostBuilder = new WebApplicationBuilder() .UseConfiguration(config) - .UseServerFactory("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNet.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -99,8 +101,10 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests }); }); - using (var app = hostBuilder.Build().Start()) + using (var app = hostBuilder.Build()) { + app.Start(); + using (var client = new HttpClient()) { var response = await client.GetAsync("http://localhost:8793/"); diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs index f67cff786f..a56fa6b47c 100644 --- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs +++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; using Microsoft.Extensions.Configuration; using Xunit; @@ -26,7 +25,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var applicationBuilder = new WebApplicationBuilder() .UseConfiguration(config) - .UseServerFactory("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNet.Server.Kestrel") .Configure(app => { var serverInfo = app.ServerFeatures.Get(); @@ -37,8 +36,10 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests }); }); - using (var app = applicationBuilder.Build().Start()) + using (var app = applicationBuilder.Build()) { + app.Start(); + using (var client = new HttpClient()) { // Send 20 requests just to make sure we don't get any failures