huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ah-ha!

This commit is contained in:
James Newton-King 2018-04-15 19:10:37 +12:00
parent 585bcc3ee0
commit 25aea395da
No known key found for this signature in database
GPG Key ID: 0A66B2F456BF5526
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs
View File

@ -10,20 +10,20 @@ namespace Microsoft.AspNetCore.SignalR.Tests
{ {
private readonly ServerFixture _serverFixture; private readonly ServerFixture _serverFixture;
private readonly IDisposable _wrappedDisposable; private readonly IDisposable _wrappedDisposable;
//private readonly ILogger _logger; private readonly ILogger _logger;
public ServerLogScope(ServerFixture serverFixture, ILoggerFactory loggerFactory, IDisposable wrappedDisposable) public ServerLogScope(ServerFixture serverFixture, ILoggerFactory loggerFactory, IDisposable wrappedDisposable)
{ {
_serverFixture = serverFixture; _serverFixture = serverFixture;
_wrappedDisposable = wrappedDisposable; _wrappedDisposable = wrappedDisposable;
//_logger = loggerFactory.CreateLogger(typeof(ServerLogScope<TStartup>)); _logger = loggerFactory.CreateLogger(typeof(ServerLogScope));
_serverFixture.ServerLogged += ServerFixtureOnServerLogged; _serverFixture.ServerLogged += ServerFixtureOnServerLogged;
} }
private void ServerFixtureOnServerLogged(LogRecord logRecord) 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() public void Dispose()

5
test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Runtime.CompilerServices;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Logging.Testing;
using Xunit.Abstractions; using Xunit.Abstractions;
@ -17,13 +18,13 @@ namespace Microsoft.AspNetCore.SignalR.Tests
ServerFixture = serverFixture; ServerFixture = serverFixture;
} }
public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, string testName = null, Func<WriteContext, bool> expectedErrorsFilter = null) public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, [CallerMemberName] string testName = null, Func<WriteContext, bool> expectedErrorsFilter = null)
{ {
var disposable = base.StartVerifableLog(out loggerFactory, minLogLevel, testName, expectedErrorsFilter); var disposable = base.StartVerifableLog(out loggerFactory, minLogLevel, testName, expectedErrorsFilter);
return new ServerLogScope(ServerFixture, loggerFactory, disposable); return new ServerLogScope(ServerFixture, loggerFactory, disposable);
} }
public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, string testName = null, Func<WriteContext, bool> expectedErrorsFilter = null) public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, [CallerMemberName] string testName = null, Func<WriteContext, bool> expectedErrorsFilter = null)
{ {
var disposable = base.StartVerifableLog(out loggerFactory, testName, expectedErrorsFilter); var disposable = base.StartVerifableLog(out loggerFactory, testName, expectedErrorsFilter);
return new ServerLogScope(ServerFixture, loggerFactory, disposable); return new ServerLogScope(ServerFixture, loggerFactory, disposable);