diff options
Diffstat (limited to 'test/jrummikub/model')
| -rw-r--r-- | test/jrummikub/model/StoneHeapTest.java | 4 | ||||
| -rw-r--r-- | test/jrummikub/model/StoneSetTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/jrummikub/model/StoneHeapTest.java b/test/jrummikub/model/StoneHeapTest.java index f0b88d3..48ca488 100644 --- a/test/jrummikub/model/StoneHeapTest.java +++ b/test/jrummikub/model/StoneHeapTest.java @@ -54,7 +54,7 @@ public class StoneHeapTest { } private int calculateTotalNumberOfStones(GameSettings testSettings) { - int totalStones = testSettings.getHighestCard() + int totalStones = testSettings.getHighestValue() * testSettings.getStoneSetNumber() * testSettings.getStoneColors().size() + testSettings.getJokerNumber(); @@ -81,7 +81,7 @@ public class StoneHeapTest { */ @Theory public void fullColor(Pair<GameSettings, StoneHeap> data) { - int stonesOfAColor = data.getFirst().getHighestCard() + int stonesOfAColor = data.getFirst().getHighestValue() * data.getFirst().getStoneSetNumber(); Map<StoneColor, Integer> counters = new HashMap<StoneColor, Integer>(); for (StoneColor c : data.getFirst().getStoneColors()) { diff --git a/test/jrummikub/model/StoneSetTest.java b/test/jrummikub/model/StoneSetTest.java index a5c44f0..b9fd961 100644 --- a/test/jrummikub/model/StoneSetTest.java +++ b/test/jrummikub/model/StoneSetTest.java @@ -31,8 +31,8 @@ public class StoneSetTest { moreColorSettings.setStoneColors(EnumSet.allOf(StoneColor.class)); lessColorSettings.setStoneColors(new HashSet<StoneColor>(Arrays.asList( StoneColor.BLUE, StoneColor.RED, StoneColor.BLACK))); - higherValueSettings.setHighestCard(17); - lowerValueSettings.setHighestCard(10); + higherValueSettings.setHighestValue(17); + lowerValueSettings.setHighestValue(10); } private void assertSet(StoneSet.Type expectedType, Integer expectedValue, |