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

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

@ -80,7 +80,7 @@ public class RoundControlTest {
private void checkCorrectlyDealt() {
GameSettings settings = testRoundState.getGameSettings();
int totalStones = settings.getHighestCard()
int totalStones = settings.getHighestValue()
* settings.getStoneSetNumber()
* settings.getStoneColors().size() + settings.getJokerNumber();
assertEquals(

53
test/jrummikub/control/SettingsControlTest.java
View file

@ -1,11 +1,15 @@
package jrummikub.control;
import static jrummikub.model.StoneColor.*;
import static org.junit.Assert.*;
import java.awt.Color;
import java.util.Arrays;
import java.util.HashSet;
import jrummikub.control.turn.TurnControlFactory;
import jrummikub.model.GameSettings;
import jrummikub.model.StoneColor;
import jrummikub.util.IListener1;
import jrummikub.view.ISettingsPanel;
import jrummikub.view.MockView;
@ -37,8 +41,7 @@ public class SettingsControlTest {
/** */
@Test
public void initialStateTest() {
assertSame(ISettingsPanel.SettingsError.NO_ERROR,
view.settingsPanel.error);
assertSame(ISettingsPanel.SettingsError.NO_ERROR, view.settingsPanel.error);
view.settingsPanel.startGameEvent.emit();
assertNotNull(gameSettings);
assertEquals(2, gameSettings.getPlayerList().size());
@ -159,8 +162,7 @@ public class SettingsControlTest {
view.settingsPanel.changePlayerNameEvent.emit(1, name2);
assertTrue(view.settingsPanel.startButtonEnabled);
assertSame(ISettingsPanel.SettingsError.NO_ERROR,
view.settingsPanel.error);
assertSame(ISettingsPanel.SettingsError.NO_ERROR, view.settingsPanel.error);
view.settingsPanel.startGameEvent.emit();
assertNotNull(gameSettings);
@ -213,6 +215,41 @@ public class SettingsControlTest {
assertEquals(3, gameSettings.getStoneSetNumber());
}
/** */
@Test
public void changeNumberOfStonesDealtTest() {
assertEquals(initialSettings.getNumberOfStonesDealt(),
view.settingsPanel.numberOfStonesDealt);
view.settingsPanel.changeNumberOfStonesDealtEvent.emit(15);
view.settingsPanel.startGameEvent.emit();
assertEquals(15, gameSettings.getNumberOfStonesDealt());
}
/** */
@Test
public void changeHighestValueTest() {
assertEquals(initialSettings.getHighestValue(),
view.settingsPanel.highestValue);
view.settingsPanel.changeHighestValueEvent.emit(10);
view.settingsPanel.startGameEvent.emit();
assertEquals(10, gameSettings.getHighestValue());
}
/** */
@Test
public void changeStoneColorsTest() {
assertEquals(initialSettings.getStoneColors(),
view.settingsPanel.stoneColors);
view.settingsPanel.changeStoneColorsEvent.emit(new HashSet<StoneColor>(Arrays.asList(
BLUE, RED, BLACK)));
view.settingsPanel.startGameEvent.emit();
assertEquals(new HashSet<StoneColor>(Arrays.asList(BLUE, RED, BLACK)),
gameSettings.getStoneColors());
}
/** */
@Test
public void typeChangeTest() {
@ -225,10 +262,10 @@ public class SettingsControlTest {
view.settingsPanel.startGameEvent.emit();
assertNotNull(gameSettings);
assertEquals(2, gameSettings.getPlayerList().size());
assertSame(TurnControlFactory.Type.COMPUTER, gameSettings
.getPlayerList().get(0).getTurnControlType());
assertSame(TurnControlFactory.Type.HUMAN, gameSettings.getPlayerList()
.get(1).getTurnControlType());
assertSame(TurnControlFactory.Type.COMPUTER, gameSettings.getPlayerList()
.get(0).getTurnControlType());
assertSame(TurnControlFactory.Type.HUMAN,
gameSettings.getPlayerList().get(1).getTurnControlType());
}
}