From 09014efd7b5769f0408e1f1395664ef31b76cd57 Mon Sep 17 00:00:00 2001 From: pricelees Date: Tue, 22 Jul 2025 16:13:47 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20API=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=97=90=EC=84=9C=EC=9D=98=20=EC=9A=94=EC=B2=AD=20/=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=EB=A1=9C=EA=B9=85=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 추후 테스트 실패시 추가하여 확인 --- .../roomescape/auth/web/AuthControllerTest.kt | 8 ------ .../member/controller/MemberControllerTest.kt | 3 --- .../web/ReservationControllerTest.kt | 25 ------------------- .../reservation/web/TimeControllerTest.kt | 11 -------- .../theme/web/ThemeControllerTest.kt | 11 -------- .../roomescape/view/PageControllerTest.kt | 8 ------ 6 files changed, 66 deletions(-) diff --git a/src/test/kotlin/roomescape/auth/web/AuthControllerTest.kt b/src/test/kotlin/roomescape/auth/web/AuthControllerTest.kt index a4f575d1..8fa954f9 100644 --- a/src/test/kotlin/roomescape/auth/web/AuthControllerTest.kt +++ b/src/test/kotlin/roomescape/auth/web/AuthControllerTest.kt @@ -43,7 +43,6 @@ class AuthControllerTest( mockMvc = mockMvc, endpoint = endpoint, body = userRequest, - log = true ) { status { isOk() } header { @@ -66,7 +65,6 @@ class AuthControllerTest( mockMvc = mockMvc, endpoint = endpoint, body = userRequest, - log = true ) { status { isBadRequest() } jsonPath("$.errorType", equalTo(ErrorType.MEMBER_NOT_FOUND.name)) @@ -83,7 +81,6 @@ class AuthControllerTest( mockMvc = mockMvc, endpoint = endpoint, body = invalidRequest, - log = true ) { status { isBadRequest() } jsonPath("$.message", containsString("이메일 형식이 일치하지 않습니다.")) @@ -97,7 +94,6 @@ class AuthControllerTest( mockMvc = mockMvc, endpoint = endpoint, body = invalidRequest, - log = true ) { status { isBadRequest() } jsonPath("$.message", containsString("비밀번호는 공백일 수 없습니다.")) @@ -116,7 +112,6 @@ class AuthControllerTest( runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isOk() } jsonPath("$.data.name", equalTo(user.name)) @@ -134,7 +129,6 @@ class AuthControllerTest( runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isBadRequest() } jsonPath("$.errorType", equalTo(ErrorType.MEMBER_NOT_FOUND.name)) @@ -153,7 +147,6 @@ class AuthControllerTest( runPostTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { is3xxRedirection() } header { @@ -170,7 +163,6 @@ class AuthControllerTest( runPostTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isOk() } header { diff --git a/src/test/kotlin/roomescape/member/controller/MemberControllerTest.kt b/src/test/kotlin/roomescape/member/controller/MemberControllerTest.kt index 27c085a0..b34e2555 100644 --- a/src/test/kotlin/roomescape/member/controller/MemberControllerTest.kt +++ b/src/test/kotlin/roomescape/member/controller/MemberControllerTest.kt @@ -35,7 +35,6 @@ class MemberControllerTest( val result: String = runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isOk() } }.andReturn().response.contentAsString @@ -59,7 +58,6 @@ class MemberControllerTest( runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { is3xxRedirection() } header { @@ -74,7 +72,6 @@ class MemberControllerTest( runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { is3xxRedirection() } header { diff --git a/src/test/kotlin/roomescape/reservation/web/ReservationControllerTest.kt b/src/test/kotlin/roomescape/reservation/web/ReservationControllerTest.kt index 946217eb..70f28bf8 100644 --- a/src/test/kotlin/roomescape/reservation/web/ReservationControllerTest.kt +++ b/src/test/kotlin/roomescape/reservation/web/ReservationControllerTest.kt @@ -80,7 +80,6 @@ class ReservationControllerTest( }.When { post("/reservations") }.Then { - log().all() statusCode(201) body("data.date", equalTo(reservationRequest.date.toString())) body("data.status", equalTo(ReservationStatus.CONFIRMED.name)) @@ -105,7 +104,6 @@ class ReservationControllerTest( }.When { post("/reservations") }.Then { - log().all() statusCode(paymentException.httpStatus.value()) body("errorType", equalTo(paymentException.errorType.name)) } @@ -143,7 +141,6 @@ class ReservationControllerTest( }.When { post("/reservations") }.Then { - log().all() statusCode(expectedException.httpStatus.value()) body("errorType", equalTo(expectedException.errorType.name)) } @@ -171,7 +168,6 @@ class ReservationControllerTest( }.When { get("/reservations") }.Then { - log().all() statusCode(200) body("data.reservations.size()", equalTo(reservations.values.sumOf { it.size })) } @@ -194,7 +190,6 @@ class ReservationControllerTest( }.When { get("/reservations-mine") }.Then { - log().all() statusCode(200) body("data.reservations.size()", equalTo(expectedReservations)) } @@ -216,7 +211,6 @@ class ReservationControllerTest( }.When { get("/reservations/search") }.Then { - log().all() header(HttpHeaders.CONTENT_TYPE, containsString(MediaType.TEXT_HTML_VALUE)) } } @@ -230,7 +224,6 @@ class ReservationControllerTest( }.When { get("/reservations/search") }.Then { - log().all() statusCode(200) body("data.reservations.size()", equalTo(reservations.values.sumOf { it.size })) } @@ -250,7 +243,6 @@ class ReservationControllerTest( }.When { get("/reservations/search") }.Then { - log().all() statusCode(HttpStatus.BAD_REQUEST.value()) body("errorType", equalTo(ErrorType.INVALID_DATE_RANGE.name)) } @@ -267,7 +259,6 @@ class ReservationControllerTest( }.When { get("/reservations/search") }.Then { - log().all() statusCode(200) body("data.reservations.size()", equalTo(reservations[member]?.size ?: 0)) } @@ -285,7 +276,6 @@ class ReservationControllerTest( }.When { get("/reservations/search") }.Then { - log().all() statusCode(200) body("data.reservations.size()", equalTo(themes.filter { it.id == requestThemeId }.size)) } @@ -304,7 +294,6 @@ class ReservationControllerTest( }.When { get("/reservations/search") }.Then { - log().all() statusCode(200) body("data.reservations.size()", equalTo(reservations.values.sumOf { it.size })) } @@ -326,7 +315,6 @@ class ReservationControllerTest( }.When { delete("/reservations/${reservation.id}") }.Then { - log().all() statusCode(302) header(HttpHeaders.LOCATION, containsString("/login")) } @@ -352,7 +340,6 @@ class ReservationControllerTest( }.When { delete("/reservations/$reservationId") }.Then { - log().all() statusCode(HttpStatus.NO_CONTENT.value()) } @@ -393,7 +380,6 @@ class ReservationControllerTest( }.When { delete("/reservations/${reservation.id}") }.Then { - log().all() statusCode(HttpStatus.NO_CONTENT.value()) } @@ -425,7 +411,6 @@ class ReservationControllerTest( }.When { post("/reservations/admin") }.Then { - log().all() statusCode(201) body("data.status", equalTo(ReservationStatus.CONFIRMED_PAYMENT_REQUIRED.name)) } @@ -447,7 +432,6 @@ class ReservationControllerTest( }.When { get("/reservations/waiting") }.Then { - log().all() header(HttpHeaders.CONTENT_TYPE, containsString(MediaType.TEXT_HTML_VALUE)) } } @@ -463,7 +447,6 @@ class ReservationControllerTest( }.When { get("/reservations/waiting") }.Then { - log().all() statusCode(200) body("data.reservations.size()", equalTo(expected)) } @@ -488,7 +471,6 @@ class ReservationControllerTest( }.When { post("/reservations/waiting") }.Then { - log().all() statusCode(201) body("data.member.id", equalTo(member.id!!.toInt())) body("data.status", equalTo(ReservationStatus.WAITING.name)) @@ -526,7 +508,6 @@ class ReservationControllerTest( }.When { post("/reservations/waiting") }.Then { - log().all() statusCode(HttpStatus.BAD_REQUEST.value()) body("errorType", equalTo(ErrorType.HAS_RESERVATION_OR_WAITING.name)) } @@ -551,7 +532,6 @@ class ReservationControllerTest( }.When { delete("/reservations/waiting/${waiting.id}") }.Then { - log().all() statusCode(HttpStatus.NO_CONTENT.value()) } @@ -575,7 +555,6 @@ class ReservationControllerTest( }.When { delete("/reservations/waiting/{id}", reservation.id) }.Then { - log().all() body("errorType", equalTo(ErrorType.RESERVATION_NOT_FOUND.name)) statusCode(HttpStatus.NOT_FOUND.value()) } @@ -591,7 +570,6 @@ class ReservationControllerTest( }.When { post("/reservations/waiting/1/approve") }.Then { - log().all() statusCode(302) header(HttpHeaders.LOCATION, containsString("/login")) } @@ -609,7 +587,6 @@ class ReservationControllerTest( }.When { post("/reservations/waiting/${reservation.id!!}/approve") }.Then { - log().all() statusCode(200) } @@ -633,7 +610,6 @@ class ReservationControllerTest( }.When { post("/reservations/waiting/1/deny") }.Then { - log().all() statusCode(302) header(HttpHeaders.LOCATION, containsString("/login")) } @@ -651,7 +627,6 @@ class ReservationControllerTest( }.When { post("/reservations/waiting/${reservation.id!!}/deny") }.Then { - log().all() statusCode(204) } diff --git a/src/test/kotlin/roomescape/reservation/web/TimeControllerTest.kt b/src/test/kotlin/roomescape/reservation/web/TimeControllerTest.kt index 3e9b9968..6883d893 100644 --- a/src/test/kotlin/roomescape/reservation/web/TimeControllerTest.kt +++ b/src/test/kotlin/roomescape/reservation/web/TimeControllerTest.kt @@ -59,7 +59,6 @@ class TimeControllerTest( runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isOk() } content { @@ -78,7 +77,6 @@ class TimeControllerTest( runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { is3xxRedirection() } header { string("Location", "/login") } @@ -106,7 +104,6 @@ class TimeControllerTest( mockMvc = mockMvc, endpoint = endpoint, body = it, - log = true ) { status { isBadRequest() } } @@ -122,7 +119,6 @@ class TimeControllerTest( mockMvc = mockMvc, endpoint = endpoint, body = request, - log = true ) { status { isCreated() } content { @@ -142,7 +138,6 @@ class TimeControllerTest( mockMvc = mockMvc, endpoint = endpoint, body = request, - log = true ) { status { isConflict() } content { @@ -161,7 +156,6 @@ class TimeControllerTest( mockMvc = mockMvc, endpoint = endpoint, body = TimeFixture.create(), - log = true ) { status { is3xxRedirection() } header { string("Location", "/login") } @@ -186,7 +180,6 @@ class TimeControllerTest( runDeleteTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isNoContent() } } @@ -201,7 +194,6 @@ class TimeControllerTest( runDeleteTest( mockMvc = mockMvc, endpoint = "/times/$id", - log = true ) { status { isBadRequest() } content { @@ -224,7 +216,6 @@ class TimeControllerTest( runDeleteTest( mockMvc = mockMvc, endpoint = "/times/$id", - log = true ) { status { isConflict() } content { @@ -242,7 +233,6 @@ class TimeControllerTest( runDeleteTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { is3xxRedirection() } header { string("Location", "/login") } @@ -283,7 +273,6 @@ class TimeControllerTest( val response = runGetTest( mockMvc = mockMvc, endpoint = "/times/filter?date=$date&themeId=$themeId", - log = true ) { status { isOk() } content { diff --git a/src/test/kotlin/roomescape/theme/web/ThemeControllerTest.kt b/src/test/kotlin/roomescape/theme/web/ThemeControllerTest.kt index ff678493..34d8b1e3 100644 --- a/src/test/kotlin/roomescape/theme/web/ThemeControllerTest.kt +++ b/src/test/kotlin/roomescape/theme/web/ThemeControllerTest.kt @@ -36,7 +36,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { is3xxRedirection() } header { @@ -61,7 +60,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { val response: ThemesResponse = runGetTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isOk() } content { @@ -92,7 +90,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { mockMvc = mockMvc, endpoint = endpoint, body = request, - log = true ) { status { is3xxRedirection() } header { @@ -109,7 +106,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { mockMvc = mockMvc, endpoint = endpoint, body = request, - log = true ) { status { is3xxRedirection() } jsonPath("$.errorType") { value("PERMISSION_DOES_NOT_EXIST") } @@ -129,7 +125,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { mockMvc = mockMvc, endpoint = endpoint, body = request, - log = true ) { status { isConflict() } jsonPath("$.errorType") { value("THEME_DUPLICATED") } @@ -153,7 +148,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { mockMvc = mockMvc, endpoint = endpoint, body = request, - log = true ) { status { isBadRequest() } } @@ -214,7 +208,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { mockMvc = mockMvc, endpoint = endpoint, body = request, - log = true ) { status { isCreated() } header { @@ -239,7 +232,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { runDeleteTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { is3xxRedirection() } header { @@ -255,7 +247,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { runDeleteTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { is3xxRedirection() } jsonPath("$.errorType") { value("PERMISSION_DOES_NOT_EXIST") } @@ -274,7 +265,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { runDeleteTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isConflict() } jsonPath("$.errorType") { value("THEME_IS_USED_CONFLICT") } @@ -297,7 +287,6 @@ class ThemeControllerTest(mockMvc: MockMvc) : RoomescapeApiTest() { runDeleteTest( mockMvc = mockMvc, endpoint = endpoint, - log = true ) { status { isNoContent() } } diff --git a/src/test/kotlin/roomescape/view/PageControllerTest.kt b/src/test/kotlin/roomescape/view/PageControllerTest.kt index a9f10075..0b223c7b 100644 --- a/src/test/kotlin/roomescape/view/PageControllerTest.kt +++ b/src/test/kotlin/roomescape/view/PageControllerTest.kt @@ -24,7 +24,6 @@ class PageControllerTest( runGetTest( mockMvc = mockMvc, endpoint = it, - log = true ) { status { isOk() } } @@ -36,7 +35,6 @@ class PageControllerTest( runGetTest( mockMvc = mockMvc, endpoint = it, - log = true ) { status { isOk() } } @@ -48,7 +46,6 @@ class PageControllerTest( runGetTest( mockMvc = mockMvc, endpoint = it, - log = true ) { status { isOk() } } @@ -66,7 +63,6 @@ class PageControllerTest( runGetTest( mockMvc = mockMvc, endpoint = it, - log = true ) { status { isOk() } } @@ -80,7 +76,6 @@ class PageControllerTest( runGetTest( mockMvc = mockMvc, endpoint = it, - log = true ) { status { is3xxRedirection() } header { @@ -101,7 +96,6 @@ class PageControllerTest( runGetTest( mockMvc = mockMvc, endpoint = it, - log = true ) { status { isOk() } } @@ -112,7 +106,6 @@ class PageControllerTest( runGetTest( mockMvc = mockMvc, endpoint = it, - log = true ) { status { isOk() } } @@ -126,7 +119,6 @@ class PageControllerTest( runGetTest( mockMvc = mockMvc, endpoint = it, - log = true ) { status { is3xxRedirection() } header {