1 files changed, 64 insertions, 25 deletions
diff --git a/Timeline.Tests/TokenUnitTest.cs b/Timeline.Tests/TokenUnitTest.cs
index f942767d..5f3b8e6d 100644
--- a/Timeline.Tests/TokenUnitTest.cs
+++ b/Timeline.Tests/TokenUnitTest.cs
@@ -2,14 +2,15 @@ using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using System;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using Timeline.Controllers;
-using Timeline.Entities.Http;
+using Timeline.Models.Http;
 using Timeline.Services;
 using Timeline.Tests.Helpers;
 using Timeline.Tests.Helpers.Authentication;
+using Timeline.Tests.Mock.Data;
+using Timeline.Tests.Mock.Services;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -28,56 +29,92 @@ namespace Timeline.Tests
         }
 
         [Fact]
-        public async void CreateTokenTest_UserNotExist()
+        public async void CreateToken_MissingUsername()
         {
             using (var client = _factory.CreateDefaultClient())
             {
-                var response = await client.PostAsJsonAsync(CreateTokenUrl, new CreateTokenRequest { Username = "usernotexist", Password = "???" });
-                Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-                var body = await response.ReadBodyAsJson<CommonResponse>();
-                Assert.Equal(TokenController.ErrorCodes.Create_UserNotExist, body.Code);
+                await InvalidModelTestHelpers.TestPostInvalidModel(client, CreateTokenUrl,
+                    new CreateTokenRequest { Username = null, Password = "user" });
+            }
+        }
+
+        [Fact]
+        public async void CreateToken_InvalidModel_MissingPassword()
+        {
+            using (var client = _factory.CreateDefaultClient())
+            {
+                await InvalidModelTestHelpers.TestPostInvalidModel(client, CreateTokenUrl,
+                    new CreateTokenRequest { Username = "user", Password = null });
             }
         }
 
         [Fact]
-        public async void CreateTokenTest_BadPassword()
+        public async void CreateToken_InvalidModel_BadExpireOffset()
         {
             using (var client = _factory.CreateDefaultClient())
             {
-                var response = await client.PostAsJsonAsync(CreateTokenUrl, new CreateTokenRequest { Username = "user", Password = "???" });
+                await InvalidModelTestHelpers.TestPostInvalidModel(client, CreateTokenUrl,
+                    new CreateTokenRequest
+                    {
+                        Username = MockUsers.UserUsername,
+                        Password = MockUsers.UserPassword,
+                        ExpireOffset = -1000
+                    });
+            }
+        }
+
+        [Fact]
+        public async void CreateToken_UserNotExist()
+        {
+            using (var client = _factory.CreateDefaultClient())
+            {
+                var response = await client.PostAsJsonAsync(CreateTokenUrl,
+                    new CreateTokenRequest { Username = "usernotexist", Password = "???" });
                 Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
                 var body = await response.ReadBodyAsJson<CommonResponse>();
-                Assert.Equal(TokenController.ErrorCodes.Create_BadPassword, body.Code);
+                Assert.Equal(TokenController.ErrorCodes.Create_UserNotExist, body.Code);
             }
         }
 
         [Fact]
-        public async void CreateTokenTest_BadExpireOffset()
+        public async void CreateToken_BadPassword()
         {
             using (var client = _factory.CreateDefaultClient())
             {
-                var response = await client.PostAsJsonAsync(CreateTokenUrl, new CreateTokenRequest { Username = "???", Password = "???", ExpireOffset = -1000 });
+                var response = await client.PostAsJsonAsync(CreateTokenUrl,
+                    new CreateTokenRequest { Username = MockUsers.UserUsername, Password = "???" });
                 Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
                 var body = await response.ReadBodyAsJson<CommonResponse>();
-                Assert.Equal(TokenController.ErrorCodes.Create_BadExpireOffset, body.Code);
+                Assert.Equal(TokenController.ErrorCodes.Create_BadPassword, body.Code);
             }
         }
 
         [Fact]
