neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make highest value and number of stones dealt settable

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@337 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-05-31 01:50:56 +02:00
parent c78e8e6448
commit c004a07a42
11 changed files with 190 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/jrummikub/model/StoneHeapTest.java
View file

@ -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()) {

4
test/jrummikub/model/StoneSetTest.java
View file

@ -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,