Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] 머지 이후 오류를 수정한다 #67

Merged
merged 1 commit into from
Oct 20, 2023
Merged

[Fix] 머지 이후 오류를 수정한다 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/test/java/com/example/cargive/answer/controller/AnswerControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import static com.example.cargive.common.ApiDocumentUtils.getDocumentResponse;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
Expand Down Expand Up @@ -102,7 +100,7 @@ public void successCreateAnswer() throws Exception {
document(
"Answer/Create/Success",
getDocumentRequest(),
getDocumentResponse()
getDocumentResponse(),
pathParameters(
parameterWithName("questionId").description("질문 Id")
),
Expand Down Expand Up @@ -190,7 +188,7 @@ public void successEditAnswerTest() throws Exception {
document(
"Answer/Edit/Success",
getDocumentRequest(),
getDocumentResponse()
getDocumentResponse(),
pathParameters(
parameterWithName("answerId").description("질문 Id")
),
Expand Down Expand Up @@ -273,7 +271,7 @@ public void successDeleteAnswer() throws Exception {
document(
"Answer/Delete/Success",
getDocumentRequest(),
getDocumentResponse()
getDocumentResponse(),
pathParameters(
parameterWithName("answerId").description("질문 Id")
),
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/com/example/cargive/car/controller/CarControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import static com.example.cargive.common.ApiDocumentUtils.getDocumentResponse;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
Expand Down Expand Up @@ -219,7 +217,7 @@ public void successCreateCar() throws Exception {
document(
"Car/Create/Success",
getDocumentRequest(),
getDocumentResponse()
getDocumentResponse(),
queryParameters(
parameterWithName("memberId").description("사용자 Id")
),
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/com/example/cargive/favorite/controller/FavoriteCarControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
import static com.example.cargive.common.ApiDocumentUtils.getDocumentResponse;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.restdocs.request.RequestDocumentation.*;
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/com/example/cargive/favorite/controller/FavoritePkGroupControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
import static com.example.cargive.common.ApiDocumentUtils.getDocumentResponse;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
Expand Down Expand Up @@ -263,7 +261,7 @@ public void successCreateGroup() throws Exception {
document(
"FavoritePkGroup/Create/Success",
getDocumentRequest(),
getDocumentResponse()
getDocumentResponse(),
queryParameters(
parameterWithName("memberId").description("사용자 Id")
),
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/com/example/cargive/favorite/controller/FavoritePkInfoControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import static com.example.cargive.parkinglot.fixture.ParkingLotFixture.*;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.restdocs.request.RequestDocumentation.*;
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/com/example/cargive/history/controller/HistoryControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import static com.example.cargive.common.ApiDocumentUtils.getDocumentResponse;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.restdocs.request.RequestDocumentation.*;
Expand Down
6 changes: 2 additions & 4 deletions src/test/java/com/example/cargive/member/controller/MemberControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
import static com.example.cargive.member.fixture.MemberFixture.*;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.restdocs.request.RequestDocumentation.*;
Expand Down Expand Up @@ -325,7 +323,7 @@ public void successEditMember() throws Exception {
document(
"Member/Edit/Success",
getDocumentRequest(),
getDocumentResponse())
getDocumentResponse(),
queryParameters(
parameterWithName("memberId").description("사용자 Id")
),
Expand Down Expand Up @@ -453,7 +451,7 @@ public void successDeleteMember() throws Exception {
document(
"Member/Delete/Success",
getDocumentRequest(),
getDocumentResponse()
getDocumentResponse(),
queryParameters(
parameterWithName("memberId").description("사용자 Id")
),
Expand Down
6 changes: 2 additions & 4 deletions src/test/java/com/example/cargive/notice/controller/NoticeControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import static com.example.cargive.notice.fixture.NoticeFixture.*;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
Expand Down Expand Up @@ -317,7 +315,7 @@ public void successEditNotice() throws Exception {
document(
"Notice/Edit/Success",
getDocumentRequest(),
getDocumentResponse()
getDocumentResponse(),
pathParameters(
parameterWithName("noticeId").description("공지사항 Id")
),
Expand Down Expand Up @@ -404,7 +402,7 @@ public void successDeleteNotice() throws Exception {
document(
"Notice/Delete/Success",
getDocumentRequest(),
getDocumentResponse()),
getDocumentResponse(),
pathParameters(
parameterWithName("noticeId").description("공지사항 Id")
),
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/com/example/cargive/parkinglot/controller/ParkingLotControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import static com.example.cargive.parkinglot.fixture.ParkingLotFixture.*;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/example/cargive/question/controller/QuestionControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/example/cargive/question/controller/QuestionFindControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.restdocs.request.RequestDocumentation.*;
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/example/cargive/tag/controller/TagControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import static com.example.cargive.common.ApiDocumentUtils.getDocumentResponse;
import static org.mockito.BDDMockito.*;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.*;
import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
Expand Down
Loading