Test für mehr Steine geben

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@334 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-31 00:58:49 +02:00
parent 0cb36fb752
commit 489e7858e7

View file

@ -78,13 +78,19 @@ public class RoundControlTest {
roundControl = new RoundControl(roundState, view);
}
private void checkCorrectlyDealed() {
assertEquals(106 - testRoundState.getPlayerCount() * 14
- testRoundState.table.getSize(), testRoundState.getGameHeap()
.getSize());
private void checkCorrectlyDealt() {
int totalStones = gameSettings.getHighestCard()
* gameSettings.getStoneSetNumber()
* gameSettings.getStoneColors().size()
+ gameSettings.getJokerNumber();
assertEquals(
totalStones - testRoundState.getPlayerCount()
* gameSettings.getNumberOfStonesDealt()
- testRoundState.table.getSize(), testRoundState
.getGameHeap().getSize());
for (int i = 0; i < testRoundState.getPlayerCount(); i++) {
assertEquals(14, testRoundState.getNthNextPlayer(i).getHand()
.getSize());
assertEquals(gameSettings.getNumberOfStonesDealt(), testRoundState
.getNthNextPlayer(i).getHand().getSize());
}
}
@ -116,6 +122,13 @@ public class RoundControlTest {
view.displayStartTurnPanel = false;
}
@Test
public void checkCorrectlyDealtMoreStones() {
gameSettings.setNumberOfStonesDealt(15);
roundControl.startRound();
checkCorrectlyDealt();
}
// laidOut test cases
/** Threshold=30 */
@Test
@ -482,7 +495,7 @@ public class RoundControlTest {
@Test
public void testDealStones() {
testRound.deal();
checkCorrectlyDealed();
checkCorrectlyDealt();
for (int i = 0; i < 14; i++) {
testRound.dealStones(2);
}
@ -494,14 +507,14 @@ public class RoundControlTest {
@Test
public void testDeal() {
testRound.deal();
checkCorrectlyDealed();
checkCorrectlyDealt();
}
/** */
@Test
public void testStartRound() {
testRound.startRound();
checkCorrectlyDealed();
checkCorrectlyDealt();
checkTurnStartSetUp();
}
@ -510,7 +523,7 @@ public class RoundControlTest {
@Test
public void testTableDisplay() {
testRound.startRound();
checkCorrectlyDealed();
checkCorrectlyDealt();
view.startTurnEvent.emit();
checkTableDisplay();
view.getPlayerPanel().endTurnEvent.emit();