From 6d3a416f0eed0962e682f9aea9d247e75c425ce5 Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Thu, 26 May 2016 20:34:46 -0700 Subject: [PATCH] Test code nitpicks. --- .../BadHttpRequestTests.cs | 5 +- .../EngineTests.cs | 3 +- .../HttpsConnectionFilterTests.cs | 59 +++++++------------ .../TestHelpers/MockFrameControl.cs | 5 +- .../TestHelpers/MockSocketOuptut.cs | 2 +- .../TestInput.cs | 4 +- 6 files changed, 33 insertions(+), 45 deletions(-) diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs index a239e7102c..7b750066ac 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests @@ -68,7 +69,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests [InlineData("GET / HTTP/1.0\rA")] public async Task TestBadRequestLines(string request) { - using (var server = new TestServer(context => { return Task.FromResult(0); })) + using (var server = new TestServer(context => TaskUtilities.CompletedTask)) { using (var connection = server.CreateConnection()) { @@ -85,7 +86,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests [InlineData("GET / HTTP/1.0\rA")] public async Task ServerClosesConnectionAsSoonAsBadRequestLineIsDetected(string request) { - using (var server = new TestServer(context => { return Task.FromResult(0); })) + using (var server = new TestServer(context => TaskUtilities.CompletedTask)) { using (var connection = server.CreateConnection()) { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs index a611f8305b..1ff2116bb7 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests @@ -1062,7 +1063,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests using (var server = new TestServer(httpContext => { httpContext.Abort(); - return Task.FromResult(0); + return TaskUtilities.CompletedTask; }, testContext)) { using (var connection = server.CreateConnection()) diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs index 894fc37b3e..0d5113ab5b 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs @@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Filter; using Microsoft.AspNetCore.Server.Kestrel.Https; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -116,13 +117,12 @@ namespace Microsoft.AspNetCore.Server.KestrelTests new NoOpConnectionFilter()) ); - RequestDelegate app = context => - { - Assert.Equal(context.Features.Get(), null); - return context.Response.WriteAsync("hello world"); - }; - - using (var server = new TestServer(app, serviceContext, _serverAddress)) + using (var server = new TestServer(context => + { + Assert.Equal(context.Features.Get(), null); + return context.Response.WriteAsync("hello world"); + }, + serviceContext, _serverAddress)) { using (var client = new HttpClient(GetHandler())) { @@ -153,8 +153,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests new NoOpConnectionFilter()) ); - RequestDelegate app = context => Task.FromResult(0); - using (var server = new TestServer(app, serviceContext, _serverAddress)) + using (var server = new TestServer(context => TaskUtilities.CompletedTask, serviceContext, _serverAddress)) { using (var client = new TcpClient()) { @@ -182,16 +181,15 @@ namespace Microsoft.AspNetCore.Server.KestrelTests new NoOpConnectionFilter()) ); - RequestDelegate app = context => - { - var tlsFeature = context.Features.Get(); - Assert.NotNull(tlsFeature); - Assert.NotNull(tlsFeature.ClientCertificate); - Assert.NotNull(context.Connection.ClientCertificate); - return context.Response.WriteAsync("hello world"); - }; - - using (var server = new TestServer(app, serviceContext, _serverAddress)) + using (var server = new TestServer(context => + { + var tlsFeature = context.Features.Get(); + Assert.NotNull(tlsFeature); + Assert.NotNull(tlsFeature.ClientCertificate); + Assert.NotNull(context.Connection.ClientCertificate); + return context.Response.WriteAsync("hello world"); + }, + serviceContext, _serverAddress)) { using (var client = new TcpClient()) { @@ -219,9 +217,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests new NoOpConnectionFilter()) ); - RequestDelegate app = context => context.Response.WriteAsync(context.Request.Scheme); - - using (var server = new TestServer(app, serviceContext, _serverAddress)) + using (var server = new TestServer(context => context.Response.WriteAsync(context.Request.Scheme), serviceContext, _serverAddress)) { using (var client = new HttpClient(GetHandler())) { @@ -245,12 +241,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests new NoOpConnectionFilter()) ); - RequestDelegate app = context => - { - return context.Response.WriteAsync("hello world"); - }; - - using (var server = new TestServer(app, serviceContext, _serverAddress)) + using (var server = new TestServer(context => context.Response.WriteAsync("hello world"), serviceContext, _serverAddress)) { // SslStream is used to ensure the certificate is actually passed to the server // HttpClient might not send the certificate because it is invalid or it doesn't match any @@ -286,9 +277,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests new NoOpConnectionFilter()) ); - RequestDelegate app = context => Task.FromResult(0); - - using (var server = new TestServer(app, serviceContext, _serverAddress)) + using (var server = new TestServer(context => TaskUtilities.CompletedTask, serviceContext, _serverAddress)) { using (var client = new TcpClient()) { @@ -315,9 +304,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests new NoOpConnectionFilter()) ); - RequestDelegate app = context => Task.FromResult(0); - - using (var server = new TestServer(app, serviceContext, _serverAddress)) + using (var server = new TestServer(context => TaskUtilities.CompletedTask, serviceContext, _serverAddress)) { using (var client = new TcpClient()) { @@ -342,9 +329,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests new NoOpConnectionFilter()) ); - RequestDelegate app = context => Task.FromResult(0); - - using (var server = new TestServer(app, serviceContext, _serverAddress)) + using (var server = new TestServer(context => TaskUtilities.CompletedTask, serviceContext, _serverAddress)) { using (var client = new TcpClient()) { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockFrameControl.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockFrameControl.cs index d6d0596b02..0f5faf7148 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockFrameControl.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockFrameControl.cs @@ -5,6 +5,7 @@ using System; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { @@ -16,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers public Task FlushAsync(CancellationToken cancellationToken) { - return Task.FromResult(0); + return TaskUtilities.CompletedTask; } public void ProduceContinue() @@ -29,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers public Task WriteAsync(ArraySegment data, CancellationToken cancellationToken) { - return Task.FromResult(0); + return TaskUtilities.CompletedTask; } } } diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocketOuptut.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocketOuptut.cs index 051074c7d8..8a516c4174 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocketOuptut.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocketOuptut.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers public Task WriteAsync(ArraySegment buffer, bool chunk = false, CancellationToken cancellationToken = default(CancellationToken)) { - return Task.FromResult(0); + return TaskUtilities.CompletedTask; } } } diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs index d841e180f7..4c73c043b0 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs @@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests Task IFrameControl.WriteAsync(ArraySegment data, CancellationToken cancellationToken) { - return Task.FromResult(0); + return TaskUtilities.CompletedTask; } void IFrameControl.Flush() @@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests Task IFrameControl.FlushAsync(CancellationToken cancellationToken) { - return Task.FromResult(0); + return TaskUtilities.CompletedTask; } public void Dispose()