summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mock/jrummikub/model/MockGameSettings.java34
-rw-r--r--mock/jrummikub/model/MockRoundState.java4
-rw-r--r--src/jrummikub/JRummikub.java3
-rw-r--r--src/jrummikub/control/GameControl.java6
-rw-r--r--src/jrummikub/model/GameSettings.java24
-rw-r--r--src/jrummikub/model/IGameSettings.java29
-rw-r--r--src/jrummikub/model/IRoundState.java2
-rw-r--r--src/jrummikub/model/RoundState.java6
-rw-r--r--test/jrummikub/control/RoundControlTest.java40
-rw-r--r--test/jrummikub/model/RoundStateTest.java2
10 files changed, 45 insertions, 105 deletions
diff --git a/mock/jrummikub/model/MockGameSettings.java b/mock/jrummikub/model/MockGameSettings.java
deleted file mode 100644
index 83b5fdc..0000000
--- a/mock/jrummikub/model/MockGameSettings.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package jrummikub.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.awt.Color;
-
-public class MockGameSettings implements IGameSettings {
- List<PlayerSettings> players = new ArrayList<PlayerSettings>();
- int initialMeldThreshold;
-
- public MockGameSettings() {
- players.add(new PlayerSettings("Bennet", Color.BLUE));
- players.add(new PlayerSettings("Matze", Color.BLACK));
- players.add(new PlayerSettings("Ida", Color.RED));
- players.add(new PlayerSettings("Jannis", Color.PINK));
- initialMeldThreshold=30;
- }
-
- @Override
- public List<PlayerSettings> getPlayerList() {
- return players;
- }
-
- @Override
- public void setInitialMeldThreshold(int value) {
- initialMeldThreshold = value;
- }
-
- @Override
- public int getInitialMeldThreshold() {
- return initialMeldThreshold;
- }
-
-}
diff --git a/mock/jrummikub/model/MockRoundState.java b/mock/jrummikub/model/MockRoundState.java
index fd5e5b1..5f478fb 100644
--- a/mock/jrummikub/model/MockRoundState.java
+++ b/mock/jrummikub/model/MockRoundState.java
@@ -19,7 +19,7 @@ public class MockRoundState implements IRoundState {
/** */
public StoneHeap gameHeap;
/** */
- public IGameSettings gameSettings;
+ public GameSettings gameSettings;
/** */
public MockRoundState() {
@@ -72,7 +72,7 @@ public class MockRoundState implements IRoundState {
}
@Override
- public IGameSettings getGameSettings() {
+ public GameSettings getGameSettings() {
return gameSettings;
}
}
diff --git a/src/jrummikub/JRummikub.java b/src/jrummikub/JRummikub.java
index 04dea53..9c22dc6 100644
--- a/src/jrummikub/JRummikub.java
+++ b/src/jrummikub/JRummikub.java
@@ -6,7 +6,6 @@ import javax.swing.UIManager;
import jrummikub.control.GameControl;
import jrummikub.model.GameSettings;
-import jrummikub.model.IGameSettings;
import jrummikub.model.PlayerSettings;
import jrummikub.view.impl.View;
@@ -29,7 +28,7 @@ public class JRummikub {
} catch (Exception e) {
}
- IGameSettings gameSettings = new GameSettings();
+ GameSettings gameSettings = new GameSettings();
gameSettings.getPlayerList().add(new PlayerSettings("Ida", Color.RED));
gameSettings.getPlayerList().add(
new PlayerSettings("Matthias", Color.YELLOW));
diff --git a/src/jrummikub/control/GameControl.java b/src/jrummikub/control/GameControl.java
index efc0c57..b5d763a 100644
--- a/src/jrummikub/control/GameControl.java
+++ b/src/jrummikub/control/GameControl.java
@@ -1,6 +1,6 @@
package jrummikub.control;
-import jrummikub.model.IGameSettings;
+import jrummikub.model.GameSettings;
import jrummikub.model.RoundState;
import jrummikub.util.IListener;
import jrummikub.view.IView;
@@ -9,7 +9,7 @@ import jrummikub.view.IView;
* Controls a Game, at some point including all Rounds, starts new Rounds
*/
public class GameControl {
- private IGameSettings gameSettings;
+ private GameSettings gameSettings;
private IView view;
private RoundControl roundControl;
@@ -21,7 +21,7 @@ public class GameControl {
* @param view
* the view
*/
- public GameControl(IGameSettings gameSettings, IView view) {
+ public GameControl(GameSettings gameSettings, IView view) {
this.gameSettings = gameSettings;
this.view = view;
diff --git a/src/jrummikub/model/GameSettings.java b/src/jrummikub/model/GameSettings.java
index 8ace0fb..b5079d4 100644
--- a/src/jrummikub/model/GameSettings.java
+++ b/src/jrummikub/model/GameSettings.java
@@ -6,7 +6,7 @@ import java.util.List;
/**
* The overall game settings
*/
-public class GameSettings implements IGameSettings {
+public class GameSettings {
private List<PlayerSettings> players = new ArrayList<PlayerSettings>();
private int initialMeldThreshold;
@@ -18,26 +18,30 @@ public class GameSettings implements IGameSettings {
initialMeldThreshold = 30;
}
- /* (non-Javadoc)
- * @see jrummikub.model.IGameSettings#getPlayerList()
+ /**
+ * Returns the list containing the settings of all players
+ *
+ * @return the player settings list
*/
- @Override
public List<PlayerSettings> getPlayerList() {
return players;
}
- /* (non-Javadoc)
- * @see jrummikub.model.IGameSettings#setInitialMeldThreshold(int)
+ /**
+ * Sets the initial meld threshold
+ *
+ * @param value
+ * the value to set
*/
- @Override
public void setInitialMeldThreshold(int value) {
initialMeldThreshold = value;
}
- /* (non-Javadoc)
- * @see jrummikub.model.IGameSettings#getInitialMeldThreshold()
+ /**
+ * Returns the initial meld threshold
+ *
+ * @return the threshold
*/
- @Override
public int getInitialMeldThreshold() {
return initialMeldThreshold;
}
diff --git a/src/jrummikub/model/IGameSettings.java b/src/jrummikub/model/IGameSettings.java
deleted file mode 100644
index 68e801a..0000000
--- a/src/jrummikub/model/IGameSettings.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package jrummikub.model;
-
-import java.util.List;
-
-public interface IGameSettings {
-
- /**
- * Returns the list containing the settings of all players
- *
- * @return the player settings list
- */
- public List<PlayerSettings> getPlayerList();
-
- /**
- * Sets the initial meld threshold
- *
- * @param value
- * the value to set
- */
- public void setInitialMeldThreshold(int value);
-
- /**
- * Returns the initial meld threshold
- *
- * @return the threshold
- */
- public int getInitialMeldThreshold();
-
-} \ No newline at end of file
diff --git a/src/jrummikub/model/IRoundState.java b/src/jrummikub/model/IRoundState.java
index aba27af..af7a478 100644
--- a/src/jrummikub/model/IRoundState.java
+++ b/src/jrummikub/model/IRoundState.java
@@ -10,7 +10,7 @@ public interface IRoundState {
*
* @return The game settings
*/
- public IGameSettings getGameSettings();
+ public GameSettings getGameSettings();
/**
* Get the current {@link Table}
diff --git a/src/jrummikub/model/RoundState.java b/src/jrummikub/model/RoundState.java
index 63b72ea..56f7904 100644
--- a/src/jrummikub/model/RoundState.java
+++ b/src/jrummikub/model/RoundState.java
@@ -5,7 +5,7 @@ import java.util.List;
/** Class managing the overall and momentary RoundState */
public class RoundState implements IRoundState {
- private IGameSettings gameSettings;
+ private GameSettings gameSettings;
private ITable table;
private List<Player> players;
@@ -18,7 +18,7 @@ public class RoundState implements IRoundState {
* @param gameSettings
* the game settings
*/
- public RoundState(IGameSettings gameSettings) {
+ public RoundState(GameSettings gameSettings) {
this.gameSettings = gameSettings;
table = new Table();
@@ -68,7 +68,7 @@ public class RoundState implements IRoundState {
}
@Override
- public IGameSettings getGameSettings() {
+ public GameSettings getGameSettings() {
return gameSettings;
}
}
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index 550c2cb..b170581 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -11,18 +11,20 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import java.awt.Color;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import jrummikub.model.GameSettings;
import jrummikub.model.Hand;
import jrummikub.model.IHand;
import jrummikub.model.ITable;
-import jrummikub.model.MockGameSettings;
import jrummikub.model.MockRoundState;
import jrummikub.model.MockTable;
+import jrummikub.model.PlayerSettings;
import jrummikub.model.Position;
import jrummikub.model.RoundState;
import jrummikub.model.Stone;
@@ -42,6 +44,10 @@ public class RoundControlTest {
private MockRoundState testRoundState;
private RoundControl testRound;
private MockTable testTable;
+
+ private GameSettings gameSettings;
+ private RoundState roundState;
+ private RoundControl roundControl;
/**
* For each test create a round control initialized by a mock model and view
@@ -56,6 +62,18 @@ public class RoundControlTest {
testTable = new MockTable();
testTable.sets.add(testRoundState.table.sets.get(0));
testRoundState.table.clonedTable = testTable;
+
+ gameSettings = new GameSettings();
+
+ gameSettings.getPlayerList().add(new PlayerSettings("Ida", Color.RED));
+ gameSettings.getPlayerList().add(
+ new PlayerSettings("Matthias", Color.YELLOW));
+ gameSettings.getPlayerList().add(
+ new PlayerSettings("Jannis", Color.GREEN));
+ gameSettings.getPlayerList().add(
+ new PlayerSettings("Bennet", Color.BLACK));
+ roundState = new RoundState(gameSettings);
+ roundControl = new RoundControl(roundState, view);
}
private void checkCorrectlyDealed() {
@@ -104,9 +122,6 @@ public class RoundControlTest {
/** Threshold=30 */
@Test
public void laidOutValidTooFew() {
- MockGameSettings gameSettings = new MockGameSettings();
- RoundState roundState = new RoundState(gameSettings);
- RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
view.startTurnEvent.emit();
@@ -137,9 +152,6 @@ public class RoundControlTest {
/** Threshold=30 */
@Test
public void laidOutInvalidEnough() {
- MockGameSettings gameSettings = new MockGameSettings();
- RoundState roundState = new RoundState(gameSettings);
- RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
view.startTurnEvent.emit();
@@ -184,9 +196,6 @@ public class RoundControlTest {
/** Threshold=30 */
@Test
public void laidOutTooFewChangedTable() {
- MockGameSettings gameSettings = new MockGameSettings();
- RoundState roundState = new RoundState(gameSettings);
- RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
view.startTurnEvent.emit();
// Fake Turn to put stones on the table
@@ -254,9 +263,6 @@ public class RoundControlTest {
/** Threshold=30 */
@Test
public void laidOutEnoughChangedTable() {
- MockGameSettings gameSettings = new MockGameSettings();
- RoundState roundState = new RoundState(gameSettings);
- RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
view.startTurnEvent.emit();
// Fake Turn to put stones on the table
@@ -323,12 +329,9 @@ public class RoundControlTest {
assertEquals(2, roundState.getTable().getSize());
assertEquals(14 + 7, hand.getSize());
}
-
+
@Test
public void laidOutJustChangedTable() {
- MockGameSettings gameSettings = new MockGameSettings();
- RoundState roundState = new RoundState(gameSettings);
- RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
view.startTurnEvent.emit();
// Fake Turn to put stones on the table
@@ -389,9 +392,6 @@ public class RoundControlTest {
/** Threshold=30 */
@Test
public void laidOutValid() {
- MockGameSettings gameSettings = new MockGameSettings();
- RoundState roundState = new RoundState(gameSettings);
- RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
view.startTurnEvent.emit();
// Fake Turn to put stones on the table
diff --git a/test/jrummikub/model/RoundStateTest.java b/test/jrummikub/model/RoundStateTest.java
index c71cead..bfbe857 100644
--- a/test/jrummikub/model/RoundStateTest.java
+++ b/test/jrummikub/model/RoundStateTest.java
@@ -11,7 +11,7 @@ import org.junit.Test;
* Test class for {@link RoundState}
*/
public class RoundStateTest {
- private IGameSettings settings = new GameSettings();
+ private GameSettings settings = new GameSettings();
private IRoundState testRound;
/** */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 10:03:32 +0100