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

View: Refactor bottom panel display

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@354 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-05-31 18:25:47 +02:00
parent 03b3bf2340
commit bc04d21afb
10 changed files with 122 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mock/jrummikub/view/MockView.java
View file

@ -28,9 +28,7 @@ public class MockView implements IView {
/** */ /** */
public String currentPlayerName; public String currentPlayerName;
/** */ /** */
public boolean displayStartTurnPanel = false; public BottomPanelType bottomPanelType;
/** */
public boolean displayWinPanel = false;
/** */ /** */
public MockEvent startTurnEvent = new MockEvent(); public MockEvent startTurnEvent = new MockEvent();
@ -67,21 +65,11 @@ public class MockView implements IView {
selectedStones = stones; selectedStones = stones;
} }
@Override
public void enableStartTurnPanel(boolean enable) {
displayStartTurnPanel = enable;
}
@Override @Override
public IEvent getStartTurnEvent() { public IEvent getStartTurnEvent() {
return startTurnEvent; return startTurnEvent;
} }
@Override
public void enableWinPanel(boolean enable) {
displayWinPanel = enable;
}
@Override @Override
public IEvent getEndProgramEvent() { public IEvent getEndProgramEvent() {
return quitEvent; return quitEvent;
@ -121,7 +109,7 @@ public class MockView implements IView {
} }
@Override @Override
public void setHasLaidOut(boolean hasLaidOut) { public void setCurrentPlayerHasLaidOut(boolean hasLaidOut) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@ -132,15 +120,8 @@ public class MockView implements IView {
} }
@Override @Override
public void showInterface(boolean enable) { public void setBottomPanel(BottomPanelType type) {
// TODO Auto-generated method stub bottomPanelType = type;
}
@Override
public void enableThinkPanel(boolean b) {
// TODO Auto-generated method stub
} }
} }

5
src/jrummikub/control/ApplicationControl.java
View file

@ -4,6 +4,7 @@ import jrummikub.model.GameSettings;
import jrummikub.util.IListener; import jrummikub.util.IListener;
import jrummikub.util.IListener1; import jrummikub.util.IListener1;
import jrummikub.view.IView; import jrummikub.view.IView;
import jrummikub.view.IView.BottomPanelType;
/** /**
* The application control controls the settings for a new games and create the * The application control controls the settings for a new games and create the
@ -27,8 +28,7 @@ public class ApplicationControl {
*/ */
public void startApplication() { public void startApplication() {
view.showScorePanel(false); view.showScorePanel(false);
view.enableWinPanel(false); view.setBottomPanel(BottomPanelType.START_GAME_PANEL);
view.showInterface(false);
SettingsControl settingsControl = new SettingsControl(view, SettingsControl settingsControl = new SettingsControl(view,
new GameSettings()); new GameSettings());
settingsControl.getStartGameEvent().add(new IListener1<GameSettings>() { settingsControl.getStartGameEvent().add(new IListener1<GameSettings>() {
@ -42,7 +42,6 @@ public class ApplicationControl {
startApplication(); startApplication();
} }
}); });
view.showInterface(true);
gameControl.startGame(); gameControl.startGame();
} }

3
src/jrummikub/control/GameControl.java
View file

