From c359e8bf96be2d6e09f8a009cf3d03b8d0515357 Mon Sep 17 00:00:00 2001 From: XiaoSeS <87064762+XiaoSeS@users.noreply.github.com> Date: Thu, 30 Jul 2026 22:18:43 +0800 Subject: [PATCH] test(auth): update profile controller fixtures Signed-off-by: XiaoSeS <87064762+XiaoSeS@users.noreply.github.com> --- .../controller/UserProfileControllerTest.java | 10 ++++- .../admin/UserManagementControllerTest.java | 43 ++++++++++--------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/UserProfileControllerTest.java b/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/UserProfileControllerTest.java index 5bed49fb..aeb318fc 100644 --- a/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/UserProfileControllerTest.java +++ b/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/UserProfileControllerTest.java @@ -10,6 +10,7 @@ import com.iflytek.skillhub.domain.user.ProfileChangeRequestRepository; import com.iflytek.skillhub.domain.user.ProfileChangeStatus; import com.iflytek.skillhub.domain.user.UserAccount; import com.iflytek.skillhub.domain.user.UserAccountRepository; +import com.iflytek.skillhub.domain.user.UserProfileFieldSourceService; import com.iflytek.skillhub.security.AuthFailureThrottleService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -83,6 +84,9 @@ class UserProfileControllerTest { @MockBean private AuditLogService auditLogService; + + @MockBean + private UserProfileFieldSourceService fieldSourceService; // -- Helper -- private PlatformPrincipal testPrincipal() { @@ -121,7 +125,8 @@ class UserProfileControllerTest { var principal = testPrincipal(); var user = new UserAccount("user-1", "OldName", "user@example.com", "https://example.com/avatar.png"); - given(userAccountRepository.findById("user-1")).willReturn(Optional.of(user)); + given(userAccountRepository.findByIdForUpdate("user-1")) + .willReturn(Optional.of(user)); given(namespaceMemberRepository.findByUserId("user-1")).willReturn(List.of()); given(userRoleBindingRepository.findByUserId("user-1")).willReturn(List.of()); @@ -140,7 +145,8 @@ class UserProfileControllerTest { var principal = testPrincipal(); var user = new UserAccount("user-1", "OldName", "user@example.com", "https://example.com/avatar.png"); - given(userAccountRepository.findById("user-1")).willReturn(Optional.of(user)); + given(userAccountRepository.findByIdForUpdate("user-1")) + .willReturn(Optional.of(user)); given(namespaceMemberRepository.findByUserId("user-1")).willReturn(List.of()); given(userRoleBindingRepository.findByUserId("user-1")).willReturn(List.of()); diff --git a/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/admin/UserManagementControllerTest.java b/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/admin/UserManagementControllerTest.java index b3e6e1d4..220bed9c 100644 --- a/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/admin/UserManagementControllerTest.java +++ b/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/admin/UserManagementControllerTest.java @@ -36,6 +36,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; @SpringBootTest @AutoConfigureMockMvc @@ -168,9 +169,9 @@ class UserManagementControllerTest { String requestBody = "{\"status\":\"DISABLED\"}"; when(adminUserAppService.updateUserStatus( - "user-123", - "DISABLED", - "user-42", + eq("user-123"), + eq("DISABLED"), + eq("user-42"), any(AuditRequestContext.class))) .thenReturn(new AdminUserMutationResponse("user-123", null, "DISABLED")); @@ -195,9 +196,9 @@ class UserManagementControllerTest { ); when(adminUserAppService.updateUserStatus( - "user-123", - "ACTIVE", - "user-42", + eq("user-123"), + eq("ACTIVE"), + eq("user-42"), any(AuditRequestContext.class))) .thenReturn(new AdminUserMutationResponse("user-123", null, "ACTIVE")); @@ -210,9 +211,9 @@ class UserManagementControllerTest { .andExpect(jsonPath("$.data.status").value("ACTIVE")); verify(adminUserAppService).updateUserStatus( - "user-123", - "ACTIVE", - "user-42", + eq("user-123"), + eq("ACTIVE"), + eq("user-42"), any(AuditRequestContext.class)); } @@ -226,9 +227,9 @@ class UserManagementControllerTest { ); when(adminUserAppService.updateUserStatus( - "user-123", - "DISABLED", - "user-42", + eq("user-123"), + eq("DISABLED"), + eq("user-42"), any(AuditRequestContext.class))) .thenReturn(new AdminUserMutationResponse("user-123", null, "DISABLED")); @@ -241,9 +242,9 @@ class UserManagementControllerTest { .andExpect(jsonPath("$.data.status").value("DISABLED")); verify(adminUserAppService).updateUserStatus( - "user-123", - "DISABLED", - "user-42", + eq("user-123"), + eq("DISABLED"), + eq("user-42"), any(AuditRequestContext.class)); } @@ -257,9 +258,9 @@ class UserManagementControllerTest { ); when(adminUserAppService.updateUserStatus( - "user-123", - "ACTIVE", - "user-42", + eq("user-123"), + eq("ACTIVE"), + eq("user-42"), any(AuditRequestContext.class))) .thenReturn(new AdminUserMutationResponse("user-123", null, "ACTIVE")); @@ -272,9 +273,9 @@ class UserManagementControllerTest { .andExpect(jsonPath("$.data.status").value("ACTIVE")); verify(adminUserAppService).updateUserStatus( - "user-123", - "ACTIVE", - "user-42", + eq("user-123"), + eq("ACTIVE"), + eq("user-42"), any(AuditRequestContext.class)); }