diff --git a/pennyway-domain/domain-service/src/test/java/kr/co/pennyway/domain/context/account/integration/DeviceTokenRegisterServiceIntegrationTest.java b/pennyway-domain/domain-service/src/test/java/kr/co/pennyway/domain/context/account/integration/DeviceTokenRegisterServiceIntegrationTest.java index 02ffe3a08..37b3c5277 100644 --- a/pennyway-domain/domain-service/src/test/java/kr/co/pennyway/domain/context/account/integration/DeviceTokenRegisterServiceIntegrationTest.java +++ b/pennyway-domain/domain-service/src/test/java/kr/co/pennyway/domain/context/account/integration/DeviceTokenRegisterServiceIntegrationTest.java @@ -15,6 +15,7 @@ import kr.co.pennyway.domain.domains.user.repository.UserRepository; import kr.co.pennyway.domain.domains.user.service.UserRdbService; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -25,7 +26,6 @@ import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.test.context.ActiveProfiles; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -55,6 +55,12 @@ void setUp() { savedUser = userRepository.save(UserFixture.GENERAL_USER.toUser()); } + @AfterEach + void tearDown() { + deviceTokenRepository.deleteAll(); + userRepository.deleteAll(); + } + @Test @DisplayName("새로운 토큰 등록 요청 시 디바이스 토큰이 정상적으로 저장됩니다") void when_registering_new_token_then_save_successfully() { @@ -83,7 +89,6 @@ void when_registering_new_token_then_save_successfully() { } @Test - @Transactional @DisplayName("사용자가 동일한 디바이스에 새로운 토큰을 등록하면 기존 토큰이 비활성화됩니다") void when_registering_new_token_for_same_device_then_deactivate_existing_token() { // given @@ -94,7 +99,6 @@ void when_registering_new_token_for_same_device_then_deactivate_existing_token() DeviceToken secondToken = deviceTokenRegisterService.execute(savedUser.getId(), deviceId, "Android", "token2"); // then - assertFalse(firstToken.isActivated()); assertTrue(secondToken.isActivated()); assertEquals(deviceId, secondToken.getDeviceId()); @@ -105,7 +109,6 @@ void when_registering_new_token_for_same_device_then_deactivate_existing_token() } @Test - @Transactional @DisplayName("활성화된 토큰을 다른 디바이스에서 사용하려고 하면 예외가 발생합니다") void when_using_active_token_on_different_device_then_throw_exception() { // given @@ -121,7 +124,6 @@ void when_using_active_token_on_different_device_then_throw_exception() { } @Test - @Transactional @DisplayName("같은 deviceId, token / 다른 사용자 갱신 요청이라면, 디바이스 토큰의 소유권이 다른 사용자에게 이전됩니다") void shouldTransferTokenOwnership() { // given diff --git a/pennyway-domain/domain-service/src/test/java/kr/co/pennyway/domain/context/account/service/DeviceTokenRegisterServiceTest.java b/pennyway-domain/domain-service/src/test/java/kr/co/pennyway/domain/context/account/service/DeviceTokenRegisterServiceTest.java index 999a45841..6ecc4618a 100644 --- a/pennyway-domain/domain-service/src/test/java/kr/co/pennyway/domain/context/account/service/DeviceTokenRegisterServiceTest.java +++ b/pennyway-domain/domain-service/src/test/java/kr/co/pennyway/domain/context/account/service/DeviceTokenRegisterServiceTest.java @@ -5,7 +5,6 @@ import kr.co.pennyway.domain.domains.device.domain.DeviceToken; import kr.co.pennyway.domain.domains.device.exception.DeviceTokenErrorException; import kr.co.pennyway.domain.domains.user.domain.User; -import kr.co.pennyway.domain.domains.user.exception.UserErrorException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -14,16 +13,6 @@ import static org.junit.jupiter.api.Assertions.*; public class DeviceTokenRegisterServiceTest { - @Test - @DisplayName("사용자가 존재하지 않으면 예외가 발생합니다") - void when_user_not_found_then_throw_exception() { - // given - DeviceTokenRegisterCollection collection = new DeviceTokenRegisterCollection(); - - // when & then - assertThrows(UserErrorException.class, () -> collection.register(null, "device1", "Android", "token1")); - } - @Test @DisplayName("새로운 토큰 등록 시 올바른 정보로 생성됩니다") void when_user_has_no_token_should_create_new_token() {