8 files changed, 109 insertions, 73 deletions
diff --git a/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs b/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
index c8bec266..8a44c852 100644
--- a/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
+++ b/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
@@ -2,7 +2,8 @@ using Microsoft.AspNetCore.Mvc.Testing;
 using Newtonsoft.Json;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Timeline.Entities.Http;
+using Timeline.Models.Http;
+using Timeline.Tests.Mock.Data;
 
 namespace Timeline.Tests.Helpers.Authentication
 {
@@ -10,19 +11,30 @@ namespace Timeline.Tests.Helpers.Authentication
     {
         private const string CreateTokenUrl = "/token/create";
 
-        public static async Task<CreateTokenResponse> CreateUserTokenAsync(this HttpClient client, string username, string password, double? expireOffset = null)
+        public static async Task<CreateTokenResponse> CreateUserTokenAsync(this HttpClient client, string username, string password, int? expireOffset = null)
         {
             var response = await client.PostAsJsonAsync(CreateTokenUrl, new CreateTokenRequest { Username = username, Password = password, ExpireOffset = expireOffset });
+            response.AssertOk();
             var result = JsonConvert.DeserializeObject<CreateTokenResponse>(await response.Content.ReadAsStringAsync());
             return result;
         }
 
-        public static async Task<HttpClient> CreateClientWithUser<T>(this WebApplicationFactory<T> factory, string username, string password) where T : class
+        public static async Task<HttpClient> CreateClientWithCredential<T>(this WebApplicationFactory<T> factory, string username, string password) where T : class
         {
             var client = factory.CreateDefaultClient();
             var token = (await client.CreateUserTokenAsync(username, password)).Token;
             client.DefaultRequestHeaders.Add("Authorization", "Bearer " + token);
             return client;
         }
+
+        public static Task<HttpClient> CreateClientAsUser<T>(this WebApplicationFactory<T> factory) where T : class
+        {
+            return factory.CreateClientWithCredential(MockUsers.UserUsername, MockUsers.UserPassword);
+        }
+
+        public static Task<HttpClient> CreateClientAsAdmin<T>(this WebApplicationFactory<T> factory) where T : class
+        {
+            return factory.CreateClientWithCredential(MockUsers.AdminUsername, MockUsers.AdminPassword);
+        }
     }
 }
diff --git a/Timeline.Tests/Helpers/HttpClientExtensions.cs b/Timeline.Tests/Helpers/HttpClientExtensions.cs
new file mode 100644
index 00000000..cd40d91e
--- /dev/null
+++ b/Timeline.Tests/Helpers/HttpClientExtensions.cs
@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Timeline.Tests.Helpers
+{
+    public static class HttpClientExtensions
+    {
+        public static Task<HttpResponseMessage> PatchAsJsonAsync<T>(this HttpClient client, string url, T body)
+        {
+            return client.PatchAsync(url, new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json"));
+        }
+    }
+}
diff --git a/Timeline.Tests/Helpers/InvalidModelTestHelpers.cs b/Timeline.Tests/Helpers/InvalidModelTestHelpers.cs
new file mode 100644
index 00000000..1c079d0e
--- /dev/null
+++ b/Timeline.Tests/Helpers/InvalidModelTestHelpers.cs
@@ -0,0 +1,27 @@
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Timeline.Models.Http;
+using Xunit;
+
+namespace Timeline.Tests.Helpers
+{
+    public static class InvalidModelTestHelpers
+    {
+        public static async Task TestPostInvalidModel<T>(HttpClient client, string url, T body)
+        {
+            var response = await client.PostAsJsonAsync(url, body);
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            var responseBody = await response.ReadBodyAsJson<CommonResponse>();
+            Assert.Equal(CommonResponse.ErrorCodes.InvalidModel, responseBody.Code);
+        }
+
+        public static async Task TestPutInvalidModel<T>(HttpClient client, string url, T body)
+        {
+            var response = await client.PutAsJsonAsync(url, body);
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            var responseBody = await response.ReadBodyAsJson<CommonResponse>();
+            Assert.Equal(CommonResponse.ErrorCodes.InvalidModel, responseBody.Code);
+        }
+    }
+}
diff --git a/Timeline.Tests/Helpers/MyWebApplicationFactory.cs b/Timeline.Tests/Helpers/MyWebApplicationFactory.cs
index d9503526..b49756e4 100644
--- a/Timeline.Tests/Helpers/MyWebApplicationFactory.cs
+++ b/Timeline.Tests/Helpers/MyWebApplicationFactory.cs
@@ -5,8 +5,10 @@ using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Timeline.Models;
+using Timeline.Entities;
 using Timeline.Services;
+using Timeline.Tests.Mock.Data;
+using Timeline.Tests.Mock.Services;
 using Xunit.Abstractions;
 
 namespace Timeline.Tests.Helpers
@@ -34,7 +36,7 @@ namespace Timeline.Tests.Helpers
             using (var context = new DatabaseContext(options))
             {
                 context.Database.EnsureCreated();
-                context.Users.AddRange(TestMockUsers.MockUsers);
+                context.Users.AddRange(MockUsers.Users);
                 context.SaveChanges();
             }
         }
