summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-05-18 17:01:10 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-05-18 17:01:10 +0200
commitb5397d5aa7f01d557a469ca0d70f3b33e1fe2c60 (patch)
tree899de9a3f0e71718ecf8f6018e2b8c347b3b93df /test
parent5169f31af06926f4c268062791f648f1fdd91656 (diff)
downloadJRummikub-b5397d5aa7f01d557a469ca0d70f3b33e1fe2c60.tar
JRummikub-b5397d5aa7f01d557a469ca0d70f3b33e1fe2c60.zip
Move some static player data to a player settings class
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@252 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test')
-rw-r--r--test/jrummikub/model/RoundStateTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/jrummikub/model/RoundStateTest.java b/test/jrummikub/model/RoundStateTest.java
index 18afb53..de98090 100644
--- a/test/jrummikub/model/RoundStateTest.java
+++ b/test/jrummikub/model/RoundStateTest.java
@@ -23,13 +23,13 @@ public class RoundStateTest {
public void nextActiveTest() {
// All there?
assertEquals(4, testGame.getPlayerCount());
- assertSame(Color.red, testGame.getActivePlayer().getColor());
+ assertSame(Color.red, testGame.getActivePlayer().getPlayerSettings().getColor());
testGame.nextPlayer();
- assertSame(Color.yellow, testGame.getActivePlayer().getColor());
+ assertSame(Color.yellow, testGame.getActivePlayer().getPlayerSettings().getColor());
testGame.nextPlayer();
testGame.nextPlayer();
testGame.nextPlayer();
- assertSame(Color.red, testGame.getActivePlayer().getColor());
+ assertSame(Color.red, testGame.getActivePlayer().getPlayerSettings().getColor());
}
}