Skip to content

refactor: 대학(추천, 좋아요) 통합 테스트 데이터 Fixture 메서드로 변경 #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gyuhyeok99 merged 2 commits into from
May 12, 2025
Merged

refactor: 대학(추천, 좋아요) 통합 테스트 데이터 Fixture 메서드로 변경 #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89055dd
refactor: 대학 좋아요 통합 테스트 데이터 Fixture 메서드로 변경
Gyuhyeok99 May 12, 2025
15a71bb
refactor: 대학 추천 통합 테스트 데이터 Fixture 메서드로 변경
Gyuhyeok99 May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions ...com/example/solidconnection/university/service/GeneralUniversityRecommendServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.example.solidconnection.university.service;

import com.example.solidconnection.support.TestContainerSpringBootTest;
import com.example.solidconnection.support.integration.BaseIntegrationTest;
import com.example.solidconnection.university.domain.UniversityInfoForApply;
import com.example.solidconnection.university.fixture.UniversityInfoForApplyFixture;
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;
Expand All @@ -14,20 +15,37 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;

@DisplayName("공통 추천 대학 서비스 테스트")
@TestContainerSpringBootTest
class GeneralUniversityRecommendServiceTest extends BaseIntegrationTest {
@DisplayName("공통 추천 대학 서비스 테스트")
class GeneralUniversityRecommendServiceTest {

@Autowired
private GeneralUniversityRecommendService generalUniversityRecommendService;

@Autowired
private UniversityInfoForApplyFixture universityInfoForApplyFixture;

@Value("${university.term}")
private String term;

@BeforeEach
void setUp() {
universityInfoForApplyFixture.괌대학_A_지원_정보();
universityInfoForApplyFixture.괌대학_B_지원_정보();
universityInfoForApplyFixture.네바다주립대학_라스베이거스_지원_정보();
universityInfoForApplyFixture.메모리얼대학_세인트존스_A_지원_정보();
universityInfoForApplyFixture.서던덴마크대학교_지원_정보();
universityInfoForApplyFixture.코펜하겐IT대학_지원_정보();
universityInfoForApplyFixture.그라츠대학_지원_정보();
universityInfoForApplyFixture.그라츠공과대학_지원_정보();
universityInfoForApplyFixture.린츠_카톨릭대학_지원_정보();
universityInfoForApplyFixture.메이지대학_지원_정보();
generalUniversityRecommendService.init();
}
Comment on lines +31 to +44
Copy link
Collaborator

@nayonsoso nayonsoso May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generalUniversityRecommendService.init(); 이거 호출 전에 테스트 데이터가 6개 이상 없으면 바로 Out of Range 터지더라구요

혹시 다시 확인해주실 수 있나요? 😲
제가 break point 찍어서 확인해봤을 때는 generalUniversityRecommendService.init() 호출 전에
테스트 데이터가 0개이면,

List<UniversityInfoForApply> universities =
generalUniversityRecommendService.getRecommendUniversities();

에서 universities는 비어있는 리스트가 됩니다.
out of range 예외는 발생하지 않고요!

그리고 데이터베이스에 대학 지원 정보가 6개보다 적은 "2개"만 있더라도,
out of range 예외는 발생하지 않고, "크기가 2인 리스트"가 반환됩니다.

image

RECOMMEND_UNIVERSITY_NUM보다 적게 들어있으면 그냥 있는 만큼만 넣어놓은다거나 그러는 게 좋겠네요!
만약 수정한다면 별도 pr에서 하겠습니다!

말씀하신 부분은 이미 구현되어있습니다~

제가 테스트를 모호하게 작성한게 있어 이런 오해가 발생했으니,
“목표 추천 대학보다 적은 수의 대학이 들어있다면 그만큼을 반환한다” 는 것을 검증하는 테스트 코드를 추가하여 여러가지 케이스를 보여주도록 할 필요는 있어보입니다.

Copy link
Contributor Author

@Gyuhyeok99 Gyuhyeok99 May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아 제가 조금 명확하게 말씀을 안드렸네요...

UniversityRecommendService에서 getGeneralRecommendsExcludingSelected 함수가 있는데

private List<UniversityInfoForApply> getGeneralRecommendsExcludingSelected(List<UniversityInfoForApply> alreadyPicked) {
        List<UniversityInfoForApply> generalRecommend = new ArrayList<>(generalUniversityRecommendService.getRecommendUniversities());
        generalRecommend.removeAll(alreadyPicked);
        Collections.shuffle(generalRecommend);
        return generalRecommend.subList(0, RECOMMEND_UNIVERSITY_NUM - alreadyPicked.size());
    }

여기서 문제가 발생하는 거 같습니다

예시로 alreadyPicked.size()이라는 맞춤 추천 대학 개수가 2개로 가지고 있으면 부족한 개수를 이번 term에 열리는 학교들을 불러오고 있습니다. return으로 결국 subList(0, 4)를 호출하게 되는데 이때 말씀해주신 universities 에 3개의 대학만 들어가있다면 IndexOutOfBoundsException를 발생시킵니다!

Copy link
Collaborator

@nayonsoso nayonsoso May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아하 "General" UniversityRecommendService의 테스트 코드가 아니라
UniversityRecommendService의 테스트코드 말씀이셨군요!
저는 뭔가가 잘못된건가.. 했습니다😅


@Test
void 모집_시기의_대학들_중에서_랜덤하게_N개를_추천_목록으로_구성한다() {
// given
generalUniversityRecommendService.init();
List<UniversityInfoForApply> universities = generalUniversityRecommendService.getRecommendUniversities();

// when & then
Expand Down
34 changes: 18 additions & 16 deletions src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
import com.example.solidconnection.siteuser.domain.SiteUser;
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
import com.example.solidconnection.support.integration.BaseIntegrationTest;
import com.example.solidconnection.support.TestContainerSpringBootTest;
import com.example.solidconnection.type.PreparationStatus;
import com.example.solidconnection.type.Role;
import com.example.solidconnection.university.domain.LikedUniversity;
import com.example.solidconnection.university.domain.UniversityInfoForApply;
import com.example.solidconnection.university.dto.IsLikeResponse;
import com.example.solidconnection.university.dto.LikeResultResponse;
import com.example.solidconnection.university.fixture.UniversityInfoForApplyFixture;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
Expand All @@ -25,8 +27,9 @@
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
import static org.junit.jupiter.api.Assertions.assertAll;

@TestContainerSpringBootTest
@DisplayName("대학교 좋아요 서비스 테스트")
class UniversityLikeServiceTest extends BaseIntegrationTest {
class UniversityLikeServiceTest {

@Autowired
private UniversityLikeService universityLikeService;
Expand All @@ -37,14 +40,23 @@ class UniversityLikeServiceTest extends BaseIntegrationTest {
@Autowired
private SiteUserRepository siteUserRepository;

@Autowired
private UniversityInfoForApplyFixture universityInfoForApplyFixture;

private SiteUser testUser;
private UniversityInfoForApply 괌대학_A_지원_정보;

@BeforeEach
void setUp() {
testUser = createSiteUser();
괌대학_A_지원_정보 = universityInfoForApplyFixture.괌대학_A_지원_정보();
}
Comment on lines +49 to +53
Copy link
Collaborator

@nayonsoso nayonsoso May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BeforeEach 좋네요😊


@Nested
class 대학_좋아요를_등록한다 {

@Test
void 성공적으로_좋아요를_등록한다() {
// given
SiteUser testUser = createSiteUser();

// when
LikeResultResponse response = universityLikeService.likeUniversity(testUser, 괌대학_A_지원_정보.getId());

Expand All @@ -60,7 +72,6 @@ class 대학_좋아요를_등록한다 {
@Test
void 이미_좋아요한_대학이면_예외_응답을_반환한다() {
// given
SiteUser testUser = createSiteUser();
saveLikedUniversity(testUser, 괌대학_A_지원_정보);

// when & then
Expand All @@ -76,7 +87,6 @@ class 대학_좋아요를_취소한다 {
@Test
void 성공적으로_좋아요를_취소한다() {
// given
SiteUser testUser = createSiteUser();
saveLikedUniversity(testUser, 괌대학_A_지원_정보);

// when
Expand All @@ -93,9 +103,6 @@ class 대학_좋아요를_취소한다 {

@Test
void 좋아요하지_않은_대학이면_예외_응답을_반환한다() {
// given
SiteUser testUser = createSiteUser();

// when & then
assertThatCode(() -> universityLikeService.cancelLikeUniversity(testUser, 괌대학_A_지원_정보.getId()))
.isInstanceOf(CustomException.class)
Expand All @@ -106,7 +113,6 @@ class 대학_좋아요를_취소한다 {
@Test
void 존재하지_않는_대학_좋아요_시도하면_예외_응답을_반환한다() {
// given
SiteUser testUser = createSiteUser();
Long invalidUniversityId = 9999L;

// when & then
Expand All @@ -118,7 +124,6 @@ class 대학_좋아요를_취소한다 {
@Test
void 좋아요한_대학인지_확인한다() {
// given
SiteUser testUser = createSiteUser();
saveLikedUniversity(testUser, 괌대학_A_지원_정보);

// when
Expand All @@ -130,9 +135,6 @@ class 대학_좋아요를_취소한다 {

@Test
void 좋아요하지_않은_대학인지_확인한다() {
// given
SiteUser testUser = createSiteUser();

// when
IsLikeResponse response = universityLikeService.getIsLiked(testUser, 괌대학_A_지원_정보.getId());

Expand All @@ -143,7 +145,6 @@ class 대학_좋아요를_취소한다 {
@Test
void 존재하지_않는_대학의_좋아요_여부를_조회하면_예외_응답을_반환한다() {
// given
SiteUser testUser = createSiteUser();
Long invalidUniversityId = 9999L;

// when & then
Expand All @@ -152,6 +153,7 @@ class 대학_좋아요를_취소한다 {
.hasMessage(UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND.getMessage());
}

// todo : 추후 Fixture로 대체 필요
Copy link
Collaborator

@nayonsoso nayonsoso May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

todo로 앞으로의 계획 표시 좋습니다! 🤩

private SiteUser createSiteUser() {
SiteUser siteUser = new SiteUser(
"test@example.com",
Expand Down
56 changes: 44 additions & 12 deletions ...t/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
package com.example.solidconnection.university.service;

import com.example.solidconnection.country.fixture.CountryFixture;
import com.example.solidconnection.entity.InterestedCountry;
import com.example.solidconnection.entity.InterestedRegion;
import com.example.solidconnection.region.fixture.RegionFixture;
import com.example.solidconnection.repositories.InterestedCountyRepository;
import com.example.solidconnection.repositories.InterestedRegionRepository;
import com.example.solidconnection.siteuser.domain.SiteUser;
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
import com.example.solidconnection.support.integration.BaseIntegrationTest;
import com.example.solidconnection.support.TestContainerSpringBootTest;
import com.example.solidconnection.type.PreparationStatus;
import com.example.solidconnection.type.Role;
import com.example.solidconnection.university.domain.UniversityInfoForApply;
import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse;
import com.example.solidconnection.university.dto.UniversityRecommendsResponse;
import com.example.solidconnection.university.fixture.UniversityInfoForApplyFixture;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand All @@ -21,8 +25,9 @@
import static com.example.solidconnection.university.service.UniversityRecommendService.RECOMMEND_UNIVERSITY_NUM;
import static org.assertj.core.api.Assertions.assertThat;

@TestContainerSpringBootTest
@DisplayName("대학교 추천 서비스 테스트")
class UniversityRecommendServiceTest extends BaseIntegrationTest {
class UniversityRecommendServiceTest {

@Autowired
private UniversityRecommendService universityRecommendService;
Expand All @@ -39,16 +44,47 @@ class UniversityRecommendServiceTest extends BaseIntegrationTest {
@Autowired
private GeneralUniversityRecommendService generalUniversityRecommendService;

@Autowired
private RegionFixture regionFixture;

@Autowired
private CountryFixture countryFixture;

@Autowired
private UniversityInfoForApplyFixture universityInfoForApplyFixture;

private SiteUser testUser;
private UniversityInfoForApply 괌대학_A_지원_정보;
private UniversityInfoForApply 괌대학_B_지원_정보;
private UniversityInfoForApply 네바다주립대학_라스베이거스_지원_정보;
private UniversityInfoForApply 메모리얼대학_세인트존스_A_지원_정보;
private UniversityInfoForApply 서던덴마크대학교_지원_정보;
private UniversityInfoForApply 코펜하겐IT대학_지원_정보;
private UniversityInfoForApply 그라츠대학_지원_정보;
private UniversityInfoForApply 그라츠공과대학_지원_정보;
private UniversityInfoForApply 린츠_카톨릭대학_지원_정보;
private UniversityInfoForApply 메이지대학_지원_정보;

@BeforeEach
void setUp() {
testUser = createSiteUser();
괌대학_A_지원_정보 = universityInfoForApplyFixture.괌대학_A_지원_정보();
괌대학_B_지원_정보 = universityInfoForApplyFixture.괌대학_B_지원_정보();
네바다주립대학_라스베이거스_지원_정보 = universityInfoForApplyFixture.네바다주립대학_라스베이거스_지원_정보();
메모리얼대학_세인트존스_A_지원_정보 = universityInfoForApplyFixture.메모리얼대학_세인트존스_A_지원_정보();
서던덴마크대학교_지원_정보 = universityInfoForApplyFixture.서던덴마크대학교_지원_정보();
코펜하겐IT대학_지원_정보 = universityInfoForApplyFixture.코펜하겐IT대학_지원_정보();
그라츠대학_지원_정보 = universityInfoForApplyFixture.그라츠대학_지원_정보();
그라츠공과대학_지원_정보 = universityInfoForApplyFixture.그라츠공과대학_지원_정보();
린츠_카톨릭대학_지원_정보 = universityInfoForApplyFixture.린츠_카톨릭대학_지원_정보();
메이지대학_지원_정보 = universityInfoForApplyFixture.메이지대학_지원_정보();
generalUniversityRecommendService.init();
}

@Test
void 관심_지역_설정한_사용자의_맞춤_추천_대학을_조회한다() {
// given
SiteUser testUser = createSiteUser();
interestedRegionRepository.save(new InterestedRegion(testUser, 영미권));
interestedRegionRepository.save(new InterestedRegion(testUser, regionFixture.영미권()));

// when
UniversityRecommendsResponse response = universityRecommendService.getPersonalRecommends(testUser);
Expand All @@ -67,8 +103,7 @@ void setUp() {
@Test
void 관심_국가_설정한_사용자의_맞춤_추천_대학을_조회한다() {
// given
SiteUser testUser = createSiteUser();
interestedCountyRepository.save(new InterestedCountry(testUser, 덴마크));
interestedCountyRepository.save(new InterestedCountry(testUser, countryFixture.덴마크()));

// when
UniversityRecommendsResponse response = universityRecommendService.getPersonalRecommends(testUser);
Expand All @@ -85,9 +120,8 @@ void setUp() {
@Test
void 관심_지역과_국가_모두_설정한_사용자의_맞춤_추천_대학을_조회한다() {
// given
SiteUser testUser = createSiteUser();
interestedRegionRepository.save(new InterestedRegion(testUser, 영미권));
interestedCountyRepository.save(new InterestedCountry(testUser, 덴마크));
interestedRegionRepository.save(new InterestedRegion(testUser, regionFixture.영미권()));
interestedCountyRepository.save(new InterestedCountry(testUser, countryFixture.덴마크()));

// when
UniversityRecommendsResponse response = universityRecommendService.getPersonalRecommends(testUser);
Expand All @@ -107,9 +141,6 @@ void setUp() {

@Test
void 관심사_미설정_사용자는_일반_추천_대학을_조회한다() {
// given
SiteUser testUser = createSiteUser();

// when
UniversityRecommendsResponse response = universityRecommendService.getPersonalRecommends(testUser);

Expand Down Expand Up @@ -138,6 +169,7 @@ void setUp() {
);
}

// todo : 추후 Fixture로 대체 필요
private SiteUser createSiteUser() {
SiteUser siteUser = new SiteUser(
"test@example.com",
Expand Down
Loading