summaryrefslogtreecommitdiffstats
path: root/test/jrummikub
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-06-08 16:23:17 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-06-08 16:23:17 +0200
commit25e6f3ec4642c38df23dbd2e8ca1a3a30059a7dd (patch)
treecb4a63857037a3435e7cc2a08a673e42334d0385 /test/jrummikub
parent67d084d48bceed9e8db46877fc4bb17fed8126cd (diff)
downloadJRummikub-25e6f3ec4642c38df23dbd2e8ca1a3a30059a7dd.tar
JRummikub-25e6f3ec4642c38df23dbd2e8ca1a3a30059a7dd.zip
Fixed redeal(dis)allowed tests
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@384 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub')
-rw-r--r--test/jrummikub/control/RoundControlTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index f726a38..14a9bca 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -934,14 +934,14 @@ public class RoundControlTest {
hand.drop(new Stone(1, RED), new Position(0, 0));
hand.drop(new Stone(1, BLACK), new Position(0, 0));
hand.drop(new Stone(1, BLUE), new Position(0, 0));
- testRoundState.players.get(0).hand = hand;
+ testRound.clonedHand = hand;
view.startTurnEvent.emit();
- assertEquals(view.playerPanel.turnMode, TurnMode.INSPECT_ONLY);
+ assertEquals(TurnMode.INSPECT_ONLY, view.playerPanel.turnMode);
for (int i = 0; i < 4; i++) {
view.playerPanel.endTurnEvent.emit();
view.startTurnEvent.emit();
}
- assertEquals(view.playerPanel.turnMode, TurnMode.NORMAL_TURN);
+ assertEquals(TurnMode.NORMAL_TURN, view.playerPanel.turnMode);
}
/** */
@@ -955,11 +955,11 @@ public class RoundControlTest {
testRoundState.players.get(0).hand = hand;
testRound.clonedHand = (IHand) hand.clone();
view.startTurnEvent.emit();
- assertEquals(view.playerPanel.turnMode, TurnMode.MAY_REDEAL);
+ assertEquals(TurnMode.MAY_REDEAL, view.playerPanel.turnMode);
for (int i = 0; i < 4; i++) {
view.playerPanel.endTurnEvent.emit();
view.startTurnEvent.emit();
}
- assertEquals(view.playerPanel.turnMode, TurnMode.NORMAL_TURN);
+ assertEquals( TurnMode.NORMAL_TURN, view.playerPanel.turnMode);
}
}