diff options
| -rw-r--r-- | src/jrummikub/model/Stone.java | 7 | ||||
| -rw-r--r-- | test/jrummikub/model/StoneSetTest.java | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/jrummikub/model/Stone.java b/src/jrummikub/model/Stone.java index 6c2fd54..da8052b 100644 --- a/src/jrummikub/model/Stone.java +++ b/src/jrummikub/model/Stone.java @@ -34,13 +34,6 @@ public class Stone implements Sizeable { this.joker = false; } - @Deprecated - public Stone(int value, StoneColor color, boolean joker) { - this.value = value; - this.color = color; - this.joker = joker; - } - /** * Returns the color of the stone. * diff --git a/test/jrummikub/model/StoneSetTest.java b/test/jrummikub/model/StoneSetTest.java index 1b4e062..196090e 100644 --- a/test/jrummikub/model/StoneSetTest.java +++ b/test/jrummikub/model/StoneSetTest.java @@ -123,9 +123,9 @@ public class StoneSetTest { private StoneSet createTestSet() { List<Stone> stones = new ArrayList<Stone>(); - stones.add(new Stone(1, BLUE, false)); - stones.add(new Stone(1, RED, false)); - stones.add(new Stone(1, BLACK, false)); + stones.add(new Stone(1, BLUE)); + stones.add(new Stone(1, RED)); + stones.add(new Stone(1, BLACK)); StoneSet testSet = new StoneSet(stones); return testSet; } @@ -134,7 +134,7 @@ public class StoneSetTest { @Test public void testJoin() { StoneSet testSet = createTestSet(); - StoneSet secondSet = new StoneSet(new Stone(2, BLUE, false)); + StoneSet secondSet = new StoneSet(new Stone(2, BLUE)); StoneSet joinedSet = testSet.join(secondSet); // Sets have right size assertEquals(4, joinedSet.size()); |