...

7 files changed, 17 insertions, 17 deletions

diff --git a/Timeline.Tests/Controllers/TokenControllerTest.cs b/Timeline.Tests/Controllers/TokenControllerTest.cs
index 2b3547ea..740d8377 100644
--- a/Timeline.Tests/Controllers/TokenControllerTest.cs
+++ b/Timeline.Tests/Controllers/TokenControllerTest.cs
@@ -97,9 +97,9 @@ namespace Timeline.Tests.Controllers
 

         public static IEnumerable<object[]> Verify_BadRequest_Data()

         {

-            yield return new object[] { new JwtVerifyException(JwtVerifyException.ErrorCodes.Expired), ErrorCodes.TokenController.Verify_TimeExpired };

-            yield return new object[] { new JwtVerifyException(JwtVerifyException.ErrorCodes.IdClaimBadFormat), ErrorCodes.TokenController.Verify_BadFormat };

-            yield return new object[] { new JwtVerifyException(JwtVerifyException.ErrorCodes.OldVersion), ErrorCodes.TokenController.Verify_OldVersion };

+            yield return new object[] { new JwtUserTokenBadFormatException(JwtUserTokenBadFormatException.ErrorCodes.Expired), ErrorCodes.TokenController.Verify_TimeExpired };

+            yield return new object[] { new JwtUserTokenBadFormatException(JwtUserTokenBadFormatException.ErrorCodes.IdClaimBadFormat), ErrorCodes.TokenController.Verify_BadFormat };

+            yield return new object[] { new JwtUserTokenBadFormatException(JwtUserTokenBadFormatException.ErrorCodes.OldVersion), ErrorCodes.TokenController.Verify_OldVersion };

             yield return new object[] { new UserNotExistException(), ErrorCodes.TokenController.Verify_UserNotExist };

         }

 

