From 25aea395da3160ac0d1aebb3a7bec626a6439fe1 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 15 Apr 2018 19:10:37 +1200 Subject: [PATCH] ah-ha! --- .../ServerLogScope.cs | 6 +++--- .../VerifiableServerLoggedTest.cs | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs index 5faf9674d9..5ff8ad4c52 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs @@ -10,20 +10,20 @@ namespace Microsoft.AspNetCore.SignalR.Tests { private readonly ServerFixture _serverFixture; private readonly IDisposable _wrappedDisposable; - //private readonly ILogger _logger; + private readonly ILogger _logger; public ServerLogScope(ServerFixture serverFixture, ILoggerFactory loggerFactory, IDisposable wrappedDisposable) { _serverFixture = serverFixture; _wrappedDisposable = wrappedDisposable; - //_logger = loggerFactory.CreateLogger(typeof(ServerLogScope)); + _logger = loggerFactory.CreateLogger(typeof(ServerLogScope)); _serverFixture.ServerLogged += ServerFixtureOnServerLogged; } private void ServerFixtureOnServerLogged(LogRecord logRecord) { - //_logger.Log(logRecord.Write.LogLevel, logRecord.Write.EventId, logRecord.Write.State, logRecord.Write.Exception, logRecord.Write.Formatter); + _logger.Log(logRecord.Write.LogLevel, logRecord.Write.EventId, logRecord.Write.State, logRecord.Write.Exception, logRecord.Write.Formatter); } public void Dispose() diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs index 44059b3616..1035116e6a 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Runtime.CompilerServices; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit.Abstractions; @@ -17,13 +18,13 @@ namespace Microsoft.AspNetCore.SignalR.Tests ServerFixture = serverFixture; } - public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, string testName = null, Func expectedErrorsFilter = null) + public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) { var disposable = base.StartVerifableLog(out loggerFactory, minLogLevel, testName, expectedErrorsFilter); return new ServerLogScope(ServerFixture, loggerFactory, disposable); } - public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, string testName = null, Func expectedErrorsFilter = null) + public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, [CallerMemberName] string testName = null, Func expectedErrorsFilter = null) { var disposable = base.StartVerifableLog(out loggerFactory, testName, expectedErrorsFilter); return new ServerLogScope(ServerFixture, loggerFactory, disposable);