From a13f3f4765ca75e703badb72af84bffda302ca7b Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sun, 15 Apr 2018 17:11:09 +1200
Subject: [PATCH] Clean up

---
 .../ServerLogScope.cs                         | 36 +++++++++++++
 .../VerifiableLoggedTest.cs                   | 50 -------------------
 .../VerifiableServerLoggedTest.cs             | 32 ++++++++++++
 3 files changed, 68 insertions(+), 50 deletions(-)
 create mode 100644 test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs
 create mode 100644 test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs

diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs
new file mode 100644
index 0000000000..3e5518a466
--- /dev/null
+++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/ServerLogScope.cs
@@ -0,0 +1,36 @@
+// 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;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.SignalR.Tests
+{
+    public class ServerLogScope<TStartup> : IDisposable where TStartup : class
+    {
+        private readonly ServerFixture<TStartup> _serverFixture;
+        private readonly IDisposable _wrappedDisposable;
+        private readonly ILogger _logger;
+
+        public ServerLogScope(ServerFixture<TStartup> serverFixture, ILoggerFactory loggerFactory, IDisposable wrappedDisposable)
+        {
+            _serverFixture = serverFixture;
+            _wrappedDisposable = wrappedDisposable;
+            _logger = loggerFactory.CreateLogger(typeof(ServerLogScope<TStartup>));
+
+            _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);
+        }
+
+        public void Dispose()
+        {
+            _serverFixture.ServerLogged -= ServerFixtureOnServerLogged;
+
+            _wrappedDisposable?.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableLoggedTest.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableLoggedTest.cs
index 9359c41876..061823836c 100644
--- a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableLoggedTest.cs
+++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableLoggedTest.cs
@@ -11,56 +11,6 @@ using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.SignalR.Tests
 {
-    public class VerifiableServerLoggedTest<TStartup> : VerifiableLoggedTest where TStartup : class 
-    {
-        public ServerFixture<TStartup> ServerFixture { get; }
-
-        public VerifiableServerLoggedTest(ServerFixture<TStartup> serverFixture, ITestOutputHelper output) : base(output)
-        {
-            ServerFixture = serverFixture;
-        }
-
-        public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, string testName = null, Func<WriteContext, bool> expectedErrorsFilter = null)
-        {
-            var disposable = base.StartVerifableLog(out loggerFactory, minLogLevel, testName, expectedErrorsFilter);
-            return new ServerLogScope<TStartup>(ServerFixture, loggerFactory, disposable);
-        }
-
-        public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, string testName = null, Func<WriteContext, bool> expectedErrorsFilter = null)
-        {
-            var disposable = base.StartVerifableLog(out loggerFactory, testName, expectedErrorsFilter);
-            return new ServerLogScope<TStartup>(ServerFixture, loggerFactory, disposable);
-        }
-    }
-
-    public class ServerLogScope<TStartup> : IDisposable where TStartup : class
-    {
-        private readonly ServerFixture<TStartup> _serverFixture;
-        private readonly IDisposable _wrappedDisposable;
-        private readonly ILogger _logger;
-
-        public ServerLogScope(ServerFixture<TStartup> serverFixture, ILoggerFactory loggerFactory, IDisposable wrappedDisposable)
-        {
-            _serverFixture = serverFixture;
-            _wrappedDisposable = wrappedDisposable;
-            _logger = loggerFactory.CreateLogger(typeof(ServerLogScope<TStartup>));
-
-            _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);
-        }
-
-        public void Dispose()
-        {
-            _serverFixture.ServerLogged -= ServerFixtureOnServerLogged;
-
-            _wrappedDisposable?.Dispose();
-        }
-    }
-
     public class VerifiableLoggedTest : LoggedTest
     {
         public VerifiableLoggedTest(ITestOutputHelper output) : base(output)
diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs
new file mode 100644
index 0000000000..e92eb61d70
--- /dev/null
+++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/VerifiableServerLoggedTest.cs
@@ -0,0 +1,32 @@
+// 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;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Testing;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.SignalR.Tests
+{
+    public class VerifiableServerLoggedTest<TStartup> : VerifiableLoggedTest where TStartup : class 
+    {
+        public ServerFixture<TStartup> ServerFixture { get; }
+
+        public VerifiableServerLoggedTest(ServerFixture<TStartup> serverFixture, ITestOutputHelper output) : base(output)
+        {
+            ServerFixture = serverFixture;
+        }
+
+        public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, string testName = null, Func<WriteContext, bool> expectedErrorsFilter = null)
+        {
+            var disposable = base.StartVerifableLog(out loggerFactory, minLogLevel, testName, expectedErrorsFilter);
+            return new ServerLogScope<TStartup>(ServerFixture, loggerFactory, disposable);
+        }
+
+        public override IDisposable StartVerifableLog(out ILoggerFactory loggerFactory, string testName = null, Func<WriteContext, bool> expectedErrorsFilter = null)
+        {
+            var disposable = base.StartVerifableLog(out loggerFactory, testName, expectedErrorsFilter);
+            return new ServerLogScope<TStartup>(ServerFixture, loggerFactory, disposable);
+        }
+    }
+}
\ No newline at end of file