Skip to content

Commit ccd4eb5

Browse files
rjswjddnrjswjddn
committed
test: 테스트 코드 수정
1 parent 92c8d1f commit ccd4eb5

File tree

4 files changed

+62
-65
lines changed

4 files changed

+62
-65
lines changed

‎src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
package com.oronaminc.join.answer.service;
22

3-
import static com.oronaminc.join.global.exception.ErrorCode.NOT_FOUND_ROOM;
4-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
5-
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
6-
import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
7-
import static org.mockito.ArgumentMatchers.any;
8-
import static org.mockito.ArgumentMatchers.anyLong;
9-
import static org.mockito.ArgumentMatchers.eq;
10-
import static org.mockito.BDDMockito.given;
3+
import static com.oronaminc.join.global.exception.ErrorCode.*;
4+
import static org.assertj.core.api.AssertionsForClassTypes.*;
5+
import static org.assertj.core.api.InstanceOfAssertFactories.*;
6+
import static org.mockito.ArgumentMatchers.*;
7+
import static org.mockito.BDDMockito.*;
8+
9+
import java.time.LocalDateTime;
10+
import java.util.List;
11+
import java.util.Set;
12+
13+
import org.junit.jupiter.api.BeforeEach;
14+
import org.junit.jupiter.api.DisplayName;
15+
import org.junit.jupiter.api.Test;
16+
import org.junit.jupiter.api.extension.ExtendWith;
17+
import org.mockito.InjectMocks;
18+
import org.mockito.Mock;
19+
import org.mockito.junit.jupiter.MockitoExtension;
20+
import org.springframework.data.domain.Slice;
21+
import org.springframework.test.util.ReflectionTestUtils;
1122

1223
import com.oronaminc.join.answer.dao.AnswerRepository;
1324
import com.oronaminc.join.answer.domain.Answer;
@@ -31,18 +42,6 @@
3142
import com.oronaminc.join.room.domain.Room;
3243
import com.oronaminc.join.room.domain.RoomStatus;
3344
import com.oronaminc.join.room.service.RoomReader;
34-
import java.time.LocalDateTime;
35-
import java.util.List;
36-
import java.util.Set;
37-
import org.junit.jupiter.api.BeforeEach;
38-
import org.junit.jupiter.api.DisplayName;
39-
import org.junit.jupiter.api.Test;
40-
import org.junit.jupiter.api.extension.ExtendWith;
41-
import org.mockito.InjectMocks;
42-
import org.mockito.Mock;
43-
import org.mockito.junit.jupiter.MockitoExtension;
44-
import org.springframework.data.domain.Slice;
45-
import org.springframework.test.util.ReflectionTestUtils;
4645

