From 5fa5e5c49dc5ae1cf1b798a2b3f70cc9796dba8b Mon Sep 17 00:00:00 2001 From: pricelees Date: Mon, 15 Sep 2025 13:30:27 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=97=90=EC=84=9C=EC=9D=98=20=EC=B4=88=EA=B8=B0=ED=99=94=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EB=A9=94=EC=84=9C=EB=93=9C=EC=97=90=20?= =?UTF-8?q?=EA=B0=80=EB=8F=85=EC=84=B1=EC=9D=84=20=EC=9C=84=ED=95=9C=20pri?= =?UTF-8?q?ntln=20=EB=A1=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomescape/supports/RestAssuredUtils.kt | 1 + .../roomescape/supports/TestAuthUtil.kt | 26 +++++++++++++++---- .../kotlin/roomescape/supports/TestUtil.kt | 6 ++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt b/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt index 69ab256a..31aaa1c7 100644 --- a/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt +++ b/src/test/kotlin/roomescape/supports/RestAssuredUtils.kt @@ -17,6 +17,7 @@ fun runTest( on: RequestSpecification.() -> Response, expect: ValidatableResponse.() -> Unit ): ValidatableResponse { + println("[runTest] 테스트 시작") return Given { contentType(MediaType.APPLICATION_JSON_VALUE) token?.also { header("Authorization", "Bearer $token") } diff --git a/src/test/kotlin/roomescape/supports/TestAuthUtil.kt b/src/test/kotlin/roomescape/supports/TestAuthUtil.kt index 55e66d0d..a429c424 100644 --- a/src/test/kotlin/roomescape/supports/TestAuthUtil.kt +++ b/src/test/kotlin/roomescape/supports/TestAuthUtil.kt @@ -22,20 +22,28 @@ class TestAuthUtil( private val storeRepository: StoreRepository, ) { fun createAdmin(admin: AdminEntity): AdminEntity { + println("[TestAuthUtil] 관리자 생성 시작. id=${admin.id}") + val storeId = admin.storeId if (storeId != null && storeRepository.findByIdOrNull(storeId) == null) { + println("[TestAuthUtil] 매장 정보 없음. 매장 생성 시작. storeId=${storeId} adminId=${admin.id}") storeRepository.save( StoreFixture.create( id = storeId, businessRegNum = randomBusinessRegNum(), ) - ) + ).also { + println("[TestAuthUtil] 매장 생성 완료. storeId=${storeId} adminId=${admin.id}") + } } - return adminRepository.save(admin) + return adminRepository.save(admin).also { + println("[TestAuthUtil] 관리자 생성 완료. id=${admin.id}") + } } - fun signup(request: UserCreateRequest): UserEntity { + fun signup(request: UserCreateRequest): UserEntity { + println("[TestAuthUtil] 회원가입 시작: $request") val userId: Long = Given { contentType(MediaType.APPLICATION_JSON_VALUE) body(request) @@ -48,14 +56,16 @@ class TestAuthUtil( } return userRepository.findByIdOrNull(userId) + ?.also { println("[TestAuthUtil] 회원가입 완료. 회원 반환: $userId") } ?: throw AssertionError("Unexpected Exception Occurred.") } fun adminLogin(admin: AdminEntity): String { + println("[TestAuthUtil] 관리자 로그인 시작. id=${admin.id}, account=${admin.account}") val saved = createAdmin(admin) val requestBody = LoginRequest(saved.account, saved.password, PrincipalType.ADMIN) - return Given { + val token: String = Given { contentType(MediaType.APPLICATION_JSON_VALUE) body(requestBody) } When { @@ -65,17 +75,21 @@ class TestAuthUtil( } Extract { path("data.accessToken") } + + return token.also { println("[TestAuthUtil] 관리자 로그인 완료. id=${admin.id}, account=${admin.account}") } } fun defaultStoreAdminLogin(): String = adminLogin(AdminFixture.storeDefault) fun defaultHqAdminLogin(): String = adminLogin(AdminFixture.hqDefault) fun userLogin(user: UserEntity): String { + println("[TestAuthUtil] 회원 로그인 시작. id=${user.id}, email=${user.email}") if (userRepository.findByEmail(user.email) == null) { + println("[TestAuthUtil] 회원 정보 없음. 회원 생성 시작. email=${user.email}") userRepository.save(user) } - return Given { + val token: String = Given { contentType(MediaType.APPLICATION_JSON_VALUE) body(LoginRequest(account = user.email, password = user.password, principalType = PrincipalType.USER)) } When { @@ -85,6 +99,8 @@ class TestAuthUtil( } Extract { path("data.accessToken") } + + return token.also { println("[TestAuthUtil] 회원 로그인 완료. id=${user.id}, email=${user.email}") } } fun defaultUserLogin(): String = userLogin(UserFixture.default) diff --git a/src/test/kotlin/roomescape/supports/TestUtil.kt b/src/test/kotlin/roomescape/supports/TestUtil.kt index 076be785..10c4d735 100644 --- a/src/test/kotlin/roomescape/supports/TestUtil.kt +++ b/src/test/kotlin/roomescape/supports/TestUtil.kt @@ -3,7 +3,11 @@ package roomescape.supports import kotlin.random.Random inline fun initialize(name: String, block: () -> T): T { - return block() + println("초기화 작업 시작: $name") + return block().also { + println("초기화 작업 완료: $name") + println("===================================") + } } fun randomPhoneNumber(): String {