From 93805c3c9e5089e678ce222bcd1a91f5feb54f3a Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:22:40 +0900 Subject: [PATCH 01/11] =?UTF-8?q?feat:=20GpaScoreFixture=EC=97=90=20GPA?= =?UTF-8?q?=EC=A0=90=EC=88=98=20=EC=83=9D=EC=84=B1=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../score/fixture/GpaScoreFixture.java | 27 +++++++++++ .../score/fixture/GpaScoreFixtureBuilder.java | 45 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java create mode 100644 src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixtureBuilder.java diff --git a/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java new file mode 100644 index 000000000..9353063f1 --- /dev/null +++ b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java @@ -0,0 +1,27 @@ +package com.example.solidconnection.score.fixture; + +import com.example.solidconnection.application.domain.Gpa; +import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.score.domain.GpaScore; +import com.example.solidconnection.siteuser.domain.SiteUser; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.test.context.TestComponent; + +@TestComponent +@RequiredArgsConstructor +public class GpaScoreFixture { + + private final GpaScoreFixtureBuilder gpaScoreFixtureBuilder; + + public GpaScore GPA점수( + Double gpa, + Double gpaCriteria, + VerifyStatus verifyStatus, + SiteUser siteUser) { + return gpaScoreFixtureBuilder.gpaScore() + .gpa(new Gpa(gpa, gpaCriteria, "/gpa-report.pdf")) + .verifyStatus(verifyStatus) + .siteUser(siteUser) + .create(); + } +} diff --git a/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixtureBuilder.java b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixtureBuilder.java new file mode 100644 index 000000000..a5a18e006 --- /dev/null +++ b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixtureBuilder.java @@ -0,0 +1,45 @@ +package com.example.solidconnection.score.fixture; + +import com.example.solidconnection.application.domain.Gpa; +import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.score.domain.GpaScore; +import com.example.solidconnection.score.repository.GpaScoreRepository; +import com.example.solidconnection.siteuser.domain.SiteUser; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.test.context.TestComponent; + +@TestComponent +@RequiredArgsConstructor +public class GpaScoreFixtureBuilder { + + private final GpaScoreRepository gpaScoreRepository; + + private Gpa gpa; + private VerifyStatus verifyStatus; + private SiteUser siteUser; + + public GpaScoreFixtureBuilder gpaScore() { + return new GpaScoreFixtureBuilder(gpaScoreRepository); + } + + public GpaScoreFixtureBuilder gpa(Gpa gpa) { + this.gpa = gpa; + return this; + } + + public GpaScoreFixtureBuilder verifyStatus(VerifyStatus verifyStatus) { + this.verifyStatus = verifyStatus; + return this; + } + + public GpaScoreFixtureBuilder siteUser(SiteUser siteUser) { + this.siteUser = siteUser; + return this; + } + + public GpaScore create() { + GpaScore gpaScore = new GpaScore(gpa, siteUser); + gpaScore.setVerifyStatus(verifyStatus); + return gpaScoreRepository.save(gpaScore); + } +} From d41f6b50a8e238f0cccec939151efe24fb4a9bff Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:23:49 +0900 Subject: [PATCH 02/11] =?UTF-8?q?refactor:=20GPA=EC=A0=90=EC=88=98=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20Fixture=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdminGpaScoreServiceTest.java | 27 +++++++------------ .../score/service/ScoreServiceTest.java | 18 +++++-------- 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index a891759cd..b59483772 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -4,14 +4,13 @@ import com.example.solidconnection.admin.dto.GpaScoreSearchResponse; import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; -import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.GpaScore; -import com.example.solidconnection.score.repository.GpaScoreRepository; +import com.example.solidconnection.score.fixture.GpaScoreFixture; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; -import com.example.solidconnection.support.integration.BaseIntegrationTest; +import com.example.solidconnection.support.TestContainerSpringBootTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -29,17 +28,18 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; +@TestContainerSpringBootTest @DisplayName("학점 검증 관리자 서비스 테스트") -class AdminGpaScoreServiceTest extends BaseIntegrationTest { +class AdminGpaScoreServiceTest { @Autowired private AdminGpaScoreService adminGpaScoreService; @Autowired - private GpaScoreRepository gpaScoreRepository; + private SiteUserFixture siteUserFixture; @Autowired - private SiteUserFixture siteUserFixture; + private GpaScoreFixture gpaScoreFixture; private GpaScore gpaScore1; private GpaScore gpaScore2; @@ -50,9 +50,9 @@ void setUp() { SiteUser user1 = siteUserFixture.사용자(1, "test1"); SiteUser user2 = siteUserFixture.사용자(2, "test2"); SiteUser user3 = siteUserFixture.사용자(3, "test3"); - gpaScore3 = createGpaScore(user3, VerifyStatus.REJECTED); - gpaScore2 = createGpaScore(user2, VerifyStatus.PENDING); - gpaScore1 = createGpaScore(user1, VerifyStatus.PENDING); + gpaScore3 = gpaScoreFixture.GPA점수(3.5, 4.5, VerifyStatus.REJECTED, user3); + gpaScore2 = gpaScoreFixture.GPA점수(3.5, 4.5, VerifyStatus.PENDING, user2); + gpaScore1 = gpaScoreFixture.GPA점수(3.5, 4.5, VerifyStatus.PENDING, user1); } @Nested @@ -203,13 +203,4 @@ class GPA_점수_검증_및_수정 { .hasMessage(GPA_SCORE_NOT_FOUND.getMessage()); } } - - private GpaScore createGpaScore(SiteUser siteUser, VerifyStatus status) { - GpaScore gpaScore = new GpaScore( - new Gpa(4.0, 4.5, "/gpa-report.pdf"), - siteUser - ); - gpaScore.setVerifyStatus(status); - return gpaScoreRepository.save(gpaScore); - } } diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index e03813607..6fdd31a30 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -1,6 +1,5 @@ package com.example.solidconnection.score.service; -import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.s3.domain.ImgType; @@ -14,6 +13,7 @@ import com.example.solidconnection.score.dto.LanguageTestScoreRequest; import com.example.solidconnection.score.dto.LanguageTestScoreStatusResponse; import com.example.solidconnection.score.dto.LanguageTestScoreStatusesResponse; +import com.example.solidconnection.score.fixture.GpaScoreFixture; import com.example.solidconnection.score.repository.GpaScoreRepository; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -55,6 +55,9 @@ class ScoreServiceTest extends BaseIntegrationTest { @Autowired private SiteUserFixture siteUserFixture; + @Autowired + private GpaScoreFixture gpaScoreFixture; + private SiteUser user; @BeforeEach @@ -66,8 +69,8 @@ void setUp() { void GPA_점수_상태를_조회한다() { // given List scores = List.of( - createGpaScore(user, 3.5, 4.5), - createGpaScore(user, 3.8, 4.5) + gpaScoreFixture.GPA점수(3.5, 4.5, VerifyStatus.PENDING, user), + gpaScoreFixture.GPA점수(3.8, 4.5, VerifyStatus.APPROVED, user) ); // when @@ -167,15 +170,6 @@ void setUp() { ); } - private GpaScore createGpaScore(SiteUser siteUser, double gpa, double gpaCriteria) { - GpaScore gpaScore = new GpaScore( - new Gpa(gpa, gpaCriteria, "/gpa-report.pdf"), - siteUser - ); - gpaScore.setSiteUser(siteUser); - return gpaScoreRepository.save(gpaScore); - } - private LanguageTestScore createLanguageTestScore(SiteUser siteUser, LanguageTestType languageTestType, String score) { LanguageTestScore languageTestScore = new LanguageTestScore( new LanguageTest(languageTestType, score, "/gpa-report.pdf"), From ae730bb3e9053ce2a807a253a107f48a429f6581 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:27:24 +0900 Subject: [PATCH 03/11] =?UTF-8?q?fix:=20=EC=96=91=EB=B0=A9=ED=96=A5=20?= =?UTF-8?q?=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../solidconnection/score/fixture/GpaScoreFixtureBuilder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixtureBuilder.java b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixtureBuilder.java index a5a18e006..7943008b4 100644 --- a/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixtureBuilder.java @@ -39,6 +39,7 @@ public GpaScoreFixtureBuilder siteUser(SiteUser siteUser) { public GpaScore create() { GpaScore gpaScore = new GpaScore(gpa, siteUser); + gpaScore.setSiteUser(siteUser); gpaScore.setVerifyStatus(verifyStatus); return gpaScoreRepository.save(gpaScore); } From c82688c9e8106860bf656ffb0ac8bf95d35a6bb5 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:29:57 +0900 Subject: [PATCH 04/11] =?UTF-8?q?refacotr:=20GPA=5F=EC=A0=90=EC=88=98?= =?UTF-8?q?=EB=A1=9C=20=ED=95=A8=EC=88=98=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminGpaScoreServiceTest.java | 6 +++--- .../solidconnection/score/fixture/GpaScoreFixture.java | 2 +- .../solidconnection/score/service/ScoreServiceTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index b59483772..273cbdcad 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -50,9 +50,9 @@ void setUp() { SiteUser user1 = siteUserFixture.사용자(1, "test1"); SiteUser user2 = siteUserFixture.사용자(2, "test2"); SiteUser user3 = siteUserFixture.사용자(3, "test3"); - gpaScore3 = gpaScoreFixture.GPA점수(3.5, 4.5, VerifyStatus.REJECTED, user3); - gpaScore2 = gpaScoreFixture.GPA점수(3.5, 4.5, VerifyStatus.PENDING, user2); - gpaScore1 = gpaScoreFixture.GPA점수(3.5, 4.5, VerifyStatus.PENDING, user1); + gpaScore3 = gpaScoreFixture.GPA_점수(3.5, 4.5, VerifyStatus.REJECTED, user3); + gpaScore2 = gpaScoreFixture.GPA_점수(3.5, 4.5, VerifyStatus.PENDING, user2); + gpaScore1 = gpaScoreFixture.GPA_점수(3.5, 4.5, VerifyStatus.PENDING, user1); } @Nested diff --git a/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java index 9353063f1..c8ebcb03c 100644 --- a/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java +++ b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java @@ -13,7 +13,7 @@ public class GpaScoreFixture { private final GpaScoreFixtureBuilder gpaScoreFixtureBuilder; - public GpaScore GPA점수( + public GpaScore GPA_점수 ( Double gpa, Double gpaCriteria, VerifyStatus verifyStatus, diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 6fdd31a30..a5264d533 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -69,8 +69,8 @@ void setUp() { void GPA_점수_상태를_조회한다() { // given List scores = List.of( - gpaScoreFixture.GPA점수(3.5, 4.5, VerifyStatus.PENDING, user), - gpaScoreFixture.GPA점수(3.8, 4.5, VerifyStatus.APPROVED, user) + gpaScoreFixture.GPA_점수(3.5, 4.5, VerifyStatus.PENDING, user), + gpaScoreFixture.GPA_점수(3.8, 4.5, VerifyStatus.APPROVED, user) ); // when From 1270d2ed5ba6a0abff7039f2750fbc8846b1377c Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:43:14 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat:=20LanguageTestScoreFixture=EC=97=90?= =?UTF-8?q?=20=EC=96=B4=ED=95=99=EC=A0=90=EC=88=98=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fixture/LanguageTestScoreFixture.java | 28 +++++++++++ .../LanguageTestScoreFixtureBuilder.java | 46 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixture.java create mode 100644 src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixtureBuilder.java diff --git a/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixture.java b/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixture.java new file mode 100644 index 000000000..7d4261868 --- /dev/null +++ b/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixture.java @@ -0,0 +1,28 @@ +package com.example.solidconnection.score.fixture; + +import com.example.solidconnection.application.domain.LanguageTest; +import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.score.domain.LanguageTestScore; +import com.example.solidconnection.siteuser.domain.SiteUser; +import com.example.solidconnection.university.domain.LanguageTestType; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.test.context.TestComponent; + +@TestComponent +@RequiredArgsConstructor +public class LanguageTestScoreFixture { + + private final LanguageTestScoreFixtureBuilder languageTestScoreFixtureBuilder; + + public LanguageTestScore 어학_점수 ( + LanguageTestType languageTestType, + String languageTestScore, + VerifyStatus verifyStatus, + SiteUser siteUser) { + return languageTestScoreFixtureBuilder.languageTestScore() + .languageTest(new LanguageTest(languageTestType, languageTestScore, "/language-report.pdf")) + .verifyStatus(verifyStatus) + .siteUser(siteUser) + .create(); + } +} diff --git a/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixtureBuilder.java b/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixtureBuilder.java new file mode 100644 index 000000000..fd5a8d417 --- /dev/null +++ b/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixtureBuilder.java @@ -0,0 +1,46 @@ +package com.example.solidconnection.score.fixture; + +import com.example.solidconnection.application.domain.LanguageTest; +import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.score.domain.LanguageTestScore; +import com.example.solidconnection.score.repository.LanguageTestScoreRepository; +import com.example.solidconnection.siteuser.domain.SiteUser; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.test.context.TestComponent; + +@TestComponent +@RequiredArgsConstructor +public class LanguageTestScoreFixtureBuilder { + + private final LanguageTestScoreRepository languageTestScoreRepository; + + private LanguageTest languageTest; + private VerifyStatus verifyStatus; + private SiteUser siteUser; + + public LanguageTestScoreFixtureBuilder languageTestScore() { + return new LanguageTestScoreFixtureBuilder(languageTestScoreRepository); + } + + public LanguageTestScoreFixtureBuilder languageTest(LanguageTest languageTest) { + this.languageTest = languageTest; + return this; + } + + public LanguageTestScoreFixtureBuilder verifyStatus(VerifyStatus verifyStatus) { + this.verifyStatus = verifyStatus; + return this; + } + + public LanguageTestScoreFixtureBuilder siteUser(SiteUser siteUser) { + this.siteUser = siteUser; + return this; + } + + public LanguageTestScore create() { + LanguageTestScore languageTestScore = new LanguageTestScore(languageTest, siteUser); + languageTestScore.setSiteUser(siteUser); + languageTestScore.setVerifyStatus(verifyStatus); + return languageTestScoreRepository.save(languageTestScore); + } +} From 69d4c676f928098d83874b412cd7fb430adaa402 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:45:03 +0900 Subject: [PATCH 06/11] =?UTF-8?q?refactor:=20=EC=96=B4=ED=95=99=EC=A0=90?= =?UTF-8?q?=EC=88=98=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20Fixture=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminLanguageTestScoreServiceTest.java | 27 ++++++------------ .../score/service/ScoreServiceTest.java | 28 ++++++------------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index 3fe3eb5a8..1b3308cda 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -4,14 +4,13 @@ import com.example.solidconnection.admin.dto.LanguageTestScoreSearchResponse; import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; -import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.LanguageTestScore; -import com.example.solidconnection.score.repository.LanguageTestScoreRepository; +import com.example.solidconnection.score.fixture.LanguageTestScoreFixture; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; -import com.example.solidconnection.support.integration.BaseIntegrationTest; +import com.example.solidconnection.support.TestContainerSpringBootTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -30,17 +29,18 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; +@TestContainerSpringBootTest @DisplayName("어학 검증 관리자 서비스 테스트") -class AdminLanguageTestScoreServiceTest extends BaseIntegrationTest { +class AdminLanguageTestScoreServiceTest { @Autowired private AdminLanguageTestScoreService adminLanguageTestScoreService; @Autowired - private LanguageTestScoreRepository languageTestScoreRepository; + private SiteUserFixture siteUserFixture; @Autowired - private SiteUserFixture siteUserFixture; + private LanguageTestScoreFixture languageTestScoreFixture; private LanguageTestScore languageTestScore1; private LanguageTestScore languageTestScore2; @@ -51,9 +51,9 @@ void setUp() { SiteUser user1 = siteUserFixture.사용자(1, "test1"); SiteUser user2 = siteUserFixture.사용자(2, "test2"); SiteUser user3 = siteUserFixture.사용자(3, "test3"); - languageTestScore3 = createLanguageTestScore(user3, VerifyStatus.REJECTED); - languageTestScore2 = createLanguageTestScore(user2, VerifyStatus.PENDING); - languageTestScore1 = createLanguageTestScore(user1, VerifyStatus.PENDING); + languageTestScore3 = languageTestScoreFixture.어학_점수(TOEIC, "500", VerifyStatus.REJECTED, user3); + languageTestScore2 = languageTestScoreFixture.어학_점수(TOEIC, "500", VerifyStatus.PENDING, user2); + languageTestScore1 = languageTestScoreFixture.어학_점수(TOEIC, "500", VerifyStatus.PENDING, user1); } @Nested @@ -213,13 +213,4 @@ class 어학점수_검증_및_수정 { .hasMessage(LANGUAGE_TEST_SCORE_NOT_FOUND.getMessage()); } } - - private LanguageTestScore createLanguageTestScore(SiteUser siteUser, VerifyStatus status) { - LanguageTestScore languageTestScore = new LanguageTestScore( - new LanguageTest(TOEIC, "500", "/toeic-report.pdf"), - siteUser - ); - languageTestScore.setVerifyStatus(status); - return languageTestScoreRepository.save(languageTestScore); - } } diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index a5264d533..cfc042e8b 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -1,6 +1,5 @@ package com.example.solidconnection.score.service; -import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; @@ -14,12 +13,12 @@ import com.example.solidconnection.score.dto.LanguageTestScoreStatusResponse; import com.example.solidconnection.score.dto.LanguageTestScoreStatusesResponse; import com.example.solidconnection.score.fixture.GpaScoreFixture; +import com.example.solidconnection.score.fixture.LanguageTestScoreFixture; import com.example.solidconnection.score.repository.GpaScoreRepository; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; -import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.support.integration.BaseIntegrationTest; +import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.university.domain.LanguageTestType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -34,8 +33,9 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.BDDMockito.given; +@TestContainerSpringBootTest @DisplayName("점수 서비스 테스트") -class ScoreServiceTest extends BaseIntegrationTest { +class ScoreServiceTest { @Autowired private ScoreService scoreService; @@ -43,9 +43,6 @@ class ScoreServiceTest extends BaseIntegrationTest { @Autowired private GpaScoreRepository gpaScoreRepository; - @Autowired - private SiteUserRepository siteUserRepository; - @Autowired private LanguageTestScoreRepository languageTestScoreRepository; @@ -58,6 +55,9 @@ class ScoreServiceTest extends BaseIntegrationTest { @Autowired private GpaScoreFixture gpaScoreFixture; + @Autowired + private LanguageTestScoreFixture languageTestScoreFixture; + private SiteUser user; @BeforeEach @@ -99,10 +99,9 @@ void setUp() { void 어학_시험_점수_상태를_조회한다() { // given List scores = List.of( - createLanguageTestScore(user, LanguageTestType.TOEIC, "100"), - createLanguageTestScore(user, LanguageTestType.TOEFL_IBT, "7.5") + languageTestScoreFixture.어학_점수(LanguageTestType.TOEIC, "100", VerifyStatus.PENDING, user), + languageTestScoreFixture.어학_점수(LanguageTestType.TOEFL_IBT, "7.5", VerifyStatus.PENDING, user) ); - siteUserRepository.save(user); // when LanguageTestScoreStatusesResponse response = scoreService.getLanguageTestScoreStatus(user); @@ -170,15 +169,6 @@ void setUp() { ); } - private LanguageTestScore createLanguageTestScore(SiteUser siteUser, LanguageTestType languageTestType, String score) { - LanguageTestScore languageTestScore = new LanguageTestScore( - new LanguageTest(languageTestType, score, "/gpa-report.pdf"), - siteUser - ); - languageTestScore.setSiteUser(siteUser); - return languageTestScoreRepository.save(languageTestScore); - } - private GpaScoreRequest createGpaScoreRequest() { return new GpaScoreRequest( 3.5, From 3e49fb014a5333c1cf9ead16fb4969fe92f0da10 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:50:06 +0900 Subject: [PATCH 07/11] =?UTF-8?q?test:=20score=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=97=90=EC=84=9C=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=ED=95=84=EB=93=9C=20=EA=B2=80=EC=A6=9D=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdminGpaScoreServiceTest.java | 42 ++-------------- .../AdminLanguageTestScoreServiceTest.java | 50 ++----------------- .../score/service/ScoreServiceTest.java | 35 ++----------- 3 files changed, 10 insertions(+), 117 deletions(-) diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index 273cbdcad..846ead0d0 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -69,19 +69,7 @@ class 지원한_GPA_목록_조회 { Page response = adminGpaScoreService.searchGpaScores(condition, pageable); // then - assertThat(response.getContent()) - .hasSize(expectedGpaScores.size()) - .zipSatisfy(expectedGpaScores, (actual, expected) -> assertAll( - () -> assertThat(actual.gpaScoreStatusResponse().id()).isEqualTo(expected.getId()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpa()).isEqualTo(expected.getGpa().getGpa()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpaCriteria()).isEqualTo(expected.getGpa().getGpaCriteria()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpaReportUrl()).isEqualTo(expected.getGpa().getGpaReportUrl()), - () -> assertThat(actual.gpaScoreStatusResponse().verifyStatus()).isEqualTo(expected.getVerifyStatus()), - - () -> assertThat(actual.siteUserResponse().id()).isEqualTo(expected.getSiteUser().getId()), - () -> assertThat(actual.siteUserResponse().profileImageUrl()).isEqualTo(expected.getSiteUser().getProfileImageUrl()), - () -> assertThat(actual.siteUserResponse().nickname()).isEqualTo(expected.getSiteUser().getNickname()) - )); + assertThat(response.getContent()).hasSize(expectedGpaScores.size()); } @Test @@ -95,19 +83,7 @@ class 지원한_GPA_목록_조회 { Page response = adminGpaScoreService.searchGpaScores(condition, pageable); // then - assertThat(response.getContent()) - .hasSize(expectedGpaScores.size()) - .zipSatisfy(expectedGpaScores, (actual, expected) -> assertAll( - () -> assertThat(actual.gpaScoreStatusResponse().id()).isEqualTo(expected.getId()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpa()).isEqualTo(expected.getGpa().getGpa()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpaCriteria()).isEqualTo(expected.getGpa().getGpaCriteria()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpaReportUrl()).isEqualTo(expected.getGpa().getGpaReportUrl()), - () -> assertThat(actual.gpaScoreStatusResponse().verifyStatus()).isEqualTo(expected.getVerifyStatus()), - - () -> assertThat(actual.siteUserResponse().id()).isEqualTo(expected.getSiteUser().getId()), - () -> assertThat(actual.siteUserResponse().profileImageUrl()).isEqualTo(expected.getSiteUser().getProfileImageUrl()), - () -> assertThat(actual.siteUserResponse().nickname()).isEqualTo(expected.getSiteUser().getNickname()) - )); + assertThat(response.getContent()).hasSize(expectedGpaScores.size()); } @Test @@ -121,19 +97,7 @@ class 지원한_GPA_목록_조회 { Page response = adminGpaScoreService.searchGpaScores(condition, pageable); // then - assertThat(response.getContent()) - .hasSize(expectedGpaScores.size()) - .zipSatisfy(expectedGpaScores, (actual, expected) -> assertAll( - () -> assertThat(actual.gpaScoreStatusResponse().id()).isEqualTo(expected.getId()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpa()).isEqualTo(expected.getGpa().getGpa()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpaCriteria()).isEqualTo(expected.getGpa().getGpaCriteria()), - () -> assertThat(actual.gpaScoreStatusResponse().gpaResponse().gpaReportUrl()).isEqualTo(expected.getGpa().getGpaReportUrl()), - () -> assertThat(actual.gpaScoreStatusResponse().verifyStatus()).isEqualTo(expected.getVerifyStatus()), - - () -> assertThat(actual.siteUserResponse().id()).isEqualTo(expected.getSiteUser().getId()), - () -> assertThat(actual.siteUserResponse().profileImageUrl()).isEqualTo(expected.getSiteUser().getProfileImageUrl()), - () -> assertThat(actual.siteUserResponse().nickname()).isEqualTo(expected.getSiteUser().getNickname()) - )); + assertThat(response.getContent()).hasSize(expectedGpaScores.size()); } } diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index 1b3308cda..208c28846 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -70,22 +70,7 @@ class 지원한_어학_목록_조회 { Page response = adminLanguageTestScoreService.searchLanguageTestScores(condition, pageable); // then - assertThat(response.getContent()) - .hasSize(expectedLanguageTestScores.size()) - .zipSatisfy(expectedLanguageTestScores, (actual, expected) -> assertAll( - () -> assertThat(actual.languageTestScoreStatusResponse().id()).isEqualTo(expected.getId()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestType()) - .isEqualTo(expected.getLanguageTest().getLanguageTestType()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestScore()) - .isEqualTo(expected.getLanguageTest().getLanguageTestScore()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestReportUrl()) - .isEqualTo(expected.getLanguageTest().getLanguageTestReportUrl()), - () -> assertThat(actual.languageTestScoreStatusResponse().verifyStatus()).isEqualTo(expected.getVerifyStatus()), - - () -> assertThat(actual.siteUserResponse().id()).isEqualTo(expected.getSiteUser().getId()), - () -> assertThat(actual.siteUserResponse().profileImageUrl()).isEqualTo(expected.getSiteUser().getProfileImageUrl()), - () -> assertThat(actual.siteUserResponse().nickname()).isEqualTo(expected.getSiteUser().getNickname()) - )); + assertThat(response.getContent()).hasSize(expectedLanguageTestScores.size()); } @Test @@ -100,21 +85,7 @@ class 지원한_어학_목록_조회 { // then assertThat(response.getContent()) - .hasSize(expectedLanguageTestScores.size()) - .zipSatisfy(expectedLanguageTestScores, (actual, expected) -> assertAll( - () -> assertThat(actual.languageTestScoreStatusResponse().id()).isEqualTo(expected.getId()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestType()) - .isEqualTo(expected.getLanguageTest().getLanguageTestType()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestScore()) - .isEqualTo(expected.getLanguageTest().getLanguageTestScore()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestReportUrl()) - .isEqualTo(expected.getLanguageTest().getLanguageTestReportUrl()), - () -> assertThat(actual.languageTestScoreStatusResponse().verifyStatus()).isEqualTo(expected.getVerifyStatus()), - - () -> assertThat(actual.siteUserResponse().id()).isEqualTo(expected.getSiteUser().getId()), - () -> assertThat(actual.siteUserResponse().profileImageUrl()).isEqualTo(expected.getSiteUser().getProfileImageUrl()), - () -> assertThat(actual.siteUserResponse().nickname()).isEqualTo(expected.getSiteUser().getNickname()) - )); + .hasSize(expectedLanguageTestScores.size()); } @Test @@ -128,22 +99,7 @@ class 지원한_어학_목록_조회 { Page response = adminLanguageTestScoreService.searchLanguageTestScores(condition, pageable); // then - assertThat(response.getContent()) - .hasSize(expectedLanguageTestScores.size()) - .zipSatisfy(expectedLanguageTestScores, (actual, expected) -> assertAll( - () -> assertThat(actual.languageTestScoreStatusResponse().id()).isEqualTo(expected.getId()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestType()) - .isEqualTo(expected.getLanguageTest().getLanguageTestType()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestScore()) - .isEqualTo(expected.getLanguageTest().getLanguageTestScore()), - () -> assertThat(actual.languageTestScoreStatusResponse().languageTestResponse().languageTestReportUrl()) - .isEqualTo(expected.getLanguageTest().getLanguageTestReportUrl()), - () -> assertThat(actual.languageTestScoreStatusResponse().verifyStatus()).isEqualTo(expected.getVerifyStatus()), - - () -> assertThat(actual.siteUserResponse().id()).isEqualTo(expected.getSiteUser().getId()), - () -> assertThat(actual.siteUserResponse().profileImageUrl()).isEqualTo(expected.getSiteUser().getProfileImageUrl()), - () -> assertThat(actual.siteUserResponse().nickname()).isEqualTo(expected.getSiteUser().getNickname()) - )); + assertThat(response.getContent()).hasSize(expectedLanguageTestScores.size()); } } diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index cfc042e8b..622297ec5 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -7,10 +7,8 @@ import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.dto.GpaScoreRequest; -import com.example.solidconnection.score.dto.GpaScoreStatusResponse; import com.example.solidconnection.score.dto.GpaScoreStatusesResponse; import com.example.solidconnection.score.dto.LanguageTestScoreRequest; -import com.example.solidconnection.score.dto.LanguageTestScoreStatusResponse; import com.example.solidconnection.score.dto.LanguageTestScoreStatusesResponse; import com.example.solidconnection.score.fixture.GpaScoreFixture; import com.example.solidconnection.score.fixture.LanguageTestScoreFixture; @@ -30,7 +28,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.BDDMockito.given; @TestContainerSpringBootTest @@ -77,13 +74,7 @@ void setUp() { GpaScoreStatusesResponse response = scoreService.getGpaScoreStatus(user); // then - assertThat(response.gpaScoreStatusResponseList()) - .hasSize(scores.size()) - .containsExactlyInAnyOrder( - scores.stream() - .map(GpaScoreStatusResponse::from) - .toArray(GpaScoreStatusResponse[]::new) - ); + assertThat(response.gpaScoreStatusResponseList()).hasSize(scores.size()); } @Test @@ -107,13 +98,7 @@ void setUp() { LanguageTestScoreStatusesResponse response = scoreService.getLanguageTestScoreStatus(user); // then - assertThat(response.languageTestScoreStatusResponseList()) - .hasSize(scores.size()) - .containsExactlyInAnyOrder( - scores.stream() - .map(LanguageTestScoreStatusResponse::from) - .toArray(LanguageTestScoreStatusResponse[]::new) - ); + assertThat(response.languageTestScoreStatusResponseList()).hasSize(scores.size()); } @Test @@ -138,13 +123,7 @@ void setUp() { GpaScore savedScore = gpaScoreRepository.findById(scoreId).orElseThrow(); // then - assertAll( - () -> assertThat(savedScore.getId()).isEqualTo(scoreId), - () -> assertThat(savedScore.getGpa().getGpa()).isEqualTo(request.gpa()), - () -> assertThat(savedScore.getGpa().getGpaCriteria()).isEqualTo(request.gpaCriteria()), - () -> assertThat(savedScore.getVerifyStatus()).isEqualTo(VerifyStatus.PENDING), - () -> assertThat(savedScore.getGpa().getGpaReportUrl()).isEqualTo(fileUrl) - ); + assertThat(savedScore.getId()).isEqualTo(scoreId); } @Test @@ -160,13 +139,7 @@ void setUp() { LanguageTestScore savedScore = languageTestScoreRepository.findById(scoreId).orElseThrow(); // then - assertAll( - () -> assertThat(savedScore.getId()).isEqualTo(scoreId), - () -> assertThat(savedScore.getLanguageTest().getLanguageTestType()).isEqualTo(request.languageTestType()), - () -> assertThat(savedScore.getLanguageTest().getLanguageTestScore()).isEqualTo(request.languageTestScore()), - () -> assertThat(savedScore.getVerifyStatus()).isEqualTo(VerifyStatus.PENDING), - () -> assertThat(savedScore.getLanguageTest().getLanguageTestReportUrl()).isEqualTo(fileUrl) - ); + assertThat(savedScore.getId()).isEqualTo(scoreId); } private GpaScoreRequest createGpaScoreRequest() { From e778155682db0f1e8c5643c6b0a8609aa5161ef7 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:58:38 +0900 Subject: [PATCH 08/11] =?UTF-8?q?test:=20=EC=96=B4=ED=95=99=20=EC=A0=90?= =?UTF-8?q?=EC=88=98=20fixture=20=EC=96=B4=ED=95=99=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=20=EB=B0=8F=20=EC=A0=90=EC=88=98=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdminLanguageTestScoreServiceTest.java | 6 +++--- .../score/fixture/LanguageTestScoreFixture.java | 10 ++++------ .../score/service/ScoreServiceTest.java | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index 208c28846..4940d880d 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -51,9 +51,9 @@ void setUp() { SiteUser user1 = siteUserFixture.사용자(1, "test1"); SiteUser user2 = siteUserFixture.사용자(2, "test2"); SiteUser user3 = siteUserFixture.사용자(3, "test3"); - languageTestScore3 = languageTestScoreFixture.어학_점수(TOEIC, "500", VerifyStatus.REJECTED, user3); - languageTestScore2 = languageTestScoreFixture.어학_점수(TOEIC, "500", VerifyStatus.PENDING, user2); - languageTestScore1 = languageTestScoreFixture.어학_점수(TOEIC, "500", VerifyStatus.PENDING, user1); + languageTestScore3 = languageTestScoreFixture.어학_점수(VerifyStatus.REJECTED, user3); + languageTestScore2 = languageTestScoreFixture.어학_점수(VerifyStatus.PENDING, user2); + languageTestScore1 = languageTestScoreFixture.어학_점수(VerifyStatus.PENDING, user1); } @Nested diff --git a/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixture.java b/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixture.java index 7d4261868..7805692e0 100644 --- a/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixture.java +++ b/src/test/java/com/example/solidconnection/score/fixture/LanguageTestScoreFixture.java @@ -8,19 +8,17 @@ import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; +import static com.example.solidconnection.university.domain.LanguageTestType.TOEIC; + @TestComponent @RequiredArgsConstructor public class LanguageTestScoreFixture { private final LanguageTestScoreFixtureBuilder languageTestScoreFixtureBuilder; - public LanguageTestScore 어학_점수 ( - LanguageTestType languageTestType, - String languageTestScore, - VerifyStatus verifyStatus, - SiteUser siteUser) { + public LanguageTestScore 어학_점수 (VerifyStatus verifyStatus, SiteUser siteUser) { return languageTestScoreFixtureBuilder.languageTestScore() - .languageTest(new LanguageTest(languageTestType, languageTestScore, "/language-report.pdf")) + .languageTest(new LanguageTest(TOEIC, "500", "/language-report.pdf")) .verifyStatus(verifyStatus) .siteUser(siteUser) .create(); diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 622297ec5..33bcb0fcf 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -90,8 +90,8 @@ void setUp() { void 어학_시험_점수_상태를_조회한다() { // given List scores = List.of( - languageTestScoreFixture.어학_점수(LanguageTestType.TOEIC, "100", VerifyStatus.PENDING, user), - languageTestScoreFixture.어학_점수(LanguageTestType.TOEFL_IBT, "7.5", VerifyStatus.PENDING, user) + languageTestScoreFixture.어학_점수(VerifyStatus.PENDING, user), + languageTestScoreFixture.어학_점수(VerifyStatus.PENDING, user) ); // when From da38921873666e808c299baf700b23db982c4cf3 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 20 May 2025 17:59:47 +0900 Subject: [PATCH 09/11] =?UTF-8?q?test:=20GPA=20=EC=A0=90=EC=88=98=20fixtur?= =?UTF-8?q?e=20GPA=20=ED=83=80=EC=9E=85=20=EB=B0=8F=20=EC=A0=90=EC=88=98?= =?UTF-8?q?=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminGpaScoreServiceTest.java | 6 +++--- .../solidconnection/score/fixture/GpaScoreFixture.java | 8 ++------ .../solidconnection/score/service/ScoreServiceTest.java | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index 846ead0d0..77ba772d4 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -50,9 +50,9 @@ void setUp() { SiteUser user1 = siteUserFixture.사용자(1, "test1"); SiteUser user2 = siteUserFixture.사용자(2, "test2"); SiteUser user3 = siteUserFixture.사용자(3, "test3"); - gpaScore3 = gpaScoreFixture.GPA_점수(3.5, 4.5, VerifyStatus.REJECTED, user3); - gpaScore2 = gpaScoreFixture.GPA_점수(3.5, 4.5, VerifyStatus.PENDING, user2); - gpaScore1 = gpaScoreFixture.GPA_점수(3.5, 4.5, VerifyStatus.PENDING, user1); + gpaScore3 = gpaScoreFixture.GPA_점수(VerifyStatus.REJECTED, user3); + gpaScore2 = gpaScoreFixture.GPA_점수(VerifyStatus.PENDING, user2); + gpaScore1 = gpaScoreFixture.GPA_점수(VerifyStatus.PENDING, user1); } @Nested diff --git a/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java index c8ebcb03c..4a61d1557 100644 --- a/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java +++ b/src/test/java/com/example/solidconnection/score/fixture/GpaScoreFixture.java @@ -13,13 +13,9 @@ public class GpaScoreFixture { private final GpaScoreFixtureBuilder gpaScoreFixtureBuilder; - public GpaScore GPA_점수 ( - Double gpa, - Double gpaCriteria, - VerifyStatus verifyStatus, - SiteUser siteUser) { + public GpaScore GPA_점수 (VerifyStatus verifyStatus, SiteUser siteUser) { return gpaScoreFixtureBuilder.gpaScore() - .gpa(new Gpa(gpa, gpaCriteria, "/gpa-report.pdf")) + .gpa(new Gpa(4.0, 4.5, "/gpa-report.pdf")) .verifyStatus(verifyStatus) .siteUser(siteUser) .create(); diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 33bcb0fcf..0b1aa0718 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -66,8 +66,8 @@ void setUp() { void GPA_점수_상태를_조회한다() { // given List scores = List.of( - gpaScoreFixture.GPA_점수(3.5, 4.5, VerifyStatus.PENDING, user), - gpaScoreFixture.GPA_점수(3.8, 4.5, VerifyStatus.APPROVED, user) + gpaScoreFixture.GPA_점수(VerifyStatus.PENDING, user), + gpaScoreFixture.GPA_점수(VerifyStatus.APPROVED, user) ); // when From e5f5aa2f8173f8ee614c9c850cf0e9ea537a067d Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Wed, 21 May 2025 13:24:16 +0900 Subject: [PATCH 10/11] =?UTF-8?q?refactor:=20=EB=B3=80=EC=88=98=EB=AA=85?= =?UTF-8?q?=20=EC=88=9C=EC=84=9C=20=EC=98=A4=EB=A6=84=EC=B0=A8=EC=88=9C?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminGpaScoreServiceTest.java | 4 ++-- .../admin/service/AdminLanguageTestScoreServiceTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index 77ba772d4..74da89dd8 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -50,9 +50,9 @@ void setUp() { SiteUser user1 = siteUserFixture.사용자(1, "test1"); SiteUser user2 = siteUserFixture.사용자(2, "test2"); SiteUser user3 = siteUserFixture.사용자(3, "test3"); - gpaScore3 = gpaScoreFixture.GPA_점수(VerifyStatus.REJECTED, user3); - gpaScore2 = gpaScoreFixture.GPA_점수(VerifyStatus.PENDING, user2); gpaScore1 = gpaScoreFixture.GPA_점수(VerifyStatus.PENDING, user1); + gpaScore2 = gpaScoreFixture.GPA_점수(VerifyStatus.PENDING, user2); + gpaScore3 = gpaScoreFixture.GPA_점수(VerifyStatus.REJECTED, user3); } @Nested diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index 4940d880d..e61235a4a 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -51,9 +51,9 @@ void setUp() { SiteUser user1 = siteUserFixture.사용자(1, "test1"); SiteUser user2 = siteUserFixture.사용자(2, "test2"); SiteUser user3 = siteUserFixture.사용자(3, "test3"); - languageTestScore3 = languageTestScoreFixture.어학_점수(VerifyStatus.REJECTED, user3); - languageTestScore2 = languageTestScoreFixture.어학_점수(VerifyStatus.PENDING, user2); languageTestScore1 = languageTestScoreFixture.어학_점수(VerifyStatus.PENDING, user1); + languageTestScore2 = languageTestScoreFixture.어학_점수(VerifyStatus.PENDING, user2); + languageTestScore3 = languageTestScoreFixture.어학_점수(VerifyStatus.REJECTED, user3); } @Nested From 8ca6823efc6e689802bda113003e127586b2aecc Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Wed, 21 May 2025 13:40:55 +0900 Subject: [PATCH 11/11] =?UTF-8?q?refactor:=20=EC=A0=90=EC=88=98=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EA=B2=80=EC=A6=9D=20?= =?UTF-8?q?=EC=8B=9C=20=EB=8B=89=EB=84=A4=EC=9E=84=EA=B3=BC=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminGpaScoreServiceTest.java | 12 ++++++++++++ .../service/AdminLanguageTestScoreServiceTest.java | 13 ++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index 74da89dd8..c649e1ba9 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -70,6 +70,9 @@ class 지원한_GPA_목록_조회 { // then assertThat(response.getContent()).hasSize(expectedGpaScores.size()); + assertThat(response.getContent()) + .extracting(content -> content.gpaScoreStatusResponse().verifyStatus()) + .containsOnly(VerifyStatus.PENDING); } @Test @@ -84,6 +87,9 @@ class 지원한_GPA_목록_조회 { // then assertThat(response.getContent()).hasSize(expectedGpaScores.size()); + assertThat(response.getContent()) + .extracting(content -> content.siteUserResponse().nickname()) + .containsOnly("test1", "test2", "test3"); } @Test @@ -98,6 +104,12 @@ class 지원한_GPA_목록_조회 { // then assertThat(response.getContent()).hasSize(expectedGpaScores.size()); + assertThat(response.getContent()) + .extracting(content -> content.gpaScoreStatusResponse().verifyStatus()) + .containsOnly(VerifyStatus.PENDING); + assertThat(response.getContent()) + .extracting(content -> content.siteUserResponse().nickname()) + .containsOnly("test1"); } } diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index e61235a4a..669c0b0be 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -71,6 +71,9 @@ class 지원한_어학_목록_조회 { // then assertThat(response.getContent()).hasSize(expectedLanguageTestScores.size()); + assertThat(response.getContent()) + .extracting(content -> content.languageTestScoreStatusResponse().verifyStatus()) + .containsOnly(VerifyStatus.PENDING); } @Test @@ -84,8 +87,10 @@ class 지원한_어학_목록_조회 { Page response = adminLanguageTestScoreService.searchLanguageTestScores(condition, pageable); // then + assertThat(response.getContent()).hasSize(expectedLanguageTestScores.size()); assertThat(response.getContent()) - .hasSize(expectedLanguageTestScores.size()); + .extracting(content -> content.siteUserResponse().nickname()) + .containsOnly("test1", "test2", "test3"); } @Test @@ -100,6 +105,12 @@ class 지원한_어학_목록_조회 { // then assertThat(response.getContent()).hasSize(expectedLanguageTestScores.size()); + assertThat(response.getContent()) + .extracting(content -> content.languageTestScoreStatusResponse().verifyStatus()) + .containsOnly(VerifyStatus.PENDING); + assertThat(response.getContent()) + .extracting(content -> content.siteUserResponse().nickname()) + .containsOnly("test1"); } }