summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-05-05 21:23:18 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-05-05 21:23:18 +0200
commit8cef7f0f9d6545034cc1451a33402a0d12a5071b (patch)
tree03b80dec02152b6c5d376df8c741dda64f678968
parent38f6f0dc24bd2755786f8a7947743feadb505b7f (diff)
downloadJRummikub-8cef7f0f9d6545034cc1451a33402a0d12a5071b.tar
JRummikub-8cef7f0f9d6545034cc1451a33402a0d12a5071b.zip
Fix RoundControlTest for MockTable changes
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@156 72836036-5685-4462-b002-a69064685172
-rw-r--r--test/jrummikub/control/RoundControlTest.java13
1 files changed, 5 insertions, 8 deletions
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index 6958819..f716e27 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -7,6 +7,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -120,8 +121,7 @@ public class RoundControlTest {
resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit();
- assertNotSame(oldTable, testGameState.table);
- assertSame(newTable, testGameState.table);
+ assertSame(newTable, testGameState.setTable);
assertEquals(1, testGameState.activePlayer);
checkTurnStartSetUp();
@@ -141,8 +141,7 @@ public class RoundControlTest {
resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit();
- assertSame(oldTable, testGameState.table);
- assertNotSame(newTable, testGameState.table);
+ assertNull(testGameState.setTable);
assertEquals(1, testGameState.activePlayer);
assertEquals(14 + 3, testGameState.players.get(0).hand.getSize());
checkTurnStartSetUp();
@@ -160,10 +159,9 @@ public class RoundControlTest {
resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit();
+ assertSame(newTable, testGameState.setTable);
assertEquals(14 + 1, testGameState.players.get(0).hand.getSize());
assertEquals(1, testGameState.activePlayer);
- assertSame(newTable, testGameState.table);
- assertNotSame(oldTable, testGameState.table);
checkTurnStartSetUp();
}
@@ -180,10 +178,9 @@ public class RoundControlTest {
resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit();
+ assertNull(testGameState.setTable);
assertEquals(14 + 1, testGameState.players.get(0).hand.getSize());
assertEquals(1, testGameState.activePlayer);
- assertNotSame(newTable, testGameState.table);
- assertSame(oldTable, testGameState.table);
checkTurnStartSetUp();
}