feat: @DirtiesContext 제거를 통한 테스트 개선

Space-Club · Jan 7, 2024 · e903a27 · e903a27
1 parent 86a6581
commit e903a27
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 32 deletions.
diff --git a/src/test/java/com/spaceclub/club/repository/ClubUserRepositoryTest.java b/src/test/java/com/spaceclub/club/repository/ClubUserRepositoryTest.java
@@ -1,15 +1,14 @@
 package com.spaceclub.club.repository;
 
-import com.spaceclub.SpaceClubCustomDisplayNameGenerator;
 import com.spaceclub.club.domain.ClubUser;
 import com.spaceclub.club.domain.ClubUserRole;
 import com.spaceclub.user.repository.UserRepository;
+import jakarta.persistence.EntityManager;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.DirtiesContext;
 
 import java.util.List;
 import java.util.Optional;
@@ -25,17 +24,17 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 @DataJpaTest
-@DisplayNameGeneration(SpaceClubCustomDisplayNameGenerator.class)
 class ClubUserRepositoryTest {
 
     @Autowired
     private ClubUserRepository clubUserRepository;
-
     @Autowired
     private ClubRepository clubRepository;
-
     @Autowired
     private UserRepository userRepository;
+    @Autowired
+    private EntityManager entityManager;
+
 
     @BeforeEach
     void setUp() {
@@ -44,8 +43,13 @@ void setUp() {
         clubUserRepository.save(club1User1Manager());
     }
 
+    @AfterEach
+    void resetAutoIncrementId() {
+        entityManager.createNativeQuery("ALTER TABLE CLUB ALTER COLUMN CLUB_ID RESTART WITH 1")
+                .executeUpdate();
+    }
+
     @Test
-    @DirtiesContext
     void 클럽_id로_클럽유저_조회에_성공한다() {
         // given
         clubRepository.save(club2());
@@ -60,7 +64,6 @@ void setUp() {
 
 
     @Test
-    @DirtiesContext
     void 클럽의_유저_조회에_성공한다() {
         // when
         Optional<ClubUser> getClubUser = clubUserRepository.findByClub_IdAndUserId(club1().getId(), user1().getId());
@@ -74,7 +77,6 @@ void setUp() {
     }
 
     @Test
-    @DirtiesContext
     void 클럽의_권한에_따른_인원수_조회에_성공한다() {
         // given
         userRepository.save(user2());
@@ -88,7 +90,6 @@ void setUp() {
     }
 
     @Test
-    @DirtiesContext
     void 유저에_따른_클럽유저_조회에_성공한다() {
         // given
         clubRepository.save(club2());

diff --git a/src/test/java/com/spaceclub/event/repository/EventRepositoryTest.java b/src/test/java/com/spaceclub/event/repository/EventRepositoryTest.java
@@ -10,7 +10,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
-import org.springframework.test.annotation.DirtiesContext;
 
 import java.util.List;
 
@@ -21,17 +20,14 @@
 import static com.spaceclub.event.EventTestFixture.showEvent;
 import static com.spaceclub.user.UserTestFixture.user1;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
 @DataJpaTest
-@DirtiesContext
 @DisplayNameGeneration(SpaceClubCustomDisplayNameGenerator.class)
 class EventRepositoryTest {
 
     @Autowired
     private EventRepository eventRepository;
-
     @Autowired
     private ClubRepository clubRepository;
 
@@ -47,13 +43,8 @@ class EventRepositoryTest {
         List<Event> events = eventPages.getContent();
 
         // then
-        assertAll(
-                () -> assertThat(eventPages.getTotalElements())
-                        .isEqualTo(2),
-                () -> assertThat(events).allSatisfy(event -> {
-                    assertThat(event.getClub()).isEqualTo(club1());
-                })
-        );
+        assertThat(eventPages.getTotalElements()).isEqualTo(2);
+        events.forEach(event -> assertThat(event.getClub()).isEqualTo(club1()));
     }
 
 }
diff --git a/src/test/java/com/spaceclub/event/repository/EventUserRepositoryTest.java b/src/test/java/com/spaceclub/event/repository/EventUserRepositoryTest.java
@@ -9,6 +9,8 @@
 import com.spaceclub.user.domain.Provider;
 import com.spaceclub.user.domain.User;
 import com.spaceclub.user.repository.UserRepository;
+import jakarta.persistence.EntityManager;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.Test;
@@ -19,7 +21,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
-import org.springframework.test.annotation.DirtiesContext;
 
 import java.util.List;
 
@@ -30,24 +31,29 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.springframework.data.domain.Sort.Direction.DESC;
-import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
 
 @DataJpaTest
-@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
 @DisplayNameGeneration(SpaceClubCustomDisplayNameGenerator.class)
 class EventUserRepositoryTest {
 
     @Autowired
     private EventUserRepository eventUserRepository;
-
     @Autowired
     private EventRepository eventRepository;
-
     @Autowired
     private UserRepository userRepository;
-
     @Autowired
     private ClubRepository clubRepository;
+    @Autowired
+    private EntityManager entityManager;
+
+    @AfterEach
+    void resetAutoIncrementId() {
+        entityManager.createNativeQuery("ALTER TABLE EVENT ALTER COLUMN EVENT_ID RESTART WITH 1")
+                .executeUpdate();
+        entityManager.createNativeQuery("ALTER TABLE CLUB ALTER COLUMN CLUB_ID RESTART WITH 1")
+                .executeUpdate();
+    }
 
     @BeforeEach
     void setUp() {

diff --git a/src/test/java/com/spaceclub/notification/mail/repository/TemplateNameRepositoryTest.java b/src/test/java/com/spaceclub/notification/mail/repository/TemplateNameRepositoryTest.java
@@ -10,7 +10,6 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
@@ -20,7 +19,6 @@
 
 @SpringBootTest
 @Transactional
-@ActiveProfiles("test")
 class TemplateNameRepositoryTest {
 
     @Autowired

diff --git a/src/test/java/com/spaceclub/user/repository/BookmarkRepositoryTest.java b/src/test/java/com/spaceclub/user/repository/BookmarkRepositoryTest.java
@@ -26,7 +26,7 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.springframework.data.domain.Sort.Direction.DESC;
 import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
-
+//SFASDFASD
 @DataJpaTest
 @DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
 class BookmarkRepositoryTest {

diff --git a/src/test/java/com/spaceclub/user/repository/UserRepositoryTest.java b/src/test/java/com/spaceclub/user/repository/UserRepositoryTest.java
@@ -8,7 +8,6 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.DirtiesContext;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -18,7 +17,6 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 @DataJpaTest
-@DirtiesContext
 @DisplayNameGeneration(SpaceClubCustomDisplayNameGenerator.class)
 class UserRepositoryTest {