refactor: 게임 방 정보 조회 Fixture 사용하도록 수정 #114

woowacourse-teams · Aug 4, 2024 · 970e5e0 · 970e5e0
1 parent c7ad09f
commit 970e5e0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 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
@@ -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
@@ -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())
             );
         }
     }