Skip to content

Commit 707ada4

Browse files
committed
[test/#350] Hibernate 6 업데이트에 따른 테스트 수정
1 parent 42485b7 commit 707ada4

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
uniqueConstraints = {
2727
@UniqueConstraint(
2828
name = "UNIQUE_PROVIDER_UID",
29-
columnNames = {"provider", "uid"})
29+
columnNames = {"provider", "UID"})
3030
})
3131
@Getter
3232
@NoArgsConstructor(access = AccessLevel.PROTECTED)

resource-server/src/test/java/com/inhabas/api/domain/questionnaire/repository/QuestionnaireRepositoryTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public void countByIdIn() {
2727
ArrayList<Questionnaire> questionnaireInDatabase =
2828
new ArrayList<>() {
2929
{
30-
add(new Questionnaire(1L, "지원동기 및 목표를 기술해주세요."));
31-
add(new Questionnaire(2L, "프로그래밍 관련 언어를 다루어 본 적이 있다면 적어주세요."));
32-
add(new Questionnaire(3L, "빅데이터 관련 활동 혹은 공모전 관련 경험이 있다면 적어주세요."));
33-
add(new Questionnaire(4L, "추후 희망하는 진로가 무엇이며, 동아리 활동이 진로에 어떠한 영향을 줄 것이라고 생각하나요?"));
34-
add(new Questionnaire(5L, "어떤 경로로 IBAS를 알게 되셨나요?"));
30+
add(new Questionnaire(null, "지원동기 및 목표를 기술해주세요."));
31+
add(new Questionnaire(null, "프로그래밍 관련 언어를 다루어 본 적이 있다면 적어주세요."));
32+
add(new Questionnaire(null, "빅데이터 관련 활동 혹은 공모전 관련 경험이 있다면 적어주세요."));
33+
add(new Questionnaire(null, "추후 희망하는 진로가 무엇이며, 동아리 활동이 진로에 어떠한 영향을 줄 것이라고 생각하나요?"));
34+
add(new Questionnaire(null, "어떤 경로로 IBAS를 알게 되셨나요?"));
3535
}
3636
};
3737
questionnaireRepository.saveAll(questionnaireInDatabase);

resource-server/src/test/java/com/inhabas/api/domain/scholarship/repository/ScholarshipHistoryRepositoryTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
8-
import org.springframework.test.util.ReflectionTestUtils;
98

109
import com.inhabas.api.auth.domain.oauth2.member.domain.entity.Member;
1110
import com.inhabas.api.auth.domain.oauth2.member.repository.MemberRepository;
@@ -31,16 +30,17 @@ void getYearlyData() {
3130
Member writer = memberRepository.save(MemberTest.chiefMember());
3231
ScholarshipHistory scholarshipHistory =
3332
new ScholarshipHistory(writer, "title", LocalDateTime.now());
34-
ReflectionTestUtils.setField(scholarshipHistory, "id", 1L);
3533
ScholarshipHistory savedScholarshipHistory =
3634
scholarshipHistoryRepository.save(scholarshipHistory);
3735
Data data =
38-
new Data(1L, savedScholarshipHistory.getTitle(), savedScholarshipHistory.getDateHistory());
36+
new Data(
37+
savedScholarshipHistory.getId(),
38+
savedScholarshipHistory.getTitle(),
39+
savedScholarshipHistory.getDateHistory());
3940
List<YearlyData> savedData =
4041
List.of(new YearlyData(savedScholarshipHistory.getDateHistory().getYear(), List.of(data)));
4142

4243
// when
43-
scholarshipHistoryRepository.save(scholarshipHistory);
4444
List<YearlyData> yearlyData = scholarshipHistoryRepository.getYearlyData();
4545

4646
// then

resource-server/src/test/java/com/inhabas/api/domain/signUp/SignUpIntegrationTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,11 @@ public static RequestPostProcessor accessToken(String accessToken) {
348348
private void 면접질문_설정() {
349349
questionnaireRepository.saveAll(
350350
Arrays.asList(
351-
new Questionnaire(1L, "지원동기 및 목표를 기술해주세요."),
352-
new Questionnaire(2L, "프로그래밍 관련 언어를 다루어 본 적이 있다면 적어주세요."),
353-
new Questionnaire(3L, "빅데이터 관련 활동 혹은 공모전 관련 경험이 있다면 적어주세요."),
354-
new Questionnaire(4L, "추후 희망하는 진로가 무엇이며, 동아리 활동이 진로에 어떠한 영향을 줄 것이라고 생각하나요?"),
355-
new Questionnaire(5L, "어떤 경로로 IBAS를 알게 되셨나요?")));
351+
new Questionnaire(null, "지원동기 및 목표를 기술해주세요."),
352+
new Questionnaire(null, "프로그래밍 관련 언어를 다루어 본 적이 있다면 적어주세요."),
353+
new Questionnaire(null, "빅데이터 관련 활동 혹은 공모전 관련 경험이 있다면 적어주세요."),
354+
new Questionnaire(null, "추후 희망하는 진로가 무엇이며, 동아리 활동이 진로에 어떠한 영향을 줄 것이라고 생각하나요?"),
355+
new Questionnaire(null, "어떤 경로로 IBAS를 알게 되셨나요?")));
356356
}
357357

358358
private void 전공정보_설정() {

resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class AnswerRepositoryTest {
3333
void findByMember_Id() {
3434
// given
3535
Member member = memberRepository.save(MemberTest.signingUpMember1());
36-
Questionnaire questionnaire = new Questionnaire(1L, "hello");
36+
Questionnaire questionnaire = new Questionnaire(null, "hello");
3737
questionnaireRepository.save(questionnaire);
3838
String content = "Ok... bye";
3939
Answer answer = new Answer(member, questionnaire, content);

resource-server/src/test/java/com/inhabas/api/web/ContestBoardControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ void updateBoard_Invalid_Input() throws Exception {
316316
// when
317317
String response =
318318
mvc.perform(
319-
post("/contest/contest/")
319+
post("/contest/contest/1")
320320
.contentType(MediaType.APPLICATION_JSON)
321321
.content(jsonOf(saveContestBoardDto)))
322322
.andExpect(status().isBadRequest())

resource-server/src/test/java/com/inhabas/api/web/MenuControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void getTotalMenuInfoTest() throws Exception {
4949
.andExpect(
5050
content()
5151
.string(
52-
"[{\"id\":1,\"groupName\":\"IBAS\",\"menuList\":[{\"menuId\":6,\"priority\":1,\"name\":\"ë\u008F\u0099ì\u0095\u0084리 ì\u0086\u008Cê°\u009C\",\"type\":\"INTRODUCE\",\"description\":\"\"}]}]"))
52+
"[{\"id\":1,\"groupName\":\"IBAS\",\"menuList\":[{\"menuId\":6,\"priority\":1,\"name\":\"동아리 소개\",\"type\":\"INTRODUCE\",\"description\":\"\"}]}]"))
5353
.andReturn();
5454

5555
then(menuService).should(times(1)).getAllMenuInfo();
@@ -66,7 +66,7 @@ public void getMenuInfoByIdTest() throws Exception {
6666
.andExpect(
6767
content()
6868
.string(
69-
"{\"menuId\":6,\"priority\":1,\"name\":\"ê³µì§\u0080ì\u0082¬í\u0095\u00AD\",\"type\":\"LIST\",\"description\":\"\"}"))
69+
"{\"menuId\":6,\"priority\":1,\"name\":\"공지사항\",\"type\":\"LIST\",\"description\":\"\"}"))
7070
.andExpect(status().isOk())
7171
.andReturn();
7272

resource-server/src/test/java/com/inhabas/testAnnotataion/NoSecureWebMvcTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.lang.annotation.RetentionPolicy;
66
import java.lang.annotation.Target;
77

8-
import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
8+
import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientWebSecurityAutoConfiguration;
99
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
1010
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
1111
import org.springframework.context.annotation.Import;
@@ -16,7 +16,7 @@
1616

1717
/**
1818
* WebMvcTest(excludeAutoConfiguration = {SecurityAutoConfiguration.class,
19-
* OAuth2ClientAutoConfiguration.class}) , default security filter 를 사용하지 않음. 테스트 설정 파일에서
19+
* OAuth2ClientWebSecurityAutoConfiguration.class}) , default security filter 를 사용하지 않음. 테스트 설정 파일에서
2020
* OAuth2Client 정보를 읽어들이지 않음.
2121
*
2222
* @see DefaultWebMvcTest
@@ -27,7 +27,7 @@
2727
@WebMvcTest(
2828
excludeAutoConfiguration = {
2929
SecurityAutoConfiguration.class,
30-
OAuth2ClientAutoConfiguration.class
30+
OAuth2ClientWebSecurityAutoConfiguration.class
3131
}) // disable default spring-security configuration
3232
@Import(InterceptorConfigMockBean.class)
3333
public @interface NoSecureWebMvcTest {

0 commit comments

Comments
 (0)