Skip to content

Commit 7d4237c

Browse files
committed
fix: 기존 작성되어있던 test 코드 수정
1 parent 2bc4e95 commit 7d4237c

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

src/main/java/com/back/global/initData/DevInitData.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ public class DevInitData {
3939

4040
@Bean
4141
ApplicationRunner DevInitDataApplicationRunner() {
42-
return args -> initialize();
42+
return args -> {
43+
initialize();
44+
};
4345
}
4446

45-
@Transactional
4647
public void initialize() {
4748
runDataSql();
4849
initUsersAndPostsAndComments();
@@ -102,7 +103,7 @@ public void initUsersAndPostsAndComments() {
102103
}
103104
}
104105

105-
private void createSamplePosts(User user1, User user2, User user3) {
106+
private void createSamplePosts(User user1, User user2, User user3) { // ⭐ @Transactional 제거
106107
Post post1 = new Post(user1,
107108
"[백엔드] 같이 스프링 공부하실 분 구해요!",
108109
"매주 토요일 오후 2시에 온라인으로 스터디 진행합니다.\n교재는 '스프링 완전정복'을 사용할 예정입니다.",

src/test/java/com/back/domain/studyroom/controller/RoomControllerTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@ void getRoomMembers() {
329329
given(currentUser.getUserId()).willReturn(1L);
330330

331331
given(roomService.getRoomMembers(eq(1L), eq(1L))).willReturn(Arrays.asList(testMember));
332+
333+
// toRoomMemberResponseList 호출 추가
334+
List<RoomMemberResponse> memberResponses = Arrays.asList(RoomMemberResponse.from(testMember));
335+
given(roomService.toRoomMemberResponseList(eq(1L), anyList())).willReturn(memberResponses);
332336

333337
// when
334338
ResponseEntity<RsData<List<RoomMemberResponse>>> response = roomController.getRoomMembers(1L);
@@ -342,6 +346,7 @@ void getRoomMembers() {
342346

343347
verify(currentUser, times(1)).getUserId();
344348
verify(roomService, times(1)).getRoomMembers(eq(1L), eq(1L));
349+
verify(roomService, times(1)).toRoomMemberResponseList(eq(1L), anyList());
345350
}
346351

347352
@Test

src/test/java/com/back/domain/studyroom/service/RoomServiceTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ class RoomServiceTest {
5858

5959
@Mock
6060
private NotificationService notificationService;
61+
62+
@Mock
63+
private AvatarService avatarService;
6164

6265
@InjectMocks
6366
private RoomService roomService;
@@ -157,14 +160,16 @@ void joinRoom_Success() {
157160
given(userRepository.findById(2L)).willReturn(Optional.of(testUser));
158161
given(roomMemberRepository.findByRoomIdAndUserId(1L, 2L)).willReturn(Optional.empty());
159162
given(roomParticipantService.getParticipantCount(1L)).willReturn(0L); // Redis 카운트
163+
given(avatarService.loadOrCreateAvatar(1L, 2L)).willReturn(1L); // 아바타 Mock 추가
160164

161165
// when
162166
RoomMember joinedMember = roomService.joinRoom(1L, null, 2L);
163167

164168
// then
165169
assertThat(joinedMember).isNotNull();
166170
assertThat(joinedMember.getRole()).isEqualTo(RoomRole.VISITOR);
167-
verify(roomParticipantService, times(1)).enterRoom(2L, 1L); // Redis 입장 확인
171+
verify(avatarService, times(1)).loadOrCreateAvatar(1L, 2L);
172+
verify(roomParticipantService, times(1)).enterRoom(eq(2L), eq(1L), any()); // avatarId 파라미터 추가
168173
verify(roomMemberRepository, never()).save(any(RoomMember.class)); // DB 저장 안됨!
169174
}
170175

0 commit comments

Comments
 (0)