diff --git a/Timeline.Tests/Helpers/ResponseExtensions.cs b/Timeline.Tests/Helpers/ResponseExtensions.cs
index 155836fb..46c9e81d 100644
--- a/Timeline.Tests/Helpers/ResponseExtensions.cs
+++ b/Timeline.Tests/Helpers/ResponseExtensions.cs
@@ -1,11 +1,58 @@
 using Newtonsoft.Json;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Timeline.Models.Http;
+using Xunit;
 
 namespace Timeline.Tests.Helpers
 {
     public static class ResponseExtensions
     {
+        public static void AssertOk(this HttpResponseMessage response)
+        {
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
+        public static void AssertNotFound(this HttpResponseMessage response)
+        {
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        public static void AssertBadRequest(this HttpResponseMessage response)
+        {
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+
+        public static async Task AssertIsPutCreated(this HttpResponseMessage response)
+        {
+            Assert.Equal(HttpStatusCode.Created, response.StatusCode);
+            var body = await response.ReadBodyAsJson<CommonResponse>();
+            Assert.Equal(CommonPutResponse.CreatedCode, body.Code);
+        }
+
+        public static async Task AssertIsPutModified(this HttpResponseMessage response)
+        {
+            response.AssertOk();
+            var body = await response.ReadBodyAsJson<CommonResponse>();
+            Assert.Equal(CommonPutResponse.ModifiedCode, body.Code);
+        }
+
+
+        public static async Task AssertIsDeleteDeleted(this HttpResponseMessage response)
+        {
+            response.AssertOk();
+            var body = await response.ReadBodyAsJson<CommonResponse>();
+            Assert.Equal(CommonDeleteResponse.DeletedCode, body.Code);
+        }
+
+        public static async Task AssertIsDeleteNotExist(this HttpResponseMessage response)
+        {
+            response.AssertOk();
+            var body = await response.ReadBodyAsJson<CommonResponse>();
+            Assert.Equal(CommonDeleteResponse.NotExistsCode, body.Code);
+        }
+
         public static async Task<T> ReadBodyAsJson<T>(this HttpResponseMessage response)
         {
             return JsonConvert.DeserializeObject<T>(await response.Content.ReadAsStringAsync());
diff --git a/Timeline.Tests/Helpers/TestClock.cs b/Timeline.Tests/Helpers/TestClock.cs
deleted file mode 100644
index ea90305f..00000000
--- a/Timeline.Tests/Helpers/TestClock.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using Timeline.Services;
-
-namespace Timeline.Tests.Helpers
-{
-    public class TestClock : IClock
-    {
-        public DateTime? MockCurrentTime { get; set; } = null;
-
-        public DateTime GetCurrentTime()
-        {
-            return MockCurrentTime.GetValueOrDefault(DateTime.Now);
-        }
-    }
-
-    public static class TestClockWebApplicationFactoryExtensions
-    {
-        public static TestClock GetTestClock<T>(this WebApplicationFactory<T> factory) where T : class
-        {
-            return factory.Server.Host.Services.GetRequiredService<IClock>() as TestClock;
-        }
-    }
-}
diff --git a/Timeline.Tests/Helpers/TestUsers.cs b/Timeline.Tests/Helpers/TestUsers.cs
deleted file mode 100644
index 71de8237..00000000
--- a/Timeline.Tests/Helpers/TestUsers.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Timeline.Entities;
-using Timeline.Models;
-using Timeline.Services;
-
-namespace Timeline.Tests.Helpers
-{
-    public static class TestMockUsers
-    {
-        static TestMockUsers()
-        {
-            var mockUsers = new List<User>();
-            var passwordService = new PasswordService();
-
-            mockUsers.Add(new User
-            {
-                Name = "user",
-                EncryptedPassword = passwordService.HashPassword("user"),
-                RoleString = UserUtility.IsAdminToRoleString(false),
-                Version = 0,
-            });
-            mockUsers.Add(new User
-            {
-                Name = "admin",
-                EncryptedPassword = passwordService.HashPassword("admin"),
-                RoleString = UserUtility.IsAdminToRoleString(true),
-                Version = 0,
-            });
-
-            MockUsers = mockUsers;
-
-            var mockUserInfos = mockUsers.Select(u => UserUtility.CreateUserInfo(u)).ToList();
-            mockUserInfos.Sort(UserInfoComparers.Comparer);
-            MockUserInfos = mockUserInfos;
-        }
-
-        public static List<User> MockUsers { get; }
-
-        public static IReadOnlyList<UserInfo> MockUserInfos { get; }
-    }
-}
diff --git a/Timeline.Tests/Helpers/UserInfoComparers.cs b/Timeline.Tests/Helpers/UserInfoComparers.cs
index c7c584b7..1a1c652d 100644
--- a/Timeline.Tests/Helpers/UserInfoComparers.cs
+++ b/Timeline.Tests/Helpers/UserInfoComparers.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Timeline.Entities;
+using Timeline.Models;
 
 namespace Timeline.Tests.Helpers
 {