@ -14,6 +14,7 @@ import jrummikub.util.IEvent;
import jrummikub.util.IListener; import jrummikub.util.IListener;
import jrummikub.util.IListener1; import jrummikub.util.IListener1;
import jrummikub.view.IView; import jrummikub.view.IView;
import jrummikub.view.IView.BottomPanelType;
/** /**
* Controls a Game, at some point including all Rounds, starts new Rounds * Controls a Game, at some point including all Rounds, starts new Rounds
@ -128,7 +129,7 @@ public class GameControl {
gameState.getScores().add(roundScore); gameState.getScores().add(roundScore);
roundControl = null; roundControl = null;
view.enableWinPanel(true); view.setBottomPanel(BottomPanelType.WIN_PANEL);
view.getScorePanel().setPlayers(gameSettings.getPlayerList()); view.getScorePanel().setPlayers(gameSettings.getPlayerList());
view.getScorePanel().setScores(gameState.getScores()); view.getScorePanel().setScores(gameState.getScores());

14
src/jrummikub/control/RoundControl.java
View file

@ -1,5 +1,7 @@
package jrummikub.control; package jrummikub.control;
import static jrummikub.control.turn.TurnControlFactory.Type.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -7,7 +9,6 @@ import java.util.Set;
import jrummikub.control.turn.ITurnControl; import jrummikub.control.turn.ITurnControl;
import jrummikub.control.turn.TurnControlFactory; import jrummikub.control.turn.TurnControlFactory;
import static jrummikub.control.turn.TurnControlFactory.Type.*;
import jrummikub.model.Hand; import jrummikub.model.Hand;
import jrummikub.model.IHand; import jrummikub.model.IHand;
import jrummikub.model.IPlayer; import jrummikub.model.IPlayer;
@ -25,6 +26,7 @@ import jrummikub.util.IEvent1;
import jrummikub.util.IListener; import jrummikub.util.IListener;
import jrummikub.util.Pair; import jrummikub.util.Pair;
import jrummikub.view.IView; import jrummikub.view.IView;
import jrummikub.view.IView.BottomPanelType;
/** /**
* Controller that manages a single round of rummikub * Controller that manages a single round of rummikub
@ -82,18 +84,15 @@ public class RoundControl {
.getTurnControlType() == HUMAN; .getTurnControlType() == HUMAN;
clonedTable = (ITable) roundState.getTable().clone(); clonedTable = (ITable) roundState.getTable().clone();
if (isHuman) { view.setBottomPanel(isHuman ? BottomPanelType.START_TURN_PANEL
view.enableStartTurnPanel(true); : BottomPanelType.COMPUTER_HAND_PANEL);
} else {
view.enableThinkPanel(true);
}
view.getTablePanel().setStoneSets(clonedTable.clone()); view.getTablePanel().setStoneSets(clonedTable.clone());
view.setCurrentPlayerName(roundState.getActivePlayer().getPlayerSettings() view.setCurrentPlayerName(roundState.getActivePlayer().getPlayerSettings()
.getName()); .getName());
view.setCurrentPlayerColor(roundState.getActivePlayer().getPlayerSettings() view.setCurrentPlayerColor(roundState.getActivePlayer().getPlayerSettings()
.getColor()); .getColor());
view.setHasLaidOut(roundState.getActivePlayer().getLaidOut()); view.setCurrentPlayerHasLaidOut(roundState.getActivePlayer().getLaidOut());
if (!isHuman) if (!isHuman)
startTurn(); startTurn();
@ -156,7 +155,6 @@ public class RoundControl {
} }
private void endOfTurn() { private void endOfTurn() {
view.enableThinkPanel(false);
turnControl = null; turnControl = null;
if (roundState.getTurnNumber() >= 1) { if (roundState.getTurnNumber() >= 1) {
checkTurn(); checkTurn();

3
src/jrummikub/control/turn/HumanTurnControl.java
View file

@ -18,6 +18,7 @@ import jrummikub.util.IListener;
import jrummikub.util.IListener1; import jrummikub.util.IListener1;
import jrummikub.util.IListener2; import jrummikub.util.IListener2;
import jrummikub.util.Pair; import jrummikub.util.Pair;
import jrummikub.view.IView.BottomPanelType;
/** /**
* Controller for a single turn made by a human player * Controller for a single turn made by a human player
@ -87,7 +88,7 @@ public class HumanTurnControl extends AbstractTurnControl {
view.getHandPanel().setStones(hand.clone()); view.getHandPanel().setStones(hand.clone());
view.getHandPanel().resetCurrentRow(); view.getHandPanel().resetCurrentRow();
view.enableStartTurnPanel(false); view.setBottomPanel(BottomPanelType.HUMAN_HAND_PANEL);
timer.startTimer(); timer.startTimer();
} }

43
src/jrummikub/view/IView.java
View file

@ -59,14 +59,6 @@ public interface IView {
*/ */
public void setSelectedStones(Collection<Stone> stones); public void setSelectedStones(Collection<Stone> stones);
/**
* Enables or disables the player's StartTurnPanel
*
* @param enable
* enable/disable
*/
public void enableStartTurnPanel(boolean enable);
/** /**
* The start turn event is emitted when the player wants to start his turn * The start turn event is emitted when the player wants to start his turn
* *
@ -74,14 +66,6 @@ public interface IView {
*/ */
public IEvent getStartTurnEvent(); public IEvent getStartTurnEvent();
/**
* Enables or disables the panel shown when a player has won
*
* @param enable
* enable/disable
*/
public void enableWinPanel(boolean enable);
/** /**
* The quit event is emitted when the player wants to quit the game * The quit event is emitted when the player wants to quit the game
* *
@ -122,35 +106,24 @@ public interface IView {
public void setCurrentPlayerColor(Color color); public void setCurrentPlayerColor(Color color);
/** /**
* Is used for the PlayerPanel to display if a player has laid out along * Is used for the PlayerPanel to display if a player has laid out along with
* with the name * the name
* *
* @param hasLaidOut * @param hasLaidOut
* specifies if the current player has laid out or not * specifies if the current player has laid out or not
*/ */
public void setHasLaidOut(boolean hasLaidOut); public void setCurrentPlayerHasLaidOut(boolean hasLaidOut);
/** /**
* Is emitted if the player wants to end the game and start a new one * Is emitted if the player wants to end the game and start a new one
* *
* @return newGameEvent * @return newGameEvent
*/ */
IEvent getNewGameEvent(); public IEvent getNewGameEvent();
/** public void setBottomPanel(BottomPanelType type);
* Enables or disables most parts of the interface
*
* @param enable
* specifies if the interface is to be enabled or disabled
*/
void showInterface(boolean enable);
/** public enum BottomPanelType {
* Enables or disables the panel shown while the computer player is making a START_GAME_PANEL, START_TURN_PANEL, HUMAN_HAND_PANEL, COMPUTER_HAND_PANEL, WIN_PANEL
* move }
*
* @param b
* specifies if the interface is enabled or disabled
*/
public void enableThinkPanel(boolean b);
} }

