-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #131 from Instagram-Clone-Coding/Test/MemberAuth
회원가입 인증코드 이메일 HTML 적용, 멤버 인증 테스트 작성
Showing
8 changed files
with
670 additions
and
10 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
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
10 changes: 10 additions & 0 deletions
10
src/main/java/cloneproject/Instagram/exception/CantSendEmailException.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,10 @@ | ||
| package cloneproject.Instagram.exception; | ||
|
|
||
| import cloneproject.Instagram.dto.error.ErrorCode; | ||
|
|
||
| public class CantSendEmailException extends BusinessException{ | ||
| public CantSendEmailException(){ | ||
| super(ErrorCode.CANT_SEND_EMAIL); | ||
| } | ||
|
|
||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,281 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <meta http-equiv="Content-Type" content="text/html charset=UTF-8" /> | ||
| <title>Instagram</title> | ||
| </head> | ||
| <body> | ||
| <table | ||
| border="0" | ||
| width="100%%" | ||
| cellspacing="0" | ||
| cellpadding="0" | ||
| style="border-collapse: collapse" | ||
| > | ||
| <tbody> | ||
| <tr> | ||
| <td height="20" colspan="3" style="line-height: 20px"> </td> | ||
| </tr> | ||
| <tr> | ||
| <td height="1" colspan="3" style="line-height: 1px"></td> | ||
| </tr> | ||
| <tr> | ||
| <td> | ||
| <table | ||
| border="0" | ||
| width="100%%" | ||
| cellspacing="0" | ||
| cellpadding="0" | ||
| style=" | ||
| border-collapse: collapse; | ||
| text-align: center; | ||
| width: 100%%; | ||
| max-width: 433px; | ||
| margin-top: 0; | ||
| margin-left: auto; | ||
| margin-bottom: 0; | ||
| margin-right: auto; | ||
| " | ||
| > | ||
| <tbody> | ||
| <tr> | ||
| <td width="15"></td> | ||
| <td style="line-height: 0px; padding: 0 0 15px 0"> | ||
| <table | ||
| border="0" | ||
| width="100%%" | ||
| cellspacing="0" | ||
| cellpadding="0" | ||
| style="border-collapse: collapse" | ||
| > | ||
| <tbody> | ||
| <tr> | ||
| <td | ||
| style="width: 100%%; text-align: left; height: 33px" | ||
| > | ||
| <img | ||
| src="http://drive.google.com/uc?export=view&id=1oArh9BFHw1K2Gc5dsYzs_ZQMt6JAuQeE" | ||
| height="33" | ||
| style="border: 0" | ||
| /> | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </td> | ||
| <td width="15"></td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td> | ||
| <table | ||
| border="0" | ||
| width="430" | ||
| cellspacing="0" | ||
| cellpadding="0" | ||
| style=" | ||
| border-collapse: collapse; | ||
| margin-top: 0; | ||
| margin-left: auto; | ||
| margin-bottom: 0; | ||
| margin-right: auto; | ||
| " | ||
| > | ||
| <tbody> | ||
| <tr> | ||
| <td> | ||
| <table | ||
| border="0" | ||
| width="430" | ||
| cellspacing="0" | ||
| cellpadding="0" | ||
| style=" | ||
| border-collapse: collapse; | ||
| margin-top: 0; | ||
| margin-left: auto; | ||
| margin-bottom: 0; | ||
| margin-right: auto; | ||
| width: 430; | ||
| " | ||
| > | ||
| <tbody> | ||
| <tr> | ||
| <td width="15" style="display: block"> | ||
| | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td width="12" style="display: block"> | ||
| | ||
| </td> | ||
| <td> | ||
| <table | ||
| border="0" | ||
| width="100%%" | ||
| cellspacing="0" | ||
| cellpadding="0" | ||
| style="border-collapse: collapse" | ||
| > | ||
| <tbody> | ||
| <tr> | ||
| <td></td> | ||
| <td | ||
| style=" | ||
| margin-top: 10; | ||
| margin-left: 0; | ||
| margin-bottom: 10; | ||
| margin-right: 0; | ||
| color: #565a5c; | ||
| font-size: 18px; | ||
| " | ||
| > | ||
| <p | ||
| style=" | ||
| margin-top: 10; | ||
| margin-left: 0; | ||
| margin-bottom: 10; | ||
| margin-right: 0; | ||
| color: #565a5c; | ||
| font-size: 18px; | ||
| " | ||
| > | ||
| Hi, | ||
| </p> | ||
| <p | ||
| style=" | ||
| margin-top: 10; | ||
| margin-left: 0; | ||
| margin-bottom: 10; | ||
| margin-right: 0; | ||
| color: #565a5c; | ||
| font-size: 18px; | ||
| " | ||
| > | ||
| <!-- 이메일 --> | ||
| Someone tried to sign up for an Instagram | ||
| account with %s. If it | ||
| was you, enter this confirmation code in | ||
| the app: | ||
| </p> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td></td> | ||
| <td | ||
| style=" | ||
| padding: 10px; | ||
| color: #565a5c; | ||
| font-size: 32px; | ||
| font-weight: 500; | ||
| text-align: center; | ||
| padding-bottom: 25px; | ||
| " | ||
| > | ||
| <!-- 코드 --> | ||
| %s | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td> | ||
| <table | ||
| border="0" | ||
| cellspacing="0" | ||
| cellpadding="0" | ||
| style=" | ||
| border-collapse: collapse; | ||
| margin: 0 auto 0 auto; | ||
| margin-top: 0; | ||
| margin-left: auto; | ||
| margin-bottom: 0; | ||
| margin-right: auto; | ||
| width: 100%%; | ||
| max-width: 600px; | ||
| " | ||
| > | ||
| <tbody style="text-align: center"> | ||
| <tr> | ||
| <td width="15" style="display: block"> | ||
| | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td> | ||
| <table style="padding-top: 10px; "> | ||
| <tbody style="margin: auto"> | ||
| <tr> | ||
| <img | ||
| src="http://drive.google.com/uc?export=view&id=1Max2S-mP-GpssexCdfo2obS4OYpcSqK-" | ||
| height="26" | ||
| width="52" | ||
| alt="meta logo" | ||
| /> | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </tr> | ||
| <tr> | ||
| <td style="height: 10px"></td> | ||
| </tr> | ||
| <tr> | ||
| <td | ||
| style=" | ||
| color: #abadae; | ||
| font-size: 11px; | ||
| padding-bottom: 5px; | ||
| " | ||
| > | ||
| © Instagram. Meta Platforms, Inc., 1601 Willow Road, Menlo | ||
| Park, CA 94025<br aria-hidden="true" /> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td | ||
| style=" | ||
| color: #abadae; | ||
| font-size: 11px; | ||
| padding-bottom: 5px; | ||
| " | ||
| > | ||
| <!--이메일--> | ||
| This message was sent to %s.<br aria-hidden="true" /> | ||
| </td> | ||
| </tr> | ||
| </td> | ||
| <td width="20" style="display: block"> </td> | ||
| <td width="15"></td> | ||
| </tr> | ||
| <tr> | ||
| <td height="32" colspan="3" style="line-height: 32px"> | ||
| | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td height="20" colspan="3" style="line-height: 20px"> </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </body> | ||
| </html> |
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
205 changes: 205 additions & 0 deletions
205
src/test/java/cloneproject/Instagram/service/MemberAuthServiceTest.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,205 @@ | ||
| package cloneproject.Instagram.service; | ||
|
|
||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.DisplayName; | ||
| import org.junit.jupiter.api.Nested; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mock; | ||
| import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; | ||
| import org.springframework.test.context.junit.jupiter.SpringExtension; | ||
|
|
||
| import cloneproject.Instagram.dto.member.JwtDto; | ||
| import cloneproject.Instagram.dto.member.LoginRequest; | ||
| import cloneproject.Instagram.dto.member.RegisterRequest; | ||
| import cloneproject.Instagram.entity.member.Member; | ||
| import cloneproject.Instagram.exception.UseridAlreadyExistException; | ||
| import cloneproject.Instagram.repository.MemberRepository; | ||
| import cloneproject.Instagram.util.JwtUtil; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.times; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| @ExtendWith(SpringExtension.class) | ||
| @DisplayName("Follow Service") | ||
| public class MemberAuthServiceTest { | ||
|
|
||
| @InjectMocks | ||
| private MemberAuthService memberAuthService; | ||
|
|
||
| @Mock | ||
| private JwtUtil jwtUtil; | ||
|
|
||
| @Mock | ||
| private EmailCodeService emailCodeService; | ||
|
|
||
| @Mock | ||
| private MemberRepository memberRepository; | ||
|
|
||
| @Mock | ||
| private BCryptPasswordEncoder bCryptPasswordEncoder; | ||
|
|
||
| @BeforeEach | ||
| void setRepostiory(){ | ||
| Member member = Member.builder() | ||
| .username("dlwlrma") | ||
| .name("이지금") | ||
| .email("aaa@gmail.com") | ||
| .password("1234") | ||
| .build(); | ||
|
|
||
| when(memberRepository.findById(1L)).thenReturn(Optional.of(member)); | ||
| when(memberRepository.findByUsername("dlwlrma")).thenReturn(Optional.of(member)); | ||
| } | ||
|
|
||
| @Nested | ||
| @DisplayName("username 중복조회 API는") | ||
| class Describe_checkUsername{ | ||
|
|
||
| @Nested | ||
| @DisplayName("존재하는 경우에는") | ||
| class Context_exist{ | ||
| @DisplayName("false를 반환한다") | ||
| @Test | ||
| void it_return_false(){ | ||
| when(memberRepository.existsByUsername("dlwlrma")).thenReturn(true); | ||
|
|
||
| assertEquals(false, memberAuthService.checkUsername("dlwlrma")); | ||
| } | ||
| } | ||
| @Nested | ||
| @DisplayName("존재하지 않는 경우에는") | ||
| class Context_dont_exist{ | ||
| @DisplayName("true를 반환한다") | ||
| @Test | ||
| void it_return_true(){ | ||
| assertEquals(true, memberAuthService.checkUsername("dlwlrma1")); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Nested | ||
| @DisplayName("register는") | ||
| class Describe_register{ | ||
|
|
||
| @Nested | ||
| @DisplayName("username이 존재하는 경우에는") | ||
| class Context_username_already_exist{ | ||
| @DisplayName("exception을 발생시킨다") | ||
| @Test | ||
| void it_throw_exception(){ | ||
| RegisterRequest registerRequest = new RegisterRequest("dlwlrma", "이지금", "a12341234", "aaa@gmail.com", "ABC123"); | ||
| when(memberRepository.existsByUsername("dlwlrma")).thenReturn(true); | ||
|
|
||
| assertThrows(UseridAlreadyExistException.class, ()->memberAuthService.register(registerRequest)); | ||
| } | ||
| } | ||
|
|
||
| @Nested | ||
| @DisplayName("EmailCode가 올바르지 않은 경우에는") | ||
| class Context_dont_exist{ | ||
| @DisplayName("false를 반환한다") | ||
| @Test | ||
| void it_return_false(){ | ||
| RegisterRequest registerRequest = new RegisterRequest("dlwlrma", "이지금", "a12341234", "aaa@gmail.com", "ABC123"); | ||
| assertEquals(false, memberAuthService.register(registerRequest)); | ||
| } | ||
| } | ||
|
|
||
| @Nested | ||
| @DisplayName("정상적인 경우에는") | ||
| class Context_correct_process{ | ||
| @DisplayName("true를 반환한다") | ||
| @Test | ||
| void it_return_true(){ | ||
| RegisterRequest registerRequest = new RegisterRequest("dlwlrma", "이지금", "a12341234", "aaa@gmail.com", "ABC123"); | ||
| when(emailCodeService.checkEmailCode(any(), any(), any())).thenReturn(true); | ||
|
|
||
| assertEquals(true, memberAuthService.register(registerRequest)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Nested | ||
| @DisplayName("sendEmailConfirmation는") | ||
| class Describe_sendEmailConfirmation{ | ||
|
|
||
| @Nested | ||
| @DisplayName("username이 존재하는 경우에는") | ||
| class Context_username_exist{ | ||
| @DisplayName("exception을 발생시킨다") | ||
| @Test | ||
| void it_throw_exception(){ | ||
| when(memberRepository.existsByUsername("dlwlrma")).thenReturn(true); | ||
|
|
||
| assertThrows(UseridAlreadyExistException.class, ()->memberAuthService.sendEmailConfirmation("dlwlrma", "")); | ||
| } | ||
| } | ||
| @Nested | ||
| @DisplayName("username이 존재하지 않는 경우에는") | ||
| class Context_username_dont_exist{ | ||
| @DisplayName("정상적으로 실행된다") | ||
| @Test | ||
| void it_do_well(){ | ||
| memberAuthService.sendEmailConfirmation("dlwlrma", ""); | ||
| verify(emailCodeService, times(1)).sendEmailConfirmationCode(any(), any()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // TODO AuthenticationManagerBuilder NullPointerException 해결 | ||
| // @Nested | ||
| // @DisplayName("login은") | ||
| // class Describe_login{ | ||
|
|
||
| // @Nested | ||
| // @DisplayName("올바른 정보를 입력하면") | ||
| // class Context_correct_account{ | ||
| // @DisplayName("JWT 토큰이 반환된다") | ||
| // @Test | ||
| // void it_return_jwt() throws Exception{ | ||
| // LoginRequest loginRequest = new LoginRequest("dlwlrma", "a12341234"); | ||
| // JwtDto jwtDto = JwtDto.builder() | ||
| // .type("Bearer") | ||
| // .accessToken("AAA.BBB.CCC") | ||
| // .refreshToken("CCC.BBB.AAA") | ||
| // .build(); | ||
| // when(jwtUtil.generateTokenDto(any())).thenReturn(jwtDto); | ||
|
|
||
| // assertEquals(jwtDto, memberAuthService.login(loginRequest)); | ||
| // } | ||
| // } | ||
|
|
||
| // @Nested | ||
| // @DisplayName("EmailCode가 올바르지 않은 경우에는") | ||
| // class Context_dont_exist{ | ||
| // @DisplayName("false를 반환한다") | ||
| // @Test | ||
| // void it_return_false(){ | ||
| // RegisterRequest registerRequest = new RegisterRequest("dlwlrma", "이지금", "a12341234", "aaa@gmail.com", "ABC123"); | ||
| // assertEquals(false, memberAuthService.register(registerRequest)); | ||
| // } | ||
| // } | ||
|
|
||
| // @Nested | ||
| // @DisplayName("정상적인 경우에는") | ||
| // class Context_correct_process{ | ||
| // @DisplayName("true를 반환한다") | ||
| // @Test | ||
| // void it_return_true(){ | ||
| // RegisterRequest registerRequest = new RegisterRequest("dlwlrma", "이지금", "a12341234", "aaa@gmail.com", "ABC123"); | ||
| // when(emailCodeService.checkEmailCode(any(), any(), any())).thenReturn(true); | ||
|
|
||
| // assertEquals(true, memberAuthService.register(registerRequest)); | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| } |