Merge pull request #132 from zanzanbari/test/131

test : 로직 수정에 따른 테스트 코드 변경 #131
zanzanbari · Aug 18, 2023 · cf3d4b7 · cf3d4b7
2 parents b807e0a + 89d79c0
commit cf3d4b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 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
@@ -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();

diff --git 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시간이 지나지 않아 재가입 할 수 없습니다");
-    }
 }
diff --git 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")
         );