Skip to content

Commit 2a4f05b

Browse files
committed
[fix] Controller 테스트 실패 케이스에서 cursor 검증 수정, unique email 생성 로직 수정
1 parent cc58d27 commit 2a4f05b

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

src/test/java/org/ject/support/admin/member/controller/AdminMemberSemesterControllerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.ject.support.admin.member.controller;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.hamcrest.Matchers.hasSize;
4+
import static org.hamcrest.Matchers.*;
55
import static org.ject.support.domain.member.fixture.MemberFixture.member;
66
import static org.ject.support.domain.member.fixture.SemesterActivityFixture.semesterActivity;
77
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -34,6 +34,7 @@
3434
import org.junit.jupiter.api.Test;
3535
import org.springframework.beans.factory.annotation.Autowired;
3636
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
37+
import org.springframework.cache.support.NullValue;
3738
import org.springframework.http.MediaType;
3839
import org.springframework.test.context.TestPropertySource;
3940
import org.springframework.test.web.servlet.MockMvc;
@@ -195,7 +196,7 @@ class AdminMemberSemesterControllerTest {
195196
.andExpect(jsonPath("$.data.content", hasSize(1)))
196197
.andExpect(jsonPath("$.data.content[0].memberActivityId").value(first.getId()))
197198
.andExpect(jsonPath("$.data.hasNext").value(false))
198-
.andExpect(jsonPath("$.data.nextCursor").doesNotExist())
199+
.andExpect(jsonPath("$.data.nextCursor").value(nullValue()))
199200
.andExpect(jsonPath("$.data.totalCount").value(3));
200201
}
201202

src/test/java/org/ject/support/domain/recruit/controller/QuestionControllerTest.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.ject.support.domain.recruit.domain.Question;
77
import org.ject.support.domain.recruit.domain.Recruit;
88
import org.ject.support.domain.recruit.domain.Semester;
9-
import org.ject.support.domain.recruit.repository.QuestionRepository;
109
import org.ject.support.domain.recruit.repository.RecruitRepository;
1110
import org.ject.support.domain.recruit.repository.SemesterRepository;
1211
import org.ject.support.testconfig.AuthenticatedUser;
@@ -21,6 +20,7 @@
2120

2221
import java.time.LocalDateTime;
2322
import java.util.List;
23+
import java.util.UUID;
2424

2525
import static org.assertj.core.api.Assertions.assertThat;
2626
import static org.hamcrest.Matchers.containsString;
@@ -43,9 +43,6 @@ class QuestionControllerTest {
4343
@Autowired
4444
RecruitRepository recruitRepository;
4545

46-
@Autowired
47-
QuestionRepository questionRepository;
48-
4946
@Autowired
5047
MemberRepository memberRepository;
5148

@@ -60,8 +57,7 @@ class QuestionControllerTest {
6057

6158
@BeforeEach
6259
void setUp() {
63-
String uniqueSuffix = String.valueOf(System.nanoTime());
64-
String shortSuffix = uniqueSuffix.substring(uniqueSuffix.length()-6);
60+
String uniqueSuffix = uniqueSuffix();
6561
List<Question> questions = List.of(
6662
Question.builder().sequence(1).inputType(TEXT).isRequired(true).title("title1").label("label").selectOptions(List.of("a", "b", "c")).build(),
6763
Question.builder().sequence(2).inputType(TEXT).isRequired(true).title("title2").label("label").build(),
@@ -89,13 +85,20 @@ void setUp() {
8985
recruitRepository.save(recruit);
9086

9187
member = member()
92-
.email("test_" + shortSuffix + "@gmail.com")
88+
.email("test_" + uniqueSuffix + "@t.kr")
9389
.interestedDomains(List.of())
9490
.region(null)
9591
.build();
9692
memberRepository.save(member);
9793
}
9894

95+
private String uniqueSuffix() {
96+
return UUID.randomUUID()
97+
.toString()
98+
.replace("-", "")
99+
.substring(0, 8);
100+
}
101+
99102
@Test
100103
@AuthenticatedUser
101104
void 지원서_문항_조회_시_redis에_캐싱한다() throws Exception {

0 commit comments

Comments
 (0)