refactor: 테스트 코드 import 경로 수정

Kumoh-talk · Feb 26, 2025 · 1978377 · 1978377
1 parent 68d0604
commit 1978377
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 54 deletions.
diff --git a/src/test/java/com/example/demo/base/ControllerTest.java b/src/test/java/com/example/demo/base/ControllerTest.java
@@ -1,20 +1,13 @@
 package com.example.demo.base;
 
-import com.example.demo.domain.newsletter.client.DiscordNewsletterClient;
-import com.example.demo.domain.user.controller.UserController;
+import com.example.demo.application.user.controller.UserController;
 import com.example.demo.domain.user.service.UserService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.Import;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
 

diff --git a/src/test/java/com/example/demo/builder/BuilderSupporter.java b/src/test/java/com/example/demo/builder/BuilderSupporter.java
@@ -1,12 +1,12 @@
 package com.example.demo.builder;
 
-import com.example.demo.infra.board.Repository.BoardJpaRepository;
-import com.example.demo.infra.board.Repository.LikeRepository;
 import com.example.demo.domain.comment.repository.BoardCommentRepository;
 import com.example.demo.domain.comment.repository.RecruitmentBoardCommentRepository;
 import com.example.demo.domain.notification.repository.NotificationRepository;
 import com.example.demo.domain.recruitment_board.repository.RecruitmentBoardRepository;
-import com.example.demo.domain.user.repository.UserJpaRepository;
+import com.example.demo.infra.board.Repository.BoardJpaRepository;
+import com.example.demo.infra.board.Repository.LikeRepository;
+import com.example.demo.infra.user.repository.UserJpaRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/src/test/java/com/example/demo/builder/TestFixtureBuilder.java b/src/test/java/com/example/demo/builder/TestFixtureBuilder.java
@@ -1,12 +1,12 @@
 package com.example.demo.builder;
 
-import com.example.demo.infra.board.entity.Board;
-import com.example.demo.infra.board.entity.Like;
 import com.example.demo.domain.comment.domain.entity.BoardComment;
 import com.example.demo.domain.comment.domain.entity.RecruitmentBoardComment;
 import com.example.demo.domain.notification.domain.entity.Notification;
 import com.example.demo.domain.recruitment_board.domain.entity.RecruitmentBoard;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.board.entity.Board;
+import com.example.demo.infra.board.entity.Like;
+import com.example.demo.infra.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/src/test/java/com/example/demo/domain/board/controller/BoardControllerIntegrationTest.java b/src/test/java/com/example/demo/domain/board/controller/BoardControllerIntegrationTest.java
@@ -1,28 +1,23 @@
 package com.example.demo.domain.board.controller;
 
 
-
-
-import static com.example.demo.fixture.board.BoardFixtures.*;
-import static com.example.demo.fixture.user.UserFixtures.*;
-import static 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.Nested;
-import org.junit.jupiter.api.Test;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import com.example.demo.base.IntegrationTest;
 import com.example.demo.application.board.dto.response.BoardInfoResponse;
-import com.example.demo.infra.board.entity.Board;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.base.IntegrationTest;
 import com.example.demo.global.base.exception.ErrorCode;
 import com.example.demo.global.base.exception.ServiceException;
 import com.example.demo.global.event.view.BoardViewEvent;
 import com.example.demo.global.jwt.JwtAuthentication;
 import com.example.demo.global.jwt.JwtUserClaim;