-        public async void CreateTokenTest_Success()
+        public async void CreateToken_Success()
         {
             using (var client = _factory.CreateDefaultClient())
             {
-                var response = await client.PostAsJsonAsync(CreateTokenUrl, new CreateTokenRequest { Username = "user", Password = "user" });
+                var response = await client.PostAsJsonAsync(CreateTokenUrl,
+                    new CreateTokenRequest { Username = MockUsers.UserUsername, Password = MockUsers.UserPassword });
                 Assert.Equal(HttpStatusCode.OK, response.StatusCode);
                 var body = await response.ReadBodyAsJson<CreateTokenResponse>();
                 Assert.NotEmpty(body.Token);
-                Assert.Equal(TestMockUsers.MockUserInfos.Where(u => u.Username == "user").Single(), body.User, UserInfoComparers.EqualityComparer);
+                Assert.Equal(MockUsers.UserUserInfo, body.User, UserInfoComparers.EqualityComparer);
+            }
+        }
+
+        [Fact]
+        public async void VerifyToken_InvalidModel_MissingToken()
+        {
+            using (var client = _factory.CreateDefaultClient())
+            {
+                await InvalidModelTestHelpers.TestPostInvalidModel(client, VerifyTokenUrl,
+                    new VerifyTokenRequest { Token = null });
             }
         }
 
         [Fact]
-        public async void VerifyTokenTest_BadToken()
+        public async void VerifyToken_BadToken()
         {
             using (var client = _factory.CreateDefaultClient())
             {
@@ -89,7 +126,7 @@ namespace Timeline.Tests
         }
 
         [Fact]
-        public async void VerifyTokenTest_BadVersion_AND_UserNotExist()
+        public async void VerifyToken_BadVersion_AND_UserNotExist()
         {
             using (var client = _factory.CreateDefaultClient())
             {
@@ -131,7 +168,7 @@ namespace Timeline.Tests
         }
 
         [Fact]
-        public async void VerifyTokenTest_Expired()
+        public async void VerifyToken_Expired()
         {
             using (var client = _factory.CreateDefaultClient())
             {
@@ -139,8 +176,9 @@ namespace Timeline.Tests
                 // because verify logic is encapsuled in other library.
                 var mockClock = _factory.GetTestClock();
                 mockClock.MockCurrentTime = DateTime.Now - TimeSpan.FromDays(2);
-                var token = (await client.CreateUserTokenAsync("user", "user", 1)).Token;
-                var response = await client.PostAsJsonAsync(VerifyTokenUrl, new VerifyTokenRequest { Token = token });
+                var token = (await client.CreateUserTokenAsync(MockUsers.UserUsername, MockUsers.UserPassword, 1)).Token;
+                var response = await client.PostAsJsonAsync(VerifyTokenUrl,
+                    new VerifyTokenRequest { Token = token });
                 var body = await response.ReadBodyAsJson<CommonResponse>();
                 Assert.Equal(TokenController.ErrorCodes.Verify_Expired, body.Code);
                 mockClock.MockCurrentTime = null;
@@ -148,15 +186,16 @@ namespace Timeline.Tests
         }
 
         [Fact]
-        public async void VerifyTokenTest_Success()
+        public async void VerifyToken_Success()
         {
             using (var client = _factory.CreateDefaultClient())
             {
-                var createTokenResult = await client.CreateUserTokenAsync("user", "user");
-                var response = await client.PostAsJsonAsync(VerifyTokenUrl, new VerifyTokenRequest { Token = createTokenResult.Token });
+                var createTokenResult = await client.CreateUserTokenAsync(MockUsers.UserUsername, MockUsers.UserPassword);
+                var response = await client.PostAsJsonAsync(VerifyTokenUrl,
+                    new VerifyTokenRequest { Token = createTokenResult.Token });
                 Assert.Equal(HttpStatusCode.OK, response.StatusCode);
                 var body = JsonConvert.DeserializeObject<VerifyTokenResponse>(await response.Content.ReadAsStringAsync());
-                Assert.Equal(TestMockUsers.MockUserInfos.Where(u => u.Username == "user").Single(), body.User, UserInfoComparers.EqualityComparer);
+                Assert.Equal(MockUsers.UserUserInfo, body.User, UserInfoComparers.EqualityComparer);
             }
         }
     }