summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mock/jrummikub/model/MockPlayer.java7
-rw-r--r--mock/jrummikub/model/MockRoundState.java5
-rw-r--r--mock/jrummikub/model/MockTable.java2
-rw-r--r--src/jrummikub/JRummikub.java3
-rw-r--r--src/jrummikub/control/GameControl.java6
-rw-r--r--src/jrummikub/control/RoundControl.java116
-rw-r--r--src/jrummikub/model/GameSettings.java24
-rw-r--r--src/jrummikub/model/IPlayer.java6
-rw-r--r--src/jrummikub/model/IRoundState.java2
-rw-r--r--src/jrummikub/model/Player.java7
-rw-r--r--src/jrummikub/model/RoundState.java6
-rw-r--r--test/jrummikub/control/RoundControlTest.java289
-rw-r--r--test/jrummikub/model/RoundStateTest.java2
13 files changed, 309 insertions, 166 deletions
diff --git a/mock/jrummikub/model/MockPlayer.java b/mock/jrummikub/model/MockPlayer.java
index a580a48..a7b57b4 100644
--- a/mock/jrummikub/model/MockPlayer.java
+++ b/mock/jrummikub/model/MockPlayer.java
@@ -13,7 +13,7 @@ public class MockPlayer implements IPlayer {
/**
* @param playerSettings
- * the player settings
+ * the player settings
*/
public MockPlayer(PlayerSettings playerSettings) {
hand = new Hand();
@@ -35,4 +35,9 @@ public class MockPlayer implements IPlayer {
public PlayerSettings getPlayerSettings() {
return playerSettings;
}
+
+ @Override
+ public void setLaidOut(boolean laidOut) {
+ this.laidOut = laidOut;
+ }
}
diff --git a/mock/jrummikub/model/MockRoundState.java b/mock/jrummikub/model/MockRoundState.java
index 7b58fab..fd5e5b1 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 GameSettings gameSettings;
+ public IGameSettings gameSettings;
/** */
public MockRoundState() {
@@ -32,6 +32,7 @@ public class MockRoundState implements IRoundState {
activePlayer = 0;
gameHeap = new StoneHeap();
gameSettings = new GameSettings();
+ gameSettings.setInitialMeldThreshold(30);
}
@Override
@@ -71,7 +72,7 @@ public class MockRoundState implements IRoundState {
}
@Override
- public GameSettings getGameSettings() {
+ public IGameSettings getGameSettings() {
return gameSettings;
}
}
diff --git a/mock/jrummikub/model/MockTable.java b/mock/jrummikub/model/MockTable.java
index bfbf8e9..d5bf07b 100644
--- a/mock/jrummikub/model/MockTable.java
+++ b/mock/jrummikub/model/MockTable.java
@@ -23,7 +23,7 @@ public class MockTable implements ITable {
@Override
public void pickUpStone(Stone stone) {
- // TODO Auto-generated method stub
+ // TODO: Auto-generated method stub
}
@Override
diff --git a/src/jrummikub/JRummikub.java b/src/jrummikub/JRummikub.java
index 9c22dc6..04dea53 100644
--- a/src/jrummikub/JRummikub.java
+++ b/src/jrummikub/JRummikub.java
@@ -6,6 +6,7 @@ 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;
@@ -28,7 +29,7 @@ public class JRummikub {
} catch (Exception e) {
}
- GameSettings gameSettings = new GameSettings();
+ IGameSettings 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 b5d763a..efc0c57 100644
--- a/src/jrummikub/control/GameControl.java
+++ b/src/jrummikub/control/GameControl.java
@@ -1,6 +1,6 @@
package jrummikub.control;
-import jrummikub.model.GameSettings;
+import jrummikub.model.IGameSettings;
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 GameSettings gameSettings;
+ private IGameSettings gameSettings;
private IView view;
private RoundControl roundControl;
@@ -21,7 +21,7 @@ public class GameControl {
* @param view
* the view
*/
- public GameControl(GameSettings gameSettings, IView view) {
+ public GameControl(IGameSettings gameSettings, IView view) {
this.gameSettings = gameSettings;
this.view = view;
diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java
index 9b746d1..a69b890 100644
--- a/src/jrummikub/control/RoundControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -23,7 +23,7 @@ import jrummikub.view.IView;
* Controller that manages a single round of rummikub
*/
public class RoundControl {
- private IRoundState gameState;
+ private IRoundState roundState;
private IView view;
private ITable clonedTable;
private Event endRoundEvent = new Event();
@@ -37,8 +37,8 @@ public class RoundControl {
* @param view
* view used for user interaction
*/
- public RoundControl(IRoundState gameState, IView view) {
- this.gameState = gameState;
+ public RoundControl(IRoundState roundState, IView view) {
+ this.roundState = roundState;
this.view = view;
}
@@ -69,20 +69,21 @@ public class RoundControl {
}
private void prepareTurn() {
- clonedTable = (ITable) gameState.getTable().clone();
+ clonedTable = (ITable) roundState.getTable().clone();
view.enableStartTurnPanel(true);
view.getTablePanel().setStoneSets(clonedTable);
- view.setCurrentPlayerName(gameState.getActivePlayer().getPlayerSettings().getName());
+ view.setCurrentPlayerName(roundState.getActivePlayer()
+ .getPlayerSettings().getName());
view.getTablePanel().setLeftPlayerName(
- gameState.getNthNextPlayer(1).getPlayerSettings().getName());
+ roundState.getNthNextPlayer(1).getPlayerSettings().getName());
view.getTablePanel().setTopPlayerName(
- gameState.getNthNextPlayer(2).getPlayerSettings().getName());
+ roundState.getNthNextPlayer(2).getPlayerSettings().getName());
view.getTablePanel().setRightPlayerName(
- gameState.getNthNextPlayer(3).getPlayerSettings().getName());
+ roundState.getNthNextPlayer(3).getPlayerSettings().getName());
}
private void startTurn() {
- TurnControl turnControl = new TurnControl(gameState.getActivePlayer()
+ TurnControl turnControl = new TurnControl(roundState.getActivePlayer()
.getHand(), clonedTable, view);
connections.add(turnControl.getEndOfTurnEvent().add(new IListener() {
@@ -96,42 +97,95 @@ public class RoundControl {
}
void deal() {
- for (int i = 0; i < gameState.getPlayerCount(); i++) {
- IHand hand = gameState.getNthNextPlayer(i).getHand();
+ for (int i = 0; i < roundState.getPlayerCount(); i++) {
+ IHand hand = roundState.getNthNextPlayer(i).getHand();
for (int j = 0; j < 7; j++) {
- hand.drop(gameState.getGameHeap().drawStone(), new Position(j,
+ hand.drop(roundState.getGameHeap().drawStone(), new Position(j,
0));
- hand.drop(gameState.getGameHeap().drawStone(), new Position(j,
+ hand.drop(roundState.getGameHeap().drawStone(), new Position(j,
1));
}
}
}
- private void endOfTurn() {
- Set<Stone> tableDiff = tableDifference(gameState.getTable(),
- clonedTable);
+ /**
+ * after a legal move
+ *
+ * @return win or no win
+ */
+ private boolean postLegalMove() {
+ roundState.setTable(clonedTable);
- if (!tableDiff.isEmpty()) { // Player has made a move
- if (clonedTable.isValid()) {
- gameState.setTable(clonedTable);
+ if (roundState.getActivePlayer().getHand().getSize() == 0) {
+ win();
+ return true;
+ }
+ return false;
+ }
- if (gameState.getActivePlayer().getHand().getSize() == 0) {
- win();
- return;
- }
+ private boolean notLaidOutYet(Set<Stone> tableDiff) {
+ boolean win = false;
+ if (tableSetDifference(clonedTable, roundState.getTable()).isEmpty()) {
+ // laid sthg out and didn't change table
+ List<StoneSet> newSets = tableSetDifference(roundState.getTable(),
+ clonedTable);
+
+ int totalValue = 0;
+ for (StoneSet set : newSets) {
+ totalValue += set.classify().getSecond();
+ }
+
+ if (totalValue >= roundState.getGameSettings()
+ .getInitialMeldThreshold()) {
+
+ roundState.getActivePlayer().setLaidOut(true);
+ win = postLegalMove();
+ return win;
} else {
- gameState.getGameHeap().putBack(tableDiff);
+ // deal penalty, reset
+ roundState.getGameHeap().putBack(tableDiff);
dealPenalty(tableDiff.size());
+ return win;
}
- } else { // Player hasn't made a move
+ } else {
+ // deal penalty, reset
+ roundState.getGameHeap().putBack(tableDiff);
+ dealPenalty(tableDiff.size());
+ return win;
+ }
+ }
+
+ private void endOfTurn() {
+ Set<Stone> tableDiff = tableDifference(roundState.getTable(),
+ clonedTable);
+
+ if (tableDiff.isEmpty()) {
+ // Player hasn't made a move
if (clonedTable.isValid()) {
- gameState.setTable(clonedTable);
+ roundState.setTable(clonedTable);
}
-
dealStone();
+ } else {
+ // Player has made a move
+ if (!clonedTable.isValid()) {
+ // deal penalty, reset
+ roundState.getGameHeap().putBack(tableDiff);
+ dealPenalty(tableDiff.size());
+ } else {
+ if (roundState.getActivePlayer().getLaidOut()) {
+ // Player has laid out
+ if (postLegalMove()) {
+ return;
+ }
+ } else {
+ // Player hasn't laid out
+ if (notLaidOutYet(tableDiff)) {
+ return;
+ }
+ }
+ }
}
-
- gameState.nextPlayer();
+ roundState.nextPlayer();
prepareTurn();
}
@@ -164,7 +218,7 @@ public class RoundControl {
}
void dealStones(int count) {
- IHand hand = gameState.getActivePlayer().getHand();
+ IHand hand = roundState.getActivePlayer().getHand();
int rowCount = hand.getRowCount();
for (int i = 0; i < count; ++i) {
@@ -172,7 +226,7 @@ public class RoundControl {
rowCount++;
}
- hand.drop(gameState.getGameHeap().drawStone(), new Position(
+ hand.drop(roundState.getGameHeap().drawStone(), new Position(
Hand.WIDTH - 1, rowCount - 1));
}
}
diff --git a/src/jrummikub/model/GameSettings.java b/src/jrummikub/model/GameSettings.java
index b5079d4..8ace0fb 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 {
+public class GameSettings implements IGameSettings {
private List<PlayerSettings> players = new ArrayList<PlayerSettings>();
private int initialMeldThreshold;
@@ -18,30 +18,26 @@ public class GameSettings {
initialMeldThreshold = 30;
}
- /**
- * Returns the list containing the settings of all players
- *
- * @return the player settings list
+ /* (non-Javadoc)
+ * @see jrummikub.model.IGameSettings#getPlayerList()
*/
+ @Override
public List<PlayerSettings> getPlayerList() {
return players;
}
- /**
- * Sets the initial meld threshold
- *
- * @param value
- * the value to set
+ /* (non-Javadoc)
+ * @see jrummikub.model.IGameSettings#setInitialMeldThreshold(int)
*/
+ @Override
public void setInitialMeldThreshold(int value) {
initialMeldThreshold = value;
}
- /**
- * Returns the initial meld threshold
- *
- * @return the threshold
+ /* (non-Javadoc)
+ * @see jrummikub.model.IGameSettings#getInitialMeldThreshold()
*/
+ @Override
public int getInitialMeldThreshold() {
return initialMeldThreshold;
}
diff --git a/src/jrummikub/model/IPlayer.java b/src/jrummikub/model/IPlayer.java
index 1ae6f12..6c4a9ae 100644
--- a/src/jrummikub/model/IPlayer.java
+++ b/src/jrummikub/model/IPlayer.java
@@ -25,4 +25,10 @@ public interface IPlayer {
* @return the player settings
*/
public PlayerSettings getPlayerSettings();
+
+ /**
+ * Set if the player laid out
+ *
+ */
+ void setLaidOut(boolean laidOut);
} \ No newline at end of file
diff --git a/src/jrummikub/model/IRoundState.java b/src/jrummikub/model/IRoundState.java
index af7a478..aba27af 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 GameSettings getGameSettings();
+ public IGameSettings getGameSettings();
/**
* Get the current {@link Table}
diff --git a/src/jrummikub/model/Player.java b/src/jrummikub/model/Player.java
index f482f28..d10992e 100644
--- a/src/jrummikub/model/Player.java
+++ b/src/jrummikub/model/Player.java
@@ -10,7 +10,7 @@ public class Player implements IPlayer {
* Create a new player with a given name and color
*
* @param settings
- * the player settings
+ * the player settings
*/
public Player(PlayerSettings settings) {
this.settings = settings;
@@ -30,6 +30,11 @@ public class Player implements IPlayer {
}
@Override
+ public void setLaidOut(boolean laidOut) {
+ this.laidOut = laidOut;
+ }
+
+ @Override
public PlayerSettings getPlayerSettings() {
return settings;
}
diff --git a/src/jrummikub/model/RoundState.java b/src/jrummikub/model/RoundState.java
index 56f7904..63b72ea 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 GameSettings gameSettings;
+ private IGameSettings gameSettings;
private ITable table;
private List<Player> players;
@@ -18,7 +18,7 @@ public class RoundState implements IRoundState {
* @param gameSettings
* the game settings
*/
- public RoundState(GameSettings gameSettings) {
+ public RoundState(IGameSettings gameSettings) {
this.gameSettings = gameSettings;
table = new Table();
@@ -68,7 +68,7 @@ public class RoundState implements IRoundState {
}
@Override
- public GameSettings getGameSettings() {
+ public IGameSettings getGameSettings() {
return gameSettings;
}
}
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index e320d35..1e2ee89 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -20,6 +20,7 @@ import java.util.Set;
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.Position;
@@ -99,215 +100,274 @@ public class RoundControlTest {
view.displayStartTurnPanel = false;
}
+ // TODO: evt. Mock round/gaestate zwecks hargecodeter player, dann wer weiß,
+ // wie wir sonst an Player rankommen
+
// laidOut test cases
- /** */
+ /** Threshold=30 */
@Test
public void laidOutValidTooFew() {
-
- RoundState roundState = new RoundState(null);
+ MockGameSettings gameSettings = new MockGameSettings();
+ RoundState roundState = new RoundState(gameSettings);
RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
- IHand hand = roundState.getActivePlayer().getHand();
+ view.startTurnEvent.emit();
Stone blueOne = new Stone(1, BLUE);
Stone blueTwo = new Stone(2, BLUE);
Stone blueThree = new Stone(3, BLUE);
+ IHand hand = roundState.getActivePlayer().getHand();
hand.drop(blueOne, new Position(0, 0));
hand.drop(blueTwo, new Position(0, 0));
hand.drop(blueThree, new Position(0, 0));
assertFalse(roundState.getActivePlayer().getLaidOut());
- hand.pickUp(blueOne);
- hand.pickUp(blueTwo);
- hand.pickUp(blueThree);
+ view.handPanel.stoneClickEvent.emit(blueOne, false);
+ view.handPanel.stoneClickEvent.emit(blueTwo, true);
+ view.handPanel.stoneClickEvent.emit(blueThree, true);
- roundState.getTable().drop(
- new StoneSet(Arrays.asList(blueOne, blueTwo, blueThree)),
- new Position(0, 0));
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertTrue(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
- .getLaidOut());
+ assertFalse(roundState
+ .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertEquals(0, roundState.getTable().getSize());
}
- /** */
+ /** Threshold=30 */
@Test
public void laidOutInvalidEnough() {
- RoundState roundState = new RoundState(null);
+ MockGameSettings gameSettings = new MockGameSettings();
+ RoundState roundState = new RoundState(gameSettings);
RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
- IHand hand = roundState.getActivePlayer().getHand();
+ view.startTurnEvent.emit();
Stone blueOne = new Stone(1, BLUE);
Stone blueTwo = new Stone(2, BLUE);
Stone blueThree = new Stone(3, BLUE);
- Stone redEight = new Stone(8, RED);
- Stone redNine = new Stone(9, RED);
- Stone redTen = new Stone(10, RED);
-
- Stone orangeOne = new Stone(1, ORANGE);
-
+ IHand hand = roundState.getActivePlayer().getHand();
hand.drop(blueOne, new Position(0, 0));
hand.drop(blueTwo, new Position(0, 0));
hand.drop(blueThree, new Position(0, 0));
- hand.drop(redEight, new Position(0, 0));
- hand.drop(redNine, new Position(0, 0));
- hand.drop(redTen, new Position(0, 0));
+ view.handPanel.stoneClickEvent.emit(blueOne, false);
+ view.handPanel.stoneClickEvent.emit(blueTwo, true);
+ view.handPanel.stoneClickEvent.emit(blueThree, true);
- hand.drop(orangeOne, new Position(0, 0));
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
- hand.pickUp(orangeOne);
- hand.pickUp(blueTwo);
- hand.pickUp(blueThree);
+ Stone blueTen = new Stone(10, BLUE);
+ Stone redTen = new Stone(10, RED);
+ Stone blueEleven = new Stone(11, BLUE);
- roundState.getTable().drop(
- new StoneSet(Arrays.asList(orangeOne, blueTwo, blueThree)),
- new Position(0, 0));
+ assertFalse(roundState.getActivePlayer().getLaidOut());
+
+ hand.drop(blueTen, new Position(0, 0));
+ hand.drop(redTen, new Position(0, 0));
+ hand.drop(blueEleven, new Position(0, 0));
- hand.pickUp(redEight);
- hand.pickUp(redNine);
- hand.pickUp(redTen);
+ view.handPanel.stoneClickEvent.emit(blueTen, false);
+ view.handPanel.stoneClickEvent.emit(redTen, true);
+ view.handPanel.stoneClickEvent.emit(blueEleven, true);
- roundState.getTable().drop(
- new StoneSet(Arrays.asList(redEight, redNine, redTen)),
- new Position(0, 0));
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertTrue(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
- .getLaidOut());
+ assertFalse(roundState
+ .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertEquals(0, roundState.getTable().getSize());
}
- /** */
+ /** Threshold=30 */
@Test
public void laidOutTooFewChangedTable() {
- RoundState roundState = new RoundState(null);
+ 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
+ Stone blueSeven = new Stone(7, BLUE);
+ Stone blackSeven = new Stone(7, BLACK);
+ Stone redSeven = new Stone(7, RED);
+ Stone orangeSeven = new Stone(7, ORANGE);
+
+ Stone blueOne = new Stone(1, BLUE);
+ Stone blueTwo = new Stone(2, BLUE);
+ Stone blueThree = new Stone(3, BLUE);
+
IHand hand = roundState.getActivePlayer().getHand();
+ hand.drop(blueOne, new Position(0, 0));
+ hand.drop(blueTwo, new Position(0, 0));
+ hand.drop(blueThree, new Position(0, 0));
+
+ hand.drop(redSeven, new Position(0, 0));
+ hand.drop(blueSeven, new Position(0, 0));
+ hand.drop(blackSeven, new Position(0, 0));
+ hand.drop(orangeSeven, new Position(0, 0));
+
+ view.handPanel.stoneClickEvent.emit(redSeven, false);
+ view.handPanel.stoneClickEvent.emit(blueSeven, true);
+ view.handPanel.stoneClickEvent.emit(blackSeven, true);
+ view.handPanel.stoneClickEvent.emit(orangeSeven, true);
+
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
+
+ view.handPanel.stoneClickEvent.emit(blueOne, false);
+ view.handPanel.stoneClickEvent.emit(blueTwo, true);
+ view.handPanel.stoneClickEvent.emit(blueThree, true);
+
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
+
+ view.playerPanel.endTurnEvent.emit();
+ assertEquals(2, roundState.getTable().getSize());
+ view.startTurnEvent.emit();
Stone redEight = new Stone(8, RED);
Stone redNine = new Stone(9, RED);
Stone redTen = new Stone(10, RED);
+ hand = roundState.getActivePlayer().getHand();
hand.drop(redEight, new Position(0, 0));
hand.drop(redNine, new Position(0, 0));
hand.drop(redTen, new Position(0, 0));
- Stone blueSeven = new Stone(7, BLUE);
- Stone blackSeven = new Stone(7, BLACK);
- Stone redSeven = new Stone(7, RED);
- Stone orangeSeven = new Stone(7, ORANGE);
+ view.tablePanel.stoneClickEvent.emit(redSeven, false);
+ view.handPanel.stoneClickEvent.emit(redEight, true);
+ view.handPanel.stoneClickEvent.emit(redNine, true);
+ view.handPanel.stoneClickEvent.emit(redTen, true);
- StoneSet sevenSet = new StoneSet(Arrays.asList(blueSeven, blackSeven,
- redSeven, orangeSeven));
-
- roundState.getTable().drop(sevenSet, new Position(0, 0));
- hand.pickUp(redEight);
- hand.pickUp(redNine);
- hand.pickUp(redTen);
- roundState.getTable().pickUpStone(redSeven);
+ assertFalse(roundState.getActivePlayer().getLaidOut());
- roundState.getTable()
- .drop(new StoneSet(Arrays.asList(redSeven, redEight, redNine,
- redTen)), new Position(0, 0));
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertTrue(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
- .getLaidOut());
+ assertFalse(roundState
+ .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertEquals(2, roundState.getTable().getSize());
}
- /** */
+ /** Threshold=30 */
@Test
public void laidOutEnoughChangedTable() {
- RoundState roundState = new RoundState(null);
+ 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
+ Stone blueSeven = new Stone(7, BLUE);
+ Stone blackSeven = new Stone(7, BLACK);
+ Stone redSeven = new Stone(7, RED);
+ Stone orangeSeven = new Stone(7, ORANGE);
+
+ Stone blueOne = new Stone(1, BLUE);
+ Stone blueTwo = new Stone(2, BLUE);
+ Stone blueThree = new Stone(3, BLUE);
+
IHand hand = roundState.getActivePlayer().getHand();
+ hand.drop(blueOne, new Position(0, 0));
+ hand.drop(blueTwo, new Position(0, 0));
+ hand.drop(blueThree, new Position(0, 0));
+
+ hand.drop(redSeven, new Position(0, 0));
+ hand.drop(blueSeven, new Position(0, 0));
+ hand.drop(blackSeven, new Position(0, 0));
+ hand.drop(orangeSeven, new Position(0, 0));
+
+ view.handPanel.stoneClickEvent.emit(redSeven, false);
+ view.handPanel.stoneClickEvent.emit(blueSeven, true);
+ view.handPanel.stoneClickEvent.emit(blackSeven, true);
+ view.handPanel.stoneClickEvent.emit(orangeSeven, true);
+
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
+
+ view.handPanel.stoneClickEvent.emit(blueOne, false);
+ view.handPanel.stoneClickEvent.emit(blueTwo, true);
+ view.handPanel.stoneClickEvent.emit(blueThree, true);
+
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
+
+ view.playerPanel.endTurnEvent.emit();
+ assertEquals(2, roundState.getTable().getSize());
+ view.startTurnEvent.emit();
Stone redEight = new Stone(8, RED);
Stone redNine = new Stone(9, RED);
Stone redTen = new Stone(10, RED);
Stone redEleven = new Stone(11, RED);
+ hand = roundState.getActivePlayer().getHand();
hand.drop(redEight, new Position(0, 0));
hand.drop(redNine, new Position(0, 0));
hand.drop(redTen, new Position(0, 0));
hand.drop(redEleven, new Position(0, 0));
- Stone blueSeven = new Stone(7, BLUE);
- Stone blackSeven = new Stone(7, BLACK);
- Stone redSeven = new Stone(7, RED);
- Stone orangeSeven = new Stone(7, ORANGE);
-
- StoneSet sevenSet = new StoneSet(Arrays.asList(blueSeven, blackSeven,
- redSeven, orangeSeven));
- roundState.getTable().drop(sevenSet, new Position(0, 0));
+ view.tablePanel.stoneClickEvent.emit(redSeven, false);
+ view.handPanel.stoneClickEvent.emit(redEight, true);
+ view.handPanel.stoneClickEvent.emit(redNine, true);
+ view.handPanel.stoneClickEvent.emit(redTen, true);
+ view.handPanel.stoneClickEvent.emit(redEleven, true);
- hand.pickUp(redEight);
- hand.pickUp(redNine);
- hand.pickUp(redTen);
- hand.pickUp(redEleven);
- roundState.getTable().pickUpStone(redSeven);
+ assertFalse(roundState.getActivePlayer().getLaidOut());
- roundState.getTable().drop(
- new StoneSet(Arrays.asList(redSeven, redEight, redNine, redTen,
- redEleven)), new Position(0, 0));
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertTrue(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
- .getLaidOut());
+ assertFalse(roundState
+ .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertEquals(2, roundState.getTable().getSize());
}
- /** */
+ /** Threshold=30 */
@Test
public void laidOutValid() {
- RoundState roundState = new RoundState(null);
+ MockGameSettings gameSettings = new MockGameSettings();
+ RoundState roundState = new RoundState(gameSettings);
RoundControl roundControl = new RoundControl(roundState, view);
roundControl.startRound();
- IHand hand = roundState.getActivePlayer().getHand();
+ view.startTurnEvent.emit();
+ // Fake Turn to put stones on the table
+ Stone blueSeven = new Stone(7, BLUE);
+ Stone blackSeven = new Stone(7, BLACK);
+ Stone redSeven = new Stone(7, RED);
+ Stone orangeSeven = new Stone(7, ORANGE);
Stone blueOne = new Stone(1, BLUE);
Stone blueTwo = new Stone(2, BLUE);
Stone blueThree = new Stone(3, BLUE);
- Stone redEight = new Stone(8, RED);
- Stone redNine = new Stone(9, RED);
- Stone redTen = new Stone(10, RED);
-
+ IHand hand = roundState.getActivePlayer().getHand();
hand.drop(blueOne, new Position(0, 0));
hand.drop(blueTwo, new Position(0, 0));
hand.drop(blueThree, new Position(0, 0));
- hand.drop(redEight, new Position(0, 0));
- hand.drop(redNine, new Position(0, 0));
- hand.drop(redTen, new Position(0, 0));
-
- assertFalse(roundState.getActivePlayer().getLaidOut());
+ hand.drop(redSeven, new Position(0, 0));
+ hand.drop(blueSeven, new Position(0, 0));
+ hand.drop(blackSeven, new Position(0, 0));
+ hand.drop(orangeSeven, new Position(0, 0));
- hand.pickUp(blueOne);
- hand.pickUp(blueTwo);
- hand.pickUp(blueThree);
+ view.handPanel.stoneClickEvent.emit(redSeven, false);
+ view.handPanel.stoneClickEvent.emit(blueSeven, true);
+ view.handPanel.stoneClickEvent.emit(blackSeven, true);
+ view.handPanel.stoneClickEvent.emit(orangeSeven, true);
- roundState.getTable().drop(
- new StoneSet(Arrays.asList(blueOne, blueTwo, blueThree)),
- new Position(0, 0));
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
- hand.pickUp(redEight);
- hand.pickUp(redNine);
- hand.pickUp(redTen);
+ view.handPanel.stoneClickEvent.emit(blueOne, false);
+ view.handPanel.stoneClickEvent.emit(blueTwo, true);
+ view.handPanel.stoneClickEvent.emit(blueThree, true);
- roundState.getTable().drop(
- new StoneSet(Arrays.asList(redEight, redNine, redTen)),
- new Position(0, 0));
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
-
assertTrue(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getLaidOut());
+ assertEquals(2, roundState.getTable().getSize());
}
/** */
@@ -444,12 +504,27 @@ public class RoundControlTest {
view.startTurnEvent.emit();
assertFalse(view.displayStartTurnPanel);
IHand hand = testRoundState.players.get(0).hand;
- Stone stone = hand.iterator().next().getFirst();
- hand.pickUp(stone);
- testTable.drop(new StoneSet(stone), new Position(0, 0));
+
+ Stone blueEight = new Stone(8, BLUE);
+ Stone blackEight = new Stone(8, BLACK);
+ Stone redEight = new Stone(8, RED);
+ Stone orangeEight = new Stone(8, ORANGE);
+
+ hand.drop(redEight, new Position(0, 0));
+ hand.drop(blueEight, new Position(0, 0));
+ hand.drop(blackEight, new Position(0, 0));
+ hand.drop(orangeEight, new Position(0, 0));
+
+ view.handPanel.stoneClickEvent.emit(redEight, false);
+ view.handPanel.stoneClickEvent.emit(blueEight, true);
+ view.handPanel.stoneClickEvent.emit(blackEight, true);
+ view.handPanel.stoneClickEvent.emit(orangeEight, true);
+
+ view.tablePanel.clickEvent.emit(new Position(0, 0));
+
testRoundState.players.get(0).hand = new Hand();
resetTurnStart();
- view.getPlayerPanel().endTurnEvent.emit();
+ view.playerPanel.endTurnEvent.emit();
assertTrue(view.displayWinPanel);
}
diff --git a/test/jrummikub/model/RoundStateTest.java b/test/jrummikub/model/RoundStateTest.java
index bfbe857..c71cead 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 GameSettings settings = new GameSettings();
+ private IGameSettings settings = new GameSettings();
private IRoundState testRound;
/** */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 17:28:13 +0200