test:테스트에 어플리케이션 콘텍스트 캐싱 위한 수정

woowacourse-teams · Oct 10, 2023 · d96d6aa · d96d6aa
1 parent 62f0691
commit d96d6aa
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 34 deletions.
diff --git a/server/src/test/java/com/project/yozmcafe/service/BaseServiceTest.java b/server/src/test/java/com/project/yozmcafe/service/BaseServiceTest.java
@@ -1,12 +1,16 @@
 package com.project.yozmcafe.service;
 
 
-import org.springframework.boot.test.mock.mockito.SpyBean;
-
 import com.project.yozmcafe.BaseTest;
 import com.project.yozmcafe.domain.S3Client;
+import com.project.yozmcafe.service.auth.GoogleOAuthClient;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 
 public abstract class BaseServiceTest extends BaseTest {
+
     @SpyBean
     protected S3Client s3Client;
+
+    @SpyBean
+    protected GoogleOAuthClient googleOAuthClient;
 }
diff --git a/server/src/test/java/com/project/yozmcafe/service/UnViewedCafeRefillListenerTest.java b/server/src/test/java/com/project/yozmcafe/service/UnViewedCafeRefillListenerTest.java
@@ -1,6 +1,5 @@
 package com.project.yozmcafe.service;
 
-import com.project.yozmcafe.BaseTest;
 import com.project.yozmcafe.controller.auth.OAuthProvider;
 import com.project.yozmcafe.domain.cafe.Cafe;
 import com.project.yozmcafe.domain.cafe.CafeRepository;
@@ -10,11 +9,9 @@
 import com.project.yozmcafe.domain.member.MemberRepository;
 import com.project.yozmcafe.fixture.Fixture;
 import com.project.yozmcafe.service.auth.AuthService;
-import com.project.yozmcafe.service.auth.GoogleOAuthClient;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.event.ApplicationEvents;
 import org.springframework.test.context.event.RecordApplicationEvents;
 
@@ -26,17 +23,14 @@
 import static org.mockito.Mockito.doReturn;
 
 @RecordApplicationEvents
-class UnViewedCafeRefillListenerTest extends BaseTest {
+class UnViewedCafeRefillListenerTest extends BaseServiceTest {
 
     @Autowired
     AuthService authService;
 
     @Autowired
     CafeService cafeService;
 
-    @SpyBean
-    private GoogleOAuthClient googleOAuthClient;
-
     @Autowired
     private MemberRepository memberRepository;
 

diff --git a/server/src/test/java/com/project/yozmcafe/service/UnViewedCafeServiceTest.java b/server/src/test/java/com/project/yozmcafe/service/UnViewedCafeServiceTest.java
@@ -1,15 +1,5 @@
 package com.project.yozmcafe.service;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.project.yozmcafe.domain.RandomCafeShuffleStrategy;
 import com.project.yozmcafe.domain.cafe.Cafe;
 import com.project.yozmcafe.domain.cafe.CafeRepository;
@@ -18,13 +8,22 @@
 import com.project.yozmcafe.domain.member.Member;
 import com.project.yozmcafe.domain.member.MemberRepository;
 import com.project.yozmcafe.fixture.Fixture;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 class UnViewedCafeServiceTest extends BaseServiceTest {
 
     private UnViewedCafeService unViewedCafeService;
 
     @Autowired
     private CafeRepository cafeRepository;
+
     @Autowired
     UnViewedCafeRepository unViewedCafeRepository;
 

diff --git a/server/src/test/java/com/project/yozmcafe/service/auth/AuthServiceTest.java b/server/src/test/java/com/project/yozmcafe/service/auth/AuthServiceTest.java
@@ -1,17 +1,5 @@
 package com.project.yozmcafe.service.auth;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.anyString;
-import static org.mockito.Mockito.doReturn;
-
-import java.util.List;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.project.yozmcafe.controller.auth.OAuthProvider;
 import com.project.yozmcafe.controller.dto.AuthorizationUrlDto;
 import com.project.yozmcafe.domain.cafe.Cafe;
@@ -21,8 +9,16 @@
 import com.project.yozmcafe.domain.member.MemberInfo;
 import com.project.yozmcafe.domain.member.MemberRepository;
 import com.project.yozmcafe.fixture.Fixture;
-
 import com.project.yozmcafe.service.BaseServiceTest;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.anyString;
+import static org.mockito.Mockito.doReturn;
 
 class AuthServiceTest extends BaseServiceTest {
 
@@ -32,8 +28,6 @@ class AuthServiceTest extends BaseServiceTest {
     private CafeRepository cafeRepository;
     @Autowired
     private AuthService authService;
-    @SpyBean
-    protected GoogleOAuthClient googleOAuthClient;
 
     @Test
     @DisplayName("회원가입된 상태의 유저로 createAccessToken 호출하면 멤버를 새로 저장하지 않는다")