summaryrefslogtreecommitdiffstats
path: root/test/jrummikub
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-06-17 20:00:43 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-06-17 20:00:43 +0200
commit4f71c5cb4700b39d816c6a4ae123ad94fef456df (patch)
tree3ed53d9d84956179e86b5483c8d07bd767d4b0f8 /test/jrummikub
parent2c9f1d5d202ca1cea69846aea42a4962e7482a6b (diff)
downloadJRummikub-4f71c5cb4700b39d816c6a4ae123ad94fef456df.tar
JRummikub-4f71c5cb4700b39d816c6a4ae123ad94fef456df.zip
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
Diffstat (limited to 'test/jrummikub')
-rw-r--r--test/jrummikub/control/SaveControlTest.java5
-rw-r--r--test/jrummikub/model/StoneSetTest.java23
2 files changed, 18 insertions, 10 deletions
diff --git a/test/jrummikub/control/SaveControlTest.java b/test/jrummikub/control/SaveControlTest.java
index b2e0299..3ff5f42 100644
--- a/test/jrummikub/control/SaveControlTest.java
+++ b/test/jrummikub/control/SaveControlTest.java
@@ -20,7 +20,12 @@ import jrummikub.view.MockView;
import org.junit.Test;
+/** */
public class SaveControlTest {
+ /**
+ * @throws IOException
+ * if input cannot be saved/loaded
+ */
@Test
public void testSaveLoad() throws IOException {
GameSettings settings = new GameSettings();
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);
}