45
src/jrummikub/view/impl/View.java
View file

@ -160,19 +160,15 @@ public class View extends JFrame implements IView {
playerPanel.getHandPanel().setSelectedStones(stones); playerPanel.getHandPanel().setSelectedStones(stones);
} }
@Override /*
public void enableStartTurnPanel(boolean enable) { * @Override public void enableStartTurnPanel(boolean enable) {
playerPanel.setVisible(!enable); * playerPanel.setVisible(!enable); startTurnPanel.setVisible(enable);
startTurnPanel.setVisible(enable); * winPanel.setVisible(false); }
winPanel.setVisible(false); *
} * @Override public void enableWinPanel(boolean enable) {
* playerPanel.setVisible(!enable); startTurnPanel.setVisible(false);
@Override * winPanel.setVisible(enable); }
public void enableWinPanel(boolean enable) { */
playerPanel.setVisible(!enable);
startTurnPanel.setVisible(false);
winPanel.setVisible(enable);
}
@Override @Override
public void showSettingsPanel(boolean show) { public void showSettingsPanel(boolean show) {
@ -196,7 +192,7 @@ public class View extends JFrame implements IView {
} }
@Override @Override
public void setHasLaidOut(boolean hasLaidOut) { public void setCurrentPlayerHasLaidOut(boolean hasLaidOut) {
playerPanel.setHasLaidOut(hasLaidOut); playerPanel.setHasLaidOut(hasLaidOut);
} }
@ -260,19 +256,18 @@ public class View extends JFrame implements IView {
} }
@Override @Override
public void showInterface(boolean enable) { public void setBottomPanel(BottomPanelType type) {
if (enable) { startTurnPanel.setVisible(type == BottomPanelType.START_TURN_PANEL);
playerPanel.showButtons(true); winPanel.setVisible(type == BottomPanelType.WIN_PANEL);
} else { playerPanel.setVisible(type != BottomPanelType.START_TURN_PANEL
List<Pair<StoneSet, Position>> emptyTable = Collections.emptyList(); && type != BottomPanelType.WIN_PANEL);
table.setStoneSets(emptyTable);
if (type == BottomPanelType.START_GAME_PANEL) {
table.setStoneSets(Collections.<Pair<StoneSet, Position>> emptyList());
playerPanel.getHandPanel().setStones(createDecorationStones()); playerPanel.getHandPanel().setStones(createDecorationStones());
playerPanel.showButtons(false);
}
} }
@Override playerPanel.showButtons(type != BottomPanelType.START_GAME_PANEL);
public void enableThinkPanel(boolean enable) { playerPanel.enableButtons(type != BottomPanelType.COMPUTER_HAND_PANEL);
playerPanel.enableButtons(!enable);
} }
} }

