From 970e5e014711481d3cf422d3474b47d43050ad66 Mon Sep 17 00:00:00 2001 From: PgmJun <84304802+PgmJun@users.noreply.github.com> Date: Sun, 4 Aug 2024 22:24:23 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B2=8C=EC=9E=84=20=EB=B0=A9=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20Fixture=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20#11?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../balance/room/RoomControllerTest.java | 21 +++++++++++++------ .../service/balance/room/RoomServiceTest.java | 19 ++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/backend/src/test/java/ddangkong/controller/balance/room/RoomControllerTest.java b/backend/src/test/java/ddangkong/controller/balance/room/RoomControllerTest.java index 82e46410..2216a066 100644 --- a/backend/src/test/java/ddangkong/controller/balance/room/RoomControllerTest.java +++ b/backend/src/test/java/ddangkong/controller/balance/room/RoomControllerTest.java @@ -10,6 +10,7 @@ import ddangkong.controller.balance.room.dto.RoomJoinResponse; import ddangkong.controller.balance.room.dto.RoomSettingRequest; import ddangkong.domain.balance.content.Category; +import ddangkong.domain.balance.room.Room; import ddangkong.service.balance.room.dto.RoundFinishedResponse; import io.restassured.RestAssured; import io.restassured.http.ContentType; @@ -27,19 +28,27 @@ class 밸런스_게임_방_정보_조회 { @Test void 게임_방_정보_조회() { - //when + // given + Room room = roomFixture.createNewRoom(); + memberFixture.createMaster("방장", room); + memberFixture.createCommon("참가자1", room); + memberFixture.createCommon("참가자2", room); + memberFixture.createCommon("참가자3", room); + + // when RoomInfoResponse actual = RestAssured.given() - .when().get("/api/balances/rooms/1") + .pathParam("roomId", room.getId()) + .when().get("/api/balances/rooms/{roomId}") .then().contentType(ContentType.JSON).log().all() .statusCode(200) .extract().as(RoomInfoResponse.class); - //then + // then assertAll( () -> Assertions.assertThat(actual.members()).hasSize(4), - () -> Assertions.assertThat(actual.isGameStart()).isTrue(), - () -> Assertions.assertThat(actual.roomSetting().timeLimit()).isEqualTo(30000), - () -> Assertions.assertThat(actual.roomSetting().totalRound()).isEqualTo(5) + () -> Assertions.assertThat(actual.isGameStart()).isFalse(), + () -> Assertions.assertThat(actual.roomSetting().timeLimit()).isEqualTo(room.getTimeLimit()), + () -> Assertions.assertThat(actual.roomSetting().totalRound()).isEqualTo(room.getTotalRound()) ); } } diff --git a/backend/src/test/java/ddangkong/service/balance/room/RoomServiceTest.java b/backend/src/test/java/ddangkong/service/balance/room/RoomServiceTest.java index 3dde6489..3404435b 100644 --- a/backend/src/test/java/ddangkong/service/balance/room/RoomServiceTest.java +++ b/backend/src/test/java/ddangkong/service/balance/room/RoomServiceTest.java @@ -38,19 +38,22 @@ class 게임_방_정보_조회 { @Test void 게임_방_정보를_조회한다() { + // given + Room room = roomFixture.createNewRoom(); + memberFixture.createMaster("방장", room); + memberFixture.createCommon("참가자1", room); + memberFixture.createCommon("참가자2", room); + memberFixture.createCommon("참가자3", room); + // when - RoomJoinResponse room = roomService.createRoom("방장"); - roomService.joinRoom("멤버1", room.roomId()); - roomService.joinRoom("멤버2", room.roomId()); + RoomInfoResponse actual = roomService.findRoomInfo(room.getId()); // then - RoomInfoResponse actual = roomService.findRoomInfo(room.roomId()); - assertAll( - () -> Assertions.assertThat(actual.members()).hasSize(3), + () -> Assertions.assertThat(actual.members()).hasSize(4), () -> Assertions.assertThat(actual.isGameStart()).isFalse(), - () -> Assertions.assertThat(actual.roomSetting().timeLimit()).isEqualTo(30000), - () -> Assertions.assertThat(actual.roomSetting().totalRound()).isEqualTo(5) + () -> Assertions.assertThat(actual.roomSetting().timeLimit()).isEqualTo(room.getTimeLimit()), + () -> Assertions.assertThat(actual.roomSetting().totalRound()).isEqualTo(room.getTotalRound()) ); } }