diff options
| -rw-r--r-- | src/jrummikub/control/RoundControl.java | 1 | ||||
| -rw-r--r-- | test/jrummikub/control/GameControlTest.java | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java index fb4ab0c..930d861 100644 --- a/src/jrummikub/control/RoundControl.java +++ b/src/jrummikub/control/RoundControl.java @@ -233,7 +233,6 @@ public class RoundControl { } for (Stone stone : set.getFirst()) { markedStones.add(stone); - } } view.setStoneCollectionHidden(true); diff --git a/test/jrummikub/control/GameControlTest.java b/test/jrummikub/control/GameControlTest.java index be8c8d8..1a9ba3b 100644 --- a/test/jrummikub/control/GameControlTest.java +++ b/test/jrummikub/control/GameControlTest.java @@ -49,8 +49,7 @@ public class GameControlTest { public void testEndOfRound() { gameControl.startGame(); // Manipulate first players hand, to allow player1 to win - IHand playerHand = gameControl.roundControl.roundState - .getActivePlayer().getHand(); + IHand playerHand = gameControl.roundControl.clonedHand; for (Pair<Stone, Position> entry : playerHand.clone()) { playerHand.pickUp(entry.getFirst()); } @@ -73,8 +72,8 @@ public class GameControlTest { view.handPanel.stoneClickEvent.emit(stone3, true); view.tablePanel.clickEvent.emit(new Position(0, 0)); - view.playerPanel.endTurnEvent.emit(); + assertSame(BottomPanelType.WIN_PANEL, view.bottomPanelType); view.newRoundEvent.emit(); |