14
test/jrummikub/control/GameControlTest.java
View file

@ -1,8 +1,7 @@
package jrummikub.control; package jrummikub.control;
import static jrummikub.model.StoneColor.RED; import static jrummikub.model.StoneColor.*;
import static org.junit.Assert.assertSame; import static org.junit.Assert.*;
import static org.junit.Assert.assertTrue;
import java.awt.Color; import java.awt.Color;
@ -12,6 +11,7 @@ import jrummikub.model.PlayerSettings;
import jrummikub.model.Position; import jrummikub.model.Position;
import jrummikub.model.Stone; import jrummikub.model.Stone;
import jrummikub.util.Pair; import jrummikub.util.Pair;
import jrummikub.view.IView.BottomPanelType;
import jrummikub.view.MockView; import jrummikub.view.MockView;
import org.junit.Before; import org.junit.Before;
@ -41,7 +41,7 @@ public class GameControlTest {
@Test @Test
public void testStartFirstRound() { public void testStartFirstRound() {
gameControl.startGame(); gameControl.startGame();
assertTrue(view.displayStartTurnPanel); assertSame(BottomPanelType.START_TURN_PANEL, view.bottomPanelType);
} }
/** */ /** */
@ -75,10 +75,10 @@ public class GameControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0)); view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit(); view.playerPanel.endTurnEvent.emit();
assertTrue(view.displayWinPanel); assertSame(BottomPanelType.WIN_PANEL, view.bottomPanelType);
view.newRoundEvent.emit(); view.newRoundEvent.emit();
assertTrue(view.displayStartTurnPanel); assertSame(BottomPanelType.START_TURN_PANEL, view.bottomPanelType);
} }
/** */ /** */
@ -91,7 +91,7 @@ public class GameControlTest {
view.playerPanel.endTurnEvent.emit(); view.playerPanel.endTurnEvent.emit();
view.startTurnEvent.emit(); view.startTurnEvent.emit();
view.playerPanel.redealEvent.emit(); view.playerPanel.redealEvent.emit();
assertTrue(view.displayStartTurnPanel); assertSame(BottomPanelType.START_TURN_PANEL, view.bottomPanelType);
view.startTurnEvent.emit(); view.startTurnEvent.emit();
assertSame(firstPlayer, gameControl.roundControl.roundState assertSame(firstPlayer, gameControl.roundControl.roundState
.getActivePlayer().getPlayerSettings()); .getActivePlayer().getPlayerSettings());

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

@ -28,6 +28,7 @@ import jrummikub.model.Table;
import jrummikub.util.IListener; import jrummikub.util.IListener;
import jrummikub.util.IListener1; import jrummikub.util.IListener1;
import jrummikub.util.Pair; import jrummikub.util.Pair;
import jrummikub.view.IView.BottomPanelType;
import jrummikub.view.MockView; import jrummikub.view.MockView;
import org.junit.Before; import org.junit.Before;
@ -70,24 +71,21 @@ public class RoundControlTest {
gameSettings.getPlayerList().add(new PlayerSettings("Ida", Color.RED)); gameSettings.getPlayerList().add(new PlayerSettings("Ida", Color.RED));
gameSettings.getPlayerList().add( gameSettings.getPlayerList().add(
new PlayerSettings("Matthias", Color.YELLOW)); new PlayerSettings("Matthias", Color.YELLOW));
gameSettings.getPlayerList().add( gameSettings.getPlayerList().add(new PlayerSettings("Jannis", Color.GREEN));
new PlayerSettings("Jannis", Color.GREEN)); gameSettings.getPlayerList().add(new PlayerSettings("Bennet", Color.BLACK));
gameSettings.getPlayerList().add(
new PlayerSettings("Bennet", Color.BLACK));
roundState = new RoundState(gameSettings); roundState = new RoundState(gameSettings);
roundControl = new RoundControl(roundState, view); roundControl = new RoundControl(roundState, view);
} }
private void checkCorrectlyDealt() { private void checkCorrectlyDealt() {
GameSettings settings = testRoundState.getGameSettings(); GameSettings settings = testRoundState.getGameSettings();
int totalStones = settings.getHighestValue() int totalStones = settings.getHighestValue() * settings.getStoneSetNumber()
* settings.getStoneSetNumber()
* settings.getStoneColors().size() + settings.getJokerNumber(); * settings.getStoneColors().size() + settings.getJokerNumber();
assertEquals( assertEquals(
totalStones - testRoundState.getPlayerCount() totalStones - testRoundState.getPlayerCount()
* settings.getNumberOfStonesDealt() * settings.getNumberOfStonesDealt()
- testRoundState.table.getSize(), testRoundState - testRoundState.table.getSize(), testRoundState.getGameHeap()
.getGameHeap().getSize()); .getSize());
for (int i = 0; i < testRoundState.getPlayerCount(); i++) { for (int i = 0; i < testRoundState.getPlayerCount(); i++) {
assertEquals(settings.getNumberOfStonesDealt(), testRoundState assertEquals(settings.getNumberOfStonesDealt(), testRoundState
.getNthNextPlayer(i).getHand().getSize()); .getNthNextPlayer(i).getHand().getSize());
@ -97,9 +95,9 @@ public class RoundControlTest {
private void checkTurnStartSetUp() { private void checkTurnStartSetUp() {
assertNotNull(view.currentPlayerName); assertNotNull(view.currentPlayerName);
// TODO Check player list in view // TODO Check player list in view
assertTrue(view.displayStartTurnPanel);
assertSame(BottomPanelType.START_TURN_PANEL, view.bottomPanelType);
assertFalse(view.startTurnEvent.listeners.isEmpty()); assertFalse(view.startTurnEvent.listeners.isEmpty());
assertFalse(view.displayWinPanel);
checkTableDisplay(); checkTableDisplay();
} }
@ -119,7 +117,7 @@ public class RoundControlTest {
private void resetTurnStart() { private void resetTurnStart() {
view.currentPlayerName = null; view.currentPlayerName = null;
// TODO reset player list // TODO reset player list
view.displayStartTurnPanel = false; view.bottomPanelType = null;
} }
/** /**
@ -162,8 +160,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0)); view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit(); view.playerPanel.endTurnEvent.emit();
assertFalse(roundState assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut()); .getLaidOut());
assertEquals(0, roundState.getTable().getSize()); assertEquals(0, roundState.getTable().getSize());
assertEquals(14 + 6, hand.getSize()); assertEquals(14 + 6, hand.getSize());
} }
@ -183,8 +181,8 @@ public class RoundControlTest {
assertFalse(roundState.getActivePlayer().getLaidOut()); assertFalse(roundState.getActivePlayer().getLaidOut());
view.playerPanel.endTurnEvent.emit(); view.playerPanel.endTurnEvent.emit();
assertFalse(roundState assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut()); .getLaidOut());
assertEquals(0, roundState.getTable().getSize()); assertEquals(0, roundState.getTable().getSize());
assertEquals(14 + 1, hand.getSize()); assertEquals(14 + 1, hand.getSize());
} }
@ -231,8 +229,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0)); view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit(); view.playerPanel.endTurnEvent.emit();
assertFalse(roundState assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut()); .getLaidOut());
assertEquals(0, roundState.getTable().getSize()); assertEquals(0, roundState.getTable().getSize());
assertEquals(14 + 9, hand.getSize()); assertEquals(14 + 9, hand.getSize());
} }
@ -302,8 +300,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0)); view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit(); view.playerPanel.endTurnEvent.emit();
assertFalse(roundState assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut()); .getLaidOut());
assertEquals(2, roundState.getTable().getSize()); assertEquals(2, roundState.getTable().getSize());
assertEquals(14 + 6, hand.getSize()); assertEquals(14 + 6, hand.getSize());
} }
@ -376,8 +374,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0)); view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit(); view.playerPanel.endTurnEvent.emit();
assertFalse(roundState assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut()); .getLaidOut());
assertEquals(2, roundState.getTable().getSize()); assertEquals(2, roundState.getTable().getSize());
assertEquals(14 + 7, hand.getSize()); assertEquals(14 + 7, hand.getSize());
} }
@ -440,8 +438,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0)); view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit(); view.playerPanel.endTurnEvent.emit();
assertFalse(roundState assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
.getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut()); .getLaidOut());
assertEquals(2, roundState.getTable().getSize()); assertEquals(2, roundState.getTable().getSize());
assertEquals(14 + 3, hand.getSize()); assertEquals(14 + 3, hand.getSize());
} }
@ -547,7 +545,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable; oldTable.clonedTable = testTable;
view.startTurnEvent.emit(); view.startTurnEvent.emit();
assertFalse(view.displayStartTurnPanel); assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
IHand hand = testRoundState.players.get(0).hand; IHand hand = testRoundState.players.get(0).hand;
hand.pickUp(hand.iterator().next().getFirst()); hand.pickUp(hand.iterator().next().getFirst());
@ -573,7 +571,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable; oldTable.clonedTable = testTable;
view.startTurnEvent.emit(); view.startTurnEvent.emit();
assertFalse(view.displayStartTurnPanel); assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
IHand hand = testRoundState.players.get(0).hand; IHand hand = testRoundState.players.get(0).hand;
Stone stone = hand.iterator().next().getFirst(); Stone stone = hand.iterator().next().getFirst();
hand.pickUp(stone); hand.pickUp(stone);
@ -601,7 +599,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable; oldTable.clonedTable = testTable;
view.startTurnEvent.emit(); view.startTurnEvent.emit();
assertFalse(view.displayStartTurnPanel); assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
resetTurnStart(); resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit(); view.getPlayerPanel().endTurnEvent.emit();
@ -626,7 +624,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable; oldTable.clonedTable = testTable;
view.startTurnEvent.emit(); view.startTurnEvent.emit();
assertFalse(view.displayStartTurnPanel); assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
resetTurnStart(); resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit(); view.getPlayerPanel().endTurnEvent.emit();
@ -658,7 +656,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable; oldTable.clonedTable = testTable;
view.startTurnEvent.emit(); view.startTurnEvent.emit();
assertFalse(view.displayStartTurnPanel); assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
IHand hand = testRoundState.players.get(0).hand; IHand hand = testRoundState.players.get(0).hand;
Stone blueEight = new Stone(8, BLUE); Stone blueEight = new Stone(8, BLUE);
@ -699,15 +697,12 @@ public class RoundControlTest {
Stone blueTwo = new Stone(2, BLUE); Stone blueTwo = new Stone(2, BLUE);
Stone blueThree = new Stone(3, BLUE); Stone blueThree = new Stone(3, BLUE);
Stone blueFour = new Stone(4, BLUE); Stone blueFour = new Stone(4, BLUE);
StoneSet oldSet1 = new StoneSet( StoneSet oldSet1 = new StoneSet(Arrays.asList(blueOne, redOne, blackOne));
Arrays.asList(blueOne, redOne, blackOne));
StoneSet oldSet2 = new StoneSet(blueTwo); StoneSet oldSet2 = new StoneSet(blueTwo);
oldTable.drop(oldSet1, new Position(0, 0)); oldTable.drop(oldSet1, new Position(0, 0));
oldTable.drop(oldSet2, new Position(0, 0)); oldTable.drop(oldSet2, new Position(0, 0));
StoneSet newSet1 = new StoneSet(Arrays.asList(blueOne, blueTwo, StoneSet newSet1 = new StoneSet(Arrays.asList(blueOne, blueTwo, blueFour));
blueFour)); StoneSet newSet2 = new StoneSet(Arrays.asList(redOne, blackOne, blueThree));
StoneSet newSet2 = new StoneSet(Arrays.asList(redOne, blackOne,
blueThree));
newTable.drop(newSet1, new Position(0, 0)); newTable.drop(newSet1, new Position(0, 0));
newTable.drop(newSet2, new Position(0, 0)); newTable.drop(newSet2, new Position(0, 0));
@ -732,15 +727,14 @@ public class RoundControlTest {
Stone blueTwo = new Stone(2, BLUE); Stone blueTwo = new Stone(2, BLUE);
Stone blueThree = new Stone(3, BLUE); Stone blueThree = new Stone(3, BLUE);
Stone blueFour = new Stone(4, BLUE); Stone blueFour = new Stone(4, BLUE);
StoneSet oldSet1 = new StoneSet(Arrays.asList(blueOne, redOne, StoneSet oldSet1 = new StoneSet(Arrays.asList(blueOne, redOne, blackOne,
blackOne, orangeOne)); orangeOne));
StoneSet oldSet2 = new StoneSet(Arrays.asList(blueTwo, blueThree, StoneSet oldSet2 = new StoneSet(Arrays.asList(blueTwo, blueThree, blueFour));
blueFour));
oldTable.drop(oldSet1, new Position(0, 0)); oldTable.drop(oldSet1, new Position(0, 0));
oldTable.drop(oldSet2, new Position(0, 0)); oldTable.drop(oldSet2, new Position(0, 0));
ITable newTable = (Table) oldTable.clone(); ITable newTable = (Table) oldTable.clone();
List<StoneSet> newSets = RoundControl.tableSetDifference(oldTable, List<StoneSet> newSets = RoundControl
newTable); .tableSetDifference(oldTable, newTable);
List<StoneSet> vanishedSets = RoundControl.tableSetDifference(newTable, List<StoneSet> vanishedSets = RoundControl.tableSetDifference(newTable,
oldTable); oldTable);
@ -748,8 +742,8 @@ public class RoundControlTest {
assertTrue(vanishedSets.isEmpty()); assertTrue(vanishedSets.isEmpty());
newTable.pickUp(oldSet2); newTable.pickUp(oldSet2);
newTable.drop(oldSet2.join(new StoneSet(new Stone(5, BLUE))), newTable.drop(oldSet2.join(new StoneSet(new Stone(5, BLUE))), new Position(
new Position(0, 0)); 0, 0));
newSets = RoundControl.tableSetDifference(oldTable, newTable); newSets = RoundControl.tableSetDifference(oldTable, newTable);
vanishedSets = RoundControl.tableSetDifference(newTable, oldTable); vanishedSets = RoundControl.tableSetDifference(newTable, oldTable);
@ -761,8 +755,7 @@ public class RoundControlTest {
Stone redTwo = new Stone(2, RED); Stone redTwo = new Stone(2, RED);
Stone redThree = new Stone(3, RED); Stone redThree = new Stone(3, RED);
Stone redFour = new Stone(4, RED); Stone redFour = new Stone(4, RED);
StoneSet oldSet3 = new StoneSet( StoneSet oldSet3 = new StoneSet(Arrays.asList(redTwo, redThree, redFour));
Arrays.asList(redTwo, redThree, redFour));
ITable newTable2 = (Table) oldTable.clone(); ITable newTable2 = (Table) oldTable.clone();
newTable2.drop(oldSet3, new Position(0, 0)); newTable2.drop(oldSet3, new Position(0, 0));
newSets = RoundControl.tableSetDifference(oldTable, newTable2); newSets = RoundControl.tableSetDifference(oldTable, newTable2);
@ -824,20 +817,19 @@ public class RoundControlTest {
} }
testRoundState.players.get(0).laidOut = true; testRoundState.players.get(0).laidOut = true;
testRoundState.players.get(0).hand.drop(new Stone(1, RED), testRoundState.players.get(0).hand.drop(new Stone(1, RED), new Position(0,
new Position(0, 0));
testRoundState.players.get(0).hand.drop(new Stone(2, RED),
new Position(0, 0));
testRoundState.players.get(1).laidOut = true;
testRoundState.players.get(1).hand.drop(new Stone(RED), new Position(0,
0)); 0));
testRoundState.players.get(0).hand.drop(new Stone(2, RED), new Position(0,
0));
testRoundState.players.get(1).laidOut = true;
testRoundState.players.get(1).hand.drop(new Stone(RED), new Position(0, 0));
testRoundState.players.get(2).laidOut = false; testRoundState.players.get(2).laidOut = false;
testRoundState.players.get(2).hand.drop(new Stone(9, RED), testRoundState.players.get(2).hand.drop(new Stone(9, RED), new Position(0,
new Position(0, 0)); 0));
testRoundState.players.get(2).hand.drop(new Stone(10, RED), testRoundState.players.get(2).hand.drop(new Stone(10, RED), new Position(0,
new Position(0, 0)); 0));
testRoundState.players.get(2).hand.drop(new Stone(11, RED), testRoundState.players.get(2).hand.drop(new Stone(11, RED), new Position(0,
new Position(0, 0)); 0));
testRoundState.players.get(3).laidOut = true; testRoundState.players.get(3).laidOut = true;
testRound.endOfRound(); testRound.endOfRound();
@ -871,19 +863,19 @@ public class RoundControlTest {
} }
testRoundState.players.get(0).laidOut = true; testRoundState.players.get(0).laidOut = true;
testRoundState.players.get(0).hand.drop(new Stone(1, RED), testRoundState.players.get(0).hand.drop(new Stone(1, RED), new Position(0,
new Position(0, 0)); 0));
testRoundState.players.get(0).hand.drop(new Stone(2, RED), testRoundState.players.get(0).hand.drop(new Stone(2, RED), new Position(0,
new Position(0, 0)); 0));
testRoundState.players.get(1).laidOut = true; testRoundState.players.get(1).laidOut = true;
testRoundState.players.get(1).hand.drop(new Stone(3, RED), testRoundState.players.get(1).hand.drop(new Stone(3, RED), new Position(0,
new Position(0, 0)); 0));
testRoundState.players.get(2).laidOut = true; testRoundState.players.get(2).laidOut = true;
testRoundState.players.get(2).hand.drop(new Stone(3, BLUE), testRoundState.players.get(2).hand.drop(new Stone(3, BLUE), new Position(0,
new Position(0, 0)); 0));
testRoundState.players.get(3).laidOut = false; testRoundState.players.get(3).laidOut = false;
testRoundState.players.get(3).hand.drop(new Stone(13, RED), testRoundState.players.get(3).hand.drop(new Stone(13, RED), new Position(0,
new Position(0, 0)); 0));
testRound.endOfRound(); testRound.endOfRound();
assertTrue(roundEnded); assertTrue(roundEnded);

14
test/jrummikub/control/turn/TurnControlTest.java
View file

@ -1,12 +1,7 @@
package jrummikub.control.turn; package jrummikub.control.turn;
import static jrummikub.model.StoneColor.BLACK; import static jrummikub.model.StoneColor.*;
import static jrummikub.model.StoneColor.BLUE; import static org.junit.Assert.*;
import static jrummikub.model.StoneColor.RED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -32,6 +27,7 @@ import jrummikub.util.Event;
import jrummikub.util.IEvent; import jrummikub.util.IEvent;
import jrummikub.util.IListener; import jrummikub.util.IListener;
import jrummikub.util.Pair; import jrummikub.util.Pair;
import jrummikub.view.IView.BottomPanelType;
import jrummikub.view.MockView; import jrummikub.view.MockView;
import org.junit.Before; import org.junit.Before;
@ -130,7 +126,7 @@ public class TurnControlTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void showInitialHand() { public void showInitialHand() {
mockView.displayStartTurnPanel = true; mockView.bottomPanelType = BottomPanelType.START_TURN_PANEL;
List<Pair<Stone, Position>> stones = Arrays.asList( List<Pair<Stone, Position>> stones = Arrays.asList(
new Pair<Stone, Position>(new Stone(RED), new Position(0, 0)), new Pair<Stone, Position>(new Stone(RED), new Position(0, 0)),
@ -150,7 +146,7 @@ public class TurnControlTest {
} }
assertEquals(stones.size(), i); assertEquals(stones.size(), i);
assertFalse(mockView.displayStartTurnPanel); assertSame(BottomPanelType.HUMAN_HAND_PANEL, mockView.bottomPanelType);
} }
/** */ /** */