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

Man kann im Model bestimmen, wie viele Steine gegeben werden. Test geht auch

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@335 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-31 00:58:50 +02:00
parent 489e7858e7
commit 2e24ee3e7f
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/jrummikub/control/RoundControl.java
View file

@ -136,11 +136,10 @@ public class RoundControl {
void deal() { void deal() {
for (int i = 0; i < roundState.getPlayerCount(); i++) { for (int i = 0; i < roundState.getPlayerCount(); i++) {
IHand hand = roundState.getNthNextPlayer(i).getHand(); IHand hand = roundState.getNthNextPlayer(i).getHand();
for (int j = 0; j < 7; j++) { for (int j = 0; j < roundState.getGameSettings()
hand.drop(roundState.getGameHeap().drawStone(), new Position(j, .getNumberOfStonesDealt(); j++) {
hand.drop(roundState.getGameHeap().drawStone(), new Position(0,
0)); 0));
hand.drop(roundState.getGameHeap().drawStone(), new Position(j,
1));
} }
} }
} }

16
test/jrummikub/control/RoundControlTest.java
View file

@ -79,17 +79,17 @@ public class RoundControlTest {
} }
private void checkCorrectlyDealt() { private void checkCorrectlyDealt() {
int totalStones = gameSettings.getHighestCard() GameSettings settings = testRoundState.getGameSettings();
* gameSettings.getStoneSetNumber() int totalStones = settings.getHighestCard()
* gameSettings.getStoneColors().size() * settings.getStoneSetNumber()
+ gameSettings.getJokerNumber(); * settings.getStoneColors().size() + settings.getJokerNumber();
assertEquals( assertEquals(
totalStones - testRoundState.getPlayerCount() totalStones - testRoundState.getPlayerCount()
* gameSettings.getNumberOfStonesDealt() * settings.getNumberOfStonesDealt()
- testRoundState.table.getSize(), testRoundState - testRoundState.table.getSize(), testRoundState
.getGameHeap().getSize()); .getGameHeap().getSize());
for (int i = 0; i < testRoundState.getPlayerCount(); i++) { for (int i = 0; i < testRoundState.getPlayerCount(); i++) {
assertEquals(gameSettings.getNumberOfStonesDealt(), testRoundState assertEquals(settings.getNumberOfStonesDealt(), testRoundState
.getNthNextPlayer(i).getHand().getSize()); .getNthNextPlayer(i).getHand().getSize());
} }
} }
@ -124,8 +124,8 @@ public class RoundControlTest {
@Test @Test
public void checkCorrectlyDealtMoreStones() { public void checkCorrectlyDealtMoreStones() {
gameSettings.setNumberOfStonesDealt(15); testRoundState.getGameSettings().setNumberOfStonesDealt(15);
roundControl.startRound(); testRound.deal();
checkCorrectlyDealt(); checkCorrectlyDealt();
} }