fix[JWT]: 토큰 생성과 재발급에 관한 로직의 변경으로 인한 테스트 코드 수정

Author: asowjdan

backend/src/test/java/com/ai/lawyer/domain/member/controller/MemberControllerTest.java

@@ -108,7 +108,7 @@ public String getName() {
     @DisplayName("회원가입 성공")
     void signup_Success() throws Exception {
         // given
-        given(memberService.signup(any(MemberSignupRequest.class))).willReturn(memberResponse);
+        given(memberService.signup(any(MemberSignupRequest.class), any(HttpServletResponse.class))).willReturn(memberResponse);
 
         // when and then
         mockMvc.perform(post("/api/auth/signup")
@@ -124,13 +124,13 @@ void signup_Success() throws Exception {
                 .andExpect(jsonPath("$.name").value("테스트"))
                 .andExpect(jsonPath("$.role").value("USER"));
 
-        verify(memberService).signup(any(MemberSignupRequest.class));
+        verify(memberService).signup(any(MemberSignupRequest.class), any(HttpServletResponse.class));
     }
 
     @Test
     @DisplayName("회원가입 실패 - 이메일 중복")
     void signup_Fail_DuplicateEmail() throws Exception {
-        given(memberService.signup(any(MemberSignupRequest.class)))
+        given(memberService.signup(any(MemberSignupRequest.class), any(HttpServletResponse.class)))
                 .willThrow(new IllegalArgumentException("이미 존재하는 이메일입니다."));
 
         mockMvc.perform(post("/api/auth/signup")
@@ -140,7 +140,7 @@ void signup_Fail_DuplicateEmail() throws Exception {
                 .andDo(print())
                 .andExpect(status().isBadRequest());
 
-        verify(memberService).signup(any(MemberSignupRequest.class));
+        verify(memberService).signup(any(MemberSignupRequest.class), any(HttpServletResponse.class));
     }
 
     @Test
@@ -163,7 +163,7 @@ void signup_Fail_ValidationError() throws Exception {
                 .andDo(print())
                 .andExpect(status().isBadRequest());
 
-        verify(memberService, never()).signup(any(MemberSignupRequest.class));
+        verify(memberService, never()).signup(any(MemberSignupRequest.class), any(HttpServletResponse.class));
     }
 
     @Test

backend/src/test/java/com/ai/lawyer/domain/member/service/MemberServiceTest.java

@@ -102,7 +102,7 @@ void signup_Success() {
 
         // when
         log.info("회원가입 서비스 호출 중...");
-        MemberResponse result = memberService.signup(signupRequest);
+        MemberResponse result = memberService.signup(signupRequest, response);
         log.info("회원가입 완료: memberId={}", result.getMemberId());
 
         // then
@@ -138,7 +138,7 @@ void signup_Fail_DuplicateEmail() {
         log.info("예외 발생 검증 시작");
         assertThatThrownBy(() -> {
             log.info("회원가입 시도 중... (실패 예상)");
-            memberService.signup(signupRequest);
+            memberService.signup(signupRequest, response);
         })
                 .as("이메일 중복 시 IllegalArgumentException 발생")
                 .isInstanceOf(IllegalArgumentException.class)
@@ -262,8 +262,8 @@ void refreshToken_Success() {
         log.info("2단계: Redis에서 리프레시 토큰 유효성 검증");
         verify(memberRepository).findByLoginId("[email protected]");
         log.info("3단계: 회원 정보 조회");
-        verify(tokenProvider).deleteRefreshToken("[email protected]");
-        log.info("4단계: 기존 리프레시 토큰 Redis에서 삭제 (RTR 패턴)");
+        verify(tokenProvider).deleteAllTokens("[email protected]");
+        log.info("4단계: 기존 모든 토큰 Redis에서 삭제 (RTR 패턴)");
         verify(tokenProvider).generateAccessToken(member);
         log.info("5단계: 새 액세스 토큰 생성");
         verify(tokenProvider).generateRefreshToken(member);
@@ -370,8 +370,8 @@ void logout_Success() {
 
         // then
         log.info("검증 시작: Redis 토큰 삭제 및 쿠키 클리어 확인");
-        verify(tokenProvider).deleteRefreshToken(loginId);
-        log.info("Redis에서 리프레시 토큰 삭제 호출 확인");
+        verify(tokenProvider).deleteAllTokens(loginId);
+        log.info("Redis에서 모든 토큰 삭제 호출 확인");
         verify(cookieUtil).clearTokenCookies(response);
         log.info("쿠키에서 토큰 클리어 호출 확인");
         log.info("=== 로그아웃 성공 테스트 완료 ===");
@@ -499,7 +499,7 @@ void resetPassword_Success() {
         given(memberRepository.findByLoginId(loginId)).willReturn(Optional.of(member));
         given(emailAuthService.isEmailVerified(loginId)).willReturn(true); // Redis 인증 성공
         given(passwordEncoder.encode(newPassword)).willReturn("encodedNewPassword");
-        doNothing().when(tokenProvider).deleteRefreshToken(loginId);
+        doNothing().when(tokenProvider).deleteAllTokens(loginId);
         doNothing().when(emailAuthService).clearAuthData(loginId);
         log.info("Mock 설정 완료: 회원 존재, 클라이언트 인증 성공, Redis 인증 성공, 비밀번호 인코딩 준비");
 
@@ -520,8 +520,8 @@ void resetPassword_Success() {
         log.info("회원 정보 저장 호출 확인");
         verify(emailAuthService).clearAuthData(loginId);
         log.info("인증 데이터 삭제 호출 확인");
-        verify(tokenProvider).deleteRefreshToken(loginId);
-        log.info("기존 리프레시 토큰 삭제 호출 확인 (보안상 로그아웃 처리)");
+        verify(tokenProvider).deleteAllTokens(loginId);
+        log.info("기존 모든 토큰 삭제 호출 확인 (보안상 로그아웃 처리)");
         log.info("=== 비밀번호 재설정 성공 테스트 완료 ===");
     }
 
@@ -545,7 +545,7 @@ void resetPassword_Fail_ClientSuccessFalse() {
         verify(emailAuthService, never()).isEmailVerified(anyString());
         verify(passwordEncoder, never()).encode(anyString());
         verify(memberRepository, never()).save(any(Member.class));
-        verify(tokenProvider, never()).deleteRefreshToken(anyString());
+        verify(tokenProvider, never()).deleteAllTokens(anyString());
     }
 
     @Test
@@ -567,7 +567,7 @@ void resetPassword_Fail_RedisNotVerified() {
         verify(emailAuthService).isEmailVerified(loginId);
         verify(passwordEncoder, never()).encode(anyString());
         verify(memberRepository, never()).save(any(Member.class));
-        verify(tokenProvider, never()).deleteRefreshToken(anyString());
+        verify(tokenProvider, never()).deleteAllTokens(anyString());
     }
 
     @Test
@@ -587,7 +587,7 @@ void resetPassword_Fail_NullSuccess() {
         verify(memberRepository).findByLoginId(loginId);
         verify(passwordEncoder, never()).encode(anyString());
         verify(memberRepository, never()).save(any(Member.class));
-        verify(tokenProvider, never()).deleteRefreshToken(anyString());
+        verify(tokenProvider, never()).deleteAllTokens(anyString());
     }
 
     @Test
@@ -607,7 +607,7 @@ void resetPassword_Fail_MemberNotFound() {
         verify(memberRepository).findByLoginId(loginId);
         verify(passwordEncoder, never()).encode(anyString());
         verify(memberRepository, never()).save(any(Member.class));
-        verify(tokenProvider, never()).deleteRefreshToken(anyString());
+        verify(tokenProvider, never()).deleteAllTokens(anyString());
     }
 
     @Test

backend/src/test/java/com/ai/lawyer/domain/poll/controller/PollControllerTest.java

@@ -2,26 +2,23 @@
 
 import com.ai.lawyer.domain.poll.service.PollService;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import com.ai.lawyer.domain.poll.dto.PollDto;
 import com.ai.lawyer.domain.poll.dto.PollVoteDto;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.mockito.Mock;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import com.ai.lawyer.global.security.SecurityConfig;
-import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.junit.jupiter.api.DisplayName;
+import jakarta.servlet.http.Cookie;
+import static org.mockito.BDDMockito.*;
+import com.ai.lawyer.global.jwt.TokenProvider;
 
 @Import(SecurityConfig.class)
 @AutoConfigureMockMvc
@@ -37,132 +34,151 @@
 class PollControllerTest {
     @Autowired
     private MockMvc mockMvc;
-    @MockBean
+    @MockitoBean
     private PollService pollService;
-    @MockBean
+    @MockitoBean
     private com.ai.lawyer.domain.post.service.PostService postService;
-    @Autowired
-    private ObjectMapper objectMapper;
-    @MockBean
+    @MockitoBean
     private com.ai.lawyer.global.jwt.TokenProvider tokenProvider;
-    @MockBean
+    @MockitoBean
     private com.ai.lawyer.global.jwt.CookieUtil cookieUtil;
-    @MockBean
+    @MockitoBean
     private com.ai.lawyer.domain.member.repositories.MemberRepository memberRepository;
-    @MockBean
+    @MockitoBean
     private org.springframework.data.jpa.mapping.JpaMetamodelMappingContext jpaMappingContext;
 
+    @BeforeEach
+    void setUp() {
+        // JWT 필터 모킹 설정 - 쿠키에서 토큰 추출 및 검증
+        given(cookieUtil.getAccessTokenFromCookies(any())).willReturn("valid-access-token");
+        given(tokenProvider.validateTokenWithResult("valid-access-token"))
+                .willReturn(TokenProvider.TokenValidationResult.VALID);
+        given(tokenProvider.getMemberIdFromToken("valid-access-token")).willReturn(1L);
+        given(tokenProvider.getRoleFromToken("valid-access-token")).willReturn("USER");
+    }
+
     @Test
     @DisplayName("투표 단일 조회")
-    @WithMockUser(username="1")
     void t1() throws Exception {
         Mockito.when(pollService.getPoll(Mockito.anyLong())).thenReturn(null);
-        mockMvc.perform(get("/api/polls/1"))
+
+        mockMvc.perform(get("/api/polls/1")
+                .cookie(new Cookie("accessToken", "valid-access-token")))
                 .andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("투표 옵션 목록 조회")
-    @WithMockUser(username="1")
     void t2() throws Exception {
         Mockito.when(pollService.getPollOptions(Mockito.anyLong())).thenReturn(java.util.Collections.emptyList());
-        mockMvc.perform(get("/api/polls/1/options"))
+
+        mockMvc.perform(get("/api/polls/1/options")
+                .cookie(new Cookie("accessToken", "valid-access-token")))
                 .andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("투표하기")
-    @WithMockUser(username="1")
     void t3() throws Exception {
         Mockito.when(pollService.vote(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong())).thenReturn(null);
+
         mockMvc.perform(
                 org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post("/api/polls/1/vote")
                         .param("pollItemsId", "1")
+                        .cookie(new Cookie("accessToken", "valid-access-token"))
         ).andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("투표 통계 조회")
-    @WithMockUser(username="1")
     void t4() throws Exception {
         Mockito.when(pollService.getPollStatics(Mockito.anyLong())).thenReturn(java.util.Collections.emptyList());
-        mockMvc.perform(get("/api/polls/1/statics"))
+
+        mockMvc.perform(get("/api/polls/1/statics")
+                .cookie(new Cookie("accessToken", "valid-access-token")))
                 .andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("투표 종료")
-    @WithMockUser(username="1")
     void t5() throws Exception {
         Mockito.doNothing().when(pollService).closePoll(Mockito.anyLong());
+
         mockMvc.perform(
                 org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put("/api/polls/1/close")
+                        .cookie(new Cookie("accessToken", "valid-access-token"))
         ).andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("투표 삭제")
-    @WithMockUser(username="1")
     void t6() throws Exception {
         Mockito.doNothing().when(pollService).deletePoll(Mockito.anyLong());
+
         mockMvc.perform(
                 org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete("/api/polls/1")
+                        .cookie(new Cookie("accessToken", "valid-access-token"))
         ).andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("진행중인 투표 Top 1 조회")
-    @WithMockUser(username="1")
     void t7() throws Exception {
         Mockito.when(pollService.getTopPollByStatus(Mockito.any())).thenReturn(null);
-        mockMvc.perform(get("/api/polls/top/ongoing"))
+
+        mockMvc.perform(get("/api/polls/top/ongoing")
+                .cookie(new Cookie("accessToken", "valid-access-token")))
                 .andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("종료된 투표 Top 1 조회")
-    @WithMockUser(username="1")
     void t8() throws Exception {
         Mockito.when(pollService.getTopPollByStatus(Mockito.any())).thenReturn(null);
-        mockMvc.perform(get("/api/polls/top/closed"))
+
+        mockMvc.perform(get("/api/polls/top/closed")
+                .cookie(new Cookie("accessToken", "valid-access-token")))
                 .andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("투표 생성")
-    @WithMockUser(username="1")
     void t9() throws Exception {
         Mockito.when(pollService.createPoll(Mockito.any(), Mockito.anyLong())).thenReturn(null);
+
         mockMvc.perform(
                 org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post("/api/polls")
                         .contentType(org.springframework.http.MediaType.APPLICATION_JSON)
                         .content("{}")
+                        .cookie(new Cookie("accessToken", "valid-access-token"))
         ).andExpect(status().isOk());
     }
 
     @Test
     @DisplayName("투표 단일 조회")
-    @WithMockUser(username="1")
     void t10() throws Exception {
         PollDto responseDto = PollDto.builder().pollId(1L).voteTitle("테스트 투표").build();
         Mockito.when(pollService.getPoll(Mockito.anyLong())).thenReturn(responseDto);
-        mockMvc.perform(get("/api/polls/1"))
+
+        mockMvc.perform(get("/api/polls/1")
+                .cookie(new Cookie("accessToken", "valid-access-token")))
                 .andExpect(status().isOk())
                 .andExpect(org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath("$.result.pollId").value(1L))
                 .andExpect(org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath("$.result.voteTitle").value("테스트 투표"));
     }
 
     @Test
     @DisplayName("투표하기")
-    @WithMockUser(username="1")
     void t11() throws Exception {
         PollVoteDto responseDto = PollVoteDto.builder().pollId(1L).memberId(1L).build();
         Mockito.when(pollService.vote(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong())).thenReturn(responseDto);
+
         mockMvc.perform(
                 org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post("/api/polls/1/vote")
                         .param("pollItemsId", "1")
+                        .cookie(new Cookie("accessToken", "valid-access-token"))
         ).andExpect(status().isOk())
          .andExpect(org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath("$.result.pollId").value(1L))
          .andExpect(org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath("$.result.memberId").value(1L));
     }
-}
+}