6 files changed, 17 insertions, 19 deletions
diff --git a/Timeline.Tests/Controllers/TokenControllerTest.cs b/Timeline.Tests/Controllers/TokenControllerTest.cs
index 61fbe950..43e1a413 100644
--- a/Timeline.Tests/Controllers/TokenControllerTest.cs
+++ b/Timeline.Tests/Controllers/TokenControllerTest.cs
@@ -42,7 +42,7 @@ namespace Timeline.Tests.Controllers
             var mockCreateResult = new UserTokenCreateResult
             {
                 Token = "mocktokenaaaaa",
-                User = new UserInfo
+                User = new Models.User
                 {
                     Id = 1,
                     Username = MockUser.User.Username,
@@ -99,7 +99,7 @@ namespace Timeline.Tests.Controllers
         public async Task Verify_Ok()
         {
             const string token = "aaaaaaaaaaaaaa";
-            _mockUserService.Setup(s => s.VerifyToken(token)).ReturnsAsync(new UserInfo
+            _mockUserService.Setup(s => s.VerifyToken(token)).ReturnsAsync(new Models.User
             {
                 Id = 1,
                 Username = MockUser.User.Username,
diff --git a/Timeline.Tests/Controllers/UserControllerTest.cs b/Timeline.Tests/Controllers/UserControllerTest.cs
index a1035675..192d53dd 100644
--- a/Timeline.Tests/Controllers/UserControllerTest.cs
+++ b/Timeline.Tests/Controllers/UserControllerTest.cs
@@ -36,9 +36,9 @@ namespace Timeline.Tests.Controllers
         [Fact]
         public async Task GetList_Success()
         {
-            var mockUserList = new UserInfo[] {
-                new UserInfo { Id = 1, Username = "aaa", Administrator = true, Version = 1 },
-                new UserInfo { Id = 2, Username = "bbb", Administrator = false, Version = 1 }
+            var mockUserList = new Models.User[] {
+                new Models.User { Id = 1, Username = "aaa", Administrator = true, Version = 1 },
+                new Models.User { Id = 2, Username = "bbb", Administrator = false, Version = 1 }
             };
             _mockUserService.Setup(s => s.ListUsers()).ReturnsAsync(mockUserList);
             var action = await _controller.List();
@@ -51,7 +51,7 @@ namespace Timeline.Tests.Controllers
         public async Task Get_Success()
         {
             const string username = "aaa";
-            _mockUserService.Setup(s => s.GetUserByUsername(username)).ReturnsAsync(new UserInfo
+            _mockUserService.Setup(s => s.GetUserByUsername(username)).ReturnsAsync(new Models.User
             {
                 Id = 1,
                 Username = MockUser.User.Username,
diff --git a/Timeline.Tests/Helpers/TestDatabase.cs b/Timeline.Tests/Helpers/TestDatabase.cs
index 3163279a..e29a71fa 100644
--- a/Timeline.Tests/Helpers/TestDatabase.cs
+++ b/Timeline.Tests/Helpers/TestDatabase.cs
@@ -18,9 +18,9 @@ namespace Timeline.Tests.Helpers
         {
             return new UserEntity
             {
-                Name = user.Username,
-                EncryptedPassword = PasswordService.HashPassword(user.Password),
-                RoleString = UserRoleConvert.ToString(user.Administrator),
+                Username = user.Username,
+                Password = PasswordService.HashPassword(user.Password),
+                Roles = UserRoleConvert.ToString(user.Administrator),
                 Avatar = null
             };
         }
diff --git a/Timeline.Tests/Services/UserAvatarServiceTest.cs b/Timeline.Tests/Services/UserAvatarServiceTest.cs
index d4371c48..2dca7ccf 100644
--- a/Timeline.Tests/Services/UserAvatarServiceTest.cs
+++ b/Timeline.Tests/Services/UserAvatarServiceTest.cs
@@ -171,7 +171,7 @@ namespace Timeline.Tests.Services
             var mockAvatarEntity = CreateMockAvatarEntity("aaa");
             {
                 var context = _database.Context;
-                var user = await context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
+                var user = await context.Users.Where(u => u.Username == username).Include(u => u.Avatar).SingleAsync();
                 user.Avatar = mockAvatarEntity;
                 await context.SaveChangesAsync();
             }
@@ -205,7 +205,7 @@ namespace Timeline.Tests.Services
             var mockAvatarEntity = CreateMockAvatarEntity("aaa");
             {
                 var context = _database.Context;
-                var user = await context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
+                var user = await context.Users.Where(u => u.Username == username).Include(u => u.Avatar).SingleAsync();
                 user.Avatar = mockAvatarEntity;
                 await context.SaveChangesAsync();
             }
@@ -236,7 +236,7 @@ namespace Timeline.Tests.Services
         {
             string username = MockUser.User.Username;
 
-            var user = await _database.Context.Users.Where(u => u.Name == username).Include(u => u.Avatar).SingleAsync();
+            var user = await _database.Context.Users.Where(u => u.Username == username).Include(u => u.Avatar).SingleAsync();
 
             var avatar1 = CreateMockAvatar("aaa");
             var avatar2 = CreateMockAvatar("bbb");
diff --git a/Timeline.Tests/Services/UserDetailServiceTest.cs b/Timeline.Tests/Services/UserDetailServiceTest.cs
index e6eabadf..dbff2705 100644
--- a/Timeline.Tests/Services/UserDetailServiceTest.cs
+++ b/Timeline.Tests/Services/UserDetailServiceTest.cs
@@ -51,7 +51,7 @@ namespace Timeline.Tests.Services
             const string nickname = "aaaaaa";
             {
                 var context = _testDatabase.Context;
-                var userId = (await context.Users.Where(u => u.Name == MockUser.User.Username).Select(u => new { u.Id }).SingleAsync()).Id;
+                var userId = (await context.Users.Where(u => u.Username == MockUser.User.Username).Select(u => new { u.Id }).SingleAsync()).Id;
                 context.UserDetails.Add(new UserDetailEntity
                 {
                     Nickname = nickname,
@@ -83,7 +83,7 @@ namespace Timeline.Tests.Services
         public async Task SetNickname_ShouldWork()
         {
             var username = MockUser.User.Username;
-            var user = await _testDatabase.Context.Users.Where(u => u.Name == username).Include(u => u.Detail).SingleAsync();
+            var user = await _testDatabase.Context.Users.Where(u => u.Username == username).Include(u => u.Detail).SingleAsync();
 
             var nickname1 = "nickname1";
             var nickname2 = "nickname2";
diff --git a/Timeline.Tests/Services/UserTokenManagerTest.cs b/Timeline.Tests/Services/UserTokenManagerTest.cs
index 19122d31..e649fbab 100644
--- a/Timeline.Tests/Services/UserTokenManagerTest.cs
+++ b/Timeline.Tests/Services/UserTokenManagerTest.cs
@@ -2,8 +2,6 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Timeline.Models;
 using Timeline.Services;
@@ -58,7 +56,7 @@ namespace Timeline.Tests.Services
             const string username = "uuu";
             const string password = "ppp";
             var mockExpireTime = setExpireTime ? (DateTime?)DateTime.Now : null;
-            var mockUserInfo = new UserInfo
+            var mockUserInfo = new User
             {
                 Id = 1,
                 Username = username,
@@ -126,7 +124,7 @@ namespace Timeline.Tests.Services
                 ExpireAt = mockTime.AddDays(1)
             };
             _mockUserTokenService.Setup(s => s.VerifyToken(mockToken)).Returns(mockTokenInfo);
-            _mockUserService.Setup(s => s.GetUserById(1)).ReturnsAsync(new UserInfo
+            _mockUserService.Setup(s => s.GetUserById(1)).ReturnsAsync(new User
             {
                 Id = 1,
                 Username = "aaa",
@@ -149,7 +147,7 @@ namespace Timeline.Tests.Services
                 Version = 1,
                 ExpireAt = mockTime.AddDays(1)
             };
-            var mockUserInfo = new UserInfo
+            var mockUserInfo = new User
             {
                 Id = 1,
                 Username = "aaa",