test: controller integration test 환경 통일

playkuround · Jun 28, 2024 · 1e211f4 · 1e211f4
1 parent 5b91216
commit 1e211f4
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 99 deletions.
diff --git a/src/test/java/com/playkuround/playkuroundserver/IntegrationControllerTest.java b/src/test/java/com/playkuround/playkuroundserver/IntegrationControllerTest.java
@@ -0,0 +1,19 @@
+package com.playkuround.playkuroundserver;
+
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@AutoConfigureMockMvc
+@SpringBootTest(properties = "spring.profiles.active=test")
+@EntityScan(basePackages = {"com.playkuround.playkuroundserver.domain"})
+public @interface IntegrationControllerTest {
+}
+
diff --git a/src/test/java/com/playkuround/playkuroundserver/domain/adventure/api/AdventureApiTest.java b/src/test/java/com/playkuround/playkuroundserver/domain/adventure/api/AdventureApiTest.java
@@ -1,6 +1,7 @@
 package com.playkuround.playkuroundserver.domain.adventure.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.domain.adventure.api.request.AdventureSaveRequest;
 import com.playkuround.playkuroundserver.domain.adventure.dao.AdventureRepository;
 import com.playkuround.playkuroundserver.domain.adventure.domain.Adventure;
@@ -17,8 +18,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.jdbc.Sql;
@@ -32,8 +31,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
+@IntegrationControllerTest
 @Sql(scripts = {"/data-mysql.sql"}, executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
 class AdventureApiTest {
 
@@ -62,10 +60,10 @@ class AdventureApiTest {
 
     @AfterEach
     void clean() {
-        badgeRepository.deleteAll();
-        adventureRepository.deleteAll();
-        landmarkRepository.deleteAll();
-        userRepository.deleteAll();
+        badgeRepository.deleteAllInBatch();
+        adventureRepository.deleteAllInBatch();
+        landmarkRepository.deleteAllInBatch();
+        userRepository.deleteAllInBatch();
         redisTemplate.delete(redisSetKey);
     }
 

diff --git a/src/test/java/com/playkuround/playkuroundserver/domain/appversion/api/AppVersionApiTest.java b/src/test/java/com/playkuround/playkuroundserver/domain/appversion/api/AppVersionApiTest.java
@@ -1,6 +1,7 @@
 package com.playkuround.playkuroundserver.domain.appversion.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.domain.appversion.api.request.UpdateAppVersionRequest;
 import com.playkuround.playkuroundserver.domain.appversion.dao.AppVersionRepository;
 import com.playkuround.playkuroundserver.domain.appversion.domain.AppVersion;
@@ -14,8 +15,6 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -27,8 +26,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
+@IntegrationControllerTest
 class AppVersionApiTest {
 
     @Autowired
@@ -45,8 +43,8 @@ class AppVersionApiTest {
 
     @AfterEach
     void afterEach() {
-        appVersionRepository.deleteAll();
-        userRepository.deleteAll();
+        appVersionRepository.deleteAllInBatch();
+        userRepository.deleteAllInBatch();
     }
 
     @Nested

diff --git a/src/test/java/com/playkuround/playkuroundserver/domain/attendance/api/AttendanceApiTest.java b/src/test/java/com/playkuround/playkuroundserver/domain/attendance/api/AttendanceApiTest.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.domain.attendance.api.request.AttendanceRegisterRequest;
 import com.playkuround.playkuroundserver.domain.attendance.application.AttendanceRegisterService;
 import com.playkuround.playkuroundserver.domain.attendance.dao.AttendanceRepository;
@@ -20,8 +21,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.data.auditing.AuditingHandler;
@@ -46,8 +45,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
+@IntegrationControllerTest
 class AttendanceApiTest {
 
     @Autowired
@@ -65,15 +63,16 @@ class AttendanceApiTest {
     @Autowired
     private AttendanceRepository attendanceRepository;
 
-    private final String redisSetKey = "ranking";
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
+    private final String redisSetKey = "ranking";
+
     @AfterEach
     void clean() {
-        attendanceRepository.deleteAll();
-        badgeRepository.deleteAll();
-        userRepository.deleteAll();
+        attendanceRepository.deleteAllInBatch();
+        badgeRepository.deleteAllInBatch();
+        userRepository.deleteAllInBatch();
         redisTemplate.delete(redisSetKey);
     }
 

diff --git a/...st/java/com/playkuround/playkuroundserver/domain/auth/email/api/AuthEmailSendApiTest.java b/...st/java/com/playkuround/playkuroundserver/domain/auth/email/api/AuthEmailSendApiTest.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.domain.auth.email.api.request.AuthEmailSendRequest;
 import com.playkuround.playkuroundserver.domain.auth.email.dao.AuthEmailRepository;
 import com.playkuround.playkuroundserver.domain.auth.email.domain.AuthEmail;
@@ -15,8 +16,6 @@
 import org.junit.jupiter.params.provider.NullAndEmptySource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
@@ -35,8 +34,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
+@IntegrationControllerTest
 class AuthEmailSendApiTest {
 
     @Autowired
@@ -56,8 +54,8 @@ class AuthEmailSendApiTest {
 
     @AfterEach
     void clean() {
-        authEmailRepository.deleteAll();
-        userRepository.deleteAll();
+        authEmailRepository.deleteAllInBatch();
+        userRepository.deleteAllInBatch();
     }
 
     @Test

diff --git a/.../java/com/playkuround/playkuroundserver/domain/auth/email/api/AuthEmailVerifyApiTest.java b/.../java/com/playkuround/playkuroundserver/domain/auth/email/api/AuthEmailVerifyApiTest.java
@@ -1,6 +1,7 @@
 package com.playkuround.playkuroundserver.domain.auth.email.api;
 
 import com.jayway.jsonpath.JsonPath;
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.domain.auth.email.dao.AuthEmailRepository;
 import com.playkuround.playkuroundserver.domain.auth.email.domain.AuthEmail;
 import com.playkuround.playkuroundserver.domain.auth.token.dao.AuthVerifyTokenRepository;
@@ -16,8 +17,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
@@ -30,8 +29,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
+@IntegrationControllerTest
 class AuthEmailVerifyApiTest {
 
     @Autowired
@@ -51,10 +49,10 @@ class AuthEmailVerifyApiTest {
 
     @AfterEach
     void clean() {
-        authEmailRepository.deleteAll();
-        refreshTokenRepository.deleteAll();
-        authVerifyTokenRepository.deleteAll();
-        userRepository.deleteAll();
+        authEmailRepository.deleteAllInBatch();
+        refreshTokenRepository.deleteAllInBatch();
+        authVerifyTokenRepository.deleteAllInBatch();
+        userRepository.deleteAllInBatch();
     }
 
     @Test

diff --git a/src/test/java/com/playkuround/playkuroundserver/domain/badge/api/BadgeApiTest.java b/src/test/java/com/playkuround/playkuroundserver/domain/badge/api/BadgeApiTest.java
@@ -1,5 +1,6 @@
 package com.playkuround.playkuroundserver.domain.badge.api;
 
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.domain.badge.dao.BadgeRepository;
 import com.playkuround.playkuroundserver.domain.badge.domain.Badge;
 import com.playkuround.playkuroundserver.domain.badge.domain.BadgeType;
@@ -11,11 +12,6 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import java.util.List;
@@ -28,13 +24,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
-@ComponentScan(basePackages = {"com.playkuround.playkuroundserver.domain"},
-        excludeFilters = {
-                @ComponentScan.Filter(type = FilterType.REGEX, pattern = "com.playkuround.playkuroundserver.learning.*")
-        })
-@EntityScan(basePackages = {"com.playkuround.playkuroundserver.domain"})
+@IntegrationControllerTest
 class BadgeApiTest {
 
     @Autowired
@@ -48,8 +38,8 @@ class BadgeApiTest {
 
     @AfterEach
     void clean() {
-        badgeRepository.deleteAll();
-        userRepository.deleteAll();
+        badgeRepository.deleteAllInBatch();
+        userRepository.deleteAllInBatch();
     }
 
     @Nested

diff --git a/src/test/java/com/playkuround/playkuroundserver/domain/fakedoor/api/FakeDoorApiTest.java b/src/test/java/com/playkuround/playkuroundserver/domain/fakedoor/api/FakeDoorApiTest.java
@@ -1,5 +1,6 @@
 package com.playkuround.playkuroundserver.domain.fakedoor.api;
 
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.domain.fakedoor.dao.FakeDoorRepository;
 import com.playkuround.playkuroundserver.domain.fakedoor.domain.FakeDoor;
 import com.playkuround.playkuroundserver.domain.user.dao.UserRepository;
@@ -8,8 +9,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 
 import java.util.List;
@@ -18,8 +17,7 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
+@IntegrationControllerTest
 class FakeDoorApiTest {
 
     @Autowired
@@ -33,8 +31,8 @@ class FakeDoorApiTest {
 
     @AfterEach
     void clean() {
-        fakeDoorRepository.deleteAll();
-        userRepository.deleteAll();
+        fakeDoorRepository.deleteAllInBatch();
+        userRepository.deleteAllInBatch();
     }
 
     @Test

diff --git a/src/test/java/com/playkuround/playkuroundserver/domain/landmark/api/LandmarkApiTest.java b/src/test/java/com/playkuround/playkuroundserver/domain/landmark/api/LandmarkApiTest.java
@@ -1,5 +1,6 @@
 package com.playkuround.playkuroundserver.domain.landmark.api;
 
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.domain.landmark.dao.LandmarkRepository;
 import com.playkuround.playkuroundserver.domain.landmark.domain.Landmark;
 import com.playkuround.playkuroundserver.domain.landmark.domain.LandmarkType;
@@ -11,8 +12,6 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,8 +20,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
+@IntegrationControllerTest
 class LandmarkApiTest {
 
     @Autowired
@@ -36,7 +34,7 @@ class LandmarkApiTest {
 
     @AfterEach
     void clear() {
-        userRepository.deleteAll();
+        userRepository.deleteAllInBatch();
     }
 
     @Nested

diff --git a/...est/java/com/playkuround/playkuroundserver/domain/score/api/LandmarkScoreRankApiTest.java b/...est/java/com/playkuround/playkuroundserver/domain/score/api/LandmarkScoreRankApiTest.java
@@ -1,5 +1,6 @@
 package com.playkuround.playkuroundserver.domain.score.api;
 
+import com.playkuround.playkuroundserver.IntegrationControllerTest;
 import com.playkuround.playkuroundserver.TestUtil;
 import com.playkuround.playkuroundserver.domain.adventure.dao.AdventureRepository;
 import com.playkuround.playkuroundserver.domain.adventure.domain.Adventure;
@@ -15,8 +16,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
@@ -28,8 +27,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@AutoConfigureMockMvc
-@SpringBootTest(properties = "spring.profiles.active=test")
+@IntegrationControllerTest
 class LandmarkScoreRankApiTest {
 
     @Autowired
@@ -46,8 +44,8 @@ class LandmarkScoreRankApiTest {
 
     @AfterEach
     void clean() {
-        adventureRepository.deleteAll();
-        userRepository.deleteAll();
+        adventureRepository.deleteAllInBatch();
+        userRepository.deleteAllInBatch();
     }
 
     @Test