-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refact:패키지 구조 변경 및 user 관련 테스트 코드 수정
- Loading branch information
byunyourim
committed
Sep 7, 2024
1 parent
315b978
commit 43d3f06
Showing
17 changed files
with
150 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
src/main/java/com/kboticket/common/util/PasswordUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package com.kboticket.common.util; | ||
|
||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; | ||
|
||
public class PasswordUtils { | ||
|
||
static BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); | ||
|
||
public static String encrypt(String rawPassword) { | ||
return bCryptPasswordEncoder.encode(rawPassword); | ||
} | ||
|
||
public static String validate(String rawPassword) { | ||
// 정규식 추가 | ||
return rawPassword; | ||
} | ||
|
||
public static Boolean matches(String rawPassword, String encodedPassword) { | ||
return bCryptPasswordEncoder.matches(rawPassword, encodedPassword); | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
...a/com/kboticket/util/SeatArrangement.java → ...boticket/common/util/SeatArrangement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...m/kboticket/util/coolSms/SmsTemplate.java → ...cket/common/util/coolSms/SmsTemplate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.kboticket.util.coolSms; | ||
package com.kboticket.common.util.coolSms; | ||
|
||
public class SmsTemplate { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,14 +43,14 @@ void setUp() { | |
} | ||
|
||
@Test | ||
@DisplayName("[SUCCESS] 비밀번호 일치여부 테스트") | ||
@DisplayName("[SUCCESS] Password 일치 여부") | ||
void verifyPasswordSuccessTest() throws Exception { | ||
// given | ||
String email = "[email protected]"; | ||
String password = "1111"; | ||
|
||
given(authentication.getName()).willReturn(email); | ||
given(userService.checkPassword(anyString(), anyString())).willReturn(false); | ||
given(userService.verifyPassword(anyString(), anyString())).willReturn(true); | ||
|
||
// when & then | ||
mockMvc.perform(post("/users/verify-password") | ||
|
@@ -60,11 +60,11 @@ void verifyPasswordSuccessTest() throws Exception { | |
.andDo(result -> System.out.println("Response status: " + result.getResponse().getStatus())) | ||
.andExpect(status().isOk()); | ||
|
||
verify(userService).checkPassword(email, password); | ||
verify(userService).verifyPassword(email, password); | ||
} | ||
|
||
@Test | ||
@DisplayName("[FAIL] 비밀번호 일치여부 테스트") | ||
@DisplayName("[FAIL] 비밀번호 일치 여부 테스트") | ||
void verifyPasswordFailTest() throws Exception { | ||
// given | ||
String email = "[email protected]"; | ||
|
@@ -81,7 +81,7 @@ void verifyPasswordFailTest() throws Exception { | |
.andDo(result -> System.out.println("Response status: " + result.getResponse().getStatus())) | ||
.andExpect(status().isOk()); | ||
|
||
verify(userService).checkPassword(email, password); | ||
verify(userService).verifyPassword(email, password); | ||
} | ||
|
||
@Test | ||
|
Oops, something went wrong.