summaryrefslogtreecommitdiffstats
path: root/test/jrummikub
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-05-04 19:09:39 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-05-04 19:09:39 +0200
commit6e9c1b539b412dc08716eb3f88adb53b3021a27b (patch)
treee7162d24700fb26b7103dc0f69705f70423cd288 /test/jrummikub
parent8e32bc9e696216129266406c085d59731aae043c (diff)
downloadJRummikub-6e9c1b539b412dc08716eb3f88adb53b3021a27b.tar
JRummikub-6e9c1b539b412dc08716eb3f88adb53b3021a27b.zip
Test für Austeilen geschrieben, eine Menge getSize hinzugefügt
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@116 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub')
-rw-r--r--test/jrummikub/control/RoundControlTest.java24
-rw-r--r--test/jrummikub/model/GameStateTest.java8
2 files changed, 28 insertions, 4 deletions
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
new file mode 100644
index 0000000..2e6a7d0
--- /dev/null
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -0,0 +1,24 @@
+package jrummikub.control;
+
+import static org.junit.Assert.*;
+import jrummikub.model.GameState;
+import jrummikub.view.MockView;
+
+import org.junit.Test;
+
+public class RoundControlTest {
+
+ @Test
+ public void testDeal() {
+ MockView view = new MockView();
+ GameState testGameState = new GameState();
+ RoundControl testRound = new RoundControl(testGameState, view);
+ testRound.deal();
+ assertEquals(106 - testGameState.getPlayerCount() * 14, testGameState
+ .getGameHeap().getSize());
+ for (int i = 0; i < testGameState.getPlayerCount(); i++) {
+ assertEquals(14, testGameState.getPlayer(i).getHand().getSize());
+ }
+ }
+
+}
diff --git a/test/jrummikub/model/GameStateTest.java b/test/jrummikub/model/GameStateTest.java
index 8887e78..a134231 100644
--- a/test/jrummikub/model/GameStateTest.java
+++ b/test/jrummikub/model/GameStateTest.java
@@ -18,13 +18,13 @@ public class GameStateTest {
@Test
public void nextActiveTest() {
// All there?
- assertEquals(4, testGame.players.size());
- assertSame(Color.red, testGame.activePlayer().getColor());
+ assertEquals(4, testGame.getPlayerCount());
+ assertSame(Color.red, testGame.getActivePlayer().getColor());
testGame.nextPlayer();
- assertSame(Color.yellow, testGame.activePlayer().getColor());
+ assertSame(Color.yellow, testGame.getActivePlayer().getColor());
testGame.nextPlayer();
testGame.nextPlayer();
testGame.nextPlayer();
- assertSame(Color.red, testGame.activePlayer().getColor());
+ assertSame(Color.red, testGame.getActivePlayer().getColor());
}
}