diff --git a/README.md b/README.md index 7f2532761b..85a0a73610 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,10 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. +## File logging for functional test + +Turn on file logging for Kestrel functional tests by specifying the environment variable ASPNETCORE_TEST_LOG_DIR to the log output directory. + ## Packages Kestrel is available as a NuGet package. diff --git a/build/dependencies.props b/build/dependencies.props index ace613e29c..2a1dc23c3b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -7,41 +7,41 @@ 0.10.13 2.1.0-preview3-17002 1.10.0 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32037 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 - 2.1.0-preview3-32110 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-a-preview3-file-logger-16960 + 2.1.0-a-preview3-file-logger-16960 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-a-preview3-file-logger-16474 + 2.1.0-a-preview3-file-logger-16474 + 2.1.0-a-preview3-file-logger-16474 + 2.1.0-a-preview3-file-logger-16474 + 2.1.0-preview3-32196 2.0.0 - 2.1.0-preview3-26331-01 - 2.1.0-preview3-32110 + 2.1.0-preview2-26406-04 + 2.1.0-preview3-32196 15.6.1 4.7.49 11.0.2 - 4.5.0-preview3-26331-02 - 4.5.0-preview3-26331-02 - 4.5.0-preview3-26331-02 - 4.5.0-preview3-26331-02 - 4.5.0-preview3-26331-02 - 4.5.0-preview3-26331-02 - 4.5.0-preview3-26331-02 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 1.3.7 0.8.0 2.3.1 diff --git a/src/Kestrel.Core/Properties/AssemblyInfo.cs b/src/Kestrel.Core/Properties/AssemblyInfo.cs index 793159eefb..27495d5268 100644 --- a/src/Kestrel.Core/Properties/AssemblyInfo.cs +++ b/src/Kestrel.Core/Properties/AssemblyInfo.cs @@ -4,8 +4,8 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Libuv.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Sockets.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Core.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Kestrel.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs index b550c852c7..3843c6c532 100644 --- a/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs +++ b/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs @@ -23,22 +23,14 @@ using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Xunit; -using Xunit.Abstractions; using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class AddressRegistrationTests + public class AddressRegistrationTests : TestApplicationErrorLoggerLoggedTest { private const int MaxRetries = 10; - private readonly Action _configureLoggingDelegate; - - public AddressRegistrationTests(ITestOutputHelper output) - { - _configureLoggingDelegate = builder => builder.AddXunit(output); - } - [ConditionalFact] [HostNameIsReachable] public async Task RegisterAddresses_HostName_Success() @@ -165,7 +157,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseUrls(addressInput) .Configure(ConfigureEchoAddress); @@ -201,7 +193,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.GetTestCertificate()); }); }) - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseUrls("http://127.0.0.1:0") .Configure(app => { @@ -261,7 +253,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests private async Task RegisterIPEndPoint_Success(IPEndPoint endPoint, string testUrl, int testPort = 0) { var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Listen(endPoint, listenOptions => @@ -322,7 +314,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { options.ListenAnyIP(testPort); }) - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .Configure(ConfigureEchoAddress); using (var host = hostBuilder.Build()) @@ -363,7 +355,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { options.ListenLocalhost(testPort); }) - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .Configure(ConfigureEchoAddress); using (var host = hostBuilder.Build()) @@ -419,10 +411,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests private async Task RegisterDefaultServerAddresses_Success(IEnumerable addresses, bool mockHttps = false) { - var testLogger = new TestApplicationErrorLogger(); - var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel(options => { if (mockHttps) @@ -430,9 +420,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests options.DefaultCertificate = new X509Certificate2(TestResources.TestCertificatePath, "testPassword"); } }) - .ConfigureLogging(builder => builder - .AddProvider(new KestrelTestLoggerProvider(testLogger)) - .SetMinimumLevel(LogLevel.Debug)) .Configure(ConfigureEchoAddress); using (var host = hostBuilder.Build()) @@ -446,7 +433,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.Contains(5001, host.GetPorts()); } - Assert.Single(testLogger.Messages, log => log.LogLevel == LogLevel.Debug && + Assert.Single(TestApplicationErrorLogger.Messages, log => log.LogLevel == LogLevel.Debug && (string.Equals(CoreStrings.FormatBindingToDefaultAddresses(Constants.DefaultServerAddress, Constants.DefaultServerHttpsAddress), log.Message, StringComparison.Ordinal) || string.Equals(CoreStrings.FormatBindingToDefaultAddress(Constants.DefaultServerAddress), log.Message, StringComparison.Ordinal))); @@ -467,7 +454,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var port = ((IPEndPoint)socket.LocalEndPoint).Port; var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) .UseKestrel() .UseUrls($"http://127.0.0.1:{port}") .Configure(ConfigureEchoAddress); @@ -484,6 +470,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [IPv6SupportedCondition] public void ThrowsWhenBindingToIPv6AddressInUse() { + TestApplicationErrorLogger.IgnoredExceptions.Add(typeof(IOException)); + using (var socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp)) { socket.Bind(new IPEndPoint(IPAddress.IPv6Loopback, 0)); @@ -491,7 +479,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var port = ((IPEndPoint)socket.LocalEndPoint).Port; var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel() .UseUrls($"http://[::1]:{port}") .Configure(ConfigureEchoAddress); @@ -508,7 +496,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task OverrideDirectConfigurationWithIServerAddressesFeature_Succeeds() { var useUrlsAddress = $"http://127.0.0.1:0"; - var testLogger = new TestApplicationErrorLogger(); var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel(options => { @@ -519,7 +506,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }) .UseUrls(useUrlsAddress) .PreferHostingUrls(true) - .ConfigureLogging(builder => builder.AddProvider(new KestrelTestLoggerProvider(testLogger))) + .ConfigureServices(AddTestLogging) .Configure(ConfigureEchoAddress); using (var host = hostBuilder.Build()) @@ -535,7 +522,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var useUrlsAddressWithPort = $"http://127.0.0.1:{port}"; Assert.Equal(serverAddresses.First(), useUrlsAddressWithPort); - Assert.Single(testLogger.Messages, log => log.LogLevel == LogLevel.Information && + Assert.Single(TestApplicationErrorLogger.Messages, log => log.LogLevel == LogLevel.Information && string.Equals(CoreStrings.FormatOverridingWithPreferHostingUrls(nameof(IServerAddressesFeature.PreferHostingUrls), useUrlsAddress), log.Message, StringComparison.Ordinal)); @@ -547,9 +534,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfPreferHostingUrlsFalse() { var useUrlsAddress = $"http://127.0.0.1:0"; - var testLogger = new TestApplicationErrorLogger(); + var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Listen(new IPEndPoint(IPAddress.Loopback, 0), listenOptions => @@ -559,7 +546,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }) .UseUrls($"http://127.0.0.1:0") .PreferHostingUrls(false) - .ConfigureLogging(builder => builder.AddProvider(new KestrelTestLoggerProvider(testLogger))) .Configure(ConfigureEchoAddress); using (var host = hostBuilder.Build()) @@ -575,7 +561,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var endPointAddress = $"https://127.0.0.1:{port}"; Assert.Equal(serverAddresses.First(), endPointAddress); - Assert.Single(testLogger.Messages, log => log.LogLevel == LogLevel.Warning && + Assert.Single(TestApplicationErrorLogger.Messages, log => log.LogLevel == LogLevel.Warning && string.Equals(CoreStrings.FormatOverridingWithKestrelOptions(useUrlsAddress, "UseKestrel()"), log.Message, StringComparison.Ordinal)); @@ -587,7 +573,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfAddressesEmpty() { var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Listen(new IPEndPoint(IPAddress.Loopback, 0), listenOptions => @@ -630,7 +616,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public void ThrowsWhenBindingLocalhostToDynamicPort() { + TestApplicationErrorLogger.IgnoredExceptions.Add(typeof(InvalidOperationException)); + var hostBuilder = TransportSelector.GetWebHostBuilder() + .ConfigureServices(AddTestLogging) .UseKestrel() .UseUrls("http://localhost:0") .Configure(ConfigureEchoAddress); @@ -646,7 +635,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [InlineData("ssh://localhost")] public void ThrowsForUnsupportedAddressFromHosting(string addr) { + TestApplicationErrorLogger.IgnoredExceptions.Add(typeof(InvalidOperationException)); + var hostBuilder = TransportSelector.GetWebHostBuilder() + .ConfigureServices(AddTestLogging) .UseKestrel() .UseUrls(addr) .Configure(ConfigureEchoAddress); @@ -664,7 +656,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var endPointAddress = $"http://127.0.0.1:{port}/"; var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Listen(IPAddress.Loopback, port); @@ -679,7 +671,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) .UseKestrel(options => { options.Listen(IPAddress.Loopback, port); @@ -703,7 +694,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var ipv6endPointAddress = $"http://[::1]:{port}/"; var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Listen(IPAddress.Loopback, port); @@ -720,7 +711,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) .UseKestrel(options => { options.Listen(IPAddress.Loopback, port); @@ -739,6 +729,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests private void ThrowsWhenBindingLocalhostToAddressInUse(AddressFamily addressFamily) { + TestApplicationErrorLogger.IgnoredExceptions.Add(typeof(IOException)); + var addressInUseCount = 0; var wrongMessageCount = 0; @@ -771,7 +763,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } var hostBuilder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel() .UseUrls($"http://localhost:{port}") .Configure(ConfigureEchoAddress); diff --git a/test/Kestrel.FunctionalTests/BadHttpRequestTests.cs b/test/Kestrel.FunctionalTests/BadHttpRequestTests.cs index d01f81b347..2954b3f7c2 100644 --- a/test/Kestrel.FunctionalTests/BadHttpRequestTests.cs +++ b/test/Kestrel.FunctionalTests/BadHttpRequestTests.cs @@ -15,7 +15,7 @@ using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class BadHttpRequestTests + public class BadHttpRequestTests : LoggedTest { [Theory] [MemberData(nameof(InvalidRequestLineData))] @@ -153,13 +153,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task BadRequestLogsAreNotHigherThanInformation() { - var sink = new TestSink(); - var logger = new TestLogger("TestLogger", sink, enabled: true); - using (var server = new TestServer(async context => { await context.Request.Body.ReadAsync(new byte[1], 0, 1); - }, new TestServiceContext { Log = new KestrelTrace(logger) })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = new TestConnection(server.Port)) { @@ -171,14 +168,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.All(sink.Writes, w => Assert.InRange(w.LogLevel, LogLevel.Trace, LogLevel.Information)); - Assert.Contains(sink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information); + Assert.All(TestSink.Writes, w => Assert.InRange(w.LogLevel, LogLevel.Trace, LogLevel.Information)); + Assert.Contains(TestSink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information); } [Fact] public async Task TestRequestSplitting() { - using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext { Log = Mock.Of() })) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory, Mock.Of()))) { using (var client = server.CreateConnection()) { @@ -202,7 +199,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests .Setup(trace => trace.ConnectionBadRequest(It.IsAny(), It.IsAny())) .Callback((connectionId, exception) => loggedException = exception); - using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext { Log = mockKestrelTrace.Object })) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory, mockKestrelTrace.Object))) { using (var connection = server.CreateConnection()) { diff --git a/test/Kestrel.FunctionalTests/CertificateLoaderTests.cs b/test/Kestrel.FunctionalTests/CertificateLoaderTests.cs index 21ad9704ed..86cbaa288d 100644 --- a/test/Kestrel.FunctionalTests/CertificateLoaderTests.cs +++ b/test/Kestrel.FunctionalTests/CertificateLoaderTests.cs @@ -5,26 +5,19 @@ using System.Linq; using System.Security.Cryptography.X509Certificates; using Microsoft.AspNetCore.Server.Kestrel.Https.Internal; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class CertificateLoaderTests + public class CertificateLoaderTests : LoggedTest { - private readonly ITestOutputHelper _output; - - public CertificateLoaderTests(ITestOutputHelper output) - { - _output = output; - } - [Theory] [InlineData("no_extensions.pfx")] public void IsCertificateAllowedForServerAuth_AllowWithNoExtensions(string testCertName) { var certPath = TestResources.GetCertPath(testCertName); - _output.WriteLine("Loading " + certPath); + TestOutputHelper.WriteLine("Loading " + certPath); var cert = new X509Certificate2(certPath, "testPassword"); Assert.Empty(cert.Extensions.OfType()); @@ -37,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public void IsCertificateAllowedForServerAuth_ValidatesEnhancedKeyUsageOnCertificate(string testCertName) { var certPath = TestResources.GetCertPath(testCertName); - _output.WriteLine("Loading " + certPath); + TestOutputHelper.WriteLine("Loading " + certPath); var cert = new X509Certificate2(certPath, "testPassword"); Assert.NotEmpty(cert.Extensions); var eku = Assert.Single(cert.Extensions.OfType()); @@ -52,7 +45,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public void IsCertificateAllowedForServerAuth_RejectsCertificatesMissingServerEku(string testCertName) { var certPath = TestResources.GetCertPath(testCertName); - _output.WriteLine("Loading " + certPath); + TestOutputHelper.WriteLine("Loading " + certPath); var cert = new X509Certificate2(certPath, "testPassword"); Assert.NotEmpty(cert.Extensions); var eku = Assert.Single(cert.Extensions.OfType()); diff --git a/test/Kestrel.FunctionalTests/ChunkedRequestTests.cs b/test/Kestrel.FunctionalTests/ChunkedRequestTests.cs index 380f199768..8dba8331e1 100644 --- a/test/Kestrel.FunctionalTests/ChunkedRequestTests.cs +++ b/test/Kestrel.FunctionalTests/ChunkedRequestTests.cs @@ -10,11 +10,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class ChunkedRequestTests + public class ChunkedRequestTests : LoggedTest { public static TheoryData ConnectionAdapterData => new TheoryData { @@ -57,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Http10TransferEncoding(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(App, testContext, listenOptions)) { @@ -87,7 +88,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Http10KeepAliveTransferEncoding(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(AppChunked, testContext, listenOptions)) { @@ -129,7 +130,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task RequestBodyIsConsumedAutomaticallyIfAppDoesntConsumeItFully(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -213,7 +214,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests response.Headers["Content-Length"] = new[] { "11" }; await response.Body.WriteAsync(Encoding.ASCII.GetBytes("Hello World"), 0, 11); - }, new TestServiceContext(), listenOptions)) + }, new TestServiceContext(LoggerFactory), listenOptions)) { var response = string.Join("\r\n", new string[] { "HTTP/1.1 200 OK", @@ -274,7 +275,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests const string headerLine = "Header: value"; const string trailingHeaderLine = "Trailing-Header: trailing-value"; - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); testContext.ServerOptions.Limits.MaxRequestHeadersTotalSize = transferEncodingHeaderLine.Length + 2 + headerLine.Length + 2 + @@ -319,7 +320,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests const string headerLine = "Header: value"; const string trailingHeaderLine = "Trailing-Header: trailing-value"; - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); testContext.ServerOptions.Limits.MaxRequestHeaderCount = 2; using (var server = new TestServer(async context => @@ -357,7 +358,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ExtensionsAreIgnored(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); var requestCount = 10; var requestsReceived = 0; @@ -444,7 +445,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task InvalidLengthResultsIn400(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { var response = httpContext.Response; @@ -488,7 +489,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task InvalidSizedDataResultsIn400(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { var response = httpContext.Response; @@ -534,7 +535,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ChunkedNotFinalTransferCodingResultsIn400(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(httpContext => { return Task.CompletedTask; diff --git a/test/Kestrel.FunctionalTests/ChunkedResponseTests.cs b/test/Kestrel.FunctionalTests/ChunkedResponseTests.cs index dc953808ce..c9a7e70747 100644 --- a/test/Kestrel.FunctionalTests/ChunkedResponseTests.cs +++ b/test/Kestrel.FunctionalTests/ChunkedResponseTests.cs @@ -9,11 +9,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class ChunkedResponseTests + public class ChunkedResponseTests : LoggedTest { public static TheoryData ConnectionAdapterData => new TheoryData { @@ -28,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ResponsesAreChunkedAutomatically(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -64,7 +65,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ResponsesAreNotChunkedAutomaticallyForHttp10Requests(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -93,7 +94,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ResponsesAreChunkedAutomaticallyForHttp11NonKeepAliveRequests(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -130,7 +131,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task SettingConnectionCloseHeaderInAppDoesNotDisableChunking(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -167,7 +168,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ZeroLengthWritesAreIgnored(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -204,7 +205,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ZeroLengthWritesFlushHeaders(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); var flushed = new SemaphoreSlim(0, 1); @@ -249,7 +250,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task EmptyResponseBodyHandledCorrectlyWithZeroLengthWrite(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -280,7 +281,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ConnectionClosedIfExceptionThrownAfterWrite(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -314,7 +315,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ConnectionClosedIfExceptionThrownAfterZeroLengthWrite(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -347,7 +348,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task WritesAreFlushedPriorToResponseCompletion(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); var flushWh = new ManualResetEventSlim(); @@ -394,7 +395,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ChunksCanBeWrittenManually(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { diff --git a/test/Kestrel.FunctionalTests/ConnectionAdapterTests.cs b/test/Kestrel.FunctionalTests/ConnectionAdapterTests.cs index 21e175d8e0..a4c719bbde 100644 --- a/test/Kestrel.FunctionalTests/ConnectionAdapterTests.cs +++ b/test/Kestrel.FunctionalTests/ConnectionAdapterTests.cs @@ -11,11 +11,12 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class ConnectionAdapterTests + public class ConnectionAdapterTests : LoggedTest { [Fact] public async Task CanReadAndWriteWithRewritingConnectionAdapter() @@ -26,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ConnectionAdapters = { adapter } }; - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); var sendString = "POST / HTTP/1.0\r\nContent-Length: 12\r\n\r\nHello World?"; @@ -56,7 +57,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ConnectionAdapters = { new AsyncConnectionAdapter() } }; - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoApp, serviceContext, listenOptions)) { @@ -85,7 +86,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ConnectionAdapters = { new AsyncConnectionAdapter() } }; - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoApp, serviceContext, listenOptions)) { @@ -106,7 +107,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ConnectionAdapters = { new ThrowingConnectionAdapter() } }; - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoApp, serviceContext, listenOptions)) { @@ -127,7 +128,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ConnectionAdapters = { new AsyncConnectionAdapter() } }; - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); var stopTask = Task.CompletedTask; using (var server = new TestServer(TestApp.EchoApp, serviceContext, listenOptions)) @@ -149,7 +150,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ConnectionAdapters = { new ThrowingConnectionAdapter() } }; - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoApp, serviceContext, listenOptions)) { @@ -181,7 +182,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ConnectionAdapters = { new PassThroughConnectionAdapter() } }; - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async context => { diff --git a/test/Kestrel.FunctionalTests/ConnectionLimitTests.cs b/test/Kestrel.FunctionalTests/ConnectionLimitTests.cs index db967776ed..8462050e36 100644 --- a/test/Kestrel.FunctionalTests/ConnectionLimitTests.cs +++ b/test/Kestrel.FunctionalTests/ConnectionLimitTests.cs @@ -12,11 +12,12 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Tests; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class ConnectionLimitTests + public class ConnectionLimitTests : LoggedTest { [Fact] public async Task ResetsCountWhenConnectionClosed() @@ -190,14 +191,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests private TestServer CreateServerWithMaxConnections(RequestDelegate app, long max) { - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); serviceContext.ServerOptions.Limits.MaxConcurrentConnections = max; return new TestServer(app, serviceContext); } private TestServer CreateServerWithMaxConnections(RequestDelegate app, ResourceCounter concurrentConnectionCounter) { - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)); listenOptions.Use(next => { diff --git a/test/Kestrel.FunctionalTests/DefaultHeaderTests.cs b/test/Kestrel.FunctionalTests/DefaultHeaderTests.cs index 757a5a0a63..c9a564c68f 100644 --- a/test/Kestrel.FunctionalTests/DefaultHeaderTests.cs +++ b/test/Kestrel.FunctionalTests/DefaultHeaderTests.cs @@ -3,16 +3,17 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class DefaultHeaderTests + public class DefaultHeaderTests : LoggedTest { [Fact] public async Task TestDefaultHeaders() { - var testContext = new TestServiceContext() + var testContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AddServerHeader = true } }; diff --git a/test/Kestrel.FunctionalTests/EventSourceTests.cs b/test/Kestrel.FunctionalTests/EventSourceTests.cs index 1d99ade358..eddc396925 100644 --- a/test/Kestrel.FunctionalTests/EventSourceTests.cs +++ b/test/Kestrel.FunctionalTests/EventSourceTests.cs @@ -10,11 +10,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class EventSourceTests : IDisposable + public class EventSourceTests : LoggedTest, IDisposable { private readonly TestEventListener _listener = new TestEventListener(); @@ -34,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests connectionId = context.Features.Get().ConnectionId; requestId = context.TraceIdentifier; return Task.CompletedTask; - })) + }, new TestServiceContext(LoggerFactory))) { port = server.Port; using (var connection = server.CreateConnection()) diff --git a/test/Kestrel.FunctionalTests/HttpConnectionManagerTests.cs b/test/Kestrel.FunctionalTests/HttpConnectionManagerTests.cs index f0df336587..7f5296763c 100644 --- a/test/Kestrel.FunctionalTests/HttpConnectionManagerTests.cs +++ b/test/Kestrel.FunctionalTests/HttpConnectionManagerTests.cs @@ -9,12 +9,13 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Moq; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class HttpConnectionManagerTests + public class HttpConnectionManagerTests : LoggedTest { // This test causes MemoryPoolBlocks to be finalized which in turn causes an assert failure in debug builds. #if !DEBUG diff --git a/test/Kestrel.FunctionalTests/HttpProtocolSelectionTests.cs b/test/Kestrel.FunctionalTests/HttpProtocolSelectionTests.cs index b75496c097..c5e4f34fbd 100644 --- a/test/Kestrel.FunctionalTests/HttpProtocolSelectionTests.cs +++ b/test/Kestrel.FunctionalTests/HttpProtocolSelectionTests.cs @@ -11,12 +11,12 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; -using Moq; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class HttpProtocolSelectionTests + public class HttpProtocolSelectionTests : TestApplicationErrorLoggerLoggedTest { [Fact] public Task Server_NoProtocols_Error() @@ -46,6 +46,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests private async Task TestSuccess(HttpProtocols serverProtocols, string request, string expectedResponse) { var builder = TransportSelector.GetWebHostBuilder() + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Listen(IPAddress.Loopback, 0, listenOptions => @@ -70,14 +71,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests private async Task TestError(HttpProtocols serverProtocols, string expectedErrorMessage) where TException : Exception { - var logger = new TestApplicationErrorLogger(); - var loggerProvider = new Mock(); - loggerProvider - .Setup(provider => provider.CreateLogger(It.IsAny())) - .Returns(logger); - var builder = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(loggerProvider.Object)) + .ConfigureServices(AddTestLogging) .UseKestrel(options => options.Listen(IPAddress.Loopback, 0, listenOptions => { listenOptions.Protocols = serverProtocols; @@ -94,7 +89,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.Single(logger.Messages, message => message.LogLevel == LogLevel.Error + Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error && message.EventId.Id == 0 && message.Message == expectedErrorMessage); } diff --git a/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs b/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs index 37bc3e4d87..1531e07b97 100644 --- a/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs +++ b/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs @@ -19,28 +19,21 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Https; using Microsoft.AspNetCore.Server.Kestrel.Https.Internal; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class HttpsConnectionAdapterTests + public class HttpsConnectionAdapterTests : LoggedTest { private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate(); private static X509Certificate2 _x509Certificate2NoExt = TestResources.GetTestCertificate("no_extensions.pfx"); - private readonly ITestOutputHelper _output; - - public HttpsConnectionAdapterTests(ITestOutputHelper output) - { - _output = output; - } // https://github.com/aspnet/KestrelHttpServer/issues/240 // This test currently fails on mono because of an issue with SslStream. [Fact] public async Task CanReadAndWriteWithHttpsConnectionAdapter() { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -49,7 +42,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(App, serviceContext, listenOptions)) + using (var server = new TestServer(App, new TestServiceContext(LoggerFactory), listenOptions)) { var result = await HttpClientSlim.PostAsync($"https://localhost:{server.Port}/", new FormUrlEncodedContent(new[] { @@ -64,7 +57,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task RequireCertificateFailsWhenNoCertificate() { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -78,7 +70,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }; - using (var server = new TestServer(App, serviceContext, listenOptions)) + using (var server = new TestServer(App, new TestServiceContext(LoggerFactory), listenOptions)) { await Assert.ThrowsAnyAsync( () => HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/")); @@ -88,7 +80,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task AllowCertificateContinuesWhenNoCertificate() { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -107,8 +98,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.NotNull(tlsFeature); Assert.Null(tlsFeature.ClientCertificate); return context.Response.WriteAsync("hello world"); - }, - serviceContext, listenOptions)) + }, new TestServiceContext(LoggerFactory), listenOptions)) { var result = await HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/", validateCertificate: false); Assert.Equal("hello world", result); @@ -126,7 +116,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task UsesProvidedServerCertificate() { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -135,7 +124,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -153,7 +142,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task UsesProvidedServerCertificateSelector() { var selectorCalled = 0; - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -175,7 +163,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }) } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -194,7 +182,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task UsesProvidedServerCertificateSelectorEachTime() { var selectorCalled = 0; - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -220,7 +207,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }) } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -249,7 +236,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task UsesProvidedServerCertificateSelectorValidatesEkus() { var selectorCalled = 0; - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -264,7 +250,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }) } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -283,7 +269,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task UsesProvidedServerCertificateSelectorOverridesServerCertificate() { var selectorCalled = 0; - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -306,7 +291,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }) } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -325,7 +310,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task UsesProvidedServerCertificateSelectorFailsIfYouReturnNull() { var selectorCalled = 0; - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -340,7 +324,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }) } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -358,7 +342,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task CertificatePassedToHttpContext() { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -379,8 +362,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.NotNull(tlsFeature.ClientCertificate); Assert.NotNull(context.Connection.ClientCertificate); return context.Response.WriteAsync("hello world"); - }, - serviceContext, listenOptions)) + }, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -404,9 +386,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests new HttpsConnectionAdapter(new HttpsConnectionAdapterOptions { ServerCertificate = _x509Certificate2 }) } }; - var serviceContext = new TestServiceContext(); - using (var server = new TestServer(context => context.Response.WriteAsync(context.Request.Scheme), serviceContext, listenOptions)) + using (var server = new TestServer(context => context.Response.WriteAsync(context.Request.Scheme), new TestServiceContext(LoggerFactory), listenOptions)) { var result = await HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/", validateCertificate: false); Assert.Equal("https", result); @@ -416,7 +397,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task DoesNotSupportTls10() { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -430,7 +410,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => context.Response.WriteAsync("hello world"), serviceContext, listenOptions)) + using (var server = new TestServer(context => context.Response.WriteAsync("hello world"), new TestServiceContext(LoggerFactory), listenOptions)) { // 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 @@ -450,7 +430,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task ClientCertificateValidationGetsCalledWithNotNullParameters(ClientCertificateMode mode) { var clientCertificateValidationCalled = false; - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -470,7 +449,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -487,7 +466,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [InlineData(ClientCertificateMode.RequireCertificate)] public async Task ValidationFailureRejectsConnection(ClientCertificateMode mode) { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -501,7 +479,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -517,7 +495,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [InlineData(ClientCertificateMode.RequireCertificate)] public async Task RejectsConnectionOnSslPolicyErrorsWhenNoValidation(ClientCertificateMode mode) { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -530,7 +507,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), listenOptions)) { using (var client = new TcpClient()) { @@ -544,7 +521,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task CertificatePassedToHttpContextIsNotDisposed() { - var serviceContext = new TestServiceContext(); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) { ConnectionAdapters = @@ -568,7 +544,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests return context.Response.WriteAsync("hello world"); }; - using (var server = new TestServer(app, serviceContext, listenOptions)) + using (var server = new TestServer(app, new TestServiceContext(LoggerFactory), listenOptions)) { // 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 @@ -587,7 +563,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public void AcceptsCertificateWithoutExtensions(string testCertName) { var certPath = TestResources.GetCertPath(testCertName); - _output.WriteLine("Loading " + certPath); + TestOutputHelper.WriteLine("Loading " + certPath); var cert = new X509Certificate2(certPath, "testPassword"); Assert.Empty(cert.Extensions.OfType()); @@ -603,7 +579,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public void ValidatesEnhancedKeyUsageOnCertificate(string testCertName) { var certPath = TestResources.GetCertPath(testCertName); - _output.WriteLine("Loading " + certPath); + TestOutputHelper.WriteLine("Loading " + certPath); var cert = new X509Certificate2(certPath, "testPassword"); Assert.NotEmpty(cert.Extensions); var eku = Assert.Single(cert.Extensions.OfType()); @@ -621,7 +597,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public void ThrowsForCertificatesMissingServerEku(string testCertName) { var certPath = TestResources.GetCertPath(testCertName); - _output.WriteLine("Loading " + certPath); + TestOutputHelper.WriteLine("Loading " + certPath); var cert = new X509Certificate2(certPath, "testPassword"); Assert.NotEmpty(cert.Extensions); var eku = Assert.Single(cert.Extensions.OfType()); diff --git a/test/Kestrel.FunctionalTests/HttpsTests.cs b/test/Kestrel.FunctionalTests/HttpsTests.cs index 051d11ab8d..eda9cbb5e6 100644 --- a/test/Kestrel.FunctionalTests/HttpsTests.cs +++ b/test/Kestrel.FunctionalTests/HttpsTests.cs @@ -20,11 +20,12 @@ using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions.Internal; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class HttpsTests + public class HttpsTests : LoggedTest { private KestrelServerOptions CreateServerOptions() { @@ -117,6 +118,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task EmptyRequestLoggedAsDebug() { var loggerProvider = new HandshakeErrorLoggerProvider(); + LoggerFactory.AddProvider(loggerProvider); var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel(options => @@ -126,11 +128,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) - .ConfigureLogging(builder => - { - builder.AddProvider(loggerProvider); - builder.SetMinimumLevel(LogLevel.Debug); - }) + .ConfigureServices(AddTestLogging) + .ConfigureLogging(builder => builder.AddProvider(loggerProvider)) .Configure(app => { }); using (var host = hostBuilder.Build()) @@ -155,6 +154,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task ClientHandshakeFailureLoggedAsDebug() { var loggerProvider = new HandshakeErrorLoggerProvider(); + LoggerFactory.AddProvider(loggerProvider); var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel(options => @@ -164,11 +164,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) - .ConfigureLogging(builder => - { - builder.AddProvider(loggerProvider); - builder.SetMinimumLevel(LogLevel.Debug); - }) + .ConfigureServices(AddTestLogging) .Configure(app => { }); using (var host = hostBuilder.Build()) @@ -196,6 +192,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task DoesNotThrowObjectDisposedExceptionOnConnectionAbort() { var loggerProvider = new HandshakeErrorLoggerProvider(); + LoggerFactory.AddProvider(loggerProvider); var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel(options => { @@ -204,6 +201,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) + .ConfigureServices(AddTestLogging) .ConfigureLogging(builder => builder.AddProvider(loggerProvider)) .Configure(app => app.Run(async httpContext => { @@ -248,6 +246,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { var tcs = new TaskCompletionSource(); var loggerProvider = new HandshakeErrorLoggerProvider(); + LoggerFactory.AddProvider(loggerProvider); var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel(options => { @@ -256,6 +255,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) + .ConfigureServices(AddTestLogging) .ConfigureLogging(builder => builder.AddProvider(loggerProvider)) .Configure(app => app.Run(async httpContext => { @@ -297,6 +297,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task DoesNotThrowObjectDisposedExceptionOnEmptyConnection() { var loggerProvider = new HandshakeErrorLoggerProvider(); + LoggerFactory.AddProvider(loggerProvider); var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel(options => { @@ -305,6 +306,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) + .ConfigureServices(AddTestLogging) .ConfigureLogging(builder => builder.AddProvider(loggerProvider)) .Configure(app => app.Run(httpContext => Task.CompletedTask)); @@ -330,6 +332,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public void ConnectionFilterDoesNotLeakBlock() { var loggerProvider = new HandshakeErrorLoggerProvider(); + LoggerFactory.AddProvider(loggerProvider); var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel(options => @@ -339,6 +342,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) + .ConfigureServices(AddTestLogging) .ConfigureLogging(builder => builder.AddProvider(loggerProvider)) .Configure(app => { }); @@ -360,6 +364,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task HandshakeTimesOutAndIsLoggedAsDebug() { var loggerProvider = new HandshakeErrorLoggerProvider(); + LoggerFactory.AddProvider(loggerProvider); var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel(options => { @@ -372,11 +377,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }); }); }) - .ConfigureLogging(builder => - { - builder.AddProvider(loggerProvider); - builder.SetMinimumLevel(LogLevel.Debug); - }) + .ConfigureServices(AddTestLogging) .Configure(app => app.Run(httpContext => Task.CompletedTask)); using (var host = hostBuilder.Build()) diff --git a/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs b/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs index 32278e4159..90c2b77cfa 100644 --- a/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs +++ b/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs @@ -9,11 +9,12 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class KeepAliveTimeoutTests + public class KeepAliveTimeoutTests : LoggedTest { private static readonly TimeSpan _keepAliveTimeout = TimeSpan.FromSeconds(10); private static readonly TimeSpan _longDelay = TimeSpan.FromSeconds(30); @@ -185,7 +186,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests private TestServer CreateServer(CancellationToken longRunningCt, CancellationToken upgradeCt) { - return new TestServer(httpContext => App(httpContext, longRunningCt, upgradeCt), new TestServiceContext + return new TestServer(httpContext => App(httpContext, longRunningCt, upgradeCt), new TestServiceContext(LoggerFactory) { // Use real SystemClock so timeouts trigger. SystemClock = new SystemClock(), diff --git a/test/Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs b/test/Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs index 12f7e604e3..df211ed170 100644 --- a/test/Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs +++ b/test/Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs @@ -8,30 +8,18 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class LoggingConnectionAdapterTests + public class LoggingConnectionAdapterTests : LoggedTest { - private readonly ITestOutputHelper _output; - - public LoggingConnectionAdapterTests(ITestOutputHelper output) - { - _output = output; - } - [Fact] public async Task LoggingConnectionAdapterCanBeAddedBeforeAndAfterHttpsAdapter() { var host = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(builder => - { - builder.SetMinimumLevel(LogLevel.Trace); - builder.AddXunit(_output); - }) + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Listen(new IPEndPoint(IPAddress.Loopback, 0), listenOptions => @@ -41,15 +29,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseConnectionLogging(); }); }) - .Configure(app => - { - app.Run(context => + .Configure(app => { - context.Response.ContentLength = 12; - return context.Response.WriteAsync("Hello World!"); - }); - }) - .Build(); + app.Run(context => + { + context.Response.ContentLength = 12; + return context.Response.WriteAsync("Hello World!"); + }); + }) + .Build(); using (host) { diff --git a/test/Kestrel.FunctionalTests/MaxRequestBodySizeTests.cs b/test/Kestrel.FunctionalTests/MaxRequestBodySizeTests.cs index 8c68fe3c39..4bc664f558 100644 --- a/test/Kestrel.FunctionalTests/MaxRequestBodySizeTests.cs +++ b/test/Kestrel.FunctionalTests/MaxRequestBodySizeTests.cs @@ -8,11 +8,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class MaxRequestBodySizeTests + public class MaxRequestBodySizeTests : LoggedTest { [Fact] public async Task RejectsRequestWithContentLengthHeaderExceedingGlobalLimit() @@ -28,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests async () => await context.Request.Body.ReadAsync(buffer, 0, 1)); throw requestRejectedEx; }, - new TestServiceContext { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) + new TestServiceContext(LoggerFactory) { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) { using (var connection = server.CreateConnection()) { @@ -74,7 +75,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests async () => await context.Request.Body.ReadAsync(buffer, 0, 1)); throw requestRejectedEx; }, - new TestServiceContext { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) + new TestServiceContext(LoggerFactory) { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) { using (var connection = server.CreateConnection()) { @@ -118,7 +119,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests context.Response.ContentLength = 1; await context.Response.Body.WriteAsync(buffer, 0, 1); }, - new TestServiceContext { ServerOptions = { Limits = { MaxRequestBodySize = 0 } } })) + new TestServiceContext(LoggerFactory) { ServerOptions = { Limits = { MaxRequestBodySize = 0 } } })) { using (var connection = server.CreateConnection()) { @@ -190,7 +191,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests invalidOpEx = Assert.Throws(() => feature.MaxRequestBodySize = perRequestMaxRequestBodySize); throw invalidOpEx; - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -230,7 +231,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests invalidOpEx = Assert.Throws(() => feature.MaxRequestBodySize = 0x10); throw invalidOpEx; - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -267,7 +268,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests async () => await context.Request.Body.ReadAsync(buffer, 0, 1)); throw requestRejectedEx2; }, - new TestServiceContext { ServerOptions = { Limits = { MaxRequestBodySize = 0 } } })) + new TestServiceContext(LoggerFactory) { ServerOptions = { Limits = { MaxRequestBodySize = 0 } } })) { using (var connection = server.CreateConnection()) { @@ -314,7 +315,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests throw requestRejectedEx; }, - new TestServiceContext { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) + new TestServiceContext(LoggerFactory) { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) { using (var connection = server.CreateConnection()) { @@ -360,7 +361,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.Equal("Hello World", Encoding.ASCII.GetString(buffer)); Assert.Equal("trailing-value", context.Request.Headers["Trailing-Header"].ToString()); }, - new TestServiceContext { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) + new TestServiceContext(LoggerFactory) { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) { using (var connection = server.CreateConnection()) { @@ -419,7 +420,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests throw requestRejectedEx; } }, - new TestServiceContext { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) + new TestServiceContext(LoggerFactory) { ServerOptions = { Limits = { MaxRequestBodySize = globalMaxRequestBodySize } } })) { using (var connection = server.CreateConnection()) { @@ -466,7 +467,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests async () => await context.Request.Body.ReadAsync(buffer, 0, 1)); throw requestRejectedEx2; }, - new TestServiceContext { ServerOptions = { Limits = { MaxRequestBodySize = 0 } } })) + new TestServiceContext(LoggerFactory) { ServerOptions = { Limits = { MaxRequestBodySize = 0 } } })) { using (var connection = server.CreateConnection()) { diff --git a/test/Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs b/test/Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs index 79cdee5295..93919845ea 100644 --- a/test/Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs +++ b/test/Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs @@ -13,13 +13,12 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class MaxRequestBufferSizeTests + public class MaxRequestBufferSizeTests : LoggedTest { private const int _dataLength = 20 * 1024 * 1024; @@ -30,13 +29,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests "\r\n" }; - private readonly Action _configureLoggingDelegate; - - public MaxRequestBufferSizeTests(ITestOutputHelper output) - { - _configureLoggingDelegate = builder => builder.AddXunit(output); - } - public static IEnumerable LargeUploadData { get @@ -259,7 +251,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests TaskCompletionSource clientFinishedSendingRequestBody) { var host = TransportSelector.GetWebHostBuilder() - .ConfigureLogging(_configureLoggingDelegate) + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Listen(new IPEndPoint(IPAddress.Loopback, 0), listenOptions => diff --git a/test/Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs b/test/Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs index 0ac7785d11..6007877262 100644 --- a/test/Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs +++ b/test/Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs @@ -5,11 +5,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class MaxRequestLineSizeTests + public class MaxRequestLineSizeTests : LoggedTest { [Theory] [InlineData("GET / HTTP/1.1\r\nHost:\r\n\r\n", 16)] @@ -70,7 +71,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests private TestServer CreateServer(int maxRequestLineSize) { - return new TestServer(async httpContext => await httpContext.Response.WriteAsync("hello, world"), new TestServiceContext + return new TestServer(async httpContext => await httpContext.Response.WriteAsync("hello, world"), new TestServiceContext(LoggerFactory) { ServerOptions = new KestrelServerOptions { diff --git a/test/Kestrel.FunctionalTests/Properties/AssemblyInfo.cs b/test/Kestrel.FunctionalTests/Properties/AssemblyInfo.cs index 24fe027b5e..5e05b4461e 100644 --- a/test/Kestrel.FunctionalTests/Properties/AssemblyInfo.cs +++ b/test/Kestrel.FunctionalTests/Properties/AssemblyInfo.cs @@ -1,8 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.Extensions.Logging.Testing; #if MACOS using Xunit; +#endif +[assembly: ShortClassName] +#if MACOS [assembly: CollectionBehavior(DisableTestParallelization = true)] #endif diff --git a/test/Kestrel.FunctionalTests/RequestBodyTimeoutTests.cs b/test/Kestrel.FunctionalTests/RequestBodyTimeoutTests.cs index 7cb1e1f33c..8e6c84296e 100644 --- a/test/Kestrel.FunctionalTests/RequestBodyTimeoutTests.cs +++ b/test/Kestrel.FunctionalTests/RequestBodyTimeoutTests.cs @@ -17,14 +17,14 @@ using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class RequestBodyTimeoutTests + public class RequestBodyTimeoutTests : LoggedTest { [Fact] public async Task RequestTimesOutWhenRequestBodyNotReceivedAtSpecifiedMinimumRate() { var gracePeriod = TimeSpan.FromSeconds(5); var systemClock = new MockSystemClock(); - var serviceContext = new TestServiceContext + var serviceContext = new TestServiceContext(LoggerFactory) { SystemClock = systemClock, DateHeaderValueManager = new DateHeaderValueManager(systemClock) @@ -69,16 +69,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task RequestTimesOutWhenNotDrainedWithinDrainTimeoutPeriod() { - var sink = new TestSink(); - var logger = new TestLogger("TestLogger", sink, enabled: true); - // This test requires a real clock since we can't control when the drain timeout is set var systemClock = new SystemClock(); - var serviceContext = new TestServiceContext + var serviceContext = new TestServiceContext(LoggerFactory) { SystemClock = systemClock, DateHeaderValueManager = new DateHeaderValueManager(systemClock), - Log = new KestrelTrace(logger) }; var appRunningEvent = new ManualResetEventSlim(); @@ -115,7 +111,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.Contains(sink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException + Assert.Contains(TestSink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException && ((BadHttpRequestException)w.Exception).StatusCode == StatusCodes.Status408RequestTimeout); } @@ -124,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { var gracePeriod = TimeSpan.FromSeconds(5); var systemClock = new MockSystemClock(); - var serviceContext = new TestServiceContext + var serviceContext = new TestServiceContext(LoggerFactory) { SystemClock = systemClock, DateHeaderValueManager = new DateHeaderValueManager(systemClock) diff --git a/test/Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs b/test/Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs index 375e92c255..6de4c37a99 100644 --- a/test/Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs +++ b/test/Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs @@ -6,11 +6,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class RequestHeaderLimitsTests + public class RequestHeaderLimitsTests : LoggedTest { [Theory] [InlineData(0, 1)] @@ -148,7 +149,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests options.Limits.MaxRequestHeadersTotalSize = maxRequestHeadersTotalSize.Value; } - return new TestServer(async httpContext => await httpContext.Response.WriteAsync("hello, world"), new TestServiceContext + return new TestServer(async httpContext => await httpContext.Response.WriteAsync("hello, world"), new TestServiceContext(LoggerFactory) { ServerOptions = options }); diff --git a/test/Kestrel.FunctionalTests/RequestHeadersTimeoutTests.cs b/test/Kestrel.FunctionalTests/RequestHeadersTimeoutTests.cs index 2520467a72..57fe8fc274 100644 --- a/test/Kestrel.FunctionalTests/RequestHeadersTimeoutTests.cs +++ b/test/Kestrel.FunctionalTests/RequestHeadersTimeoutTests.cs @@ -7,11 +7,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class RequestHeadersTimeoutTests + public class RequestHeadersTimeoutTests : LoggedTest { private static readonly TimeSpan RequestHeadersTimeout = TimeSpan.FromSeconds(10); private static readonly TimeSpan LongDelay = TimeSpan.FromSeconds(30); @@ -96,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await httpContext.Request.Body.ReadAsync(new byte[1], 0, 1); await httpContext.Response.WriteAsync("hello, world"); }, - new TestServiceContext + new TestServiceContext(LoggerFactory) { // Use real SystemClock so timeouts trigger. SystemClock = new SystemClock(), diff --git a/test/Kestrel.FunctionalTests/RequestTargetProcessingTests.cs b/test/Kestrel.FunctionalTests/RequestTargetProcessingTests.cs index 4ebb7ce571..6bf18030a3 100644 --- a/test/Kestrel.FunctionalTests/RequestTargetProcessingTests.cs +++ b/test/Kestrel.FunctionalTests/RequestTargetProcessingTests.cs @@ -9,16 +9,17 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class RequestTargetProcessingTests + public class RequestTargetProcessingTests : LoggedTest { [Fact] public async Task RequestPathIsNotNormalized() { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)); using (var server = new TestServer(async context => @@ -64,7 +65,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [InlineData("/base/hello%20world?foo=1&bar=2")] public async Task RequestFeatureContainsRawTarget(string requestTarget) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async context => { @@ -96,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [InlineData(HttpMethod.Connect, "host")] public async Task NonPathRequestTargetSetInRawTarget(HttpMethod method, string requestTarget) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async context => { @@ -111,8 +112,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { using (var connection = server.CreateConnection()) { - var host = method == HttpMethod.Connect - ? requestTarget + var host = method == HttpMethod.Connect + ? requestTarget : string.Empty; await connection.Send( diff --git a/test/Kestrel.FunctionalTests/RequestTests.cs b/test/Kestrel.FunctionalTests/RequestTests.cs index 7344c56784..e7cadd4ae8 100644 --- a/test/Kestrel.FunctionalTests/RequestTests.cs +++ b/test/Kestrel.FunctionalTests/RequestTests.cs @@ -26,27 +26,20 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Moq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class RequestTests + public class RequestTests : LoggedTest { private const int _connectionStartedEventId = 1; private const int _connectionResetEventId = 19; private static readonly int _semaphoreWaitTimeout = Debugger.IsAttached ? 10000 : 2500; - private readonly ITestOutputHelper _output; - - public RequestTests(ITestOutputHelper output) - { - _output = output; - } - public static TheoryData ConnectionAdapterData => new TheoryData { new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)), @@ -70,6 +63,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.True(bufferLength % 256 == 0, $"{nameof(bufferLength)} must be evenly divisible by 256"); var builder = TransportSelector.GetWebHostBuilder() + .ConfigureServices(AddTestLogging) .UseKestrel(options => { options.Limits.MaxRequestBodySize = contentLength; @@ -158,6 +152,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var builder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0") + .ConfigureServices(AddTestLogging) .Configure(app => { app.Run(async context => @@ -186,28 +181,29 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var responseBodyPersisted = false; var builder = TransportSelector.GetWebHostBuilder() - .UseKestrel() - .UseUrls("http://127.0.0.1:0") - .Configure(app => - { - app.Run(async context => - { - if (context.Request.Body is MemoryStream) - { - requestBodyPersisted = true; - } + .UseKestrel() + .UseUrls("http://127.0.0.1:0") + .ConfigureServices(AddTestLogging) + .Configure(app => + { + app.Run(async context => + { + if (context.Request.Body is MemoryStream) + { + requestBodyPersisted = true; + } - if (context.Response.Body is MemoryStream) - { - responseBodyPersisted = true; - } + if (context.Response.Body is MemoryStream) + { + responseBodyPersisted = true; + } - context.Request.Body = new MemoryStream(); - context.Response.Body = new MemoryStream(); + context.Request.Body = new MemoryStream(); + context.Response.Body = new MemoryStream(); - await context.Response.WriteAsync("hello, world"); - }); - }); + await context.Response.WriteAsync("hello, world"); + }); + }); using (var host = builder.Build()) { @@ -229,24 +225,25 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { var dataRead = false; var builder = TransportSelector.GetWebHostBuilder() - .UseKestrel() - .UseUrls("http://127.0.0.1:0") - .Configure(app => - { - app.Run(async context => - { - var stream = await context.Features.Get().UpgradeAsync(); - var data = new byte[3]; - var bytesRead = 0; + .UseKestrel() + .UseUrls("http://127.0.0.1:0") + .ConfigureServices(AddTestLogging) + .Configure(app => + { + app.Run(async context => + { + var stream = await context.Features.Get().UpgradeAsync(); + var data = new byte[3]; + var bytesRead = 0; - while (bytesRead < 3) - { - bytesRead += await stream.ReadAsync(data, bytesRead, data.Length - bytesRead); - } + while (bytesRead < 3) + { + bytesRead += await stream.ReadAsync(data, bytesRead, data.Length - bytesRead); + } - dataRead = Encoding.ASCII.GetString(data, 0, 3) == "abc"; - }); - }); + dataRead = Encoding.ASCII.GetString(data, 0, 3) == "abc"; + }); + }); using (var host = builder.Build()) { @@ -280,6 +277,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests .Setup(logger => logger.Log(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) .Callback>((logLevel, eventId, state, exception, formatter) => { + Logger.Log(logLevel, eventId, state, exception, formatter); if (eventId.Id == _connectionStartedEventId) { connectionStarted.Release(); @@ -298,7 +296,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var mockLoggerFactory = new Mock(); mockLoggerFactory .Setup(factory => factory.CreateLogger(It.IsAny())) - .Returns(Mock.Of()); + .Returns(Logger); mockLoggerFactory .Setup(factory => factory.CreateLogger(It.IsIn("Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv", @@ -340,6 +338,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests .Setup(logger => logger.Log(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) .Callback>((logLevel, eventId, state, exception, formatter) => { + Logger.Log(logLevel, eventId, state, exception, formatter); if (eventId.Id == _connectionResetEventId) { connectionReset.Release(); @@ -354,7 +353,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var mockLoggerFactory = new Mock(); mockLoggerFactory .Setup(factory => factory.CreateLogger(It.IsAny())) - .Returns(Mock.Of()); + .Returns(Logger); mockLoggerFactory .Setup(factory => factory.CreateLogger(It.IsIn("Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv", @@ -410,8 +409,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests .Setup(logger => logger.Log(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())) .Callback>((logLevel, eventId, state, exception, formatter) => { + Logger.Log(logLevel, eventId, state, exception, formatter); var log = $"Log {logLevel}[{eventId}]: {formatter(state, exception)} {exception}"; - _output.WriteLine(log); + TestOutputHelper.WriteLine(log); if (eventId.Id == _connectionResetEventId) { @@ -427,7 +427,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var mockLoggerFactory = new Mock(); mockLoggerFactory .Setup(factory => factory.CreateLogger(It.IsAny())) - .Returns(Mock.Of()); + .Returns(Logger); mockLoggerFactory .Setup(factory => factory.CreateLogger(It.IsIn("Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv", @@ -472,6 +472,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var expectedExceptionThrown = false; var builder = TransportSelector.GetWebHostBuilder() + .ConfigureServices(AddTestLogging) .UseKestrel() .UseUrls("http://127.0.0.1:0") .Configure(app => app.Run(async context => @@ -518,6 +519,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var builder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0") + .ConfigureServices(AddTestLogging) .Configure(app => app.Run(async context => { appStarted.Release(); @@ -548,6 +550,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var builder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0") + .ConfigureServices(AddTestLogging) .Configure(app => app.Run(context => { context.Abort(); @@ -597,7 +600,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests queryTcs.TrySetResult(context.Request.Query); rawTargetTcs.TrySetResult(context.Features.Get().RawTarget); await context.Response.WriteAsync("Done"); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -646,7 +649,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { context.TraceIdentifier = knownId; await context.Response.WriteAsync(context.TraceIdentifier); - })) + }, new TestServiceContext(LoggerFactory))) { var requestId = await HttpClientSlim.GetStringAsync($"http://{server.EndPoint}") .TimeoutAfter(TestConstants.DefaultTimeout); @@ -665,7 +668,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.Equal(identifierLength, Encoding.ASCII.GetByteCount(context.TraceIdentifier)); context.Response.ContentLength = identifierLength; await context.Response.WriteAsync(context.TraceIdentifier); - })) + }, new TestServiceContext(LoggerFactory))) { var usedIds = new ConcurrentBag(); var uri = $"http://{server.EndPoint}"; @@ -706,7 +709,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Http11KeptAliveByDefault(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoAppChunked, testContext, listenOptions)) { @@ -741,7 +744,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Http10NotKeptAliveByDefault(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoApp, testContext, listenOptions)) { @@ -781,7 +784,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Http10KeepAlive(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoAppChunked, testContext, listenOptions)) { @@ -816,7 +819,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Http10KeepAliveNotHonoredIfResponseContentLengthNotSet(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoApp, testContext, listenOptions)) { @@ -856,7 +859,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Http10KeepAliveHonoredIfResponseContentLengthSet(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoAppChunked, testContext, listenOptions)) { @@ -913,7 +916,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Expect100ContinueHonored(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoAppChunked, testContext, listenOptions)) { @@ -946,7 +949,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ZeroContentLengthAssumedOnNonKeepAliveRequestsWithoutContentLengthOrTransferEncodingHeader(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -996,7 +999,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ConnectionClosesWhenFinReceivedBeforeRequestCompletes(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); // FIN callbacks are scheduled so run inline to make this test more reliable testContext.Scheduler = PipeScheduler.Inline; @@ -1026,7 +1029,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task RequestsCanBeAbortedMidRead(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); var readTcs = new TaskCompletionSource(); var registrationTcs = new TaskCompletionSource(); @@ -1106,7 +1109,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task RequestHeadersAreResetOnEachRequest(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); IHeaderDictionary originalRequestHeaders = null; var firstRequest = true; @@ -1159,7 +1162,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { const string message = "Hello World"; - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async context => { @@ -1197,7 +1200,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task HeadersAndStreamsAreReusedAcrossRequests() { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); var streamCount = 0; var requestHeadersCount = 0; var responseHeadersCount = 0; @@ -1274,7 +1277,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(HostHeaderData))] public async Task MatchesValidRequestTargetAndHostHeader(string request, string hostHeader) { - using (var server = new TestServer(context => Task.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1292,7 +1295,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task ServerConsumesKeepAliveContentLengthRequest() { // The app doesn't read the request body, so it should be consumed by the server - using (var server = new TestServer(context => Task.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1333,7 +1336,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task ServerConsumesKeepAliveChunkedRequest() { // The app doesn't read the request body, so it should be consumed by the server - using (var server = new TestServer(context => Task.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1381,7 +1384,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task NonKeepAliveRequestNotConsumedByAppCompletes() { // The app doesn't read the request body, so it should be consumed by the server - using (var server = new TestServer(context => Task.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1414,7 +1417,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var response = Encoding.ASCII.GetBytes("goodbye"); await duplexStream.WriteAsync(response, 0, response.Length); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1440,7 +1443,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { var appEvent = new ManualResetEventSlim(); var delayEvent = new ManualResetEventSlim(); - var serviceContext = new TestServiceContext + var serviceContext = new TestServiceContext(LoggerFactory) { SystemClock = new SystemClock() }; @@ -1545,7 +1548,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests context.Response.ContentLength = 6; await context.Response.Body.WriteAsync(buffer, 0, 6); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1576,7 +1579,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task SynchronousReadsCanBeDisallowedGlobally() { - var testContext = new TestServiceContext + var testContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = false } }; @@ -1627,6 +1630,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var builder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls($"http://{registerAddress}:0") + .ConfigureServices(AddTestLogging) .Configure(app => { app.Run(async context => diff --git a/test/Kestrel.FunctionalTests/ResponseTests.cs b/test/Kestrel.FunctionalTests/ResponseTests.cs index ca9616dfcf..1482302999 100644 --- a/test/Kestrel.FunctionalTests/ResponseTests.cs +++ b/test/Kestrel.FunctionalTests/ResponseTests.cs @@ -33,11 +33,10 @@ using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Primitives; using Moq; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class ResponseTests : LoggedTest + public class ResponseTests : TestApplicationErrorLoggerLoggedTest { public static TheoryData ConnectionAdapterData => new TheoryData { @@ -48,14 +47,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - public ResponseTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Fact] public async Task LargeDownload() { var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0/") + .ConfigureServices(AddTestLogging) .Configure(app => { app.Run(async context => @@ -108,6 +106,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0/") + .ConfigureServices(AddTestLogging) .Configure(app => { app.Run(async context => @@ -151,6 +150,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0/") + .ConfigureServices(AddTestLogging) .Configure(app => { app.Run(context => @@ -189,6 +189,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0/") + .ConfigureServices(AddTestLogging) .Configure(app => { app.Run(async context => @@ -218,6 +219,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public Task ResponseStatusCodeSetBeforeHttpContextDisposeAppException() { return ResponseStatusCodeSetBeforeHttpContextDispose( + TestSink, + LoggerFactory, context => { throw new Exception(); @@ -230,6 +233,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public Task ResponseStatusCodeSetBeforeHttpContextDisposeRequestAborted() { return ResponseStatusCodeSetBeforeHttpContextDispose( + TestSink, + LoggerFactory, context => { context.Abort(); @@ -243,6 +248,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public Task ResponseStatusCodeSetBeforeHttpContextDisposeRequestAbortedAppException() { return ResponseStatusCodeSetBeforeHttpContextDispose( + TestSink, + LoggerFactory, context => { context.Abort(); @@ -256,6 +263,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public Task ResponseStatusCodeSetBeforeHttpContextDisposedRequestMalformed() { return ResponseStatusCodeSetBeforeHttpContextDispose( + TestSink, + LoggerFactory, context => { return Task.CompletedTask; @@ -269,6 +278,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public Task ResponseStatusCodeSetBeforeHttpContextDisposedRequestMalformedRead() { return ResponseStatusCodeSetBeforeHttpContextDispose( + TestSink, + LoggerFactory, async context => { await context.Request.Body.ReadAsync(new byte[1], 0, 1); @@ -282,6 +293,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public Task ResponseStatusCodeSetBeforeHttpContextDisposedRequestMalformedReadIgnored() { return ResponseStatusCodeSetBeforeHttpContextDispose( + TestSink, + LoggerFactory, async context => { try @@ -303,6 +316,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0/") + .ConfigureServices(AddTestLogging) .Configure(app => { app.Run(async context => @@ -331,6 +345,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var hostBuilder = TransportSelector.GetWebHostBuilder() .UseKestrel() .UseUrls("http://127.0.0.1:0/") + .ConfigureServices(AddTestLogging) .Configure(app => { app.Run(async context => @@ -368,7 +383,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests onCompletedTcs.SetResult(null); })); return Task.CompletedTask; - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -391,6 +406,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } private static async Task ResponseStatusCodeSetBeforeHttpContextDispose( + ITestSink testSink, + ILoggerFactory loggerFactory, RequestDelegate handler, HttpStatusCode? expectedClientStatusCode, HttpStatusCode expectedServerStatusCode, @@ -407,10 +424,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests disposedTcs.TrySetResult(c.Response.StatusCode); }); - var sink = new TestSink(); - var logger = new TestLogger("TestLogger", sink, enabled: true); - - using (var server = new TestServer(handler, new TestServiceContext() { Log = new KestrelTrace(logger) }, + using (var server = new TestServer(handler, new TestServiceContext(loggerFactory), new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)), services => services.AddSingleton(mockHttpContextFactory.Object))) { @@ -470,12 +484,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests if (sendMalformedRequest) { - Assert.Contains(sink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException + Assert.Contains(testSink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException && ((BadHttpRequestException)w.Exception).StatusCode == StatusCodes.Status400BadRequest); } else { - Assert.DoesNotContain(sink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException + Assert.DoesNotContain(testSink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException && ((BadHttpRequestException)w.Exception).StatusCode == StatusCodes.Status400BadRequest); } } @@ -485,14 +499,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task NoErrorResponseSentWhenAppSwallowsBadRequestException() { BadHttpRequestException readException = null; - var sink = new TestSink(); - var logger = new TestLogger("TestLogger", sink, enabled: true); using (var server = new TestServer(async httpContext => { readException = await Assert.ThrowsAsync( async () => await httpContext.Request.Body.ReadAsync(new byte[1], 0, 1)); - }, new TestServiceContext() { Log = new KestrelTrace(logger) })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -513,7 +525,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.NotNull(readException); - Assert.Contains(sink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException + Assert.Contains(TestSink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException && ((BadHttpRequestException)w.Exception).StatusCode == StatusCodes.Status400BadRequest); } @@ -524,7 +536,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { await httpContext.Response.WriteAsync("hello, "); await httpContext.Response.WriteAsync("world"); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -559,7 +571,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { httpContext.Response.StatusCode = statusCode; return Task.CompletedTask; - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -583,7 +595,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var server = new TestServer(httpContext => { return Task.CompletedTask; - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -616,7 +628,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { await httpContext.Response.WriteAsync(response); await httpContext.Response.Body.FlushAsync(); - }, new TestServiceContext { Log = mockKestrelTrace.Object })) + }, new TestServiceContext(LoggerFactory, mockKestrelTrace.Object))) { using (var connection = server.CreateConnection()) { @@ -645,10 +657,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task ThrowsAndClosesConnectionWhenAppWritesMoreThanContentLengthWrite() { - var testLogger = new TestApplicationErrorLogger(); - var serviceContext = new TestServiceContext + var serviceContext = new TestServiceContext(LoggerFactory) { - Log = new TestKestrelTrace(testLogger), ServerOptions = { AllowSynchronousIO = true } }; @@ -678,7 +688,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - var logMessage = Assert.Single(testLogger.Messages, message => message.LogLevel == LogLevel.Error); + var logMessage = Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); Assert.Equal( $"Response Content-Length mismatch: too many bytes written (12 of 11).", @@ -689,8 +699,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task ThrowsAndClosesConnectionWhenAppWritesMoreThanContentLengthWriteAsync() { - var testLogger = new TestApplicationErrorLogger(); - var serviceContext = new TestServiceContext { Log = new TestKestrelTrace(testLogger) }; + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -715,7 +724,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - var logMessage = Assert.Single(testLogger.Messages, message => message.LogLevel == LogLevel.Error); + var logMessage = Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); Assert.Equal( $"Response Content-Length mismatch: too many bytes written (12 of 11).", logMessage.Exception.Message); @@ -724,10 +733,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task InternalServerErrorAndConnectionClosedOnWriteWithMoreThanContentLengthAndResponseNotStarted() { - var testLogger = new TestApplicationErrorLogger(); - var serviceContext = new TestServiceContext + var serviceContext = new TestServiceContext(LoggerFactory) { - Log = new TestKestrelTrace(testLogger), ServerOptions = { AllowSynchronousIO = true } }; @@ -756,7 +763,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - var logMessage = Assert.Single(testLogger.Messages, message => message.LogLevel == LogLevel.Error); + var logMessage = Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); Assert.Equal( $"Response Content-Length mismatch: too many bytes written (12 of 5).", logMessage.Exception.Message); @@ -765,8 +772,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task InternalServerErrorAndConnectionClosedOnWriteAsyncWithMoreThanContentLengthAndResponseNotStarted() { - var testLogger = new TestApplicationErrorLogger(); - var serviceContext = new TestServiceContext { Log = new TestKestrelTrace(testLogger) }; + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(httpContext => { @@ -792,7 +798,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - var logMessage = Assert.Single(testLogger.Messages, message => message.LogLevel == LogLevel.Error); + var logMessage = Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); Assert.Equal( $"Response Content-Length mismatch: too many bytes written (12 of 5).", logMessage.Exception.Message); @@ -814,7 +820,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { httpContext.Response.ContentLength = 13; await httpContext.Response.WriteAsync("hello, world"); - }, new TestServiceContext { Log = mockTrace.Object })) + }, new TestServiceContext(LoggerFactory, mockTrace.Object))) { using (var connection = server.CreateConnection()) { @@ -869,7 +875,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // Wait until the request is aborted so we know HttpProtocol will skip the response content length check. Assert.True(await requestAborted.WaitAsync(TestConstants.DefaultTimeout)); - }, new TestServiceContext { Log = mockTrace.Object })) + }, new TestServiceContext(LoggerFactory, mockTrace.Object))) { using (var connection = server.CreateConnection()) { @@ -902,8 +908,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task WhenAppSetsContentLengthButDoesNotWriteBody500ResponseSentAndConnectionDoesNotClose() { - var testLogger = new TestApplicationErrorLogger(); - var serviceContext = new TestServiceContext { Log = new TestKestrelTrace(testLogger) }; + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(httpContext => { @@ -934,9 +939,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - var error = testLogger.Messages.Where(message => message.LogLevel == LogLevel.Error); + var error = TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error); Assert.Equal(2, error.Count()); - Assert.All(error, message => message.Equals("Response Content-Length mismatch: too few bytes written (0 of 5).")); + Assert.All(error, message => message.Message.Equals("Response Content-Length mismatch: too few bytes written (0 of 5).")); } [Theory] @@ -944,8 +949,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [InlineData(true)] public async Task WhenAppSetsContentLengthToZeroAndDoesNotWriteNoErrorIsThrown(bool flushResponse) { - var testLogger = new TestApplicationErrorLogger(); - var serviceContext = new TestServiceContext { Log = new TestKestrelTrace(testLogger) }; + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -973,7 +977,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.Equal(0, testLogger.ApplicationErrorsLogged); + Assert.Empty(TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error)); } // https://tools.ietf.org/html/rfc7230#section-3.3.3 @@ -983,8 +987,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task WhenAppSetsTransferEncodingAndContentLengthWritingLessIsNotAnError() { - var testLogger = new TestApplicationErrorLogger(); - var serviceContext = new TestServiceContext { Log = new TestKestrelTrace(testLogger) }; + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -1010,7 +1013,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.Equal(0, testLogger.ApplicationErrorsLogged); + Assert.Empty(TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error)); } // https://tools.ietf.org/html/rfc7230#section-3.3.3 @@ -1020,8 +1023,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task WhenAppSetsTransferEncodingAndContentLengthWritingMoreIsNotAnError() { - var testLogger = new TestApplicationErrorLogger(); - var serviceContext = new TestServiceContext { Log = new TestKestrelTrace(testLogger) }; + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -1047,7 +1049,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.Equal(0, testLogger.ApplicationErrorsLogged); + Assert.Empty(TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error)); } [Fact] @@ -1057,7 +1059,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { httpContext.Response.ContentLength = 42; return Task.CompletedTask; - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1086,7 +1088,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests httpContext.Response.ContentLength = 12; await httpContext.Response.WriteAsync("hello, world"); await flushed.WaitAsync(); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1111,7 +1113,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests public async Task HeadResponseBodyNotWrittenWithSyncWrite() { var flushed = new SemaphoreSlim(0, 1); - var serviceContext = new TestServiceContext { ServerOptions = { AllowSynchronousIO = true } }; + var serviceContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = true } }; using (var server = new TestServer(httpContext => { @@ -1151,7 +1153,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await httpContext.Response.WriteAsync(""); flushed.Wait(); await httpContext.Response.WriteAsync("hello, world"); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1195,7 +1197,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { tcs.TrySetException(ex); } - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1236,7 +1238,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await httpContext.Response.WriteAsync(ex.Message); responseWritten.Release(); } - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1266,7 +1268,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { httpContext.Response.Headers["Transfer-Encoding"] = responseTransferEncoding; await httpContext.Response.WriteAsync("hello, world"); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1312,7 +1314,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests httpContext.Response.Headers["Connection"] = "keep-alive"; httpContext.Response.Headers["Transfer-Encoding"] = responseTransferEncoding; await httpContext.Response.WriteAsync("hello, world"); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1359,7 +1361,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // App would have to chunk manually, but here we don't care await httpContext.Response.WriteAsync("hello, world"); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1394,7 +1396,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task FirstWriteVerifiedAfterOnStarting() { - var serviceContext = new TestServiceContext { ServerOptions = { AllowSynchronousIO = true } }; + var serviceContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = true } }; using (var server = new TestServer(httpContext => { @@ -1437,7 +1439,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task SubsequentWriteVerifiedAfterOnStarting() { - var serviceContext = new TestServiceContext { ServerOptions = { AllowSynchronousIO = true } }; + var serviceContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = true } }; using (var server = new TestServer(httpContext => { @@ -1497,7 +1499,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // If OnStarting is not run before verifying writes, an error response will be sent. return httpContext.Response.Body.WriteAsync(response, 0, response.Length); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1538,7 +1540,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // If OnStarting is not run before verifying writes, an error response will be sent. await httpContext.Response.Body.WriteAsync(response, 0, response.Length / 2); await httpContext.Response.Body.WriteAsync(response, response.Length / 2, response.Length - response.Length / 2); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1569,7 +1571,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var server = new TestServer(async httpContext => { await httpContext.Response.WriteAsync("hello, world"); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1603,11 +1605,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task WhenResponseNotStartedResponseEndedBeforeConsumingRequestBody() { - var sink = new TestSink(); - var logger = new TestLogger("TestLogger", sink, enabled: true); - using (var server = new TestServer(httpContext => Task.CompletedTask, - new TestServiceContext() { Log = new KestrelTrace(logger) })) + new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1630,20 +1629,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.Contains(sink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException + Assert.Contains(TestApplicationErrorLogger.Messages, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException && ((BadHttpRequestException)w.Exception).StatusCode == StatusCodes.Status400BadRequest); } [Fact] public async Task Sending100ContinueDoesNotStartResponse() { - var sink = new TestSink(); - var logger = new TestLogger("TestLogger", sink, enabled: true); - using (var server = new TestServer(httpContext => { return httpContext.Request.Body.ReadAsync(new byte[1], 0, 1); - }, new TestServiceContext() { Log = new KestrelTrace(logger) })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1685,7 +1681,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.Contains(sink.Writes, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException + Assert.Contains(TestApplicationErrorLogger.Messages, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException && ((BadHttpRequestException)w.Exception).StatusCode == StatusCodes.Status400BadRequest); } @@ -1696,7 +1692,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { await httpContext.Request.Body.ReadAsync(new byte[1], 0, 1); await httpContext.Response.WriteAsync("hello, world"); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -1740,7 +1736,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task Http11ResponseSentToHttp10Request(ListenOptions listenOptions) { - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EchoApp, serviceContext, listenOptions)) { @@ -1765,7 +1761,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ZeroContentLengthSetAutomaticallyAfterNoWrites(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EmptyApp, testContext, listenOptions)) { @@ -1798,7 +1794,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ZeroContentLengthSetAutomaticallyForNonKeepAliveRequests(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -1843,7 +1839,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ZeroContentLengthNotSetAutomaticallyForHeadRequests(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); using (var server = new TestServer(TestApp.EmptyApp, testContext, listenOptions)) { @@ -1867,7 +1863,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ZeroContentLengthNotSetAutomaticallyForCertainStatusCodes(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -1924,7 +1920,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ConnectionClosedAfter101Response(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -1971,13 +1967,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ThrowingResultsIn500Response(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); bool onStartingCalled = false; - var testLogger = new TestApplicationErrorLogger(); - testContext.Log = new KestrelTrace(testLogger); - using (var server = new TestServer(httpContext => { var response = httpContext.Response; @@ -2018,7 +2011,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } Assert.False(onStartingCalled); - Assert.Equal(2, testLogger.ApplicationErrorsLogged); + Assert.Equal(2, TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error).Count()); } [Theory] @@ -2028,9 +2021,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var callback1Called = false; var callback2CallCount = 0; - var testContext = new TestServiceContext(); - var testLogger = new TestApplicationErrorLogger(); - testContext.Log = new KestrelTrace(testLogger); + var testContext= new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -2079,21 +2070,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // since they are called LIFO order and the other one failed. Assert.False(callback1Called); Assert.Equal(2, callback2CallCount); - Assert.Equal(2, testLogger.ApplicationErrorsLogged); + Assert.Equal(2, TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error).Count()); } [Theory] [MemberData(nameof(ConnectionAdapterData))] public async Task ThrowingInOnCompletedIsLogged(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); var onCompletedCalled1 = false; var onCompletedCalled2 = false; - var testLogger = new TestApplicationErrorLogger(); - testContext.Log = new KestrelTrace(testLogger); - using (var server = new TestServer(async httpContext => { var response = httpContext.Response; @@ -2130,7 +2118,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } // All OnCompleted callbacks should be called even if they throw. - Assert.Equal(2, testLogger.ApplicationErrorsLogged); + Assert.Equal(2, TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error).Count()); Assert.True(onCompletedCalled1); Assert.True(onCompletedCalled2); } @@ -2139,13 +2127,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ThrowingAfterWritingKillsConnection(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); bool onStartingCalled = false; - var testLogger = new TestApplicationErrorLogger(); - testContext.Log = new KestrelTrace(testLogger); - using (var server = new TestServer(async httpContext => { var response = httpContext.Response; @@ -2177,20 +2162,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } Assert.True(onStartingCalled); - Assert.Equal(1, testLogger.ApplicationErrorsLogged); + Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); } [Theory] [MemberData(nameof(ConnectionAdapterData))] public async Task ThrowingAfterPartialWriteKillsConnection(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); bool onStartingCalled = false; - var testLogger = new TestApplicationErrorLogger(); - testContext.Log = new KestrelTrace(testLogger); - using (var server = new TestServer(async httpContext => { var response = httpContext.Response; @@ -2222,7 +2204,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } Assert.True(onStartingCalled); - Assert.Equal(1, testLogger.ApplicationErrorsLogged); + Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); } [Theory] @@ -2261,7 +2243,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } writeTcs.SetException(new Exception("This shouldn't be reached.")); - }, new TestServiceContext(), listenOptions)) + }, new TestServiceContext(LoggerFactory), listenOptions)) { using (var connection = server.CreateConnection()) { @@ -2288,10 +2270,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task NoErrorsLoggedWhenServerEndsConnectionBeforeClient(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); - - var testLogger = new TestApplicationErrorLogger(); - testContext.Log = new KestrelTrace(testLogger); + var testContext= new TestServiceContext(LoggerFactory); using (var server = new TestServer(async httpContext => { @@ -2316,14 +2295,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - Assert.Equal(0, testLogger.TotalErrorsLogged); + Assert.Empty(TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error)); } [Theory] [MemberData(nameof(ConnectionAdapterData))] public async Task NoResponseSentWhenConnectionIsClosedByServerBeforeClientFinishesSendingRequest(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); using (var server = new TestServer(httpContext => { @@ -2347,7 +2326,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [MemberData(nameof(ConnectionAdapterData))] public async Task ResponseHeadersAreResetOnEachRequest(ListenOptions listenOptions) { - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); IHeaderDictionary originalResponseHeaders = null; var firstRequest = true; @@ -2400,7 +2379,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { const string response = "hello, world"; - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); var callOrder = new Stack(); var onStartingTcs = new TaskCompletionSource(); @@ -2452,7 +2431,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { const string response = "hello, world"; - var testContext = new TestServiceContext(); + var testContext= new TestServiceContext(LoggerFactory); var callOrder = new Stack(); var onCompletedTcs = new TaskCompletionSource(); @@ -2526,7 +2505,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await context.Response.Body.WriteAsync(Encoding.ASCII.GetBytes("Hello2"), 0, 6); } - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -2552,7 +2531,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task SynchronousWritesCanBeDisallowedGlobally() { - var testContext = new TestServiceContext + var testContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = false } }; @@ -2698,9 +2677,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests .Setup(trace => trace.ResponseMininumDataRateNotSatisfied(It.IsAny(), It.IsAny())) .Callback(() => messageLogged.Set()); - var testContext = new TestServiceContext + var testContext = new TestServiceContext(LoggerFactory, mockKestrelTrace.Object) { - Log = mockKestrelTrace.Object, SystemClock = new SystemClock(), ServerOptions = { @@ -2768,7 +2746,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests response.ContentLength = 42; return Task.CompletedTask; - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { diff --git a/test/Kestrel.FunctionalTests/TestHelpers/TestApplicationErrorLoggerLoggedTest.cs b/test/Kestrel.FunctionalTests/TestHelpers/TestApplicationErrorLoggerLoggedTest.cs new file mode 100644 index 0000000000..1dea888411 --- /dev/null +++ b/test/Kestrel.FunctionalTests/TestHelpers/TestApplicationErrorLoggerLoggedTest.cs @@ -0,0 +1,18 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.Extensions.Logging.Testing; + +namespace Microsoft.AspNetCore.Testing +{ + public class TestApplicationErrorLoggerLoggedTest : LoggedTest + { + public TestApplicationErrorLogger TestApplicationErrorLogger { get; private set; } + + public override void AdditionalSetup() + { + TestApplicationErrorLogger = new TestApplicationErrorLogger(); + LoggerFactory.AddProvider(new KestrelTestLoggerProvider(TestApplicationErrorLogger)); + } + } +} diff --git a/test/Kestrel.FunctionalTests/TestHelpers/TestServer.cs b/test/Kestrel.FunctionalTests/TestHelpers/TestServer.cs index 7cf3399dd5..7a54c418fa 100644 --- a/test/Kestrel.FunctionalTests/TestHelpers/TestServer.cs +++ b/test/Kestrel.FunctionalTests/TestHelpers/TestServer.cs @@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests diff --git a/test/Kestrel.FunctionalTests/UpgradeTests.cs b/test/Kestrel.FunctionalTests/UpgradeTests.cs index 8b37add35f..5d89707335 100644 --- a/test/Kestrel.FunctionalTests/UpgradeTests.cs +++ b/test/Kestrel.FunctionalTests/UpgradeTests.cs @@ -9,20 +9,13 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Tests; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Testing; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { - public class UpgradeTests + public class UpgradeTests : LoggedTest { - private readonly ITestOutputHelper _output; - - public UpgradeTests(ITestOutputHelper output) - { - _output = output; - } - [Fact] public async Task ResponseThrowsAfterUpgrade() { @@ -42,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } upgrade.TrySetResult(true); - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -93,7 +86,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests upgrade.SetException(ex); throw; } - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -136,7 +129,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { await Task.Delay(100); } - })) + }, new TestServiceContext(LoggerFactory))) using (var connection = server.CreateConnection()) { await connection.SendEmptyGetWithUpgrade(); @@ -155,7 +148,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task RejectsRequestWithContentLengthAndUpgrade() { - using (var server = new TestServer(context => Task.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) using (var connection = server.CreateConnection()) { await connection.Send("POST / HTTP/1.1", @@ -178,7 +171,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task AcceptsRequestWithNoContentLengthAndUpgrade() { - using (var server = new TestServer(context => Task.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -202,7 +195,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task RejectsRequestWithChunkedEncodingAndUpgrade() { - using (var server = new TestServer(context => Task.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) using (var connection = server.CreateConnection()) { await connection.Send("POST / HTTP/1.1", @@ -226,7 +219,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { var upgradeTcs = new TaskCompletionSource(); using (var server = new TestServer(async context => - { + { var feature = context.Features.Get(); Assert.False(feature.IsUpgradableRequest); try @@ -241,7 +234,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { upgradeTcs.TrySetResult(false); } - })) + }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) { @@ -259,7 +252,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { const int limit = 10; var upgradeTcs = new TaskCompletionSource(); - var serviceContext = new TestServiceContext(); + var serviceContext = new TestServiceContext(LoggerFactory); serviceContext.ConnectionManager = new HttpConnectionManager(serviceContext.Log, ResourceCounter.Quota(limit)); using (var server = new TestServer(async context => diff --git a/test/Kestrel.Transport.Libuv.FunctionalTests/Kestrel.Transport.Libuv.FunctionalTests.csproj b/test/Kestrel.Transport.Libuv.FunctionalTests/Kestrel.Transport.Libuv.FunctionalTests.csproj index 46b9aff122..4e48a8d666 100644 --- a/test/Kestrel.Transport.Libuv.FunctionalTests/Kestrel.Transport.Libuv.FunctionalTests.csproj +++ b/test/Kestrel.Transport.Libuv.FunctionalTests/Kestrel.Transport.Libuv.FunctionalTests.csproj @@ -1,8 +1,8 @@  - Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.FunctionalTests - Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.FunctionalTests + Libuv.FunctionalTests + Libuv.FunctionalTests $(StandardTestTfms) $(DefineConstants);MACOS true diff --git a/test/Kestrel.Transport.Libuv.FunctionalTests/ListenHandleTests.cs b/test/Kestrel.Transport.Libuv.FunctionalTests/ListenHandleTests.cs index 71278e954c..61a24966d0 100644 --- a/test/Kestrel.Transport.Libuv.FunctionalTests/ListenHandleTests.cs +++ b/test/Kestrel.Transport.Libuv.FunctionalTests/ListenHandleTests.cs @@ -7,11 +7,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging.Testing; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Listening to open TCP socket and/or pipe handles is not supported on Windows.")] - public class ListenHandleTests + public class ListenHandleTests : LoggedTest { [ConditionalFact] public async Task CanListenToOpenTcpSocketHandle() @@ -20,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { listenSocket.Bind(new IPEndPoint(IPAddress.Loopback, 0)); - using (var server = new TestServer(_ => Task.CompletedTask, new TestServiceContext(), new ListenOptions((ulong)listenSocket.Handle))) + using (var server = new TestServer(_ => Task.CompletedTask, new TestServiceContext(LoggerFactory), new ListenOptions((ulong)listenSocket.Handle))) { using (var connection = new TestConnection(((IPEndPoint)listenSocket.LocalEndPoint).Port)) { diff --git a/test/Kestrel.Transport.Sockets.FunctionalTests/Kestrel.Transport.Sockets.FunctionalTests.csproj b/test/Kestrel.Transport.Sockets.FunctionalTests/Kestrel.Transport.Sockets.FunctionalTests.csproj index 901c8ca106..ca79f38600 100644 --- a/test/Kestrel.Transport.Sockets.FunctionalTests/Kestrel.Transport.Sockets.FunctionalTests.csproj +++ b/test/Kestrel.Transport.Sockets.FunctionalTests/Kestrel.Transport.Sockets.FunctionalTests.csproj @@ -1,8 +1,8 @@  - Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.FunctionalTests - Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.FunctionalTests + Sockets.FunctionalTests + Sockets.FunctionalTests $(StandardTestTfms) $(DefineConstants);MACOS $(DefineConstants);SOCKETS diff --git a/test/shared/TestApplicationErrorLogger.cs b/test/shared/TestApplicationErrorLogger.cs index 91a61f08f7..f447a32b38 100644 --- a/test/shared/TestApplicationErrorLogger.cs +++ b/test/shared/TestApplicationErrorLogger.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; @@ -15,6 +16,8 @@ namespace Microsoft.AspNetCore.Testing // Application errors are logged using 13 as the eventId. private const int ApplicationErrorEventId = 13; + public List IgnoredExceptions { get; } = new List(); + public bool ThrowOnCriticalErrors { get; set; } = true; public ConcurrentQueue Messages { get; } = new ConcurrentQueue(); @@ -49,7 +52,7 @@ namespace Microsoft.AspNetCore.Testing Console.WriteLine(log); - if (logLevel == LogLevel.Critical && ThrowOnCriticalErrors) + if (logLevel == LogLevel.Critical && ThrowOnCriticalErrors && !IgnoredExceptions.Contains(exception.GetType())) { throw new Exception($"Unexpected critical error. {log}", exception); }