diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-21 00:04:16 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-21 00:04:16 +0200 |
commit | f5cff88ec9177b23dc8979aa9645a427a78c6f46 (patch) | |
tree | 5192fc950c594b9772bf28b1e8e3d712817c3b09 /test/jrummikub/control/GameControlTest.java | |
parent | 1ba3c9758394f551aa913df52852c19e7e6c6187 (diff) | |
download | JRummikub-f5cff88ec9177b23dc8979aa9645a427a78c6f46.tar JRummikub-f5cff88ec9177b23dc8979aa9645a427a78c6f46.zip |
Major refactoring of RoundControl and TurnControl
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@516 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub/control/GameControlTest.java')
-rw-r--r-- | test/jrummikub/control/GameControlTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/jrummikub/control/GameControlTest.java b/test/jrummikub/control/GameControlTest.java index e1af261..7555714 100644 --- a/test/jrummikub/control/GameControlTest.java +++ b/test/jrummikub/control/GameControlTest.java @@ -49,10 +49,8 @@ public class GameControlTest { public void testEndOfRound() { gameControl.startGame(); - view.startTurnEvent.emit(); - // Manipulate first player's hand, to allow player1 to win - IHand playerHand = gameControl.roundControl.clonedHand; + IHand playerHand = gameControl.roundControl.roundState.getActivePlayer().getHand(); for (Pair<Stone, Position> entry : playerHand.clone()) { playerHand.pickUp(entry.getFirst()); } @@ -64,6 +62,8 @@ public class GameControlTest { playerHand.drop(stone3, new Position(0, 0)); // Done setting up first players hand + view.startTurnEvent.emit(); + view.playerPanel.endTurnEvent.emit(); view.startTurnEvent.emit(); view.playerPanel.endTurnEvent.emit(); |