From 45813fc04d87e0848ab813603d51fb7dea351744 Mon Sep 17 00:00:00 2001 From: pricelees Date: Thu, 18 Sep 2025 16:23:26 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20TestAuthUtil=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C?= =?UTF-8?q?=EC=97=90=EB=8F=84=20Pair=20=EB=B0=98?= =?UTF-8?q?=ED=99=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomescape/schedule/AdminScheduleApiTest.kt | 10 +++++----- .../kotlin/roomescape/schedule/ScheduleApiTest.kt | 4 ++-- src/test/kotlin/roomescape/supports/TestAuthUtil.kt | 6 +++--- .../kotlin/roomescape/theme/AdminThemeApiTest.kt | 12 ++++++------ src/test/kotlin/roomescape/user/UserApiTest.kt | 3 +-- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/test/kotlin/roomescape/schedule/AdminScheduleApiTest.kt b/src/test/kotlin/roomescape/schedule/AdminScheduleApiTest.kt index 2a953750..3411c1fb 100644 --- a/src/test/kotlin/roomescape/schedule/AdminScheduleApiTest.kt +++ b/src/test/kotlin/roomescape/schedule/AdminScheduleApiTest.kt @@ -41,7 +41,7 @@ class AdminScheduleApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.GET, endpoint = "/admin/stores/${INVALID_PK}/schedules", expectedErrorCode = AuthErrorCode.ACCESS_DENIED @@ -203,7 +203,7 @@ class AdminScheduleApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.GET, endpoint = "/admin/schedules/${INVALID_PK}/audits", expectedErrorCode = AuthErrorCode.ACCESS_DENIED @@ -298,7 +298,7 @@ class AdminScheduleApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.POST, endpoint = "/admin/stores/${INVALID_PK}/schedules", requestBody = ScheduleFixture.createRequest, @@ -451,7 +451,7 @@ class AdminScheduleApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.PATCH, endpoint = "/admin/schedules/${INVALID_PK}", requestBody = ScheduleUpdateRequest(), @@ -582,7 +582,7 @@ class AdminScheduleApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.DELETE, endpoint = "/admin/schedules/${INVALID_PK}", expectedErrorCode = AuthErrorCode.ACCESS_DENIED diff --git a/src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt b/src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt index b74060aa..81cb6d85 100644 --- a/src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt +++ b/src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt @@ -90,7 +90,7 @@ class ScheduleApiTest( val schedule = dummyInitializer.createSchedule() runTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, on = { post("/schedules/${schedule.id}/hold") }, @@ -109,7 +109,7 @@ class ScheduleApiTest( val schedule = dummyInitializer.createSchedule(status = it) runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.POST, endpoint = "/schedules/${schedule.id}/hold", expectedErrorCode = ScheduleErrorCode.SCHEDULE_NOT_AVAILABLE diff --git a/src/test/kotlin/roomescape/supports/TestAuthUtil.kt b/src/test/kotlin/roomescape/supports/TestAuthUtil.kt index f9c345fc..67379374 100644 --- a/src/test/kotlin/roomescape/supports/TestAuthUtil.kt +++ b/src/test/kotlin/roomescape/supports/TestAuthUtil.kt @@ -91,7 +91,7 @@ class TestAuthUtil( fun defaultStoreAdminLogin(): Pair = adminLogin(AdminFixture.storeDefault) fun defaultHqAdminLogin(): Pair = adminLogin(AdminFixture.hqDefault) - fun userLogin(user: UserEntity): String { + fun userLogin(user: UserEntity): Pair { println("[TestAuthUtil] 회원 로그인 시작. id=${user.id}, email=${user.email}") if (userRepository.findByEmail(user.email) == null) { println("[TestAuthUtil] 회원 정보 없음. 회원 생성 시작. email=${user.email}") @@ -109,10 +109,10 @@ class TestAuthUtil( path("data.accessToken") } - return token.also { println("[TestAuthUtil] 회원 로그인 완료. id=${user.id}, email=${user.email}") } + return user to token.also { println("[TestAuthUtil] 회원 로그인 완료. id=${user.id}, email=${user.email}") } } - fun defaultUserLogin(): String = userLogin(UserFixture.default) + fun defaultUserLogin(): Pair = userLogin(UserFixture.default) fun defaultUser(): UserEntity = userRepository.findByEmail(UserFixture.default.email) ?: userRepository.save(UserFixture.default) diff --git a/src/test/kotlin/roomescape/theme/AdminThemeApiTest.kt b/src/test/kotlin/roomescape/theme/AdminThemeApiTest.kt index 61f76d12..4663b0d9 100644 --- a/src/test/kotlin/roomescape/theme/AdminThemeApiTest.kt +++ b/src/test/kotlin/roomescape/theme/AdminThemeApiTest.kt @@ -39,7 +39,7 @@ class AdminThemeApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.POST, requestBody = createRequest, endpoint = endpoint, @@ -246,7 +246,7 @@ class AdminThemeApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.GET, requestBody = createRequest, endpoint = endpoint, @@ -295,7 +295,7 @@ class AdminThemeApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.GET, endpoint = endpoint, expectedErrorCode = AuthErrorCode.ACCESS_DENIED @@ -359,7 +359,7 @@ class AdminThemeApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.GET, endpoint = endpoint, expectedErrorCode = AuthErrorCode.ACCESS_DENIED @@ -448,7 +448,7 @@ class AdminThemeApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.DELETE, endpoint = endpoint, expectedErrorCode = AuthErrorCode.ACCESS_DENIED @@ -527,7 +527,7 @@ class AdminThemeApiTest( test("회원") { runExceptionTest( - token = testAuthUtil.defaultUserLogin(), + token = testAuthUtil.defaultUserLogin().second, method = HttpMethod.PATCH, endpoint = endpoint, requestBody = request, diff --git a/src/test/kotlin/roomescape/user/UserApiTest.kt b/src/test/kotlin/roomescape/user/UserApiTest.kt index cdf791b1..922ecf96 100644 --- a/src/test/kotlin/roomescape/user/UserApiTest.kt +++ b/src/test/kotlin/roomescape/user/UserApiTest.kt @@ -154,8 +154,7 @@ class UserApiTest( } test("정상 응답") { - val user = testAuthUtil.defaultUser() - val token = testAuthUtil.userLogin(user) + val (user, token) = testAuthUtil.defaultUserLogin() runTest( token = token,