neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Juhu, alle test tun wieder

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@465 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-18 17:32:08 +02:00
parent 0ada4609a0
commit 00fb313b89
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/jrummikub/control/RoundControl.java
View file

@ -233,7 +233,6 @@ public class RoundControl {
}
for (Stone stone : set.getFirst()) {
markedStones.add(stone);
}
}
view.setStoneCollectionHidden(true);

5
test/jrummikub/control/GameControlTest.java
View file

@ -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();