diff --git a/src/main/java/com/ntlab/irisserver/entities/Member.java b/src/main/java/com/ntlab/irisserver/entities/Member.java index 1afa6df..82fe79c 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Member.java +++ b/src/main/java/com/ntlab/irisserver/entities/Member.java @@ -7,7 +7,7 @@ @JsonProperty("nickname") private String nickname; - //r:赤チーム b:青チーム n:無所属 + //r:赤チーム b:青チーム n:無所属 @JsonProperty("belongs") private String belongs; diff --git a/src/main/java/com/ntlab/irisserver/models/RoomManager.java b/src/main/java/com/ntlab/irisserver/models/RoomManager.java index b574e87..f5f7928 100644 --- a/src/main/java/com/ntlab/irisserver/models/RoomManager.java +++ b/src/main/java/com/ntlab/irisserver/models/RoomManager.java @@ -51,9 +51,9 @@ dr.addMember("owner"); //ゲームテスト用 - Room gr = new Room("gametest", "owner"); + Room gr = new Room("gametest", "RedSpy(owner)"); rooms.put("gametest", gr); - gr.addMember("owner"); + gr.addMember("RedSpy(owner)"); } diff --git a/src/main/java/com/ntlab/irisserver/resources/TestRest.java b/src/main/java/com/ntlab/irisserver/resources/TestRest.java index 3da7e54..d7725b8 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TestRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TestRest.java @@ -33,6 +33,8 @@ public void putTestRoom() throws IOException { KeywordManager km = KeywordManager.getInstance(); RoomManager rm = RoomManager.getInstance(); + rm.deleteRoom("drawtest"); + rm.deleteRoom("gametest"); rm.createTestRoom(); Room dr = rm.getRoom("drawtest"); @@ -40,9 +42,13 @@ //メンバー設定() dr.addMember("member"); - gr.addMember("member1"); - gr.addMember("member2"); - gr.addMember("member3"); + gr.addMember("RedAgent"); + gr.addMember("BlueSpy"); + gr.addMember("BlueAgent"); + gr.changeTeamAndMaster("RedSpy(owner)", "r", true); + gr.changeTeamAndMaster("RedAgent", "r", false); + gr.changeTeamAndMaster("BlueSpy", "b", true); + gr.changeTeamAndMaster("BlueAgent", "b", false); //両部屋:gameインスタンス作成,stateの初期化 String path = null;