summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-06-18 17:32:08 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-06-18 17:32:08 +0200
commit00fb313b89b14c04b290e3b3723bbccffc04d9dd (patch)
tree9f330cc1346a01ebce526b9ac4cc9dc74e068d59
parent0ada4609a0ebc24915dfa904e62bfe6b322fa120 (diff)
downloadJRummikub-00fb313b89b14c04b290e3b3723bbccffc04d9dd.tar
JRummikub-00fb313b89b14c04b290e3b3723bbccffc04d9dd.zip
Juhu, alle test tun wieder
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@465 72836036-5685-4462-b002-a69064685172
-rw-r--r--src/jrummikub/control/RoundControl.java1
-rw-r--r--test/jrummikub/control/GameControlTest.java5
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();