fix: test method 격리

prgrms-be-devcourse · Dec 24, 2024 · cad92c1 · cad92c1
1 parent a33bfc1
commit cad92c1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/test/java/org/programmers/signalbuddy/domain/comment/service/CommentServiceTest.java b/src/test/java/org/programmers/signalbuddy/domain/comment/service/CommentServiceTest.java
@@ -18,8 +18,8 @@
 import org.programmers.signalbuddy.domain.comment.exception.CommentErrorCode;
 import org.programmers.signalbuddy.domain.comment.repository.CommentRepository;
 import org.programmers.signalbuddy.domain.feedback.dto.FeedbackWriteRequest;
-import org.programmers.signalbuddy.domain.feedback.entity.enums.AnswerStatus;
 import org.programmers.signalbuddy.domain.feedback.entity.Feedback;
+import org.programmers.signalbuddy.domain.feedback.entity.enums.AnswerStatus;
 import org.programmers.signalbuddy.domain.feedback.repository.FeedbackRepository;
 import org.programmers.signalbuddy.domain.member.MemberRole;
 import org.programmers.signalbuddy.domain.member.entity.Member;
@@ -29,10 +29,13 @@
 import org.programmers.signalbuddy.global.support.ServiceTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.security.SecurityProperties.User;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
 @TestMethodOrder(OrderAnnotation.class)
+@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
 class CommentServiceTest extends ServiceTest {
 
     @Autowired
@@ -127,7 +130,7 @@ void writeCommentByAdmin() {
         commentService.writeComment(request, user);
 
         // then
-        Optional<Comment> actual = commentRepository.findById(4L);
+        Optional<Comment> actual = commentRepository.findById(2L);
         SoftAssertions.assertSoftly(softAssertions -> {
             softAssertions.assertThat(actual).get().isNotNull();
             softAssertions.assertThat(actual.get().getCommentId()).isNotNull();
@@ -233,7 +236,7 @@ void deleteCommentByAdmin() {
 
         // when
         commentService.writeComment(request, user);
-        commentService.deleteComment(10L, user);
+        commentService.deleteComment(2L, user);
 
         // then
         SoftAssertions.assertSoftly(softAssertions -> {

diff --git a/...t/java/org/programmers/signalbuddy/domain/feedback/repository/FeedbackRepositoryTest.java b/...t/java/org/programmers/signalbuddy/domain/feedback/repository/FeedbackRepositoryTest.java
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -55,12 +54,6 @@ void setup() {
         feedbackRepository.saveAll(feedbackList);
     }
 
-    @AfterEach
-    void teardown() {
-        feedbackRepository.deleteAll();
-        memberRepository.deleteAll();
-    }
-
     @DisplayName("탈퇴하지 않은 유저들의 피드백 목록 가져오기")
     @Test
     void findAllByActiveMembers() {

diff --git a/src/test/java/org/programmers/signalbuddy/global/db/MariaDBTestContainer.java b/src/test/java/org/programmers/signalbuddy/global/db/MariaDBTestContainer.java
@@ -13,7 +13,7 @@
 public interface MariaDBTestContainer {
 
     @Container
-    MariaDBContainer<?> MARIADB_CONTAINER = new MariaDBContainer<>("mariadb:10.11")
+    MariaDBContainer<?> MARIADB_CONTAINER = new MariaDBContainer<>("mariadb:11.5")
         .withDatabaseName("test")
         .withUsername("test")
         .withPassword("test");

diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml
@@ -2,7 +2,7 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver
-    url: jdbc:tc:mariadb:10.11://test
+    url: jdbc:tc:mariadb:11.5://test
     username: test
     password: test