diff --git a/src/main/java/com/ntlab/irisserver/models/RoomManager.java b/src/main/java/com/ntlab/irisserver/models/RoomManager.java index ad1c190..36702cc 100644 --- a/src/main/java/com/ntlab/irisserver/models/RoomManager.java +++ b/src/main/java/com/ntlab/irisserver/models/RoomManager.java @@ -45,19 +45,19 @@ public void createTestRoom() { //テストルーム作成 - Room tr = new Room("roomtest", "test"); + Room tr = new Room("roomtest", "owner"); rooms.put("roomtest", tr); - tr.addMember("test"); + tr.addMember("owner"); //お絵描きテスト用 - Room dr = new Room("drawtest", "draw"); + Room dr = new Room("drawtest", "owner"); rooms.put("drawtest", dr); - dr.addMember("draw"); + dr.addMember("owner"); //ゲームテスト用 - Room gr = new Room("gametest", "game"); + Room gr = new Room("gametest", "owner"); rooms.put("gametest", gr); - gr.addMember("game"); + gr.addMember("owner"); } diff --git a/src/main/java/com/ntlab/irisserver/resources/TestRest.java b/src/main/java/com/ntlab/irisserver/resources/TestRest.java index adb807f..49796e6 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TestRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TestRest.java @@ -28,29 +28,6 @@ this.applicationContext = applicationContext; } - public void shafflem(Room room){ - List mem = room.getMembers(); - Collections.shuffle(mem); - for(int i=0; i < 8; i++){ - if(i >= mem.size())break; - Member info = mem.get(i); - if(i==0){ - info.setMaster(true); - room.changeTeamAndMaster(info.getNickname(), "r", true); - }else if(i==1){ - info.setMaster(true); - room.changeTeamAndMaster(info.getNickname(), "b", true); - }else{ - info.setMaster(false); - } - if(i % 2 == 0){ - info.setBelongs("r"); - }else{ - info.setBelongs("b"); - } - } - } - @PUT @Path("/test") public void putTestRoom() throws IOException { @@ -63,28 +40,10 @@ Room gr = rm.getRoom("gametest"); //メンバー設定() - int length = 0; - char[] rch; - rch = new char[4]; - String rname; - while(length < 8){ - for(int i = 0; i<4; i++){ - Random random = new Random(); - rch[i] = (char)(random.nextInt(26) + 'a'); - } - rname = new String(rch); - if(length < 4)tr.addMember(rname); - dr.addMember(rname); - gr.addMember(rname); - List members = dr.getMembers(); - length = members.size(); - } - - //チームシャッフル - - shafflem(tr); - shafflem(dr); - shafflem(gr); + dr.addMember("member1"); + gr.addMember("member1"); + gr.addMember("member2"); + gr.addMember("member3"); //両部屋:gameインスタンス作成,stateの初期化 String path = null;