refactor: 대학 관련 통합 테스트 데이터 정의 구조 개선 (#286)

Gyuhyeok99 · nayonsoso · web-flow · commit f9e05b0a383d · 2025-05-11T23:55:28.000+09:00
* refactor: 메서드 체이닝으로 대학 test fixture 생성 * refactor: UniversityQueryServiceTest에 임시 반영 * chore: 테스트 환경에서 lombok 사용을 위한 의존성 추가 * test: 메서드 체이닝을 활용하여 대학 관련 Fixture 클래스 추가 * test: 대학 생성을 위한 Fixture Helper 클래스 추가 * test: Fixture Helper 클래스 실제 대학 테스트에 적용 * chore: 사용하지 않는 BuilderSupporter 클래스 제거 * refactor: 내가 생각한 방향 구현 * refactor: 테스트 코드 컴포넌트 @TestComponent로 변경 * refactor: 패키지 구조를 도메인 중심으로 개선 * feat: RegionFixture에 지역 생성 메서드 추가 * feat: CountryFixture에 국가 생성 메서드 추가 * feat: UniversityFixture에 대학 생성 메서드 추가 * feat: UniversityInfoForApplyFixture에 대학 지원 생성 메서드 추가 * feat: LanguageRequirementFixture에 언어 요구사항 생성 메서드 추가 * test: 추가한 Fixture 함수 테스트에 반영 * chore: 대학 정보 이름 실제 데이터와 일치하게 반영 * refactor: 언어 요구사항 데이터 세팅 방식 변경 --------- Co-authored-by: nayonsoso <panda0329@naver.com>
diff --git a/build.gradle b/build.gradle
@@ -58,6 +58,8 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:mysql'
+    testImplementation 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 
     // Etc
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java b/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java
@@ -0,0 +1,54 @@
+package com.example.solidconnection.country.fixture;
+
+import com.example.solidconnection.entity.Country;
+import com.example.solidconnection.region.fixture.RegionFixture;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.test.context.TestComponent;
+
+@TestComponent
+@RequiredArgsConstructor
+public class CountryFixture {
+
+    private final RegionFixture regionFixture;
+    private final CountryFixtureBuilder countryFixtureBuilder;
+
+    public Country 미국() {
+        return countryFixtureBuilder.country()
+                .code("US")
+                .koreanName("미국")
+                .region(regionFixture.영미권())
+                .findOrCreate();
+    }
+
+    public Country 캐나다() {
+        return countryFixtureBuilder.country()
+                .code("CA")
+                .koreanName("캐나다")
+                .region(regionFixture.영미권())
+                .findOrCreate();
+    }
+
+    public Country 덴마크() {
+        return countryFixtureBuilder.country()
+                .code("DK")
+                .koreanName("덴마크")
+                .region(regionFixture.유럽())
+                .findOrCreate();
+    }
+
+    public Country 오스트리아() {
+        return countryFixtureBuilder.country()
+                .code("AT")
+                .koreanName("오스트리아")
+                .region(regionFixture.유럽())
+                .findOrCreate();
+    }
+
+    public Country 일본() {
+        return countryFixtureBuilder.country()
+                .code("JP")
+                .koreanName("일본")
+                .region(regionFixture.아시아())
+                .findOrCreate();
+    }
+}
diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java b/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java
@@ -0,0 +1,42 @@
+package com.example.solidconnection.country.fixture;
+
+import com.example.solidconnection.entity.Country;
+import com.example.solidconnection.entity.Region;
+import com.example.solidconnection.country.repository.CountryRepositoryForTest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.test.context.TestComponent;
+
+@TestComponent
+@RequiredArgsConstructor
+public class CountryFixtureBuilder {
+
+    private final CountryRepositoryForTest countryRepositoryForTest;
+
+    private String code;
+    private String koreanName;
+    private Region region;
+
+    public CountryFixtureBuilder country() {
+        return new CountryFixtureBuilder(countryRepositoryForTest);
+    }
+
+    public CountryFixtureBuilder code(String code) {
+        this.code = code;
+        return this;
+    }
+
+    public CountryFixtureBuilder koreanName(String koreanName) {
+        this.koreanName = koreanName;
+        return this;
+    }
+
+    public CountryFixtureBuilder region(Region region) {
+        this.region = region;
+        return this;
+    }
+
+    public Country findOrCreate() {
+        return countryRepositoryForTest.findByCode(code)
+                .orElseGet(() -> countryRepositoryForTest.save(new Country(code, koreanName, region)));
+    }
+}
diff --git a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java b/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java
@@ -0,0 +1,11 @@
+package com.example.solidconnection.country.repository;
+
+import com.example.solidconnection.entity.Country;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface CountryRepositoryForTest extends JpaRepository<Country, Long> {
+
+    Optional<Country> findByCode(String code);
+}
diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java b/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java
@@ -0,0 +1,33 @@
+package com.example.solidconnection.region.fixture;
+
+import com.example.solidconnection.entity.Region;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.test.context.TestComponent;
+
+@TestComponent
+@RequiredArgsConstructor
+public class RegionFixture {
+
+    private final RegionFixtureBuilder regionFixtureBuilder;
+
+    public Region 영미권() {
+        return regionFixtureBuilder.region()
+                .code("AMERICAS")
+                .koreanName("영미권")
+                .findOrCreate();
+    }
+
+    public Region 유럽() {
+        return regionFixtureBuilder.region()
+                .code("EUROPE")
+                .koreanName("유럽")
+                .findOrCreate();
+    }
+
+    public Region 아시아() {
+        return regionFixtureBuilder.region()
+                .code("ASIA")
+                .koreanName("아시아")
+                .findOrCreate();
+    }
+}
diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java b/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java
@@ -0,0 +1,35 @@
+package com.example.solidconnection.region.fixture;
+
+import com.example.solidconnection.entity.Region;
+import com.example.solidconnection.region.repository.RegionRepositoryForTest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.test.context.TestComponent;
+
+@TestComponent
+@RequiredArgsConstructor
+public class RegionFixtureBuilder {
+
+    private final RegionRepositoryForTest regionRepositoryForTest;
+
+    private String code;
+    private String koreanName;
+
+    public RegionFixtureBuilder region() {
+        return new RegionFixtureBuilder(regionRepositoryForTest);
+    }
+
+    public RegionFixtureBuilder code(String code) {
+        this.code = code;
+        return this;
+    }
+
+    public RegionFixtureBuilder koreanName(String koreanName) {
+        this.koreanName = koreanName;
+        return this;
+    }
+
+    public Region findOrCreate() {
+        return regionRepositoryForTest.findByCode(code)
+                .orElseGet(() -> regionRepositoryForTest.save(new Region(code, koreanName)));
+    }
+}
diff --git a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java b/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java
@@ -0,0 +1,11 @@
+package com.example.solidconnection.region.repository;
+
+import com.example.solidconnection.entity.Region;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface RegionRepositoryForTest extends JpaRepository<Region, Long> {
+
+    Optional<Region> findByCode(String code);
+}
diff --git a/src/test/java/com/example/solidconnection/support/TestContainerSpringBootTest.java b/src/test/java/com/example/solidconnection/support/TestContainerSpringBootTest.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.test.context.ContextConfiguration;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -11,6 +12,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@ComponentScan(basePackages = "com.example.solidconnection")
 @ExtendWith({DatabaseClearExtension.class})
 @ContextConfiguration(initializers = {RedisTestContainer.class, MySQLTestContainer.class})
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
diff --git a/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixture.java b/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixture.java
@@ -0,0 +1,54 @@
+package com.example.solidconnection.university.fixture;
+
+import com.example.solidconnection.type.LanguageTestType;
+import com.example.solidconnection.university.domain.LanguageRequirement;
+import com.example.solidconnection.university.domain.UniversityInfoForApply;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.test.context.TestComponent;
+
+@TestComponent
+@RequiredArgsConstructor
+public class LanguageRequirementFixture {
+
+    private final LanguageRequirementFixtureBuilder languageRequirementFixtureBuilder;
+
+    public LanguageRequirement 토플_80(UniversityInfoForApply universityInfo) {
+        return languageRequirementFixtureBuilder
+                .languageTestType(LanguageTestType.TOEFL_IBT)
+                .minScore("80")
+                .universityInfoForApply(universityInfo)
+                .create();
+    }
+
+    public LanguageRequirement 토플_70(UniversityInfoForApply universityInfo) {
+        return languageRequirementFixtureBuilder
+                .languageTestType(LanguageTestType.TOEFL_IBT)
+                .minScore("70")
+                .universityInfoForApply(universityInfo)
+                .create();
+    }
+
+    public LanguageRequirement 토익_800(UniversityInfoForApply universityInfo) {
+        return languageRequirementFixtureBuilder
+                .languageTestType(LanguageTestType.TOEIC)
+                .minScore("800")
+                .universityInfoForApply(universityInfo)
+                .create();
+    }
+
+    public LanguageRequirement 토익_900(UniversityInfoForApply universityInfo) {
+        return languageRequirementFixtureBuilder
+                .languageTestType(LanguageTestType.TOEIC)
+                .minScore("900")
+                .universityInfoForApply(universityInfo)
+                .create();
+    }
+
+    public LanguageRequirement JLPT_N2(UniversityInfoForApply universityInfo) {
+        return languageRequirementFixtureBuilder
+                .languageTestType(LanguageTestType.JLPT)
+                .minScore("N2")
+                .universityInfoForApply(universityInfo)
+                .create();
+    }
+}
diff --git a/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixtureBuilder.java b/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixtureBuilder.java
@@ -0,0 +1,45 @@
+package com.example.solidconnection.university.fixture;
+
+import com.example.solidconnection.type.LanguageTestType;
+import com.example.solidconnection.university.domain.LanguageRequirement;
+import com.example.solidconnection.university.domain.UniversityInfoForApply;
+import com.example.solidconnection.university.repository.LanguageRequirementRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.test.context.TestComponent;
+
+@TestComponent
+@RequiredArgsConstructor
+public class LanguageRequirementFixtureBuilder {
+
+    private final LanguageRequirementRepository languageRequirementRepository;
+
+    private LanguageTestType languageTestType;
+    private String minScore;
+    private UniversityInfoForApply universityInfoForApply;
+
+    public LanguageRequirementFixtureBuilder languageTestType(LanguageTestType languageTestType) {
+        this.languageTestType = languageTestType;
+        return this;
+    }
+
+    public LanguageRequirementFixtureBuilder minScore(String minScore) {
+        this.minScore = minScore;
+        return this;
+    }
+
+    public LanguageRequirementFixtureBuilder universityInfoForApply(UniversityInfoForApply universityInfoForApply) {
+        this.universityInfoForApply = universityInfoForApply;
+        return this;
+    }
+
+    public LanguageRequirement create() {
+        LanguageRequirement languageRequirement = new LanguageRequirement(
+                null,
+                languageTestType,
+                minScore,
+                universityInfoForApply
+        );
+        universityInfoForApply.addLanguageRequirements(languageRequirement);
+        return languageRequirementRepository.save(languageRequirement);
+    }
+}
diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java
diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java
diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityInfoForApplyFixture.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityInfoForApplyFixture.java
diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityInfoForApplyFixtureBuilder.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityInfoForApplyFixtureBuilder.java
diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java
