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 +-----
 Timeline.Tests/IntegratedTests/UserAvatarTests.cs |  2 +-
 Timeline.Tests/Timeline.Tests.csproj              | 15 +++++++--------
 Timeline.Tests/UserAvatarServiceTest.cs           |  4 ++--
 Timeline.Tests/UserDetailServiceTest.cs           |  4 ++--
 6 files changed, 29 insertions(+), 23 deletions(-)

(limited to 'Timeline.Tests')

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();
diff --git a/Timeline.Tests/IntegratedTests/UserAvatarTests.cs b/Timeline.Tests/IntegratedTests/UserAvatarTests.cs
index fd0c2ef4..2a3442d1 100644
--- a/Timeline.Tests/IntegratedTests/UserAvatarTests.cs
+++ b/Timeline.Tests/IntegratedTests/UserAvatarTests.cs
@@ -55,7 +55,7 @@ namespace Timeline.Tests.IntegratedTests
                         .And.Should().HaveBodyAsCommonResponseWithCode(UserAvatarController.ErrorCodes.Get_UserNotExist);
                 }
 
-                var env = _factory.Server.Host.Services.GetRequiredService<IHostingEnvironment>();
+                var env = _factory.Server.Host.Services.GetRequiredService<IWebHostEnvironment>();
                 var defaultAvatarData = await File.ReadAllBytesAsync(Path.Combine(env.ContentRootPath, "default-avatar.png"));
 
                 async Task GetReturnDefault(string username = "user")
diff --git a/Timeline.Tests/Timeline.Tests.csproj b/Timeline.Tests/Timeline.Tests.csproj
index 72bbc418..1852da5f 100644
--- a/Timeline.Tests/Timeline.Tests.csproj
+++ b/Timeline.Tests/Timeline.Tests.csproj
@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="1.0.1">
+    <PackageReference Include="coverlet.collector" Version="1.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="5.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="2.2.0-rtm-35646" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="FluentAssertions" Version="5.9.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Timeline.Tests/UserAvatarServiceTest.cs b/Timeline.Tests/UserAvatarServiceTest.cs
index e059602d..93bb70ae 100644
--- a/Timeline.Tests/UserAvatarServiceTest.cs
+++ b/Timeline.Tests/UserAvatarServiceTest.cs
@@ -151,7 +151,7 @@ namespace Timeline.Tests
 
         private readonly MockDefaultUserAvatarProvider _mockDefaultUserAvatarProvider;
 
-        private readonly LoggerFactory _loggerFactory;
+        private readonly ILoggerFactory _loggerFactory;
         private readonly TestDatabase _database;
 
         private readonly IETagGenerator _eTagGenerator;
@@ -162,7 +162,7 @@ namespace Timeline.Tests
         {
             _mockDefaultUserAvatarProvider = mockDefaultUserAvatarProvider;
 
-            _loggerFactory = MyTestLoggerFactory.Create(outputHelper);
+            _loggerFactory = Logging.Create(outputHelper);
             _database = new TestDatabase();
 
             _eTagGenerator = new ETagGenerator();
diff --git a/Timeline.Tests/UserDetailServiceTest.cs b/Timeline.Tests/UserDetailServiceTest.cs
index 7bbb2246..98613429 100644
--- a/Timeline.Tests/UserDetailServiceTest.cs
+++ b/Timeline.Tests/UserDetailServiceTest.cs
@@ -15,14 +15,14 @@ namespace Timeline.Tests
 {
     public class UserDetailServiceTest : IDisposable
     {
-        private readonly LoggerFactory _loggerFactory;
+        private readonly ILoggerFactory _loggerFactory;
         private readonly TestDatabase _database;
 
         private readonly UserDetailService _service;
 
         public UserDetailServiceTest(ITestOutputHelper outputHelper)
         {
-            _loggerFactory = MyTestLoggerFactory.Create(outputHelper);
+            _loggerFactory = Logging.Create(outputHelper);
             _database = new TestDatabase();
 
             _service = new UserDetailService(_loggerFactory.CreateLogger<UserDetailService>(), _database.DatabaseContext);
-- 
cgit v1.2.3