Basically finish refactor of error codes.

1 files changed, 5 insertions, 7 deletions

diff --git a/Timeline.Tests/Controllers/UserControllerTest.cs b/Timeline.Tests/Controllers/UserControllerTest.cs
index 7a6541fb..043062c3 100644
--- a/Timeline.Tests/Controllers/UserControllerTest.cs
+++ b/Timeline.Tests/Controllers/UserControllerTest.cs
@@ -13,8 +13,6 @@ using Timeline.Models.Http;
 using Timeline.Services;

 using Timeline.Tests.Helpers;

 using Xunit;

-using static Timeline.ErrorCodes.User;

-using static Timeline.ErrorCodes.UserCommon;

 

 namespace Timeline.Tests.Controllers

 {

@@ -62,7 +60,7 @@ namespace Timeline.Tests.Controllers
             var action = await _controller.Get(username);

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

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

-                .Which.Code.Should().Be(UserNotExist);

+                .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

         }

 

         [Theory]

@@ -115,7 +113,7 @@ namespace Timeline.Tests.Controllers
             }, username);

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

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

-                .Which.Code.Should().Be(UserNotExist);

+                .Which.Code.Should().Be(ErrorCodes.UserCommon.NotExist);

         }

 

         [Fact]

@@ -155,8 +153,8 @@ namespace Timeline.Tests.Controllers
         }

 

         [Theory]

-        [InlineData(typeof(UserNotExistException), UserNotExist)]

-        [InlineData(typeof(UsernameConfictException), ChangeUsername_Conflict)]

+        [InlineData(typeof(UserNotExistException), ErrorCodes.UserCommon.NotExist)]

+        [InlineData(typeof(UsernameConfictException), ErrorCodes.UserController.ChangeUsername_Conflict)]

         public async Task Op_ChangeUsername_Failure(Type exceptionType, int code)

         {

             const string oldUsername = "aaa";

@@ -213,7 +211,7 @@ namespace Timeline.Tests.Controllers
             var action = await _controller.ChangePassword(new ChangePasswordRequest { OldPassword = oldPassword, NewPassword = newPassword });

             action.Should().BeAssignableTo<BadRequestObjectResult>()

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

-                .Which.Code.Should().Be(ChangePassword_BadOldPassword);

+                .Which.Code.Should().Be(ErrorCodes.UserController.ChangePassword_BadOldPassword);

         }

     }

 }