diff --git a/test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionDispatcherTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionDispatcherTests.cs index 359ee5a92c..39d19723bd 100644 --- a/test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionDispatcherTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionDispatcherTests.cs @@ -41,7 +41,7 @@ public HttpConnectionDispatcherTests(ITestOutputHelper output) : base(output) [Fact] public async Task NegotiateReservesConnectionIdAndReturnsIt() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -64,7 +64,7 @@ public async Task NegotiateReservesConnectionIdAndReturnsIt() [Fact] public async Task CheckThatThresholdValuesAreEnforced() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -102,7 +102,7 @@ public async Task CheckThatThresholdValuesAreEnforced() [InlineData(HttpTransportType.ServerSentEvents)] public async Task CheckThatThresholdValuesAreEnforcedWithSends(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -154,7 +154,7 @@ public async Task CheckThatThresholdValuesAreEnforcedWithSends(HttpTransportType [InlineData(HttpTransportType.LongPolling | HttpTransportType.WebSockets)] public async Task NegotiateReturnsAvailableTransportsAfterFilteringByOptions(HttpTransportType transports) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -188,7 +188,7 @@ public async Task NegotiateReturnsAvailableTransportsAfterFilteringByOptions(Htt [InlineData(HttpTransportType.LongPolling)] public async Task EndpointsThatAcceptConnectionId404WhenUnknownConnectionIdProvided(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -225,7 +225,7 @@ public async Task EndpointsThatAcceptConnectionId404WhenUnknownConnectionIdProvi [Fact] public async Task EndpointsThatAcceptConnectionId404WhenUnknownConnectionIdProvidedForPost() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -260,7 +260,7 @@ public async Task EndpointsThatAcceptConnectionId404WhenUnknownConnectionIdProvi [Fact] public async Task PostNotAllowedForWebSocketConnections() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -297,7 +297,7 @@ public async Task PostNotAllowedForWebSocketConnections() [Fact] public async Task PostReturns404IfConnectionDisposed() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -335,7 +335,7 @@ public async Task PostReturns404IfConnectionDisposed() [InlineData(HttpTransportType.WebSockets)] public async Task TransportEndingGracefullyWaitsOnApplication(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -396,7 +396,7 @@ public async Task TransportEndingGracefullyWaitsOnApplication(HttpTransportType [Fact] public async Task TransportEndingGracefullyWaitsOnApplicationLongPolling() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -459,7 +459,7 @@ public async Task TransportEndingGracefullyWaitsOnApplicationLongPolling() [InlineData(HttpTransportType.ServerSentEvents)] public async Task PostSendsToConnection(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -508,7 +508,7 @@ public async Task PostSendsToConnection(HttpTransportType transportType) [InlineData(HttpTransportType.ServerSentEvents)] public async Task PostSendsToConnectionInParallel(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -593,7 +593,7 @@ public override async Task CopyToAsync(Stream destination, int bufferSize, Cance [Fact] public async Task HttpContextFeatureForLongpollingWorksBetweenPolls() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -690,7 +690,7 @@ public async Task HttpContextFeatureForLongpollingWorksBetweenPolls() [InlineData(HttpTransportType.LongPolling)] public async Task EndpointsThatRequireConnectionId400WhenNoConnectionIdProvided(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -722,7 +722,7 @@ public async Task EndpointsThatRequireConnectionId400WhenNoConnectionIdProvided( [Fact] public async Task EndpointsThatRequireConnectionId400WhenNoConnectionIdProvidedForPost() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -754,7 +754,7 @@ public async Task EndpointsThatRequireConnectionId400WhenNoConnectionIdProvidedF [InlineData(HttpTransportType.ServerSentEvents, 404)] public async Task EndPointThatOnlySupportsLongPollingRejectsOtherTransports(HttpTransportType transportType, int status) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { await CheckTransportSupported(HttpTransportType.LongPolling, transportType, status, loggerFactory); } @@ -766,7 +766,7 @@ public async Task EndPointThatOnlySupportsLongPollingRejectsOtherTransports(Http [InlineData(HttpTransportType.LongPolling, 404)] public async Task EndPointThatOnlySupportsSSERejectsOtherTransports(HttpTransportType transportType, int status) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { await CheckTransportSupported(HttpTransportType.ServerSentEvents, transportType, status, loggerFactory); } @@ -778,7 +778,7 @@ public async Task EndPointThatOnlySupportsSSERejectsOtherTransports(HttpTranspor [InlineData(HttpTransportType.LongPolling, 404)] public async Task EndPointThatOnlySupportsWebSockesRejectsOtherTransports(HttpTransportType transportType, int status) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { await CheckTransportSupported(HttpTransportType.WebSockets, transportType, status, loggerFactory); } @@ -788,7 +788,7 @@ public async Task EndPointThatOnlySupportsWebSockesRejectsOtherTransports(HttpTr [InlineData(HttpTransportType.LongPolling, 404)] public async Task EndPointThatOnlySupportsWebSocketsAndSSERejectsLongPolling(HttpTransportType transportType, int status) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { await CheckTransportSupported(HttpTransportType.WebSockets | HttpTransportType.ServerSentEvents, transportType, status, loggerFactory); } @@ -797,7 +797,7 @@ public async Task EndPointThatOnlySupportsWebSocketsAndSSERejectsLongPolling(Htt [Fact] public async Task CompletedEndPointEndsConnection() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -831,7 +831,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "FailedDispose"; } - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug, expectedErrorsFilter: ExpectedErrors)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -858,7 +858,7 @@ bool ExpectedErrors(WriteContext writeContext) [Fact] public async Task CompletedEndPointEndsLongPollingConnection() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -889,7 +889,7 @@ public async Task CompletedEndPointEndsLongPollingConnection() [Fact] public async Task LongPollingTimeoutSets200StatusCode() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -915,7 +915,7 @@ public async Task LongPollingTimeoutSets200StatusCode() [Fact] public async Task WebSocketTransportTimesOutWhenCloseFrameNotReceived() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -945,7 +945,7 @@ public async Task WebSocketTransportTimesOutWhenCloseFrameNotReceived() [InlineData(HttpTransportType.ServerSentEvents)] public async Task RequestToActiveConnectionId409ForStreamingTransports(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -988,7 +988,7 @@ public async Task RequestToActiveConnectionId409ForStreamingTransports(HttpTrans [Fact] public async Task RequestToActiveConnectionIdKillsPreviousConnectionLongPolling() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1029,7 +1029,7 @@ public async Task RequestToActiveConnectionIdKillsPreviousConnectionLongPolling( [InlineData(HttpTransportType.LongPolling)] public async Task RequestToDisposedConnectionIdReturns404(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1057,7 +1057,7 @@ public async Task RequestToDisposedConnectionIdReturns404(HttpTransportType tran [Fact] public async Task ConnectionStateSetToInactiveAfterPoll() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1092,7 +1092,7 @@ public async Task ConnectionStateSetToInactiveAfterPoll() [Fact] public async Task BlockingConnectionWorksWithStreamingConnections() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1127,7 +1127,7 @@ public async Task BlockingConnectionWorksWithStreamingConnections() [Fact] public async Task BlockingConnectionWorksWithLongPollingConnection() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1168,7 +1168,7 @@ public async Task BlockingConnectionWorksWithLongPollingConnection() [Fact] public async Task AttemptingToPollWhileAlreadyPollingReplacesTheCurrentPoll() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1213,7 +1213,7 @@ public async Task AttemptingToPollWhileAlreadyPollingReplacesTheCurrentPoll() [InlineData(HttpTransportType.WebSockets, TransferFormat.Binary | TransferFormat.Text)] public async Task TransferModeSet(HttpTransportType transportType, TransferFormat? expectedTransferFormats) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1245,7 +1245,7 @@ public async Task TransferModeSet(HttpTransportType transportType, TransferForma [Fact] public async Task UnauthorizedConnectionFailsToStartEndPoint() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1291,7 +1291,7 @@ public async Task UnauthorizedConnectionFailsToStartEndPoint() [Fact] public async Task AuthenticatedUserWithoutPermissionCausesForbidden() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1339,7 +1339,7 @@ public async Task AuthenticatedUserWithoutPermissionCausesForbidden() [Fact] public async Task AuthorizedConnectionCanConnectToEndPoint() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1399,7 +1399,7 @@ public async Task AuthorizedConnectionCanConnectToEndPoint() [Fact] public async Task AllPoliciesRequiredForAuthorizedEndPoint() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1486,7 +1486,7 @@ public async Task AllPoliciesRequiredForAuthorizedEndPoint() [Fact] public async Task AuthorizedConnectionWithAcceptedSchemesCanConnectToEndPoint() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1549,7 +1549,7 @@ public async Task AuthorizedConnectionWithAcceptedSchemesCanConnectToEndPoint() [Fact] public async Task AuthorizedConnectionWithRejectedSchemesFailsToConnectToEndPoint() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1603,7 +1603,7 @@ public async Task AuthorizedConnectionWithRejectedSchemesFailsToConnectToEndPoin [Fact] public async Task SetsInherentKeepAliveFeatureOnFirstLongPollingRequest() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1635,7 +1635,7 @@ public async Task SetsInherentKeepAliveFeatureOnFirstLongPollingRequest() [InlineData(HttpTransportType.WebSockets)] public async Task DeleteEndpointRejectsRequestToTerminateNonLongPollingTransport(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1676,7 +1676,7 @@ public async Task DeleteEndpointRejectsRequestToTerminateNonLongPollingTransport [Fact] public async Task DeleteEndpointGracefullyTerminatesLongPolling() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1727,7 +1727,7 @@ public async Task DeleteEndpointGracefullyTerminatesLongPolling() [Fact] public async Task DeleteEndpointGracefullyTerminatesLongPollingEvenWhenBetweenPolls() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var connection = manager.CreateConnection(); @@ -1775,7 +1775,7 @@ public async Task DeleteEndpointGracefullyTerminatesLongPollingEvenWhenBetweenPo [Fact] public async Task NegotiateDoesNotReturnWebSocketsWhenNotAvailable() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); @@ -1928,7 +1928,7 @@ public async Task CanDisposeWhileWriteLockIsBlockedOnBackpressureAndResponseRetu [Fact] public async Task LongPollingCanPollIfWritePipeHasBackpressure() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var manager = CreateConnectionManager(loggerFactory); var pipeOptions = new PipeOptions(pauseWriterThreshold: 13, resumeWriterThreshold: 10); diff --git a/test/Microsoft.AspNetCore.Http.Connections.Tests/WebSocketsTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/WebSocketsTests.cs index 82a59030e1..87cc8f1606 100644 --- a/test/Microsoft.AspNetCore.Http.Connections.Tests/WebSocketsTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/WebSocketsTests.cs @@ -35,7 +35,7 @@ public WebSocketsTests(ITestOutputHelper output) [InlineData(nameof(WebSocketMessageType.Binary))] public async Task ReceivedFramesAreWrittenToChannel(string webSocketMessageType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); @@ -83,7 +83,7 @@ public async Task ReceivedFramesAreWrittenToChannel(string webSocketMessageType) [InlineData(TransferFormat.Binary, nameof(WebSocketMessageType.Binary))] public async Task WebSocketTransportSetsMessageTypeBasedOnTransferFormatFeature(TransferFormat transferFormat, string expectedMessageType) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); @@ -120,7 +120,7 @@ public async Task WebSocketTransportSetsMessageTypeBasedOnTransferFormatFeature( [Fact] public async Task TransportCommunicatesErrorToApplicationWhenClientDisconnectsAbnormally() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); @@ -173,7 +173,7 @@ async Task CompleteApplicationAfterTransportCompletes() [Fact] public async Task ClientReceivesInternalServerErrorWhenTheApplicationFails() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); @@ -205,7 +205,7 @@ public async Task ClientReceivesInternalServerErrorWhenTheApplicationFails() [Fact] public async Task TransportClosesOnCloseTimeoutIfClientDoesNotSendCloseFrame() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); @@ -240,7 +240,7 @@ public async Task TransportClosesOnCloseTimeoutIfClientDoesNotSendCloseFrame() [Fact] public async Task TransportFailsOnTimeoutWithErrorWhenApplicationFailsAndClientDoesNotSendCloseFrame() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); @@ -275,7 +275,7 @@ public async Task TransportFailsOnTimeoutWithErrorWhenApplicationFailsAndClientD [Fact] public async Task ServerGracefullyClosesWhenApplicationEndsThenClientSendsCloseFrame() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); @@ -315,7 +315,7 @@ public async Task ServerGracefullyClosesWhenApplicationEndsThenClientSendsCloseF [Fact] public async Task ServerGracefullyClosesWhenClientSendsCloseFrameThenApplicationEnds() { - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); @@ -358,7 +358,7 @@ public async Task SubProtocolSelectorIsUsedToSelectSubProtocol() const string ExpectedSubProtocol = "expected"; var providedSubProtocols = new[] {"provided1", "provided2"}; - using (StartVerifableLog(out var loggerFactory, LogLevel.Debug)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) { var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default); var connection = new HttpConnectionContext("foo", pair.Transport, pair.Application); diff --git a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs index 4f7af0fc85..2c210b274c 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs @@ -69,7 +69,7 @@ public HubConnectionTests(ServerFixture serverFixture, ITestOutputHelpe public async Task CheckFixedMessage(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(CheckFixedMessage)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(CheckFixedMessage)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { var connectionBuilder = new HubConnectionBuilder() .WithLoggerFactory(loggerFactory) @@ -103,7 +103,7 @@ public async Task CheckFixedMessage(string protocolName, HttpTransportType trans public async Task CanSendAndReceiveMessage(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(CanSendAndReceiveMessage)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(CanSendAndReceiveMessage)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { const string originalMessage = "SignalR"; var connection = CreateHubConnection(path, transportType, protocol, loggerFactory); @@ -132,7 +132,7 @@ public async Task CanSendAndReceiveMessage(string protocolName, HttpTransportTyp public async Task CanStopAndStartConnection(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStopAndStartConnection)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStopAndStartConnection)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { const string originalMessage = "SignalR"; var connection = CreateHubConnection(path, transportType, protocol, loggerFactory); @@ -163,7 +163,7 @@ public async Task CanStopAndStartConnection(string protocolName, HttpTransportTy public async Task CanStartConnectionFromClosedEvent(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStartConnectionFromClosedEvent)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStartConnectionFromClosedEvent)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { var logger = loggerFactory.CreateLogger(); const string originalMessage = "SignalR"; @@ -225,7 +225,7 @@ public async Task CanStartConnectionFromClosedEvent(string protocolName, HttpTra public async Task MethodsAreCaseInsensitive(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(MethodsAreCaseInsensitive)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(MethodsAreCaseInsensitive)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { const string originalMessage = "SignalR"; var connection = CreateHubConnection(path, transportType, protocol, loggerFactory); @@ -254,7 +254,7 @@ public async Task MethodsAreCaseInsensitive(string protocolName, HttpTransportTy public async Task CanInvokeClientMethodFromServer(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanInvokeClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanInvokeClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { const string originalMessage = "SignalR"; @@ -287,7 +287,7 @@ public async Task CanInvokeClientMethodFromServer(string protocolName, HttpTrans public async Task InvokeNonExistantClientMethodFromServer(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(InvokeNonExistantClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(InvokeNonExistantClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { var connection = CreateHubConnection(path, transportType, protocol, loggerFactory); var closeTcs = new TaskCompletionSource(); @@ -328,7 +328,7 @@ public async Task InvokeNonExistantClientMethodFromServer(string protocolName, H public async Task CanStreamClientMethodFromServer(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStreamClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStreamClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { var connection = CreateHubConnection(path, transportType, protocol, loggerFactory); try @@ -357,7 +357,7 @@ public async Task CanStreamClientMethodFromServer(string protocolName, HttpTrans public async Task CanCloseStreamMethodEarly(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(CanCloseStreamMethodEarly)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(CanCloseStreamMethodEarly)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { var connection = CreateHubConnection(path, transportType, protocol, loggerFactory); try @@ -397,7 +397,7 @@ public async Task CanCloseStreamMethodEarly(string protocolName, HttpTransportTy public async Task StreamDoesNotStartIfTokenAlreadyCanceled(string protocolName, HttpTransportType transportType, string path) { var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(StreamDoesNotStartIfTokenAlreadyCanceled)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, $"{nameof(StreamDoesNotStartIfTokenAlreadyCanceled)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) { var connection = CreateHubConnection(path, transportType, protocol, loggerFactory); try @@ -435,7 +435,7 @@ bool ExpectedErrors(WriteContext writeContext) } var protocol = HubProtocols[protocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ExceptionFromStreamingSentToClient)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ExceptionFromStreamingSentToClient)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(path, transportType, protocol, loggerFactory); try @@ -469,7 +469,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfHubMethodCannotBeResolved)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfHubMethodCannotBeResolved)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); try @@ -502,7 +502,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); try @@ -535,7 +535,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnHubMethodArgumentTypeMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnHubMethodArgumentTypeMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); try @@ -568,7 +568,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfStreamingHubMethodCannotBeResolved)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfStreamingHubMethodCannotBeResolved)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); try @@ -602,7 +602,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnStreamingHubMethodArgumentCountMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnStreamingHubMethodArgumentCountMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { loggerFactory.AddConsole(LogLevel.Trace); var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); @@ -637,7 +637,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnStreamingHubMethodArgumentTypeMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnStreamingHubMethodArgumentTypeMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); try @@ -671,7 +671,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfNonStreamMethodInvokedWithStreamAsync)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfNonStreamMethodInvokedWithStreamAsync)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); try @@ -704,7 +704,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfStreamMethodInvokedWithInvoke)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfStreamMethodInvokedWithInvoke)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); try @@ -737,7 +737,7 @@ bool ExpectedErrors(WriteContext writeContext) } var hubProtocol = HubProtocols[hubProtocolName]; - using (StartVerifableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfBuildingAsyncEnumeratorIsNotPossible)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfBuildingAsyncEnumeratorIsNotPossible)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}", expectedErrorsFilter: ExpectedErrors)) { var connection = CreateHubConnection(hubPath, transportType, hubProtocol, loggerFactory); try @@ -763,7 +763,7 @@ bool ExpectedErrors(WriteContext writeContext) [MemberData(nameof(TransportTypes))] public async Task ClientCanUseJwtBearerTokenForAuthentication(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, $"{nameof(ClientCanUseJwtBearerTokenForAuthentication)}_{transportType}")) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ClientCanUseJwtBearerTokenForAuthentication)}_{transportType}")) { async Task AccessTokenProvider() { @@ -801,7 +801,7 @@ async Task AccessTokenProvider() [MemberData(nameof(TransportTypes))] public async Task ClientCanUseJwtBearerTokenForAuthenticationWhenRedirected(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, $"{nameof(ClientCanUseJwtBearerTokenForAuthenticationWhenRedirected)}_{transportType}")) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ClientCanUseJwtBearerTokenForAuthenticationWhenRedirected)}_{transportType}")) { var hubConnection = new HubConnectionBuilder() .WithLoggerFactory(loggerFactory) @@ -829,7 +829,7 @@ public async Task ClientCanUseJwtBearerTokenForAuthenticationWhenRedirected(Http [MemberData(nameof(TransportTypes))] public async Task ClientCanSendHeaders(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, $"{nameof(ClientCanSendHeaders)}_{transportType}")) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(ClientCanSendHeaders)}_{transportType}")) { var hubConnection = new HubConnectionBuilder() .WithLoggerFactory(loggerFactory) @@ -861,7 +861,7 @@ public async Task ClientCanSendHeaders(HttpTransportType transportType) [WebSocketsSupportedCondition] public async Task WebSocketOptionsAreApplied() { - using (StartVerifableLog(out var loggerFactory, $"{nameof(WebSocketOptionsAreApplied)}")) + using (StartVerifiableLog(out var loggerFactory, $"{nameof(WebSocketOptionsAreApplied)}")) { // System.Net has a HttpTransportType type which means we need to fully-qualify this rather than 'use' the namespace var cookieJar = new System.Net.CookieContainer(); @@ -895,7 +895,7 @@ public async Task WebSocketOptionsAreApplied() [Fact] public async Task CheckHttpConnectionFeatures() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var hubConnection = new HubConnectionBuilder() .WithLoggerFactory(loggerFactory) @@ -931,7 +931,7 @@ public async Task CheckHttpConnectionFeatures() [Fact] public async Task UserIdProviderCanAccessHttpContext() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var hubConnection = new HubConnectionBuilder() .WithLoggerFactory(loggerFactory) @@ -962,7 +962,7 @@ public async Task UserIdProviderCanAccessHttpContext() [Fact] public async Task NegotiationSkipsServerSentEventsWhenUsingBinaryProtocol() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var hubConnectionBuilder = new HubConnectionBuilder() .WithLoggerFactory(loggerFactory) @@ -992,7 +992,7 @@ public async Task NegotiationSkipsServerSentEventsWhenUsingBinaryProtocol() [Fact] public async Task StopCausesPollToReturnImmediately() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { PollTrackingMessageHandler pollTracker = null; var hubConnection = new HubConnectionBuilder() diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs index a115236af8..a7af19c405 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs @@ -28,7 +28,7 @@ public ConnectionLifecycle(ITestOutputHelper output) : base(output) [Fact] public async Task CanStartStartedConnection() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { await WithConnectionAsync(CreateConnection(loggerFactory: loggerFactory), async (connection) => { @@ -41,7 +41,7 @@ public async Task CanStartStartedConnection() [Fact] public async Task CanStartStartingConnection() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { await WithConnectionAsync( CreateConnection(loggerFactory: loggerFactory, transport: new TestTransport(onTransportStart: SyncPoint.Create(out var syncPoint))), @@ -61,7 +61,7 @@ public async Task CanStartStartingConnection() [Fact] public async Task CannotStartConnectionOnceDisposed() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { await WithConnectionAsync( CreateConnection(loggerFactory: loggerFactory), @@ -89,7 +89,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ErrorStartingTransport"; } - using (StartVerifableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) { var startCounter = 0; var expected = new Exception("Transport failed to start"); @@ -140,7 +140,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ErrorStartingTransport"; } - using (StartVerifableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) { var startCounter = 0; var availableTransports = 3; @@ -175,7 +175,7 @@ Task OnTransportStart() [Fact] public async Task CanDisposeUnstartedConnection() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { await WithConnectionAsync( CreateConnection(loggerFactory: loggerFactory), @@ -190,7 +190,7 @@ public async Task CanDisposeUnstartedConnection() [Fact] public async Task CanDisposeStartingConnection() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { await WithConnectionAsync( CreateConnection( @@ -224,7 +224,7 @@ public async Task CanDisposeStartingConnection() [Fact] public async Task CanDisposeDisposingConnection() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { await WithConnectionAsync( CreateConnection( @@ -289,7 +289,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ErrorSending"; } - using (StartVerifableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) { var httpHandler = new TestHttpMessageHandler(); @@ -332,7 +332,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ErrorStartingTransport"; } - using (StartVerifableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) { var httpHandler = new TestHttpMessageHandler(); @@ -356,7 +356,7 @@ bool ExpectedErrors(WriteContext writeContext) [Fact] public async Task SSEWaitsForResponseToStart() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var httpHandler = new TestHttpMessageHandler(); diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs index 42839f7472..6d46bfd4ff 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs @@ -81,7 +81,7 @@ Task AccessTokenProvider() [InlineData(HttpTransportType.ServerSentEvents, false)] public async Task HttpConnectionSetsInherentKeepAliveFeature(HttpTransportType transportType, bool expectedValue) { - using (StartVerifableLog(out var loggerFactory, testName: $"HttpConnectionSetsInherentKeepAliveFeature_{transportType}_{expectedValue}")) + using (StartVerifiableLog(out var loggerFactory, testName: $"HttpConnectionSetsInherentKeepAliveFeature_{transportType}_{expectedValue}")) { var testHttpHandler = new TestHttpMessageHandler(autoNegotiate: false); diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs index 99618d3e01..4e80ebd6c5 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs @@ -126,7 +126,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ShutdownWithError"; } - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, expectedErrorsFilter: ExpectedErrors)) { var hubConnection = CreateHubConnection(new TestConnection(), loggerFactory: loggerFactory); hubConnection.ServerTimeout = TimeSpan.FromMilliseconds(2000); diff --git a/test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs b/test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs index 4b23002c36..ff6df30558 100644 --- a/test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs +++ b/test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs @@ -43,7 +43,7 @@ public RedisEndToEndTests(RedisServerFixture serverFixture, ITestOutput [MemberData(nameof(TransportTypesAndProtocolTypes))] public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType transportType, string protocolName) { - using (StartVerifableLog(out var loggerFactory, testName: + using (StartVerifiableLog(out var loggerFactory, testName: $"{nameof(HubConnectionCanSendAndReceiveMessages)}_{transportType.ToString()}_{protocolName}")) { var protocol = HubProtocolHelpers.GetHubProtocol(protocolName); @@ -64,7 +64,7 @@ public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType trans [MemberData(nameof(TransportTypesAndProtocolTypes))] public async Task HubConnectionCanSendAndReceiveGroupMessages(HttpTransportType transportType, string protocolName) { - using (StartVerifableLog(out var loggerFactory, testName: + using (StartVerifiableLog(out var loggerFactory, testName: $"{nameof(HubConnectionCanSendAndReceiveGroupMessages)}_{transportType.ToString()}_{protocolName}")) { var protocol = HubProtocolHelpers.GetHubProtocol(protocolName); @@ -95,7 +95,7 @@ public async Task HubConnectionCanSendAndReceiveGroupMessages(HttpTransportType [MemberData(nameof(TransportTypesAndProtocolTypes))] public async Task CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUser(HttpTransportType transportType, string protocolName) { - using (StartVerifableLog(out var loggerFactory, testName: + using (StartVerifiableLog(out var loggerFactory, testName: $"{nameof(CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUser)}_{transportType.ToString()}_{protocolName}")) { var protocol = HubProtocolHelpers.GetHubProtocol(protocolName); @@ -128,7 +128,7 @@ public async Task CanSendAndReceiveUserMessagesWhenOneConnectionWithUserDisconne // Regression test: // When multiple connections from the same user were connected and one left, it used to unsubscribe from the user channel // Now we keep track of users connections and only unsubscribe when no users are listening - using (StartVerifableLog(out var loggerFactory, testName: + using (StartVerifiableLog(out var loggerFactory, testName: $"{nameof(CanSendAndReceiveUserMessagesWhenOneConnectionWithUserDisconnects)}_{transportType.ToString()}_{protocolName}")) { var protocol = HubProtocolHelpers.GetHubProtocol(protocolName); diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableLoggedTest.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableLoggedTest.cs index 061823836c..b411ab7db6 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableLoggedTest.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableLoggedTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; @@ -17,18 +17,18 @@ public VerifiableLoggedTest(ITestOutputHelper output) : base(output) { } - public virtual IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) + public virtual IDisposable StartVerifiableLog(out ILoggerFactory loggerFactory, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) { var disposable = StartLog(out loggerFactory, testName); return new VerifyNoErrorsScope(loggerFactory, disposable, expectedErrorsFilter); } - public virtual IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) + public virtual IDisposable StartVerifiableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) { var disposable = StartLog(out loggerFactory, minLogLevel, testName); return new VerifyNoErrorsScope(loggerFactory, disposable, expectedErrorsFilter); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs index ab0acf1abe..c31cd0650f 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs @@ -53,15 +53,15 @@ public VerifiableServerLoggedTest(ServerFixture serverFixture, ITestOutputHelper }; } - public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) + public override IDisposable StartVerifiableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) { - var disposable = base.StartVerifableLog(out loggerFactory, minLogLevel, testName, ResolveExpectedErrorsFilter(expectedErrorsFilter)); + var disposable = base.StartVerifiableLog(out loggerFactory, minLogLevel, testName, ResolveExpectedErrorsFilter(expectedErrorsFilter)); return new ServerLogScope(ServerFixture, loggerFactory, disposable); } - public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) + public override IDisposable StartVerifiableLog(out ILoggerFactory loggerFactory, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) { - var disposable = base.StartVerifableLog(out loggerFactory, testName, ResolveExpectedErrorsFilter(expectedErrorsFilter)); + var disposable = base.StartVerifiableLog(out loggerFactory, testName, ResolveExpectedErrorsFilter(expectedErrorsFilter)); return new ServerLogScope(ServerFixture, loggerFactory, disposable); } } diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs index e2f5ff150a..6062003ce7 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs @@ -44,7 +44,7 @@ public EndToEndTests(ServerFixture serverFixture, ITestOutputHelper out [Fact] public async Task CanStartAndStopConnectionUsingDefaultTransport() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var url = ServerFixture.Url + "/echo"; // The test should connect to the server using WebSockets transport on Windows 8 and newer. @@ -64,7 +64,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ErrorStartingTransport"; } - using (StartVerifableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, expectedErrorsFilter: ExpectedErrors)) { var url = ServerFixture.Url + "/echo"; // The test should connect to the server using WebSockets transport on Windows 8 and newer. @@ -81,7 +81,7 @@ bool ExpectedErrors(WriteContext writeContext) [MemberData(nameof(TransportTypes))] public async Task CanStartAndStopConnectionUsingGivenTransport(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, minLogLevel: LogLevel.Trace, testName: $"CanStartAndStopConnectionUsingGivenTransport_{transportType}")) + using (StartVerifiableLog(out var loggerFactory, minLogLevel: LogLevel.Trace, testName: $"CanStartAndStopConnectionUsingGivenTransport_{transportType}")) { var url = ServerFixture.Url + "/echo"; var connection = new HttpConnection(new Uri(url), transportType, loggerFactory); @@ -94,7 +94,7 @@ public async Task CanStartAndStopConnectionUsingGivenTransport(HttpTransportType [WebSocketsSupportedCondition] public async Task WebSocketsTest() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var logger = loggerFactory.CreateLogger(); @@ -131,7 +131,7 @@ public async Task WebSocketsTest() [WebSocketsSupportedCondition] public async Task WebSocketsReceivesAndSendsPartialFramesTest() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var logger = loggerFactory.CreateLogger(); @@ -169,7 +169,7 @@ public async Task WebSocketsReceivesAndSendsPartialFramesTest() [WebSocketsSupportedCondition] public async Task HttpRequestsNotSentWhenWebSocketsTransportRequestedAndSkipNegotiationSet() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var logger = loggerFactory.CreateLogger(); var url = ServerFixture.Url + "/echo"; @@ -219,7 +219,7 @@ public async Task HttpRequestsNotSentWhenWebSocketsTransportRequestedAndSkipNego [InlineData(HttpTransportType.ServerSentEvents)] public async Task HttpConnectionThrowsIfSkipNegotiationSetAndTransportIsNotWebSockets(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var logger = loggerFactory.CreateLogger(); var url = ServerFixture.Url + "/echo"; @@ -261,7 +261,7 @@ public async Task HttpConnectionThrowsIfSkipNegotiationSetAndTransportIsNotWebSo [MemberData(nameof(TransportTypesAndTransferFormats))] public async Task ConnectionCanSendAndReceiveMessages(HttpTransportType transportType, TransferFormat requestedTransferFormat) { - using (StartVerifableLog(out var loggerFactory, minLogLevel: LogLevel.Trace, testName: $"ConnectionCanSendAndReceiveMessages_{transportType.ToString()}_{requestedTransferFormat.ToString()}")) + using (StartVerifiableLog(out var loggerFactory, minLogLevel: LogLevel.Trace, testName: $"ConnectionCanSendAndReceiveMessages_{transportType.ToString()}_{requestedTransferFormat.ToString()}")) { var logger = loggerFactory.CreateLogger(); @@ -325,7 +325,7 @@ public static IEnumerable MessageSizesData [MemberData(nameof(MessageSizesData))] public async Task ConnectionCanSendAndReceiveDifferentMessageSizesWebSocketsTransport(string message) { - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, testName: $"ConnectionCanSendAndReceiveDifferentMessageSizesWebSocketsTransport_{message.Length}")) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, testName: $"ConnectionCanSendAndReceiveDifferentMessageSizesWebSocketsTransport_{message.Length}")) { var logger = loggerFactory.CreateLogger(); @@ -373,7 +373,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ErrorWithNegotiation"; } - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, expectedErrorsFilter: ExpectedErrors)) { var logger = loggerFactory.CreateLogger(); @@ -396,7 +396,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ErrorStartingTransport"; } - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, expectedErrorsFilter: ExpectedErrors)) { var logger = loggerFactory.CreateLogger(); @@ -425,7 +425,7 @@ bool ExpectedErrors(WriteContext writeContext) writeContext.EventId.Name == "ErrorWithNegotiation"; } - using (StartVerifableLog(out var loggerFactory, LogLevel.Trace, testName: $"{nameof(UnauthorizedConnectionDoesNotConnect)}_{transportType}", expectedErrorsFilter: ExpectedErrors)) + using (StartVerifiableLog(out var loggerFactory, LogLevel.Trace, testName: $"{nameof(UnauthorizedConnectionDoesNotConnect)}_{transportType}", expectedErrorsFilter: ExpectedErrors)) { var logger = loggerFactory.CreateLogger(); @@ -482,7 +482,7 @@ public async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated_LongPollin private async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated(HttpTransportType transportType) { - using (StartVerifableLog(out var loggerFactory, testName: $"ConnectionCanSendAndReceiveMessages_{transportType.ToString()}")) + using (StartVerifiableLog(out var loggerFactory, testName: $"ConnectionCanSendAndReceiveMessages_{transportType.ToString()}")) { var logger = loggerFactory.CreateLogger(); diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs index b43368a0ff..4c8bf6d6f3 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs @@ -57,7 +57,7 @@ public void HttpOptionsSetOntoWebSocketOptions() [WebSocketsSupportedCondition] public async Task WebSocketsTransportStopsSendAndReceiveLoopsWhenTransportIsStopped() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null); await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echo"), @@ -71,7 +71,7 @@ public async Task WebSocketsTransportStopsSendAndReceiveLoopsWhenTransportIsStop [WebSocketsSupportedCondition] public async Task WebSocketsTransportSendsUserAgent() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null); await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/httpheader"), @@ -99,7 +99,7 @@ public async Task WebSocketsTransportSendsUserAgent() [WebSocketsSupportedCondition] public async Task WebSocketsTransportSendsXRequestedWithHeader() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null); await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/httpheader"), @@ -122,7 +122,7 @@ public async Task WebSocketsTransportSendsXRequestedWithHeader() [WebSocketsSupportedCondition] public async Task WebSocketsTransportStopsWhenConnectionChannelClosed() { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null); await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echo"), @@ -138,7 +138,7 @@ public async Task WebSocketsTransportStopsWhenConnectionChannelClosed() [InlineData(TransferFormat.Binary)] public async Task WebSocketsTransportStopsWhenConnectionClosedByTheServer(TransferFormat transferFormat) { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null); await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echoAndClose"), transferFormat); @@ -160,7 +160,7 @@ public async Task WebSocketsTransportStopsWhenConnectionClosedByTheServer(Transf [InlineData(TransferFormat.Binary)] public async Task WebSocketsTransportSetsTransferFormat(TransferFormat transferFormat) { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null); @@ -178,7 +178,7 @@ public async Task WebSocketsTransportSetsTransferFormat(TransferFormat transferF [WebSocketsSupportedCondition] public async Task WebSocketsTransportThrowsForInvalidTransferFormat(TransferFormat transferFormat) { - using (StartVerifableLog(out var loggerFactory)) + using (StartVerifiableLog(out var loggerFactory)) { var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null); var exception = await Assert.ThrowsAsync(() =>