refactor: querydsl config 테스트용 생성

woowacourse-teams · Oct 5, 2023 · 209ef3a · 209ef3a
1 parent ab0172f
commit 209ef3a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 17 deletions.
diff --git a/backend/baton/src/test/java/touch/baton/config/QueryDslRepositoryTestConfig.java b/backend/baton/src/test/java/touch/baton/config/QueryDslRepositoryTestConfig.java
@@ -0,0 +1,25 @@
+package touch.baton.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import touch.baton.domain.runnerpost.query.repository.RunnerPostPageRepository;
+
+@TestConfiguration
+public class QueryDslRepositoryTestConfig {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory() {
+        return new JPAQueryFactory(em);
+    }
+
+    @Bean
+    public RunnerPostPageRepository runnerPostPageRepository() {
+        return new RunnerPostPageRepository(jpaQueryFactory());
+    }
+}
diff --git a/backend/baton/src/test/java/touch/baton/config/RepositoryTestConfig.java b/backend/baton/src/test/java/touch/baton/config/RepositoryTestConfig.java
@@ -1,6 +1,5 @@
 package touch.baton.config;
 
-import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
@@ -24,16 +23,13 @@
 import static touch.baton.fixture.vo.DeadlineFixture.deadline;
 import static touch.baton.fixture.vo.TagNameFixture.tagName;
 
-@Import({JpaConfig.class, QuerydslConfig.class})
+@Import({JpaConfig.class, QueryDslRepositoryTestConfig.class})
 @DataJpaTest
 public abstract class RepositoryTestConfig {
 
     @Autowired
     protected EntityManager em;
 
-    @Autowired
-    protected JPAQueryFactory jpaQueryFactory;
-
     protected Runner persistRunner(final Member member) {
         em.persist(member);
         final Runner runner = RunnerFixture.createRunner(member);

diff --git a/backend/baton/src/test/java/touch/baton/config/ServiceTestConfig.java b/backend/baton/src/test/java/touch/baton/config/ServiceTestConfig.java
@@ -9,6 +9,7 @@
 import touch.baton.domain.member.query.repository.SupporterQueryRepository;
 import touch.baton.domain.member.query.repository.SupporterRunnerPostQueryRepository;
 import touch.baton.domain.runnerpost.command.repository.RunnerPostCommandRepository;
+import touch.baton.domain.runnerpost.query.repository.RunnerPostPageRepository;
 import touch.baton.domain.runnerpost.query.repository.RunnerPostQueryRepository;
 import touch.baton.domain.tag.command.repository.TagCommandRepository;
 import touch.baton.domain.tag.query.repository.RunnerPostTagQueryRepository;
@@ -31,6 +32,9 @@ public abstract class ServiceTestConfig extends RepositoryTestConfig {
     @Autowired
     protected RunnerPostQueryRepository runnerPostQueryRepository;
 
+    @Autowired
+    protected RunnerPostPageRepository runnerPostPageRepository;
+
     @Autowired
     protected SupporterRunnerPostQueryRepository supporterRunnerPostQueryRepository;
 

diff --git a/...est/java/touch/baton/document/runnerpost/read/RunnerPostReadWithLoginedRunnerApiTest.java b/...est/java/touch/baton/document/runnerpost/read/RunnerPostReadWithLoginedRunnerApiTest.java
@@ -25,6 +25,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -74,8 +75,7 @@ void readRunnerPostByLoginedRunnerAndReviewStatus() throws Exception {
 
         final Runner spyLoginedRunner = spy(loginedRunner);
         given(oauthRunnerCommandRepository.joinByMemberSocialId(any())).willReturn(Optional.ofNullable(spyLoginedRunner));
-        assert spyLoginedRunner != null;
-        given(spyLoginedRunner.getId()).willReturn(1L);
+        given(Objects.requireNonNull(spyLoginedRunner).getId()).willReturn(1L);
         final RunnerPost spyRunnerPost = spy(runnerPost);
         given(spyRunnerPost.getId()).willReturn(1L);
 

diff --git a/.../java/touch/baton/document/runnerpost/read/RunnerPostReadWithLoginedSupporterApiTest.java b/.../java/touch/baton/document/runnerpost/read/RunnerPostReadWithLoginedSupporterApiTest.java
@@ -27,6 +27,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -79,8 +80,7 @@ void readRunnerPostByLoginedSupporterAndReviewStatus() throws Exception {
 
         final Supporter spyLoginedSupporter = spy(loginedSupporter);
         given(oauthSupporterCommandRepository.joinByMemberSocialId(any())).willReturn(Optional.ofNullable(spyLoginedSupporter));
-        assert spyLoginedSupporter != null;
-        given(spyLoginedSupporter.getId()).willReturn(1L);
+        given(Objects.requireNonNull(spyLoginedSupporter).getId()).willReturn(1L);
         final RunnerPost spyRunnerPost = spy(runnerPost);
         given(spyRunnerPost.getId()).willReturn(1L);
 

diff --git a/...est/java/touch/baton/domain/runnerpost/query/repository/RunnerPostPageRepositoryTest.java b/...est/java/touch/baton/domain/runnerpost/query/repository/RunnerPostPageRepositoryTest.java
@@ -1,8 +1,8 @@
 package touch.baton.domain.runnerpost.query.repository;
 
-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 touch.baton.config.RepositoryTestConfig;
 import touch.baton.domain.member.command.Runner;
 import touch.baton.domain.member.command.Supporter;
@@ -27,13 +27,9 @@
 
 class RunnerPostPageRepositoryTest extends RepositoryTestConfig {
 
+    @Autowired
     private RunnerPostPageRepository runnerPostPageRepository;
 
-    @BeforeEach
-    void setUp() {
-        runnerPostPageRepository = new RunnerPostPageRepository(jpaQueryFactory);
-    }
-
     @DisplayName("러너 게시글을 페이징 조회한다 (중간 페이지 조회)")
     @Test
     void findByPageInfo() {

diff --git a/...src/test/java/touch/baton/domain/runnerpost/query/service/RunnerPostQueryServiceTest.java b/...src/test/java/touch/baton/domain/runnerpost/query/service/RunnerPostQueryServiceTest.java
@@ -27,7 +27,6 @@
 import touch.baton.domain.runnerpost.command.vo.Title;
 import touch.baton.domain.runnerpost.command.vo.WatchedCount;
 import touch.baton.domain.runnerpost.query.controller.response.RunnerPostResponse;
-import touch.baton.domain.runnerpost.query.repository.RunnerPostPageRepository;
 import touch.baton.domain.runnerpost.query.service.dto.PageParams;
 import touch.baton.domain.tag.command.RunnerPostTag;
 import touch.baton.domain.tag.command.RunnerPostTags;
@@ -64,7 +63,7 @@ class RunnerPostQueryServiceTest extends ServiceTestConfig {
     void setUp() {
         runnerPostQueryService = new RunnerPostQueryService(
                 runnerPostQueryRepository,
-                new RunnerPostPageRepository(jpaQueryFactory),
+                runnerPostPageRepository,
                 runnerPostTagQueryRepository,
                 supporterRunnerPostQueryRepository);
     }