4746
@ExtendWith(MockitoExtension.class)
4847
public class AnswerServiceTests {
@@ -114,7 +113,7 @@ void setUp() {
114113
.participantType(ParticipantType.TEAM)
115114
.build();
116115

117-
request = new AnswerRequest("답변입니다.");
116+
request = new AnswerRequest("답변입니다.", mockMember.getId());
118117
}
119118

120119
@Test
@@ -258,7 +257,7 @@ void updateAnswer_success() {
258257
given(permissionValidator.validateAnswerUpdatePermission(1L, 1L))
259258
.willReturn(answer);
260259

261-
AnswerRequest request = new AnswerRequest("수정된 내용");
260+
AnswerRequest request = new AnswerRequest("수정된 내용", 1L);
262261

263262
// when
264263
Answer result = answerService.update(answer.getId(), answer.getMember().getId(), request);

‎src/test/java/com/oronaminc/join/emoji/service/EmojiFacadeTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void createEmoji_success_test() throws InterruptedException {
8989
executorService.submit(() -> {
9090
try {
9191
emojiFacade.createEmoji(members.get(idx).getId(),
92-
new EmojiRequest(TargetType.ROOM, roomId));
92+
new EmojiRequest(TargetType.ROOM, roomId, members.get(idx).getId()));
9393
} catch (Exception e) {
9494
e.printStackTrace();
9595
} finally {
@@ -147,7 +147,7 @@ void deleteEmoji_success_test() throws InterruptedException {
147147
executorService.submit(() -> {
148148
try {
149149
emojiFacade.deleteEmoji(members.get(idx).getId(),
150-
new EmojiRequest(TargetType.ROOM, roomId));
150+
new EmojiRequest(TargetType.ROOM, roomId, members.get(idx).getId()));
151151
} catch (Exception e) {
152152
e.printStackTrace();
153153
} finally {

‎src/test/java/com/oronaminc/join/emoji/service/EmojiServiceTests.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
package com.oronaminc.join.emoji.service;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
5-
import static org.mockito.ArgumentMatchers.any;
6-
import static org.mockito.Mockito.when;
3+
import static org.assertj.core.api.Assertions.*;
4+
import static org.mockito.ArgumentMatchers.*;
5+
import static org.mockito.Mockito.*;
6+
7+
import org.junit.jupiter.api.DisplayName;
8+
import org.junit.jupiter.api.Test;
9+
import org.junit.jupiter.api.extension.ExtendWith;
10+
import org.mockito.InjectMocks;
11+
import org.mockito.Mock;
12+
import org.mockito.junit.jupiter.MockitoExtension;
13+
import org.springframework.test.util.ReflectionTestUtils;
714

815
import com.oronaminc.join.answer.domain.Answer;
916
import com.oronaminc.join.answer.service.AnswerReader;
@@ -21,13 +28,6 @@
2128
import com.oronaminc.join.room.domain.Room;
2229
import com.oronaminc.join.room.service.RoomReader;
2330
import com.oronaminc.join.websocket.common.EventType;
24-
import org.junit.jupiter.api.DisplayName;
25-
import org.junit.jupiter.api.Test;
26-
import org.junit.jupiter.api.extension.ExtendWith;
27-
import org.mockito.InjectMocks;
28-
import org.mockito.Mock;
29-
import org.mockito.junit.jupiter.MockitoExtension;
30-
import org.springframework.test.util.ReflectionTestUtils;
3131

3232
@ExtendWith(MockitoExtension.class)
3333
class EmojiServiceTests {
@@ -81,7 +81,7 @@ void toggleEmoji_createRoomEmoji_success() {
8181

8282
// when
8383
EmojiResponse response = emojiService.createEmoji(memberId,
84-
new EmojiRequest(targetType, targetId));
84+
new EmojiRequest(targetType, targetId, memberId));
8585

8686
// then
8787
assertThat(response.event()).isEqualTo(EventType.CREATE);
@@ -119,7 +119,7 @@ void toggleEmoji_createQuestionEmoji_success() {
119119

120120
// when
121121
EmojiResponse response = emojiService.createEmoji(memberId,
122-
new EmojiRequest(targetType, targetId));
122+
new EmojiRequest(targetType, targetId, memberId));
123123

124124
// then
125125
assertThat(response.event()).isEqualTo(EventType.CREATE);
@@ -157,7 +157,7 @@ void toggleEmoji_createAnswerEmoji_success() {
157157

158158
// when
159159
EmojiResponse response = emojiService.createEmoji(memberId,
160-
new EmojiRequest(targetType, targetId));
160+
new EmojiRequest(targetType, targetId, memberId));
161161

162162
// then
163163
assertThat(response.event()).isEqualTo(EventType.CREATE);
@@ -194,7 +194,7 @@ void toggleEmoji_createRoomEmoji_fail() {
194194
// then
195195
assertThatThrownBy(
196196
() -> {
197-
emojiService.createEmoji(memberId, new EmojiRequest(targetType, targetId));
197+
emojiService.createEmoji(memberId, new EmojiRequest(targetType, targetId, memberId));
198198
}
199199
).isInstanceOf(ErrorException.class);
200200

@@ -226,7 +226,7 @@ void toggleEmoji_deleteRoomEmoji_success() {
226226

227227
// when
228228
EmojiResponse response = emojiService.deleteEmoji(memberId,
229-
new EmojiRequest(targetType, targetId));
229+
new EmojiRequest(targetType, targetId, memberId));
230230

231231
// then
232232
assertThat(response.event()).isEqualTo(EventType.DELETE);
@@ -262,7 +262,7 @@ void toggleEmoji_deleteQuestionEmoji_success() {
262262

263263
// when
264264
EmojiResponse response = emojiService.deleteEmoji(memberId,
265-
new EmojiRequest(targetType, targetId));
265+
new EmojiRequest(targetType, targetId, memberId));
266266

267267
// then
268268
assertThat(response.event()).isEqualTo(EventType.DELETE);
@@ -298,7 +298,7 @@ void toggleEmoji_deleteAnswerEmoji_success() {
298298

299299
// when
300300
EmojiResponse response = emojiService.deleteEmoji(memberId,
301-
new EmojiRequest(targetType, targetId));
301+
new EmojiRequest(targetType, targetId, memberId));
302302

303303
// then
304304
assertThat(response.event()).isEqualTo(EventType.DELETE);
@@ -335,7 +335,7 @@ void toggleEmoji_deleteRoomEmoji_fail() {
335335
// then
336336
assertThatThrownBy(
337337
() -> {
338-
emojiService.deleteEmoji(memberId, new EmojiRequest(targetType, targetId));
338+
emojiService.deleteEmoji(memberId, new EmojiRequest(targetType, targetId, memberId));
339339
}
340340
).isInstanceOf(ErrorException.class);
341341

‎src/test/java/com/oronaminc/join/question/service/QuestionServiceTests.java‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
package com.oronaminc.join.question.service;
22

3-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
4-
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
5-
import static org.mockito.ArgumentMatchers.any;
6-
import static org.mockito.ArgumentMatchers.anyLong;
7-
import static org.mockito.BDDMockito.doNothing;
8-
import static org.mockito.BDDMockito.given;
9-
import static org.mockito.BDDMockito.verify;
10-
import static org.mockito.BDDMockito.willThrow;
3+
import static org.assertj.core.api.AssertionsForClassTypes.*;
4+
import static org.mockito.ArgumentMatchers.*;
5+
import static org.mockito.BDDMockito.*;
6+
7+
import java.time.LocalDateTime;
8+
import java.util.List;
9+
10+
import org.junit.jupiter.api.BeforeEach;
11+
import org.junit.jupiter.api.DisplayName;
12+
import org.junit.jupiter.api.Test;
13+
import org.junit.jupiter.api.extension.ExtendWith;
14+
import org.mockito.InjectMocks;
15+
import org.mockito.Mock;
16+
import org.mockito.junit.jupiter.MockitoExtension;
17+
import org.springframework.data.domain.PageRequest;
18+
import org.springframework.data.domain.Pageable;
19+
import org.springframework.data.domain.Slice;
20+
import org.springframework.test.context.ActiveProfiles;
1121

1222
import com.oronaminc.join.answer.service.AnswerService;
1323
import com.oronaminc.join.global.exception.ErrorCode;
@@ -26,20 +36,8 @@
2636
import com.oronaminc.join.room.domain.Room;
2737
import com.oronaminc.join.room.domain.RoomStatus;
2838
import com.oronaminc.join.room.service.RoomReader;
29-
import java.time.LocalDateTime;
30-
import java.util.List;
39+
3140
import lombok.extern.slf4j.Slf4j;
32-
import org.junit.jupiter.api.BeforeEach;
33-
import org.junit.jupiter.api.DisplayName;
34-
import org.junit.jupiter.api.Test;
35-
import org.junit.jupiter.api.extension.ExtendWith;
36-
import org.mockito.InjectMocks;
37-
import org.mockito.Mock;
38-
import org.mockito.junit.jupiter.MockitoExtension;
39-
import org.springframework.data.domain.PageRequest;
40-
import org.springframework.data.domain.Pageable;
41-
import org.springframework.data.domain.Slice;
42-
import org.springframework.test.context.ActiveProfiles;
4341

4442
@Slf4j
4543
@ActiveProfiles("test")
@@ -93,7 +91,7 @@ void setUp() {
9391
.roomStatus(RoomStatus.STARTED)
9492
.build();
9593

96-
request = new QuestionRequest("질문입니다");
94+
request = new QuestionRequest("질문입니다", mockMember.getId());
9795

9896
mockQ1 = QuestionFlatResponse.builder()
9997
.questionId(1L)

0 commit comments

Comments
 (0)