Basically finish refactor of error codes.

3 files changed, 17 insertions, 20 deletions

diff --git a/Timeline.Tests/Controllers/PersonalTimelineControllerTest.cs b/Timeline.Tests/Controllers/PersonalTimelineControllerTest.cs
index 372ba8a7..bbc8ba75 100644
--- a/Timeline.Tests/Controllers/PersonalTimelineControllerTest.cs
+++ b/Timeline.Tests/Controllers/PersonalTimelineControllerTest.cs
@@ -142,7 +142,7 @@ namespace Timeline.Tests.Controllers
                 .Which;

             result.StatusCode.Should().Be(StatusCodes.Status403Forbidden);

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

-            .Which.Code.Should().Be(ErrorCodes.Http.Timeline.PostListGetForbid);

+            .Which.Code.Should().Be(ErrorCodes.Common.Forbid);

             _service.VerifyAll();

         }

 

@@ -185,7 +185,7 @@ namespace Timeline.Tests.Controllers
             })).Result.Should().NotBeNull().And.BeAssignableTo<ObjectResult>().Which;

             result.StatusCode.Should().Be(StatusCodes.Status403Forbidden);

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

-                .Which.Code.Should().Be(ErrorCodes.Http.Timeline.PostOperationCreateForbid);

+                .Which.Code.Should().Be(ErrorCodes.Common.Forbid);

             _service.VerifyAll();

         }

 

@@ -249,7 +249,7 @@ namespace Timeline.Tests.Controllers
             })).Should().NotBeNull().And.BeAssignableTo<ObjectResult>().Which;

             result.StatusCode.Should().Be(StatusCodes.Status403Forbidden);

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

-                .Which.Code.Should().Be(ErrorCodes.Http.Timeline.PostOperationDeleteForbid);

+                .Which.Code.Should().Be(ErrorCodes.Common.Forbid);

             _service.VerifyAll();

         }

 

@@ -266,7 +266,7 @@ namespace Timeline.Tests.Controllers
             })).Should().NotBeNull().And.BeAssignableTo<ObjectResult>().Which;

             result.StatusCode.Should().Be(StatusCodes.Status400BadRequest);

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

-                .Which.Code.Should().Be(ErrorCodes.Http.Timeline.PostOperationDeleteNotExist);

+                .Which.Code.Should().Be(ErrorCodes.TimelineController.PostOperationDelete_NotExist);

             _service.VerifyAll();

         }

 

@@ -347,7 +347,7 @@ namespace Timeline.Tests.Controllers
             });

             result.Should().NotBeNull().And.BeAssignableTo<BadRequestObjectResult>()

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

-                .Which.Code.Should().Be(ErrorCodes.Http.Common.InvalidModel);

+                .Which.Code.Should().Be(ErrorCodes.Common.InvalidModel);

             _service.VerifyAll();

         }

 

@@ -366,7 +366,7 @@ namespace Timeline.Tests.Controllers
             });

             result.Should().NotBeNull().And.BeAssignableTo<BadRequestObjectResult>()

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

-                .Which.Code.Should().Be(ErrorCodes.Http.Timeline.ChangeMemberUserNotExist);

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

             _service.VerifyAll();

         }

 

diff --git a/Timeline.Tests/Controllers/TokenControllerTest.cs b/Timeline.Tests/Controllers/TokenControllerTest.cs
index 371884bb..2b3547ea 100644
--- a/Timeline.Tests/Controllers/TokenControllerTest.cs
+++ b/Timeline.Tests/Controllers/TokenControllerTest.cs
@@ -10,7 +10,6 @@ using Timeline.Models.Http;
 using Timeline.Services;

 using Timeline.Tests.Helpers;

 using Xunit;

-using static Timeline.ErrorCodes.Token;

 

 namespace Timeline.Tests.Controllers

 {

@@ -67,7 +66,7 @@ namespace Timeline.Tests.Controllers
             });

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

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

-                .Which.Code.Should().Be(Create.BadCredential);

+                .Which.Code.Should().Be(ErrorCodes.TokenController.Create_BadCredential);

         }

 

         [Fact]

@@ -82,7 +81,7 @@ namespace Timeline.Tests.Controllers
             });

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

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

-                .Which.Code.Should().Be(Create.BadCredential);

+                .Which.Code.Should().Be(ErrorCodes.TokenController.Create_BadCredential);

         }

 

         [Fact]

@@ -98,10 +97,10 @@ namespace Timeline.Tests.Controllers
 

         public static IEnumerable<object[]> Verify_BadRequest_Data()

         {

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

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

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

-            yield return new object[] { new UserNotExistException(), Verify.UserNotExist };

+            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 UserNotExistException(), ErrorCodes.TokenController.Verify_UserNotExist };

         }

 

         [Theory]

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);

         }

     }

 }