diff --git a/Timeline.Tests/Controllers/UserControllerTest.cs b/Timeline.Tests/Controllers/UserControllerTest.cs
index 043062c3..262dbe11 100644
--- a/Timeline.Tests/Controllers/UserControllerTest.cs
+++ b/Timeline.Tests/Controllers/UserControllerTest.cs
@@ -46,7 +46,7 @@ namespace Timeline.Tests.Controllers
         public async Task Get_Success()

         {

             const string username = "aaa";

-            _mockUserService.Setup(s => s.GetUser(username)).ReturnsAsync(MockUser.User.Info);

+            _mockUserService.Setup(s => s.GetUserByUsername(username)).ReturnsAsync(MockUser.User.Info);

             var action = await _controller.Get(username);

             action.Result.Should().BeAssignableTo<OkObjectResult>()

                 .Which.Value.Should().BeEquivalentTo(MockUser.User.Info);

@@ -56,7 +56,7 @@ namespace Timeline.Tests.Controllers
         public async Task Get_NotFound()

         {

             const string username = "aaa";

-            _mockUserService.Setup(s => s.GetUser(username)).Returns(Task.FromResult<UserInfo>(null));

+            _mockUserService.Setup(s => s.GetUserByUsername(username)).Returns(Task.FromResult<User>(null));

             var action = await _controller.Get(username);

             action.Result.Should().BeAssignableTo<NotFoundObjectResult>()

                 .Which.Value.Should().BeAssignableTo<CommonResponse>()

diff --git a/Timeline.Tests/DatabaseTest.cs b/Timeline.Tests/DatabaseTest.cs
index a7b97c16..a15823a9 100644
--- a/Timeline.Tests/DatabaseTest.cs
+++ b/Timeline.Tests/DatabaseTest.cs
@@ -28,7 +28,7 @@ namespace Timeline.Tests
         {

             var user = _context.Users.First();

             _context.UserAvatars.Count().Should().Be(0);

-            _context.UserAvatars.Add(new UserAvatar

+            _context.UserAvatars.Add(new UserAvatarEntity

             {

                 Data = null,

                 Type = null,

@@ -48,7 +48,7 @@ namespace Timeline.Tests
         {

             var user = _context.Users.First();

             _context.UserDetails.Count().Should().Be(0);

-            _context.UserDetails.Add(new UserDetail

+            _context.UserDetails.Add(new UserDetailEntity

             {

                 Nickname = null,

                 UserId = user.Id

diff --git a/Timeline.Tests/Helpers/TestDatabase.cs b/Timeline.Tests/Helpers/TestDatabase.cs
index 9560f353..3163279a 100644
--- a/Timeline.Tests/Helpers/TestDatabase.cs
+++ b/Timeline.Tests/Helpers/TestDatabase.cs
@@ -14,9 +14,9 @@ namespace Timeline.Tests.Helpers
         // currently password service is thread safe, so we share a static one.
         private static PasswordService PasswordService { get; } = new PasswordService();
 
-        private static User CreateEntityFromMock(MockUser user)
+        private static UserEntity CreateEntityFromMock(MockUser user)
         {
-            return new User
+            return new UserEntity
             {
                 Name = user.Username,
                 EncryptedPassword = PasswordService.HashPassword(user.Password),
@@ -25,7 +25,7 @@ namespace Timeline.Tests.Helpers
             };
         }
 
-        private static IEnumerable<User> CreateDefaultMockEntities()
+        private static IEnumerable<UserEntity> CreateDefaultMockEntities()
         {
             // emmmmmmm. Never reuse the user instances because EF Core uses them, which will cause strange things.
             yield return CreateEntityFromMock(MockUser.User);
diff --git a/Timeline.Tests/IntegratedTests/UserTest.cs b/Timeline.Tests/IntegratedTests/UserTest.cs
index fbef6da3..ea9f1177 100644
--- a/Timeline.Tests/IntegratedTests/UserTest.cs
+++ b/Timeline.Tests/IntegratedTests/UserTest.cs
@@ -24,7 +24,7 @@ namespace Timeline.Tests.IntegratedTests
             using var client = await CreateClientAsAdmin();

             var res = await client.GetAsync("users");

             res.Should().HaveStatusCode(200)

-                .And.HaveJsonBody<UserInfo[]>()

+                .And.HaveJsonBody<User[]>()

                 .Which.Should().BeEquivalentTo(MockUser.UserInfoList);

         }

 

@@ -34,7 +34,7 @@ namespace Timeline.Tests.IntegratedTests
             using var client = await CreateClientAsAdmin();

             var res = await client.GetAsync("users/" + MockUser.User.Username);

             res.Should().HaveStatusCode(200)

-                .And.HaveJsonBody<UserInfo>()

+                .And.HaveJsonBody<User>()

                 .Which.Should().BeEquivalentTo(MockUser.User.Info);

         }

 

@@ -77,7 +77,7 @@ namespace Timeline.Tests.IntegratedTests
         {

             var res = await client.GetAsync("users/" + username);

             res.Should().HaveStatusCode(200)

-                .And.HaveJsonBody<UserInfo>()

+                .And.HaveJsonBody<User>()

                 .Which.Administrator.Should().Be(administrator);

         }

 

diff --git a/Timeline.Tests/Services/UserAvatarServiceTest.cs b/Timeline.Tests/Services/UserAvatarServiceTest.cs
index 2729aa6f..d4371c48 100644
--- a/Timeline.Tests/Services/UserAvatarServiceTest.cs
+++ b/Timeline.Tests/Services/UserAvatarServiceTest.cs
@@ -78,7 +78,7 @@ namespace Timeline.Tests.Services
 

     public class UserAvatarServiceTest : IDisposable

     {

-        private UserAvatar CreateMockAvatarEntity(string key) => new UserAvatar

+        private UserAvatarEntity CreateMockAvatarEntity(string key) => new UserAvatarEntity

         {

             Type = $"image/test{key}",

             Data = Encoding.ASCII.GetBytes($"mock{key}"),

@@ -102,7 +102,7 @@ namespace Timeline.Tests.Services
             Data = Encoding.ASCII.GetBytes($"mock{key}")

         };

 

-        private static Avatar ToAvatar(UserAvatar entity)

+        private static Avatar ToAvatar(UserAvatarEntity entity)

         {

             return new Avatar

             {

@@ -111,7 +111,7 @@ namespace Timeline.Tests.Services
             };

         }

 

-        private static AvatarInfo ToAvatarInfo(UserAvatar entity)

+        private static AvatarInfo ToAvatarInfo(UserAvatarEntity entity)

         {

             return new AvatarInfo

             {

diff --git a/Timeline.Tests/Services/UserDetailServiceTest.cs b/Timeline.Tests/Services/UserDetailServiceTest.cs
index 9a869c89..e6eabadf 100644
--- a/Timeline.Tests/Services/UserDetailServiceTest.cs
+++ b/Timeline.Tests/Services/UserDetailServiceTest.cs
@@ -52,7 +52,7 @@ namespace Timeline.Tests.Services
             {

                 var context = _testDatabase.Context;

                 var userId = (await context.Users.Where(u => u.Name == MockUser.User.Username).Select(u => new { u.Id }).SingleAsync()).Id;

-                context.UserDetails.Add(new UserDetail

+                context.UserDetails.Add(new UserDetailEntity

                 {

                     Nickname = nickname,

                     UserId = userId