From 3ef605d629d09cfa5cc9592538ebb8001d801c49 Mon Sep 17 00:00:00 2001 From: chanwoo Date: Fri, 4 Aug 2023 19:24:19 +0900 Subject: [PATCH 1/3] =?UTF-8?q?test=20:=20resignUserLogin=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/OAuthDomainServiceTest.java | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/src/test/java/backend/wal/auth/domain/service/OAuthDomainServiceTest.java b/src/test/java/backend/wal/auth/domain/service/OAuthDomainServiceTest.java index 0a3eb30e..d057a13f 100644 --- a/src/test/java/backend/wal/auth/domain/service/OAuthDomainServiceTest.java +++ b/src/test/java/backend/wal/auth/domain/service/OAuthDomainServiceTest.java @@ -5,7 +5,6 @@ import backend.wal.auth.application.port.out.OAuthUserInfoResponseDto; import backend.wal.auth.application.port.out.FcmTokenPort; import backend.wal.auth.application.port.out.UserPort; -import backend.wal.auth.exception.ForbiddenUserException; import backend.wal.user.domain.aggregate.SocialType; import backend.wal.user.domain.aggregate.entity.User; import org.junit.jupiter.api.BeforeEach; @@ -16,7 +15,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; @@ -86,23 +84,4 @@ void newUserSignupAndLogin() { assertThat(loginResponseDto.getUserId()).isEqualTo(newUserId); assertThat(loginResponseDto.isNewUser()).isTrue(); } - - @DisplayName("탈퇴한 회원이 24시간 이내에 login 을 하면 에러가 발생한다") - @Test - void resignUserLogin() { - // given - User alreadyUser = User.createGeneral( - loginRequestDto.toCreateUserDto( - oAuthUserInfoResponseDto.getNickname(), - oAuthUserInfoResponseDto.getId()) - ); - alreadyUser.resign(); - when(userPort.findSocialUserCall(eq(oAuthUserInfoResponseDto.getId()), any(SocialType.class))) - .thenReturn(alreadyUser); - - // when, then - assertThatThrownBy(() -> oAuthDomainService.signupOrLogin(loginRequestDto, oAuthUserInfoResponseDto)) - .isInstanceOf(ForbiddenUserException.class) - .hasMessage("탈퇴한지 24시간이 지나지 않아 재가입 할 수 없습니다"); - } } \ No newline at end of file From 258eb12d2f507fec5cb2c96d1c6b96b641f4db3a Mon Sep 17 00:00:00 2001 From: chanwoo Date: Sat, 5 Aug 2023 16:51:53 +0900 Subject: [PATCH 2/3] =?UTF-8?q?test=20:=20getDetailSendDateInfo=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wal/reservation/domain/view/ReservationHistoryTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/backend/wal/reservation/domain/view/ReservationHistoryTest.java b/src/test/java/backend/wal/reservation/domain/view/ReservationHistoryTest.java index 2a821808..427203ba 100644 --- a/src/test/java/backend/wal/reservation/domain/view/ReservationHistoryTest.java +++ b/src/test/java/backend/wal/reservation/domain/view/ReservationHistoryTest.java @@ -43,7 +43,7 @@ void getDetailSendDateInfo(CharSequence sendTimeText, CharSequence reserveTimeTe assertAll( () -> assertThat(detailSendDateInfo.getReservationId()).isEqualTo(reservationId), () -> assertThat(detailSendDateInfo.getMessage()).isEqualTo(message), - () -> assertThat(detailSendDateInfo.getShowStatus()).isEqualTo(showStatus), + () -> assertThat(detailSendDateInfo.getShowStatus()).isEqualTo(showStatus.name()), () -> assertThat(detailSendDateInfo.getDetail()).isEqualTo(expect), () -> assertThat(detailSendDateInfo.getReservedAt()).isEqualTo("2011-12-30.00:00") ); From 89d79c077eae41d3f4a4f5ec47bf8b0ee7b6c74f Mon Sep 17 00:00:00 2001 From: chanwoo Date: Sat, 5 Aug 2023 16:52:20 +0900 Subject: [PATCH 3/3] =?UTF-8?q?test=20:=20findRefreshTokenByValue=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20assert=20=EA=B5=AC=EB=AC=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/domain/repository/RefreshTokenRepositoryTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/backend/wal/auth/domain/repository/RefreshTokenRepositoryTest.java b/src/test/java/backend/wal/auth/domain/repository/RefreshTokenRepositoryTest.java index f649642b..f5b911d2 100644 --- a/src/test/java/backend/wal/auth/domain/repository/RefreshTokenRepositoryTest.java +++ b/src/test/java/backend/wal/auth/domain/repository/RefreshTokenRepositoryTest.java @@ -38,8 +38,8 @@ void findRefreshTokenByValue(String target) { // then if (target.equals("RefreshToken")) { - assertThat(refreshToken.isPresent()).isTrue(); - assertThat(refreshToken.get()).isEqualTo(saved); + assertThat(refreshToken).isPresent(); + assertThat(refreshToken).contains(saved); }; if (target.equals("null")) { assertThat(refreshToken.isPresent()).isFalse();