From 76426ba946778809fed8690d0711b3199dbf4036 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Sat, 3 Aug 2024 16:10:25 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=94=BD=EC=8A=A4=EC=B2=98=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/Application.java | 2 -- .../com/bang_ggood/user/service/UserServiceTest.java | 11 +++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java index e78a6f000..c6b0b749c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java @@ -2,10 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -@ConfigurationPropertiesScan @EnableJpaAuditing @SpringBootApplication public class Application { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java index 77c5de9a7..e6889a129 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java @@ -15,6 +15,7 @@ import static com.bang_ggood.user.UserFixture.USER1; import static com.bang_ggood.user.UserFixture.oauthInfoResponseUSER1; +import static org.mockito.ArgumentMatchers.any; @ExtendWith(MockitoExtension.class) class UserServiceTest extends IntegrationTestSupport { @@ -28,15 +29,17 @@ class UserServiceTest extends IntegrationTestSupport { @Autowired private UserRepository userRepository; + private static final OauthLoginRequest oauthLoginRequest = new OauthLoginRequest("testCode"); + @DisplayName("로그인 성공 : 존재하지 않는 회원이면 데이터베이스에 새로운 유저를 추가하고 토큰을 반환한다.") @Test void login_signup() { // given - Mockito.when(oauthClient.requestOauthInfo(new OauthLoginRequest(""))) + Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) .thenReturn(UserFixture.oauthInfoResponseUSER2); // when - String token = userService.login(new OauthLoginRequest("")); + String token = userService.login(oauthLoginRequest); // then Assertions.assertThat(token).isNotBlank(); @@ -47,11 +50,11 @@ void login_signup() { void login() { // given userRepository.save(USER1); - Mockito.when(oauthClient.requestOauthInfo(new OauthLoginRequest(""))) + Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) .thenReturn(oauthInfoResponseUSER1); // when - String token = userService.login(new OauthLoginRequest("")); + String token = userService.login(oauthLoginRequest); // then Assertions.assertThat(token).isNotBlank();