summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-06-18 15:01:21 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-06-18 15:01:21 +0200
commitbc835d499f2fe3c8b9c5b6bc9cfca9d9666854e9 (patch)
tree6d25b4a32749ba85d7793975b15aacc3ba6fb91a /test
parent823ef9d4fe63cb14a114dd01fda54387998071d5 (diff)
downloadJRummikub-bc835d499f2fe3c8b9c5b6bc9cfca9d9666854e9.tar
JRummikub-bc835d499f2fe3c8b9c5b6bc9cfca9d9666854e9.zip
Fix many comments, fix tests, fix complexity
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@462 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test')
-rw-r--r--test/jrummikub/control/RoundControlTest.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index 14a9bca..a6d29c2 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -301,6 +301,7 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
+ view.acknowledgeInvalidEvent.emit();
assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getLaidOut());
assertEquals(2, roundState.getTable().getSize());
@@ -375,6 +376,7 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
+ view.acknowledgeInvalidEvent.emit();
assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getLaidOut());
assertEquals(2, roundState.getTable().getSize());
@@ -439,6 +441,7 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
+ view.acknowledgeInvalidEvent.emit();
assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getLaidOut());
assertEquals(2, roundState.getTable().getSize());
@@ -579,6 +582,7 @@ public class RoundControlTest {
testTable.drop(new StoneSet(stone), new Position(0, 0));
resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit();
+ view.acknowledgeInvalidEvent.emit();
assertNull(testRoundState.setTable);
assertEquals(1, testRoundState.activePlayer);
@@ -628,6 +632,7 @@ public class RoundControlTest {
assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit();
+ view.acknowledgeInvalidEvent.emit();
assertNull(testRoundState.setTable);
assertEquals(14 + 3, testRoundState.players.get(0).hand.getSize());
@@ -907,6 +912,7 @@ public class RoundControlTest {
view.startTurnEvent.emit();
assertFalse(view.tablePanel.clickEvent.listeners.isEmpty());
view.playerPanel.endTurnEvent.emit();
+ view.acknowledgeInvalidEvent.emit();
assertFalse(14 == testRoundState.players.get(i).hand.getSize());
}
}