diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-22 03:08:37 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-22 03:08:37 +0200 |
commit | d6c4da62243310b85a82e73e55249de9af7fdb11 (patch) | |
tree | ecdb215533c41a9d6f02c0770ea76a38f8b4867b /test/jrummikub/control/network/GameJoinControlTest.java | |
parent | 62a55c0a918b1d91338a68ee89211006e11785bf (diff) | |
download | JRummikub-d6c4da62243310b85a82e73e55249de9af7fdb11.tar JRummikub-d6c4da62243310b85a82e73e55249de9af7fdb11.zip |
Show in start turn panel if a player has redealed or drawn the last stone
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@570 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub/control/network/GameJoinControlTest.java')
-rw-r--r-- | test/jrummikub/control/network/GameJoinControlTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/jrummikub/control/network/GameJoinControlTest.java b/test/jrummikub/control/network/GameJoinControlTest.java index 179c583..e6168a5 100644 --- a/test/jrummikub/control/network/GameJoinControlTest.java +++ b/test/jrummikub/control/network/GameJoinControlTest.java @@ -33,13 +33,12 @@ public class GameJoinControlTest { @Before public void setup() { mockConnection = new MockConnectionControl(); - mockConnection.nickname = "Karl"; view = new MockView(); loginData = new LoginData("Karl", "server", "password", "channel"); networkControl = new NetworkControl(loginData, mockConnection, null, view); networkControl.startNetwork(); - mockConnection.connectedEvent.emit(); + mockConnection.connectedEvent.emit(); } /** */ @@ -52,7 +51,8 @@ public class GameJoinControlTest { assertEquals(SettingsMode.NETWORK_JOIN, view.settingsPanel.settingsMode); offerJoinedGame(id1, "Anne", "Karl"); view.settingsPanel.changePlayerColorEvent.emit(1, Color.GRAY); - assertEquals(Type.HUMAN, mockConnection.getCurrentGame().getGameSettings().getPlayerList().get(1).getType()); + assertEquals(Type.HUMAN, mockConnection.getCurrentGame().getGameSettings() + .getPlayerList().get(1).getType()); assertEquals(Color.GRAY, mockConnection.playerColor); view.settingsPanel.backEvent.emit(); @@ -71,14 +71,14 @@ public class GameJoinControlTest { mockConnection.gameOfferEvent.emit(gameData); return gameData; } - + private GameData offerJoinedGame(UUID id, String host, String player) { GameSettings gsettings = new GameSettings(); PlayerSettings psettings = new PlayerSettings(host, Color.BLACK); - psettings.setType(Type.HUMAN); + psettings.setType(Type.NETWORK); gsettings.getPlayerList().add(psettings); PlayerSettings psettings2 = new PlayerSettings(player, Color.RED); - psettings2.setType(Type.NETWORK); + psettings2.setType(Type.HUMAN); gsettings.getPlayerList().add(psettings2); GameData gameData = new GameData(id, gsettings, host); mockConnection.gameOfferEvent.emit(gameData); |