From a6150c487e7a0eb3fb1d9874d2fa7de61cdbfd30 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 27 Apr 2021 19:29:20 +0800 Subject: refactor: ... --- BackEnd/Timeline.Tests/Helpers/TestDatabase.cs | 8 ++++---- BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs | 6 +++--- BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs | 4 ++-- BackEnd/Timeline.Tests/Services/SearchServiceTest.cs | 8 ++++---- BackEnd/Timeline.Tests/Services/ServiceTestBase.cs | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'BackEnd/Timeline.Tests') diff --git a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs index 24f4a922..9bd690a2 100644 --- a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs +++ b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs @@ -26,12 +26,12 @@ namespace Timeline.Tests.Helpers var userService = new UserService(NullLogger.Instance, context, new PasswordService(), new Clock()); - await userService.ModifyUser( - await userService.GetUserIdByUsername("administrator"), + await userService.ModifyUserAsync( + await userService.GetUserIdByUsernameAsync("administrator"), new ModifyUserParams() { Username = "admin", Password = "adminpw", Nickname = "administrator" }); - var user = await userService.CreateUser("user", "userpw"); - await userService.ModifyUser(user.Id, new ModifyUserParams() { Nickname = "imuser" }); + var user = await userService.CreateUserAsync(new CreateUserParams("user", "userpw")); + await userService.ModifyUserAsync(user.Id, new ModifyUserParams() { Nickname = "imuser" }); } public async Task DisposeAsync() diff --git a/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs b/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs index 427881a0..588f2f93 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs @@ -65,7 +65,7 @@ namespace Timeline.Tests.IntegratedTests var userService = scope.ServiceProvider.GetRequiredService(); - await userService.ModifyUser(await userService.GetUserIdByUsername("administrator"), new ModifyUserParams + await userService.ModifyUserAsync(await userService.GetUserIdByUsernameAsync("administrator"), new ModifyUserParams { Username = "admin", Password = "adminpw", @@ -75,8 +75,8 @@ namespace Timeline.Tests.IntegratedTests foreach (var user in users) { var (username, password, nickname) = user; - var u = await userService.CreateUser(username, password); - await userService.ModifyUser(u.Id, new ModifyUserParams() { Nickname = nickname }); + var u = await userService.CreateUserAsync(new CreateUserParams(username, password)); + await userService.ModifyUserAsync(u.Id, new ModifyUserParams() { Nickname = nickname }); } } diff --git a/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs index 7206dab8..4d4835ca 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs @@ -92,8 +92,8 @@ namespace Timeline.Tests.IntegratedTests { // create a user for test var userService = scope.ServiceProvider.GetRequiredService(); - var id = await userService.GetUserIdByUsername("user1"); - await userService.ModifyUser(id, new ModifyUserParams { Password = "user1pw" }); + var id = await userService.GetUserIdByUsernameAsync("user1"); + await userService.ModifyUserAsync(id, new ModifyUserParams { Password = "user1pw" }); } await client.TestPostAssertErrorAsync(VerifyTokenUrl, diff --git a/BackEnd/Timeline.Tests/Services/SearchServiceTest.cs b/BackEnd/Timeline.Tests/Services/SearchServiceTest.cs index 0aa412b2..1e94076e 100644 --- a/BackEnd/Timeline.Tests/Services/SearchServiceTest.cs +++ b/BackEnd/Timeline.Tests/Services/SearchServiceTest.cs @@ -35,10 +35,10 @@ namespace Timeline.Tests.Services [Fact] public async Task UserSearch_Should_Work() { - await UserService.CreateUser("hahaha", "p"); - var u2 = await UserService.CreateUser("bababa", "p"); - await UserService.ModifyUser(u2.Id, new ModifyUserParams { Nickname = "hahaha" }); - await UserService.CreateUser("bbbbbb", "p"); + await UserService.CreateUserAsync(new CreateUserParams("hahaha", "p")); + var u2 = await UserService.CreateUserAsync(new CreateUserParams("bababa", "p")); + await UserService.ModifyUserAsync(u2.Id, new ModifyUserParams { Nickname = "hahaha" }); + await UserService.CreateUserAsync(new CreateUserParams("bbbbbb", "p")); var searchResult = await _service.SearchUser("hah"); searchResult.Items.Should().HaveCount(2); diff --git a/BackEnd/Timeline.Tests/Services/ServiceTestBase.cs b/BackEnd/Timeline.Tests/Services/ServiceTestBase.cs index 0f4efe95..2c1bdea8 100644 --- a/BackEnd/Timeline.Tests/Services/ServiceTestBase.cs +++ b/BackEnd/Timeline.Tests/Services/ServiceTestBase.cs @@ -37,8 +37,8 @@ namespace Timeline.Tests.Services UserService = new UserService(NullLogger.Instance, Database, new PasswordService(), Clock); TimelineService = new TimelineService(Database, UserService, Clock); - UserId = await UserService.GetUserIdByUsername("user"); - AdminId = await UserService.GetUserIdByUsername("admin"); + UserId = await UserService.GetUserIdByUsernameAsync("user"); + AdminId = await UserService.GetUserIdByUsernameAsync("admin"); await OnInitializeAsync(); OnInitialize(); -- cgit v1.2.3