diff options
Diffstat (limited to 'test/jrummikub/model')
| -rw-r--r-- | test/jrummikub/model/StoneSetTest.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/test/jrummikub/model/StoneSetTest.java b/test/jrummikub/model/StoneSetTest.java index d82f8f2..6f6e698 100644 --- a/test/jrummikub/model/StoneSetTest.java +++ b/test/jrummikub/model/StoneSetTest.java @@ -54,8 +54,7 @@ public class StoneSetTest { // valid+point count /** */ @Test - public void doubleJokerValid() { - // 3 Stones + public void doubleJokerValid3Stones() { // JJZ assertSet(GROUP, 3, Arrays.asList(new Stone(RED), new Stone(BLACK), new Stone(1, BLACK)), defaultSettings); @@ -73,6 +72,11 @@ public class StoneSetTest { new Stone(BLACK)), defaultSettings); assertSet(RUN, 42, Arrays.asList(new Stone(13, RED), new Stone(RED), new Stone(BLACK)), higherValueSettings); + } + + /** */ + @Test + public void doubleJokerValid4Stones() { // 4 Stones // JJZZ assertSet(GROUP, 4, Arrays.asList(new Stone(RED), new Stone(BLACK), @@ -164,6 +168,7 @@ public class StoneSetTest { new Stone(13, RED), new Stone(RED)), higherValueSettings); } + /** */ @Test public void noLimitsTest() { assertSet(RUN, 16, Arrays.asList(new Stone(RED), new Stone(1, RED), @@ -245,9 +250,8 @@ public class StoneSetTest { new Stone(5, RED), new Stone(7, RED)), defaultSettings); assertSet(INVALID, 0, Arrays.asList(new Stone(4, RED), new Stone(5, BLUE), new Stone(6, RED)), defaultSettings); - assertSet(INVALID, 0, - Arrays.asList(new Stone(4, RED), new Stone(5, RED)), - defaultSettings); + assertSet(INVALID, 0, Arrays.asList(new Stone(4, RED), + new Stone(5, RED)), defaultSettings); assertSet(INVALID, 0, Arrays.asList(new Stone(4, BLUE), new Stone(5, RED), new Stone(6, RED)), defaultSettings); // Regression test: @@ -258,9 +262,8 @@ public class StoneSetTest { /** */ @Test public void manyJokersValid() { - assertSet(GROUP, 3 * 13, - Arrays.asList(new Stone(RED), new Stone(RED), new Stone(RED)), - defaultSettings); + assertSet(GROUP, 3 * 13, Arrays.asList(new Stone(RED), new Stone(RED), + new Stone(RED)), defaultSettings); assertSet(GROUP, 4 * 13, Arrays.asList(new Stone(RED), new Stone(RED), new Stone(RED), new Stone(RED)), defaultSettings); assertSet(RUN, 13 + 12 + 11 + 10 + 9, @@ -269,8 +272,8 @@ public class StoneSetTest { assertSet(RUN, 5 * 10, Arrays.asList(new Stone(RED), new Stone(RED), new Stone(RED), new Stone(RED), new Stone(12, RED)), defaultSettings); - assertSet(GROUP, 6 * 5, - Arrays.asList(new Stone(RED), new Stone(RED), new Stone(RED), + assertSet(GROUP, 6 * 5, Arrays + .asList(new Stone(RED), new Stone(RED), new Stone(RED), new Stone(RED), new Stone(RED), new Stone(AQUA)), moreColorLowerValueSettings); } |