diff options
| -rw-r--r-- | src/jrummikub/model/StoneSet.java | 24 | ||||
| -rw-r--r-- | test/jrummikub/model/StoneSetTest.java | 43 |
2 files changed, 42 insertions, 25 deletions
diff --git a/src/jrummikub/model/StoneSet.java b/src/jrummikub/model/StoneSet.java index 47e6786..6081730 100644 --- a/src/jrummikub/model/StoneSet.java +++ b/src/jrummikub/model/StoneSet.java @@ -10,6 +10,7 @@ import java.util.Set; import sun.reflect.generics.reflectiveObjects.NotImplementedException; import jrummikub.util.Pair; +import static jrummikub.model.StoneSet.Type.*; /** Class managing {@link Stone}s joined together to form sets */ public class StoneSet implements Iterable<Stone>, Sizeable { @@ -25,14 +26,29 @@ public class StoneSet implements Iterable<Stone>, Sizeable { this.stones = new ArrayList<Stone>(stones); } + public enum Type { + GROUP, RUN, INVALID + } + /** * Test for rule conflict within the StoneSet * * @return true when the set is valid according to the rules */ public boolean isValid() { + return classify() != INVALID; + } + + /** + * Test for rule conflict within the StoneSet and determine whether the set + * is a group or a run + * + * @return GROUP or RUN for valid sets, INVALID otherwise + */ + public Type classify() { + // TODO: extend this for score calculation (release 2...) if (stones.size() < 3) { - return false; + return INVALID; } int nonJoker1 = -1, nonJoker2 = -1; for (int i = 0; i < stones.size(); i++) { @@ -43,17 +59,17 @@ public class StoneSet implements Iterable<Stone>, Sizeable { nonJoker1 = i; } if (nonJoker2 == -1) { - return true; + return GROUP; } // is run if (stones.get(nonJoker1).getColor() == stones.get(nonJoker2) .getColor()) { - return isValidRun(nonJoker1); + return isValidRun(nonJoker1) ? RUN : INVALID; } // is group else { - return isValidGroup(); + return isValidGroup() ? GROUP : INVALID; } } diff --git a/test/jrummikub/model/StoneSetTest.java b/test/jrummikub/model/StoneSetTest.java index 196090e..b3d77bd 100644 --- a/test/jrummikub/model/StoneSetTest.java +++ b/test/jrummikub/model/StoneSetTest.java @@ -6,6 +6,7 @@ import java.util.List; import jrummikub.util.Pair; import static jrummikub.model.StoneColor.*; +import static jrummikub.model.StoneSet.Type.*; import org.junit.*; import static org.junit.Assert.*; @@ -14,38 +15,38 @@ public class StoneSetTest { // Is Valid-Test // valid - public void assertSet(boolean valid, List<Stone> stones) { + public void assertSet(StoneSet.Type expectedType, List<Stone> stones) { StoneSet set = new StoneSet(stones); - assertTrue(valid == set.isValid()); + assertSame(expectedType, set.classify()); } @Test public void doubleJoker() { - assertSet(true, Arrays.asList(new Stone(RED), new Stone(BLACK), + assertSet(GROUP, Arrays.asList(new Stone(RED), new Stone(BLACK), new Stone(1, BLACK))); } @Test public void groups() { - assertSet(true, Arrays.asList(new Stone(1, RED), new Stone(1, BLACK), + assertSet(GROUP, Arrays.asList(new Stone(1, RED), new Stone(1, BLACK), new Stone(1, BLUE))); - assertSet(true, Arrays.asList(new Stone(1, RED), new Stone(1, BLACK), + assertSet(GROUP, Arrays.asList(new Stone(1, RED), new Stone(1, BLACK), new Stone(1, BLUE), new Stone(1, ORANGE))); } @Test public void runs() { - assertSet(true, Arrays.asList(new Stone(1, RED), new Stone(2, RED), + assertSet(RUN, Arrays.asList(new Stone(1, RED), new Stone(2, RED), new Stone(3, RED))); - assertSet(true, Arrays.asList(new Stone(4, BLUE), new Stone(5, BLUE), + assertSet(RUN, Arrays.asList(new Stone(4, BLUE), new Stone(5, BLUE), new Stone(6, BLUE))); } @Test public void singleJoker() { - assertSet(true, Arrays.asList(new Stone(1, RED), new Stone(1, BLACK), + assertSet(GROUP, Arrays.asList(new Stone(1, RED), new Stone(1, BLACK), new Stone(RED))); - assertSet(true, Arrays.asList(new Stone(2, RED), new Stone(3, RED), + assertSet(RUN, Arrays.asList(new Stone(2, RED), new Stone(3, RED), new Stone(BLACK))); } @@ -53,41 +54,41 @@ public class StoneSetTest { @Test public void outOfBounds() { - assertSet(false, Arrays.asList(new Stone(RED), new Stone(1, RED), + assertSet(INVALID, Arrays.asList(new Stone(RED), new Stone(1, RED), new Stone(2, RED))); - assertSet(false, Arrays.asList(new Stone(12, RED), new Stone(13, RED), + assertSet(INVALID, Arrays.asList(new Stone(12, RED), new Stone(13, RED), new Stone(RED))); - assertSet(false, Arrays.asList(new Stone(RED), new Stone(BLACK), + assertSet(INVALID, Arrays.asList(new Stone(RED), new Stone(BLACK), new Stone(1, RED), new Stone(2, RED))); } @Test public void sameColor() { - assertSet(false, Arrays.asList(new Stone(1, RED), new Stone(1, RED), + assertSet(INVALID, Arrays.asList(new Stone(1, RED), new Stone(1, RED), new Stone(1, BLUE))); - assertSet(false, Arrays.asList(new Stone(1, RED), new Stone(1, BLUE), + assertSet(INVALID, Arrays.asList(new Stone(1, RED), new Stone(1, BLUE), new Stone(1, BLACK), new Stone(1, ORANGE), new Stone(RED))); } @Test public void incorrectOrder() { - assertSet(false, Arrays.asList(new Stone(4, RED), new Stone(6, RED), + assertSet(INVALID, Arrays.asList(new Stone(4, RED), new Stone(6, RED), new Stone(5, RED))); - assertSet(false, Arrays.asList(new Stone(4, RED), new Stone(6, RED), + assertSet(INVALID, Arrays.asList(new Stone(4, RED), new Stone(6, RED), new Stone(RED))); - assertSet(false, Arrays.asList(new Stone(4, RED), new Stone(RED), + assertSet(INVALID, Arrays.asList(new Stone(4, RED), new Stone(RED), new Stone(5, RED))); } @Test public void otherInvalid() { - assertSet(false, Arrays.asList(new Stone(4, RED), new Stone(5, RED), + assertSet(INVALID, Arrays.asList(new Stone(4, RED), new Stone(5, RED), new Stone(7, RED))); - assertSet(false, Arrays.asList(new Stone(4, RED), new Stone(5, BLUE), + assertSet(INVALID, Arrays.asList(new Stone(4, RED), new Stone(5, BLUE), new Stone(6, RED))); - assertSet(false, Arrays.asList(new Stone(4, RED), new Stone(5, RED))); - assertSet(false, Arrays.asList(new Stone(4, BLUE), new Stone(5, RED), + assertSet(INVALID, Arrays.asList(new Stone(4, RED), new Stone(5, RED))); + assertSet(INVALID, Arrays.asList(new Stone(4, BLUE), new Stone(5, RED), new Stone(6, RED))); } |