Kommentare und 2 Methoden, die jetzt kurz genug sind

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@446 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-17 20:00:43 +02:00
parent 2c9f1d5d20
commit 4f71c5cb47
10 changed files with 149 additions and 60 deletions

View file

@ -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);
}