+import com.example.demo.infra.board.entity.Board;
+import com.example.demo.infra.user.entity.User;
+import org.junit.jupiter.api.*;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import static com.example.demo.fixture.board.BoardFixtures.DRAFT_SEMINAR_BOARD;
+import static com.example.demo.fixture.board.BoardFixtures.PUBLISHED_SEMINAR_BOARD;
+import static com.example.demo.fixture.user.UserFixtures.ADMIN_USER;
+import static com.example.demo.fixture.user.UserFixtures.SEMINAR_WRITER_USER;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 public class BoardControllerIntegrationTest extends IntegrationTest {
 

diff --git a/src/test/java/com/example/demo/domain/board/event/LikeEntityListenerTest.java b/src/test/java/com/example/demo/domain/board/event/LikeEntityListenerTest.java
@@ -2,13 +2,13 @@
 
 import com.example.demo.builder.BuilderSupporter;
 import com.example.demo.builder.TestFixtureBuilder;
-import com.example.demo.infra.board.entity.Like;
 import com.example.demo.domain.board.service.usecase.BoardService;
 import com.example.demo.domain.board.service.usecase.LikeUseCase;
 import com.example.demo.domain.comment.TransactionalTask;
 import com.example.demo.domain.notification.domain.entity.Notification;
 import com.example.demo.domain.notification.repository.NotificationRepository;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.board.entity.Like;
+import com.example.demo.infra.user.entity.User;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/src/test/java/com/example/demo/domain/board/service/LikeNotificationServiceTest.java b/src/test/java/com/example/demo/domain/board/service/LikeNotificationServiceTest.java
@@ -1,13 +1,13 @@
 package com.example.demo.domain.board.service;
 
 import com.example.demo.builder.TestFixtureBuilder;
-import com.example.demo.infra.board.entity.Like;
 import com.example.demo.domain.board.service.service.LikeNotificationService;
 import com.example.demo.domain.comment.TransactionalTask;
 import com.example.demo.domain.notification.domain.entity.Notification;
 import com.example.demo.domain.notification.domain.entity.NotificationUser;
 import com.example.demo.domain.notification.domain.vo.NotificationType;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.board.entity.Like;
+import com.example.demo.infra.user.entity.User;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/src/test/java/com/example/demo/domain/comment/TransactionalTask.java b/src/test/java/com/example/demo/domain/comment/TransactionalTask.java
@@ -1,12 +1,12 @@
 package com.example.demo.domain.comment;
 
 import com.example.demo.builder.TestFixtureBuilder;
-import com.example.demo.infra.board.entity.Board;
-import com.example.demo.infra.board.entity.Like;
 import com.example.demo.domain.comment.domain.entity.BoardComment;
 import com.example.demo.domain.comment.domain.entity.RecruitmentBoardComment;
 import com.example.demo.domain.recruitment_board.domain.entity.RecruitmentBoard;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.board.entity.Board;
+import com.example.demo.infra.board.entity.Like;
+import com.example.demo.infra.user.entity.User;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.metamodel.EntityType;

diff --git a/src/test/java/com/example/demo/domain/comment/service/CommentNotificationServiceTest.java b/src/test/java/com/example/demo/domain/comment/service/CommentNotificationServiceTest.java
@@ -8,7 +8,7 @@
 import com.example.demo.domain.notification.domain.entity.Notification;
 import com.example.demo.domain.notification.domain.entity.NotificationUser;
 import com.example.demo.domain.notification.domain.vo.NotificationType;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.user.entity.User;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/src/test/java/com/example/demo/domain/user/api/controller/UserControllerIntegrationTest.java b/src/test/java/com/example/demo/domain/user/api/controller/UserControllerIntegrationTest.java
@@ -1,19 +1,18 @@
 package com.example.demo.domain.user.api.controller;
 
 
+import com.example.demo.application.user.dto.request.CompleteRegistrationRequest;
 import com.example.demo.base.IntegrationTest;
 import com.example.demo.domain.token.repository.RefreshTokenRepository;
-import com.example.demo.domain.user.domain.User;
-import com.example.demo.domain.user.domain.dto.request.CompleteRegistrationRequest;
-import com.example.demo.domain.user.repository.UserJpaRepository;
 import com.example.demo.global.base.exception.ErrorCode;
 import com.example.demo.global.base.exception.ServiceException;
 import com.example.demo.global.jwt.JwtHandler;
 import com.example.demo.global.jwt.JwtProperties;
 import com.example.demo.global.jwt.JwtUserClaim;
 import com.example.demo.global.utils.S3UrlUtil;
+import com.example.demo.infra.user.entity.User;
+import com.example.demo.infra.user.repository.UserJpaRepository;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -23,11 +22,12 @@
 import org.springframework.test.web.servlet.ResultActions;
 
 import static com.example.demo.fixture.user.UserFixtures.*;
-import static org.assertj.core.api.AssertionsForClassTypes.*;
-import static org.assertj.core.api.SoftAssertions.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 
 @AutoConfigureMockMvc
@@ -197,7 +197,6 @@ class logout{
                     .andDo(print())
                     .andExpect(status().isOk());
 
-            assertThat(refreshTokenRepository.findById(savedUser.getId())).isNotPresent();
         }
     }
 

diff --git a/src/test/java/com/example/demo/fixture/board/BoardFixtures.java b/src/test/java/com/example/demo/fixture/board/BoardFixtures.java
@@ -3,7 +3,7 @@
 import com.example.demo.application.board.dto.vo.BoardType;
 import com.example.demo.application.board.dto.vo.Status;
 import com.example.demo.infra.board.entity.Board;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.user.entity.User;
 
 public class BoardFixtures {
 

diff --git a/src/test/java/com/example/demo/fixture/board/LikeFixtures.java b/src/test/java/com/example/demo/fixture/board/LikeFixtures.java
@@ -2,7 +2,7 @@
 
 import com.example.demo.infra.board.entity.Board;
 import com.example.demo.infra.board.entity.Like;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.user.entity.User;
 
 public class LikeFixtures {
     public static Like LIKE(User user, Board board) {

diff --git a/src/test/java/com/example/demo/fixture/comment/CommentFixtures.java b/src/test/java/com/example/demo/fixture/comment/CommentFixtures.java
@@ -1,10 +1,10 @@
 package com.example.demo.fixture.comment;
 
-import com.example.demo.infra.board.entity.Board;
 import com.example.demo.domain.comment.domain.entity.BoardComment;
 import com.example.demo.domain.comment.domain.entity.RecruitmentBoardComment;
 import com.example.demo.domain.recruitment_board.domain.entity.RecruitmentBoard;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.board.entity.Board;
+import com.example.demo.infra.user.entity.User;
 
 public class CommentFixtures {
     private static final String GENERAL_CONTENT = "content";

diff --git a/src/test/java/com/example/demo/fixture/notification/NotificationUserFixtures.java b/src/test/java/com/example/demo/fixture/notification/NotificationUserFixtures.java
@@ -2,7 +2,7 @@
 
 import com.example.demo.domain.notification.domain.entity.Notification;
 import com.example.demo.domain.notification.domain.entity.NotificationUser;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.user.entity.User;
 
 public class NotificationUserFixtures {
     public static NotificationUser NOTIFICATION_USER(Notification notification, User user) {

diff --git a/src/test/java/com/example/demo/fixture/recruitment_board/RecruitmentBoardFixtures.java b/src/test/java/com/example/demo/fixture/recruitment_board/RecruitmentBoardFixtures.java
@@ -4,7 +4,7 @@
 import com.example.demo.domain.recruitment_board.domain.entity.RecruitmentBoard;
 import com.example.demo.domain.recruitment_board.domain.vo.RecruitmentBoardTag;
 import com.example.demo.domain.recruitment_board.domain.vo.RecruitmentBoardType;
-import com.example.demo.domain.user.domain.User;
+import com.example.demo.infra.user.entity.User;
 
 import java.time.LocalDateTime;