refactor: 접근 제어자 추가 및 static import 제거

woowacourse-teams · Oct 15, 2024 · 7dcc5e2 · 7dcc5e2
1 parent d9a2228
commit 7dcc5e2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/backend/src/test/java/reviewme/highlight/domain/HighlightedLinesTest.java b/backend/src/test/java/reviewme/highlight/domain/HighlightedLinesTest.java
@@ -18,7 +18,7 @@
 class HighlightedLinesTest {
 
     @Autowired
-    ReviewRepository reviewRepository;
+    private ReviewRepository reviewRepository;
 
     @Test
     void 답변_내용으로_하이라이트에_사용될_라인을_생성한다() {

diff --git a/backend/src/test/java/reviewme/highlight/service/HighlightServiceTest.java b/backend/src/test/java/reviewme/highlight/service/HighlightServiceTest.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import reviewme.fixture.QuestionFixture;
 import reviewme.highlight.domain.Highlight;
 import reviewme.highlight.domain.HighlightRange;
 import reviewme.highlight.repository.HighlightRepository;
@@ -81,7 +80,7 @@ class HighlightServiceTest {
     @Test
     void 하이라이트_반영을_요청하면_새로운_하이라이트가_저장된다() {
         // given
-        long questionId = questionRepository.save(QuestionFixture.서술형_필수_질문()).getId();
+        long questionId = questionRepository.save(서술형_필수_질문()).getId();
         long sectionId = sectionRepository.save(항상_보이는_섹션(List.of(questionId))).getId();
         long templateId = templateRepository.save(템플릿(List.of(sectionId))).getId();
         String reviewRequestCode = "reviewRequestCode";

diff --git a/backend/src/test/java/reviewme/highlight/service/mapper/HighlightMapperTest.java b/backend/src/test/java/reviewme/highlight/service/mapper/HighlightMapperTest.java
@@ -2,14 +2,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static reviewme.fixture.QuestionFixture.서술형_필수_질문;
+import static reviewme.fixture.ReviewGroupFixture.리뷰_그룹;
 import static reviewme.fixture.SectionFixture.항상_보이는_섹션;
 import static reviewme.fixture.TemplateFixture.템플릿;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import reviewme.fixture.QuestionFixture;
-import reviewme.fixture.ReviewGroupFixture;
 import reviewme.highlight.domain.Highlight;
 import reviewme.highlight.domain.HighlightRange;
 import reviewme.highlight.repository.HighlightRepository;
@@ -30,7 +30,7 @@
 class HighlightMapperTest {
 
     @Autowired
-    HighlightMapper highlightMapper;
+    private HighlightMapper highlightMapper;
 
     @Autowired
     private HighlightRepository highlightRepository;
@@ -53,11 +53,11 @@ class HighlightMapperTest {
     @Test
     void 하이라이트_요청과_기존_서술형_답변으로_하이라이트를_매핑한다() {
         // given
-        long questionId = questionRepository.save(QuestionFixture.서술형_필수_질문()).getId();
+        long questionId = questionRepository.save(서술형_필수_질문()).getId();
         long sectionId = sectionRepository.save(항상_보이는_섹션(List.of(questionId))).getId();
         long templateId = templateRepository.save(템플릿(List.of(sectionId))).getId();
         String reviewRequestCode = "reviewRequestCode";
-        long reviewGroupId = reviewGroupRepository.save(ReviewGroupFixture.리뷰_그룹(reviewRequestCode, "groupAccessCode"))
+        long reviewGroupId = reviewGroupRepository.save(리뷰_그룹(reviewRequestCode, "groupAccessCode"))
                 .getId();
 
         TextAnswer textAnswer1 = new TextAnswer(questionId, "text answer1");

diff --git a/backend/src/test/java/reviewme/highlight/service/validator/HighlightValidatorTest.java b/backend/src/test/java/reviewme/highlight/service/validator/HighlightValidatorTest.java
@@ -1,14 +1,14 @@
 package reviewme.highlight.service.validator;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static reviewme.fixture.QuestionFixture.서술형_필수_질문;
+import static reviewme.fixture.ReviewGroupFixture.리뷰_그룹;
 import static reviewme.fixture.SectionFixture.항상_보이는_섹션;
 import static reviewme.fixture.TemplateFixture.템플릿;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import reviewme.fixture.QuestionFixture;
-import reviewme.fixture.ReviewGroupFixture;
 import reviewme.highlight.service.dto.HighlightRequest;
 import reviewme.highlight.service.dto.HighlightsRequest;
 import reviewme.highlight.service.exception.SubmittedAnswerAndProvidedAnswerMismatchException;
@@ -48,12 +48,12 @@ class HighlightValidatorTest {
     @Test
     void 하이라이트의_답변_id가_하이라이트의_질문_id에_해당하는_답변이_아니면_예외를_발생한다() {
         // given
-        long questionId1 = questionRepository.save(QuestionFixture.서술형_필수_질문()).getId();
-        long questionId2 = questionRepository.save(QuestionFixture.서술형_필수_질문()).getId();
+        long questionId1 = questionRepository.save(서술형_필수_질문()).getId();
+        long questionId2 = questionRepository.save(서술형_필수_질문()).getId();
         Section section = sectionRepository.save(항상_보이는_섹션(List.of(questionId1, questionId2)));
         Template template = templateRepository.save(템플릿(List.of(section.getId())));
 
-        ReviewGroup reviewGroup = reviewGroupRepository.save(ReviewGroupFixture.리뷰_그룹());
+        ReviewGroup reviewGroup = reviewGroupRepository.save(리뷰_그룹());
         TextAnswer textAnswer_Q1 = new TextAnswer(questionId1, "text answer 1");
 
         HighlightRequest highlightRequest = new HighlightRequest(textAnswer_Q1.getId(), List.of());
@@ -67,12 +67,12 @@ class HighlightValidatorTest {
     @Test
     void 하이라이트의_답변_id가_리뷰_그룹에_달린_답변이_아니면_예외를_발생한다() {
         // given
-        long questionId = questionRepository.save(QuestionFixture.서술형_필수_질문()).getId();
+        long questionId = questionRepository.save(서술형_필수_질문()).getId();
         Section section = sectionRepository.save(항상_보이는_섹션(List.of(questionId)));
         Template template = templateRepository.save(템플릿(List.of(section.getId())));
 
-        ReviewGroup reviewGroup1 = reviewGroupRepository.save(ReviewGroupFixture.리뷰_그룹());
-        ReviewGroup reviewGroup2 = reviewGroupRepository.save(ReviewGroupFixture.리뷰_그룹());
+        ReviewGroup reviewGroup1 = reviewGroupRepository.save(리뷰_그룹());
+        ReviewGroup reviewGroup2 = reviewGroupRepository.save(리뷰_그룹());
         TextAnswer textAnswer1 = new TextAnswer(questionId, "text answer1");
         TextAnswer textAnswer2 = new TextAnswer(questionId, "text answer2");
         reviewRepository.saveAll(List.of(
@@ -91,12 +91,12 @@ class HighlightValidatorTest {
     @Test
     void 하이라이트의_질문_id가_리뷰_그룹의_템플릿에_속한_질문이_아니면_예외를_발생한다() {
         // given
-        long questionId1 = questionRepository.save(QuestionFixture.서술형_필수_질문()).getId();
-        long questionId2 = questionRepository.save(QuestionFixture.서술형_필수_질문()).getId();
+        long questionId1 = questionRepository.save(서술형_필수_질문()).getId();
+        long questionId2 = questionRepository.save(서술형_필수_질문()).getId();
         Section section = sectionRepository.save(항상_보이는_섹션(List.of(questionId1)));
         Template template = templateRepository.save(템플릿(List.of(section.getId())));
 
-        ReviewGroup reviewGroup = reviewGroupRepository.save(ReviewGroupFixture.리뷰_그룹());
+        ReviewGroup reviewGroup = reviewGroupRepository.save(리뷰_그룹());
         TextAnswer textAnswer_Q1 = new TextAnswer(questionId1, "text answer 1");
 
         HighlightRequest highlightRequest = new HighlightRequest(textAnswer_Q1.getId(), List.of());