Skip to content

Commit 0befdca

Browse files
ymkim97ymkim97
committed
[TNT-257] refactor: 테스트 코드 리팩토링 진행
1 parent fed1356 commit 0befdca

18 files changed

+251
-316
lines changed

‎src/test/java/com/tnt/application/member/MemberServiceTest.java

+10-26
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ class MemberServiceTest {
5454
@DisplayName("memberId로 회원 조회 성공")
5555
void get_member_with_member_id_success() {
5656
// given
57-
Member trainerMember = MemberFixture.getTrainerMember1WithId();
57+
Member trainerMember = MemberFixture.getTrainerMemberWithId1();
5858

5959
given(memberRepository.findByIdAndDeletedAtIsNull(1L)).willReturn(Optional.ofNullable(trainerMember));
6060

6161
// when
62-
Member result = memberService.getMemberWithMemberId(requireNonNull(trainerMember).getId());
62+
Member result = memberService.getByMemberId(requireNonNull(trainerMember).getId());
6363

6464
// then
6565
assertThat(result).isNotNull().isEqualTo(trainerMember);
@@ -75,23 +75,23 @@ void get_member_with_member_id_error() {
7575
given(memberRepository.findByIdAndDeletedAtIsNull(999L)).willReturn(Optional.empty());
7676

7777
// when & then
78-
assertThrows(NotFoundException.class, () -> memberService.getMemberWithMemberId(memberId));
78+
assertThrows(NotFoundException.class, () -> memberService.getByMemberId(memberId));
7979
verify(memberRepository).findByIdAndDeletedAtIsNull(999L);
8080
}
8181

8282
@Test
8383
@DisplayName("socialId와 socialType으로 회원 조회 성공")
8484
void get_member_with_social_id_and_type_success() {
8585
// given
86-
Member member = MemberFixture.getTrainerMember1WithId();
86+
Member member = MemberFixture.getTrainerMemberWithId1();
8787
String socialId = member.getSocialId();
8888
SocialType socialType = member.getSocialType();
8989

9090
given(memberRepository.findBySocialIdAndSocialTypeAndDeletedAtIsNull(socialId, socialType)).willReturn(
9191
Optional.of(member));
9292

9393
// when
94-
Member result = memberService.getMemberWithSocialIdAndSocialType(socialId, socialType);
94+
Member result = memberService.getBySocialIdAndSocialType(socialId, socialType);
9595

9696
// then
9797
assertThat(result).isNotNull().isEqualTo(member);
@@ -117,7 +117,7 @@ void validate_member_not_exists_success() {
117117
@DisplayName("이미 존재하는 회원 검증시 실패")
118118
void validate_member_exists_error() {
119119
// given
120-
Member existingMember = MemberFixture.getTrainerMember1WithId();
120+
Member existingMember = MemberFixture.getTrainerMemberWithId1();
121121
String socialId = existingMember.getSocialId();
122122
SocialType socialType = existingMember.getSocialType();
123123

@@ -129,34 +129,18 @@ void validate_member_exists_error() {
129129
verify(memberRepository).findBySocialIdAndSocialTypeAndDeletedAtIsNull(socialId, socialType);
130130
}
131131

132-
@Test
133-
@DisplayName("회원 저장 성공")
134-
void save_member_success() {
135-
// given
136-
Member member = MemberFixture.getTrainerMember1WithId();
137-
138-
given(memberRepository.save(member)).willReturn(member);
139-
140-
// when
141-
Member savedMember = memberService.saveMember(member);
142-
143-
// then
144-
assertThat(savedMember).isNotNull().isEqualTo(member);
145-
verify(memberRepository).save(member);
146-
}
147-
148132
@Test
149133
@DisplayName("memberId로 회원 타입 조회 성공")
150134
void get_member_type_success() {
151135
// given
152-
Member member = MemberFixture.getTrainerMember1WithId();
136+
Member member = MemberFixture.getTrainerMemberWithId1();
153137
Long memberId = member.getId();
154138

155-
Trainer trainer = TrainerFixture.getTrainer2(member);
139+
Trainer trainer = TrainerFixture.getTrainer1(member);
156140

157141
given(memberSearchRepository.findMemberType(memberId)).willReturn(
158142
Optional.of(new MemberProjection.MemberTypeDto(member.getMemberType())));
159-
given(trainerService.getTrainerWithMemberId(memberId)).willReturn(trainer);
143+
given(trainerService.getByMemberId(memberId)).willReturn(trainer);
160144
given(ptService.isPtTrainerTraineeExistWithTrainerId(trainer.getId())).willReturn(true);
161145

162146
// when
@@ -170,7 +154,7 @@ void get_member_type_success() {
170154
@DisplayName("memberId로 회원 타입 조회 실패")
171155
void get_member_type_fail() {
172156
// given
173-
Member member = MemberFixture.getTrainerMember1WithId();
157+
Member member = MemberFixture.getTrainerMemberWithId1();
174158
Long memberId = member.getId();
175159

176160
given(memberSearchRepository.findMemberType(memberId)).willReturn(Optional.empty());

‎src/test/java/com/tnt/application/member/SignUpServiceTest.java

+26-22
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import org.mockito.junit.jupiter.MockitoExtension;
2424

2525
import com.tnt.application.trainee.PtGoalService;
26-
import com.tnt.application.trainee.TraineeService;
27-
import com.tnt.application.trainer.TrainerService;
2826
import com.tnt.common.error.exception.ConflictException;
2927
import com.tnt.domain.member.Member;
3028
import com.tnt.domain.trainee.PtGoal;
@@ -34,37 +32,42 @@
3432
import com.tnt.dto.member.response.SignUpResponse;
3533
import com.tnt.fixture.MemberFixture;
3634
import com.tnt.gateway.service.SessionService;
35+
import com.tnt.infrastructure.mysql.repository.member.MemberRepository;
36+
import com.tnt.infrastructure.mysql.repository.trainee.TraineeRepository;
37+
import com.tnt.infrastructure.mysql.repository.trainer.TrainerRepository;
3738

3839
@ExtendWith(MockitoExtension.class)
3940
class SignUpServiceTest {
4041

42+
@InjectMocks
43+
private SignUpService signUpService;
44+
4145
@Mock
4246
private SessionService sessionService;
4347

4448
@Mock
4549
private MemberService memberService;
4650

4751
@Mock
48-
private TrainerService trainerService;
52+
private PtGoalService ptGoalService;
4953

5054
@Mock
51-
private TraineeService traineeService;
55+
private MemberRepository memberRepository;
5256

5357
@Mock
54-
private PtGoalService ptGoalService;
58+
private TrainerRepository trainerRepository;
5559

56-
@InjectMocks
57-
private SignUpService signUpService;
60+
@Mock
61+
private TraineeRepository traineeRepository;
5862

5963
@Test
6064
@DisplayName("트레이너 회원가입 성공")
6165
void save_trainer_success() {
6266
// given
63-
Member trainerMember = MemberFixture.getTrainerMember1WithId();
67+
Member trainerMember = MemberFixture.getTrainerMemberWithId1();
6468

65-
given(memberService.saveMember(any(Member.class))).willReturn(trainerMember);
66-
given(trainerService.saveTrainer(any(Trainer.class))).willReturn(
67-
Trainer.builder().member(trainerMember).build());
69+
given(memberRepository.save(any(Member.class))).willReturn(trainerMember);
70+
given(trainerRepository.save(any(Trainer.class))).willReturn(Trainer.builder().member(trainerMember).build());
6871

6972
SignUpRequest request = new SignUpRequest(trainerMember.getFcmToken(), trainerMember.getMemberType(),
7073
trainerMember.getSocialType(), trainerMember.getSocialId(), trainerMember.getEmail(),
@@ -77,18 +80,18 @@ void save_trainer_success() {
7780

7881
// then
7982
assertThat(result).isNotNull().isEqualTo(trainerMember.getId());
80-
verify(memberService).saveMember(any(Member.class));
81-
verify(trainerService).saveTrainer(any(Trainer.class));
83+
verify(memberRepository).save(any(Member.class));
84+
verify(trainerRepository).save(any(Trainer.class));
8285
}
8386

8487
@Test
8588
@DisplayName("트레이니 회원가입 성공")
8689
void save_trainee_success() {
8790
// given
88-
Member traineeMember = MemberFixture.getTraineeMember1WithId();
91+
Member traineeMember = MemberFixture.getTraineeMemberWithId1();
8992

90-
given(memberService.saveMember(any(Member.class))).willReturn(traineeMember);
91-
given(traineeService.saveTrainee(any(Trainee.class))).willReturn(
93+
given(memberRepository.save(any(Member.class))).willReturn(traineeMember);
94+
given(traineeRepository.save(any(Trainee.class))).willReturn(
9295
Trainee.builder().id(1L).member(traineeMember).height(180.0).weight(75.0).build());
9396
given(ptGoalService.saveAllPtGoals(anyList())).willReturn(Stream.of("목표1", "목표2")
9497
.map(content -> PtGoal.builder().traineeId(traineeMember.getId()).content(content).build())
@@ -105,16 +108,16 @@ void save_trainee_success() {
105108

106109
// then
107110
assertThat(result).isNotNull().isEqualTo(traineeMember.getId());
108-
verify(memberService).saveMember(any(Member.class));
109-
verify(traineeService).saveTrainee(any(Trainee.class));
111+
verify(memberRepository).save(any(Member.class));
112+
verify(traineeRepository).save(any(Trainee.class));
110113
verify(ptGoalService).saveAllPtGoals(any());
111114
}
112115

113116
@Test
114117
@DisplayName("이미 존재하는 회원 가입 시도 실패")
115118
void exists_member_error() {
116119
// given
117-
Member trainerMember = MemberFixture.getTrainerMember1WithId();
120+
Member trainerMember = MemberFixture.getTrainerMemberWithId1();
118121

119122
doThrow(new ConflictException(MEMBER_CONFLICT)).when(memberService).validateMemberNotExists(any(), any());
120123

@@ -132,12 +135,13 @@ void exists_member_error() {
132135
@DisplayName("회원가입 완료 성공")
133136
void sign_up_success() {
134137
// given
135-
Member trainerMember = MemberFixture.getTrainerMember1WithId();
138+
Member trainerMember = MemberFixture.getTrainerMemberWithId1();
136139

137-
given(memberService.getMemberWithMemberId(any())).willReturn(trainerMember);
140+
given(memberService.getByMemberId(any())).willReturn(trainerMember);
138141

139142
// when
140-
SignUpResponse response = signUpService.finishSignUpWithImage(TRAINER_DEFAULT_IMAGE, trainerMember.getId(),
143+
SignUpResponse response = signUpService.finishSignUpAfterImageUpload(TRAINER_DEFAULT_IMAGE,
144+
trainerMember.getId(),
141145
TRAINER);
142146

143147
// then

‎src/test/java/com/tnt/application/member/WithdrawServiceTest.java

+36-36
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ class WithdrawServiceTest {
6464
@DisplayName("트레이너 회원 탈퇴 성공")
6565
void withdraw_trainer_success() {
6666
// given
67-
Member trainerMember = MemberFixture.getTrainerMember1WithId();
68-
Trainer trainer = TrainerFixture.getTrainer1(1L, trainerMember);
67+
Member trainerMember = MemberFixture.getTrainerMemberWithId1();
68+
Trainer trainer = TrainerFixture.getTrainerWithId1(trainerMember);
6969

70-
given(memberService.getMemberWithMemberId(trainerMember.getId())).willReturn(trainerMember);
71-
given(trainerService.getTrainerWithMemberId(trainerMember.getId())).willReturn(trainer);
70+
given(memberService.getByMemberId(trainerMember.getId())).willReturn(trainerMember);
71+
given(trainerService.getByMemberId(trainerMember.getId())).willReturn(trainer);
7272

7373
// when
7474
withdrawService.withdraw(trainerMember.getId());
@@ -81,16 +81,16 @@ void withdraw_trainer_success() {
8181
@DisplayName("트레이니 회원 탈퇴 성공")
8282
void withdraw_trainee_success() {
8383
// given
84-
Member traineeMember = MemberFixture.getTraineeMember1WithId();
85-
Trainee trainee = TraineeFixture.getTrainee1WithId(1L, traineeMember);
84+
Member traineeMember = MemberFixture.getTraineeMemberWithId1();
85+
Trainee trainee = TraineeFixture.getTrainee1WithId(traineeMember);
8686

8787
List<PtGoal> ptGoals = List.of(PtGoal.builder().id(1L).traineeId(trainee.getId()).content("test").build());
8888
List<Diet> diets = List.of(DietFixture.getDiet1(trainee.getId()), DietFixture.getDiet2(trainee.getId()));
8989

90-
given(memberService.getMemberWithMemberId(traineeMember.getId())).willReturn(traineeMember);
91-
given(traineeService.getTraineeWithMemberId(traineeMember.getId())).willReturn(trainee);
92-
given(ptGoalService.getAllPtGoalsWithTraineeId(trainee.getId())).willReturn(ptGoals);
93-
given(dietService.getAllDietsWithTraineeId(trainee.getId())).willReturn(diets);
90+
given(memberService.getByMemberId(traineeMember.getId())).willReturn(traineeMember);
91+
given(traineeService.getByMemberId(traineeMember.getId())).willReturn(trainee);
92+
given(ptGoalService.getAllByTraineeId(trainee.getId())).willReturn(ptGoals);
93+
given(dietService.getAllByTraineeId(trainee.getId())).willReturn(diets);
9494

9595
// when
9696
withdrawService.withdraw(traineeMember.getId());
@@ -103,18 +103,18 @@ void withdraw_trainee_success() {
103103
@DisplayName("PT 관계가 있는 트레이너 회원 탈퇴 성공")
104104
void withdraw_trainer_with_pt_success() {
105105
// given
106-
Member trainerMember = MemberFixture.getTrainerMember1WithId();
107-
Member traineeMember = MemberFixture.getTraineeMember2WithId();
106+
Member trainerMember = MemberFixture.getTrainerMemberWithId1();
107+
Member traineeMember = MemberFixture.getTraineeMemberWithId2();
108108

109-
Trainer trainer = TrainerFixture.getTrainer1(1L, trainerMember);
110-
Trainee trainee = TraineeFixture.getTrainee1WithId(1L, traineeMember);
109+
Trainer trainer = TrainerFixture.getTrainerWithId1(trainerMember);
110+
Trainee trainee = TraineeFixture.getTrainee1WithId(traineeMember);
111111

112112
PtTrainerTrainee ptTrainerTrainee = PtTrainerTraineeFixture.getPtTrainerTrainee1(trainer, trainee);
113113

114-
List<PtLesson> ptLessons = PtLessonsFixture.getPtLessons1WithId(ptTrainerTrainee);
114+
List<PtLesson> ptLessons = PtLessonsFixture.getPtLessonsWithId1(ptTrainerTrainee);
115115

116-
given(memberService.getMemberWithMemberId(trainerMember.getId())).willReturn(trainerMember);
117-
given(trainerService.getTrainerWithMemberId(trainerMember.getId())).willReturn(trainer);
116+
given(memberService.getByMemberId(trainerMember.getId())).willReturn(trainerMember);
117+
given(trainerService.getByMemberId(trainerMember.getId())).willReturn(trainer);
118118
given(ptService.isPtTrainerTraineeExistWithTrainerId(trainer.getId())).willReturn(true);
119119
given(ptService.getAllPtTrainerTraineeWithTrainerId(trainer.getId())).willReturn(List.of(ptTrainerTrainee));
120120
given(ptService.getPtLessonWithPtTrainerTrainee(ptTrainerTrainee)).willReturn(ptLessons);
@@ -130,24 +130,24 @@ void withdraw_trainer_with_pt_success() {
130130
@DisplayName("PT 관계가 있는 트레이니 회원 탈퇴 성공")
131131
void withdraw_trainee_with_pt_success() {
132132
// given
133-
Member trainerMember = MemberFixture.getTrainerMember1WithId();
134-
Member traineeMember = MemberFixture.getTraineeMember1WithId();
133+
Member trainerMember = MemberFixture.getTrainerMemberWithId1();
134+
Member traineeMember = MemberFixture.getTraineeMemberWithId1();
135135

136-
Trainer trainer = TrainerFixture.getTrainer1(1L, trainerMember);
137-
Trainee trainee = TraineeFixture.getTrainee1WithId(1L, traineeMember);
136+
Trainer trainer = TrainerFixture.getTrainerWithId1(trainerMember);
137+
Trainee trainee = TraineeFixture.getTrainee1WithId(traineeMember);
138138

139139
PtTrainerTrainee ptTrainerTrainee = PtTrainerTraineeFixture.getPtTrainerTrainee1(trainer, trainee);
140140

141141
List<PtGoal> ptGoals = List.of(PtGoal.builder().id(1L).traineeId(trainee.getId()).content("test").build());
142142
List<Diet> diets = List.of(DietFixture.getDiet1(trainee.getId()), DietFixture.getDiet2(trainee.getId()));
143143

144-
List<PtLesson> ptLessons = PtLessonsFixture.getPtLessons1WithId(ptTrainerTrainee);
144+
List<PtLesson> ptLessons = PtLessonsFixture.getPtLessonsWithId1(ptTrainerTrainee);
145145

146-
given(memberService.getMemberWithMemberId(traineeMember.getId())).willReturn(traineeMember);
147-
given(traineeService.getTraineeWithMemberId(traineeMember.getId())).willReturn(trainee);
146+
given(memberService.getByMemberId(traineeMember.getId())).willReturn(traineeMember);
147+
given(traineeService.getByMemberId(traineeMember.getId())).willReturn(trainee);
148148
given(ptService.isPtTrainerTraineeExistWithTraineeId(trainee.getId())).willReturn(true);
149-
given(ptGoalService.getAllPtGoalsWithTraineeId(trainee.getId())).willReturn(ptGoals);
150-
given(dietService.getAllDietsWithTraineeId(trainee.getId())).willReturn(diets);
149+
given(ptGoalService.getAllByTraineeId(trainee.getId())).willReturn(ptGoals);
150+
given(dietService.getAllByTraineeId(trainee.getId())).willReturn(diets);
151151
given(ptService.getPtTrainerTraineeWithTraineeId(trainee.getId())).willReturn(ptTrainerTrainee);
152152
given(ptService.getPtLessonWithPtTrainerTrainee(ptTrainerTrainee)).willReturn(ptLessons);
153153

@@ -162,12 +162,12 @@ void withdraw_trainee_with_pt_success() {
162162
@DisplayName("PT 관계가 없는 트레이너 회원 탈퇴 성공")
163163
void withdraw_trainer_without_pt_success() {
164164
// given
165-
Member trainerMember = MemberFixture.getTrainerMember1WithId();
165+
Member trainerMember = MemberFixture.getTrainerMemberWithId1();
166166

167-
Trainer trainer = TrainerFixture.getTrainer1(1L, trainerMember);
167+
Trainer trainer = TrainerFixture.getTrainerWithId1(trainerMember);
168168

169-
given(memberService.getMemberWithMemberId(trainerMember.getId())).willReturn(trainerMember);
170-
given(trainerService.getTrainerWithMemberId(trainerMember.getId())).willReturn(trainer);
169+
given(memberService.getByMemberId(trainerMember.getId())).willReturn(trainerMember);
170+
given(trainerService.getByMemberId(trainerMember.getId())).willReturn(trainer);
171171
given(ptService.isPtTrainerTraineeExistWithTrainerId(trainer.getId())).willReturn(true);
172172

173173
// when
@@ -181,18 +181,18 @@ void withdraw_trainer_without_pt_success() {
181181
@DisplayName("PT 관계가 없는 트레이니 회원 탈퇴 성공")
182182
void withdraw_trainee_without_pt_success() {
183183
// given
184-
Member traineeMember = MemberFixture.getTraineeMember1WithId();
184+
Member traineeMember = MemberFixture.getTraineeMemberWithId1();
185185

186-
Trainee trainee = TraineeFixture.getTrainee1WithId(1L, traineeMember);
186+
Trainee trainee = TraineeFixture.getTrainee1WithId(traineeMember);
187187

188188
List<PtGoal> ptGoals = List.of(PtGoal.builder().id(1L).traineeId(trainee.getId()).content("test").build());
189189
List<Diet> diets = List.of(DietFixture.getDiet1(trainee.getId()), DietFixture.getDiet2(trainee.getId()));
190190

191-
given(memberService.getMemberWithMemberId(traineeMember.getId())).willReturn(traineeMember);
192-
given(traineeService.getTraineeWithMemberId(traineeMember.getId())).willReturn(trainee);
191+
given(memberService.getByMemberId(traineeMember.getId())).willReturn(traineeMember);
192+
given(traineeService.getByMemberId(traineeMember.getId())).willReturn(trainee);
193193
given(ptService.isPtTrainerTraineeExistWithTraineeId(trainee.getId())).willReturn(true);
194-
given(ptGoalService.getAllPtGoalsWithTraineeId(trainee.getId())).willReturn(ptGoals);
195-
given(dietService.getAllDietsWithTraineeId(trainee.getId())).willReturn(diets);
194+
given(ptGoalService.getAllByTraineeId(trainee.getId())).willReturn(ptGoals);
195+
given(dietService.getAllByTraineeId(trainee.getId())).willReturn(diets);
196196
given(ptService.getPtTrainerTraineeWithTraineeId(trainee.getId())).willThrow(NotFoundException.class);
197197

198198
// when

‎src/test/java/com/tnt/application/pt/PtGoalServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void get_all_pt_goals_with_trainee_id_success() {
4646
.willReturn(ptGoals);
4747

4848
// when
49-
List<PtGoal> result = ptGoalService.getAllPtGoalsWithTraineeId(traineeId);
49+
List<PtGoal> result = ptGoalService.getAllByTraineeId(traineeId);
5050

5151
// then
5252
assertThat(result).isNotNull().hasSize(2).isEqualTo(ptGoals);

0 commit comments

Comments
 (0)