diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-05-31 03:02:31 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-05-31 03:02:31 +0200 |
| commit | 25c6383c73de20ce7e6bc45af6faa255e8d94dc6 (patch) | |
| tree | 2752e23d08191e4a568c66c507c9c630307d2112 /test | |
| parent | c004a07a4267f3320d23f3d1d2cf483cd56f40b7 (diff) | |
| download | JRummikub-25c6383c73de20ce7e6bc45af6faa255e8d94dc6.tar JRummikub-25c6383c73de20ce7e6bc45af6faa255e8d94dc6.zip | |
Allow setting stone colors to use
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@338 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test')
| -rw-r--r-- | test/jrummikub/model/StoneSetTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/jrummikub/model/StoneSetTest.java b/test/jrummikub/model/StoneSetTest.java index b9fd961..d944369 100644 --- a/test/jrummikub/model/StoneSetTest.java +++ b/test/jrummikub/model/StoneSetTest.java @@ -113,7 +113,7 @@ public class StoneSetTest { new Stone(1, BLACK), new Stone(1, BLUE), new Stone(1, ORANGE)), defaultSettings); assertSet(GROUP, 6, Arrays.asList(new Stone(1, RED), - new Stone(1, GREEN), new Stone(1, WHITE), new Stone(1, BLACK), + new Stone(1, GREEN), new Stone(1, GRAY), new Stone(1, BLACK), new Stone(1, BLUE), new Stone(1, ORANGE)), moreColorSettings); } @@ -164,7 +164,7 @@ public class StoneSetTest { // More than 4 stones assertSet(INVALID, 0, Arrays.asList(new Stone(1, RED), new Stone(1, BLUE), new Stone(1, GREEN), new Stone(1, BLACK), new Stone(1, - VIOLET), new Stone(1, ORANGE), new Stone(1, BROWN), new Stone( + VIOLET), new Stone(1, ORANGE), new Stone(1, AQUA), new Stone( BLACK), new Stone(RED)), moreColorSettings); } @@ -191,8 +191,8 @@ public class StoneSetTest { new Stone(RED)), defaultSettings); assertSet(INVALID, 0, Arrays.asList(new Stone(1, RED), new Stone(1, BLUE), new Stone(1, GREEN), new Stone(1, BLACK), new Stone(1, - VIOLET), new Stone(1, WHITE), new Stone(1, ORANGE), new Stone( - 1, BROWN), new Stone(RED)), moreColorSettings); + VIOLET), new Stone(1, GRAY), new Stone(1, ORANGE), new Stone( + 1, AQUA), new Stone(RED)), moreColorSettings); } /** */ |