summaryrefslogtreecommitdiffstats
path: root/test/jrummikub/control/GameControlTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'test/jrummikub/control/GameControlTest.java')
-rw-r--r--test/jrummikub/control/GameControlTest.java6
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();