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

Test for joker number in settings control

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@301 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-05-29 18:50:49 +02:00
parent 3f3f6370c9
commit 9e21e3f23c
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mock/jrummikub/view/MockSettingsPanel.java
View file

@ -24,7 +24,7 @@ public class MockSettingsPanel implements ISettingsPanel {
public GameSettings gameSettings = new GameSettings();
public MockEvent1<Integer> changeInitialMeldThresholdEvent = new MockEvent1<Integer>();
public IEvent1<Integer> changeJokerNumberEvent = new MockEvent1<Integer>();
public MockEvent1<Integer> changeJokerNumberEvent = new MockEvent1<Integer>();
public int initialMeldThreshold;
public int jokerNumber;

20
src/jrummikub/model/GameSettings.java
View file

@ -11,6 +11,7 @@ public class GameSettings {
private int initialMeldThreshold;
private int jokerPoints;
private int jokerNumber;
/**
* Creates new GameSettings with default values
@ -18,6 +19,7 @@ public class GameSettings {
public GameSettings() {
initialMeldThreshold = 30;
jokerPoints = 50;
jokerNumber = 2;
}
/**
@ -66,4 +68,22 @@ public class GameSettings {
public int getJokerPoints() {
return jokerPoints;
}
/**
* Sets the number of jokers in game
*
* @param value
*/
public void setJokerNumber(int value) {
jokerNumber = value;
}
/**
* Returns the number of jokers
*
* @return the number of jokers
*/
public int getJokerNumber() {
return jokerNumber;
}
}

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

@ -184,5 +184,15 @@ public class SettingsControlTest {
view.settingsPanel.startGameEvent.emit();
assertEquals(25, gameSettings.getInitialMeldThreshold());
}
/** */
@Test
public void jokerNumberTest() {
assertEquals(initialSettings.getJokerNumber(), view.settingsPanel.jokerNumber);
view.settingsPanel.changeJokerNumberEvent.emit(25);
view.settingsPanel.startGameEvent.emit();
assertEquals(25, gameSettings.getJokerNumber());
}
}