From 7c021c429ea77dffdd877c3e2a0bcf6e881a7285 Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Wed, 25 Sep 2019 21:35:35 +0800
Subject: Init migration to dotnet core 3.0.0 .

---
 Timeline.Tests/Helpers/MyTestLoggerFactory.cs     | 21 ++++++++++++++++-----
 Timeline.Tests/Helpers/MyWebApplicationFactory.cs |  6 +-----
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'Timeline.Tests/Helpers')

diff --git a/Timeline.Tests/Helpers/MyTestLoggerFactory.cs b/Timeline.Tests/Helpers/MyTestLoggerFactory.cs
index 40c6a77e..b9960378 100644
--- a/Timeline.Tests/Helpers/MyTestLoggerFactory.cs
+++ b/Timeline.Tests/Helpers/MyTestLoggerFactory.cs
@@ -1,14 +1,25 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Testing;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Xunit.Abstractions;
 
 namespace Timeline.Tests.Helpers
 {
-    public static class MyTestLoggerFactory
+    public static class Logging
     {
-        public static LoggerFactory Create(ITestOutputHelper outputHelper)
+        public static ILoggerFactory Create(ITestOutputHelper outputHelper)
         {
-            return new LoggerFactory(new[] { new XunitLoggerProvider(outputHelper) });
+            // TODO: Use test output.
+            return NullLoggerFactory.Instance;
+        }
+
+        public static IWebHostBuilder ConfigureTestLogging(this IWebHostBuilder builder)
+        {
+            builder.ConfigureLogging(logging =>
+            {
+                //logging.AddXunit(outputHelper);
+            });
+            return builder;
         }
     }
 }
diff --git a/Timeline.Tests/Helpers/MyWebApplicationFactory.cs b/Timeline.Tests/Helpers/MyWebApplicationFactory.cs
index 1a9fe01e..dfbe6620 100644
--- a/Timeline.Tests/Helpers/MyWebApplicationFactory.cs
+++ b/Timeline.Tests/Helpers/MyWebApplicationFactory.cs
@@ -58,11 +58,7 @@ namespace Timeline.Tests.Helpers
 
             return factory.WithWebHostBuilder(builder =>
             {
-                builder
-                .ConfigureLogging(logging =>
-                {
-                    logging.AddXunit(outputHelper);
-                })
+                builder.ConfigureTestLogging()
                 .ConfigureServices(services =>
                 {
                     services.AddEntityFrameworkSqlite();
-- 
cgit v1.2.3