From 4413b0c77b81c18ef75ad2a761436e7180571f44 Mon Sep 17 00:00:00 2001 From: MangKyu Date: Tue, 4 Jan 2022 20:49:12 +0900 Subject: [PATCH] Modify JpaTestConfig --- .../employment/interview/JpaTestConfig.java | 15 +++++++++++++++ .../answer/repository/AnswerRepositoryTest.java | 4 ++-- .../app/quiz/repository/QuizRepositoryTest.java | 8 +++----- .../repository/SolvedQuizRepositoryTest.java | 4 ++-- .../app/user/repository/UserRepositoryTest.java | 4 ++-- 5 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 src/test/java/com/mangkyu/employment/interview/JpaTestConfig.java diff --git a/src/test/java/com/mangkyu/employment/interview/JpaTestConfig.java b/src/test/java/com/mangkyu/employment/interview/JpaTestConfig.java new file mode 100644 index 0000000..5c80a69 --- /dev/null +++ b/src/test/java/com/mangkyu/employment/interview/JpaTestConfig.java @@ -0,0 +1,15 @@ +package com.mangkyu.employment.interview; + + +import com.mangkyu.employment.interview.config.querydsl.QueryDslConfig; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.context.annotation.Import; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Import({QueryDslConfig.class}) +@DataJpaTest +@Retention(RetentionPolicy.RUNTIME) +public @interface JpaTestConfig { +} diff --git a/src/test/java/com/mangkyu/employment/interview/app/answer/repository/AnswerRepositoryTest.java b/src/test/java/com/mangkyu/employment/interview/app/answer/repository/AnswerRepositoryTest.java index 056be41..7d4817d 100644 --- a/src/test/java/com/mangkyu/employment/interview/app/answer/repository/AnswerRepositoryTest.java +++ b/src/test/java/com/mangkyu/employment/interview/app/answer/repository/AnswerRepositoryTest.java @@ -1,19 +1,19 @@ package com.mangkyu.employment.interview.app.answer.repository; +import com.mangkyu.employment.interview.JpaTestConfig; import com.mangkyu.employment.interview.app.answer.entity.Answer; import com.mangkyu.employment.interview.app.quiz.entity.Quiz; import com.mangkyu.employment.interview.app.quiz.repository.QuizRepository; import com.mangkyu.employment.interview.testutils.EntityCreationUtils; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import javax.persistence.EntityManager; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@DataJpaTest +@JpaTestConfig class AnswerRepositoryTest { @Autowired diff --git a/src/test/java/com/mangkyu/employment/interview/app/quiz/repository/QuizRepositoryTest.java b/src/test/java/com/mangkyu/employment/interview/app/quiz/repository/QuizRepositoryTest.java index e5401ae..10bc3e5 100644 --- a/src/test/java/com/mangkyu/employment/interview/app/quiz/repository/QuizRepositoryTest.java +++ b/src/test/java/com/mangkyu/employment/interview/app/quiz/repository/QuizRepositoryTest.java @@ -1,8 +1,8 @@ package com.mangkyu.employment.interview.app.quiz.repository; +import com.mangkyu.employment.interview.JpaTestConfig; import com.mangkyu.employment.interview.app.quiz.dto.QuizSearchCondition; import com.mangkyu.employment.interview.app.quiz.entity.Quiz; -import com.mangkyu.employment.interview.config.querydsl.QueryDslConfig; import com.mangkyu.employment.interview.enums.value.QuizCategory; import com.mangkyu.employment.interview.enums.value.QuizLevel; import com.mangkyu.employment.interview.testutils.EntityCreationUtils; @@ -11,8 +11,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.context.annotation.Import; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -21,8 +19,8 @@ import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; -@DataJpaTest -@Import({QueryDslConfig.class}) + +@JpaTestConfig class QuizRepositoryTest { @Autowired diff --git a/src/test/java/com/mangkyu/employment/interview/app/solvedquiz/repository/SolvedQuizRepositoryTest.java b/src/test/java/com/mangkyu/employment/interview/app/solvedquiz/repository/SolvedQuizRepositoryTest.java index 986bafe..b313d61 100644 --- a/src/test/java/com/mangkyu/employment/interview/app/solvedquiz/repository/SolvedQuizRepositoryTest.java +++ b/src/test/java/com/mangkyu/employment/interview/app/solvedquiz/repository/SolvedQuizRepositoryTest.java @@ -1,5 +1,6 @@ package com.mangkyu.employment.interview.app.solvedquiz.repository; +import com.mangkyu.employment.interview.JpaTestConfig; import com.mangkyu.employment.interview.app.quiz.entity.Quiz; import com.mangkyu.employment.interview.app.quiz.repository.QuizRepository; import com.mangkyu.employment.interview.app.solvedquiz.entity.SolvedQuiz; @@ -8,11 +9,10 @@ import com.mangkyu.employment.interview.app.user.repository.UserRepository; import com.mangkyu.employment.interview.testutils.EntityCreationUtils; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import static org.assertj.core.api.Assertions.assertThat; -@DataJpaTest +@JpaTestConfig class SolvedQuizRepositoryTest { @Autowired diff --git a/src/test/java/com/mangkyu/employment/interview/app/user/repository/UserRepositoryTest.java b/src/test/java/com/mangkyu/employment/interview/app/user/repository/UserRepositoryTest.java index f162e45..5de017d 100644 --- a/src/test/java/com/mangkyu/employment/interview/app/user/repository/UserRepositoryTest.java +++ b/src/test/java/com/mangkyu/employment/interview/app/user/repository/UserRepositoryTest.java @@ -1,12 +1,12 @@ package com.mangkyu.employment.interview.app.user.repository; +import com.mangkyu.employment.interview.JpaTestConfig; import com.mangkyu.employment.interview.app.user.entity.User; import com.mangkyu.employment.interview.enums.value.QuizCategory; import com.mangkyu.employment.interview.enums.value.QuizDay; import com.mangkyu.employment.interview.testutils.EntityCreationUtils; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import java.util.HashSet; import java.util.List; @@ -14,7 +14,7 @@ import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -@DataJpaTest +@JpaTestConfig class UserRepositoryTest { @Autowired