1 files changed, 11 insertions, 21 deletions
diff --git a/BackEnd/Timeline.Tests/Services/TimelineServiceTest.cs b/BackEnd/Timeline.Tests/Services/TimelineServiceTest.cs
index 5a774b78..73fdd32f 100644
--- a/BackEnd/Timeline.Tests/Services/TimelineServiceTest.cs
+++ b/BackEnd/Timeline.Tests/Services/TimelineServiceTest.cs
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Timeline.Entities;
 using Timeline.Models;
 using Timeline.Services;
 using Timeline.Services.Exceptions;
@@ -13,12 +12,8 @@ using Xunit;
 
 namespace Timeline.Tests.Services
 {
-    public class TimelineServiceTest : IAsyncLifetime, IDisposable
+    public class TimelineServiceTest : DatabaseBasedTest, IDisposable
     {
-        private readonly TestDatabase _testDatabase = new TestDatabase();
-
-        private DatabaseContext _databaseContext;
-
         private readonly PasswordService _passwordService = new PasswordService();
 
         private readonly ETagGenerator _eTagGenerator = new ETagGenerator();
@@ -29,6 +24,8 @@ namespace Timeline.Tests.Services
 
         private DataManager _dataManager;
 
+        private UserPermissionService _userPermissionService;
+
         private UserService _userService;
 
         private TimelineService _timelineService;
@@ -39,20 +36,13 @@ namespace Timeline.Tests.Services
         {
         }
 
-        public async Task InitializeAsync()
-        {
-            await _testDatabase.InitializeAsync();
-            _databaseContext = _testDatabase.CreateContext();
-            _dataManager = new DataManager(_databaseContext, _eTagGenerator);
-            _userService = new UserService(NullLogger<UserService>.Instance, _databaseContext, _passwordService, _clock);
-            _timelineService = new TimelineService(NullLogger<TimelineService>.Instance, _databaseContext, _dataManager, _userService, _imageValidator, _clock);
-            _userDeleteService = new UserDeleteService(NullLogger<UserDeleteService>.Instance, _databaseContext, _timelineService);
-        }
-
-        public async Task DisposeAsync()
+        protected override void OnDatabaseCreated()
         {
-            await _testDatabase.DisposeAsync();
-            await _databaseContext.DisposeAsync();
+            _dataManager = new DataManager(Database, _eTagGenerator);
+            _userPermissionService = new UserPermissionService(Database);
+            _userService = new UserService(NullLogger<UserService>.Instance, Database, _passwordService, _clock, _userPermissionService);
+            _timelineService = new TimelineService(NullLogger<TimelineService>.Instance, Database, _dataManager, _userService, _imageValidator, _clock);
+            _userDeleteService = new UserDeleteService(NullLogger<UserDeleteService>.Instance, Database, _timelineService);
         }
 
         public void Dispose()
@@ -220,13 +210,13 @@ namespace Timeline.Tests.Services
             }
 
             {
-                await _userService.ModifyUser(userId, new User { Nickname = "haha" });
+                await _userService.ModifyUser(userId, new ModifyUserParams { Nickname = "haha" });
                 var posts = await _timelineService.GetPosts(timelineName, time2);
                 posts.Should().HaveCount(0);
             }
 
             {
-                await _userService.ModifyUser(userId, new User { Username = "haha" });
+                await _userService.ModifyUser(userId, new ModifyUserParams { Username = "haha" });
                 var posts = await _timelineService.GetPosts(timelineName, time2);
                 posts.Should().HaveCount(4);
             }