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

Make NetworkRoundControl test work

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@496 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-19 23:19:01 +02:00
parent 890051a3e9
commit 9df5497276
6 changed files with 109 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mock/jrummikub/control/network/MockConnectionControl.java
View file

@ -53,6 +53,10 @@ public class MockConnectionControl implements IConnectionControl {
public GameData joinedGame;
/** */
public Color playerColor;
/** */
public boolean turnStarted;
/** */
public boolean turnEnded;
@Override
public String getNickname() {
@ -191,13 +195,11 @@ public class MockConnectionControl implements IConnectionControl {
@Override
public void endTurn(ITable table) {
// TODO Auto-generated method stub
turnEnded = true;
}
@Override
public void startTurn(IRoundState state) {
// TODO Auto-generated method stub
turnStarted = true;
}
}

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

@ -117,7 +117,20 @@ public class RoundControl {
}
}
private void prepareTurn() {
protected void prepareTurn() {
doPrepareTurn();
boolean isHuman = roundState.getActivePlayer().getPlayerSettings()
.getType() == HUMAN;
boolean oneHuman = roundState.getGameSettings().oneHuman();
boolean isAI = (turnControl instanceof AIControl);
if (isAI || (isHuman && oneHuman)) {
startTurn();
}
}
protected void doPrepareTurn() {
boolean isHuman = roundState.getActivePlayer().getPlayerSettings()
.getType() == HUMAN;
boolean oneHuman = roundState.getGameSettings().oneHuman();
@ -141,12 +154,6 @@ public class RoundControl {
turnControl = createTurnControl(roundState.getActivePlayer()
.getPlayerSettings());
boolean isAI = (turnControl instanceof AIControl);
if (isAI || (isHuman && oneHuman)) {
startTurn();
}
}
protected void startTurn() {
@ -217,7 +224,7 @@ public class RoundControl {
|| totalValue >= roundState.getGameSettings().getInitialMeldThreshold();
}
private void endOfTurn(ITable newTable) {
protected void endOfTurn(ITable newTable) {
boolean wasHuman = (turnControl instanceof HumanTurnControl);
boolean wasAI = (turnControl instanceof AIControl);

32
src/jrummikub/control/network/NetworkRoundControl.java
View file

@ -12,11 +12,21 @@ public class NetworkRoundControl extends RoundControl {
private IConnectionControl connectionControl;
private boolean currentlyActive;
public NetworkRoundControl(IRoundState roundState, IView view, IConnectionControl connectionControl, boolean startActive) {
public NetworkRoundControl(IRoundState roundState, IView view,
IConnectionControl connectionControl, boolean startActive) {
super(roundState, view);
this.connectionControl = connectionControl;
currentlyActive = startActive;
connections.add(connectionControl.getTurnStartEvent().add(
new IListener1<IRoundState>() {
@Override
public void handle(IRoundState state) {
NetworkRoundControl.this.roundState = state;
startTurn();
}
}));
}
@Override
@ -48,8 +58,22 @@ public class NetworkRoundControl extends RoundControl {
}
@Override
protected void startTurn() {
connectionControl.startTurn(roundState);
super.startTurn();
protected void prepareTurn() {
boolean wasActive = currentlyActive;
doPrepareTurn();
if (wasActive) {
connectionControl.startTurn(roundState);
}
}
@Override
protected void endOfTurn(ITable newTable) {
if (currentlyActive) {
connectionControl.endTurn(newTable);
}
super.endOfTurn(newTable);
}
}

6
src/jrummikub/control/turn/AbstractTurnControl.java
View file

@ -97,7 +97,11 @@ public abstract class AbstractTurnControl implements ITurnControl {
}
protected void cleanUp() {
timer.stopTimer();
if (timer != null) {
timer.stopTimer();
}
started = true;
for (Connection c : connections) {
c.remove();
}

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

@ -90,7 +90,6 @@ public class HumanTurnControl extends AbstractTurnControl {
connections.add(view.getPlayerPanel().getEndTurnEvent()
.add(new IListener() {
@Override
public void handle() {
endOfTurn(false);

78
test/jrummikub/control/network/NetworkRoundControlTest.java
View file

@ -7,13 +7,10 @@ import java.awt.Color;
import jrummikub.control.turn.AIControl;
import jrummikub.model.GameSettings;
import jrummikub.model.IPlayer;
import jrummikub.model.IRoundState;
import jrummikub.model.ITable;
import jrummikub.model.PlayerSettings;
import jrummikub.model.PlayerSettings.Type;
import jrummikub.model.RoundState;
import jrummikub.model.Stone;
import jrummikub.util.IListener1;
import jrummikub.view.MockView;
import org.junit.Before;
@ -27,9 +24,6 @@ public class NetworkRoundControlTest {
private GameSettings gameSettings;
private boolean turnStarted;
private boolean turnEnded;
@Before
public void setup() {
AIControl.useBackgroundThread = false;
@ -53,38 +47,22 @@ public class NetworkRoundControlTest {
@Test
public void testHostRound() {
testRound = new NetworkRoundControl(testRoundState, view, connectionControl, true);
testRound = new NetworkRoundControl(testRoundState, view,
connectionControl, true);
connectionControl.getTurnStartEvent().add(new IListener1<IRoundState>() {
@Override
public void handle(IRoundState roundState) {
assertSame(testRoundState, roundState);
turnStarted = true;
}
});
connectionControl.getTurnEndEvent().add(new IListener1<ITable>() {
@Override
public void handle(ITable table) {
turnEnded = true;
}
});
turnStarted = false;
turnEnded = false;
connectionControl.turnStarted = false;
connectionControl.turnEnded = false;
testRound.startRound();
assertTrue(turnStarted);
turnStarted = false;
assertEquals(4, testRoundState.getPlayerCount());
for (int i = 0; i < 4; ++i) {
IPlayer player = testRoundState.getNthPlayer(i);
assertSame(gameSettings.getPlayerList().get(i), player.getPlayerSettings());
assertEquals(gameSettings.getNumberOfStonesDealt(), player.getHand().getSize());
assertSame(gameSettings.getPlayerList().get(i),
player.getPlayerSettings());
assertEquals(gameSettings.getNumberOfStonesDealt(), player.getHand()
.getSize());
}
assertSame(testRoundState.getNthPlayer(0), testRoundState.getActivePlayer());
for (int i = 0; i < 4; ++i) {
IPlayer player = testRoundState.getNthPlayer(i);
@ -95,34 +73,46 @@ public class NetworkRoundControlTest {
}
}
assertFalse(turnEnded);
assertSame(testRoundState.getNthPlayer(0), testRoundState.getActivePlayer());
assertTrue(connectionControl.turnStarted);
connectionControl.turnStarted = false;
connectionControl.turnStartEvent.emit(testRoundState);
assertFalse(connectionControl.turnEnded);
view.playerPanel.endTurnEvent.emit();
assertTrue(turnEnded);
turnEnded = false;
turnStarted = false;
assertTrue(connectionControl.turnEnded);
connectionControl.turnEnded = false;
assertSame(testRoundState.getNthPlayer(1), testRoundState.getActivePlayer());
assertTrue(connectionControl.turnStarted);
connectionControl.turnStarted = false;
connectionControl.turnStartEvent.emit(testRoundState);
assertTrue(connectionControl.turnEnded);
connectionControl.turnEnded = false;
assertSame(testRoundState.getNthPlayer(2), testRoundState.getActivePlayer());
assertTrue(connectionControl.turnStarted);
connectionControl.turnStarted = false;
connectionControl.turnStartEvent.emit(testRoundState);
assertTrue(turnStarted);
turnStarted = false;
assertFalse(connectionControl.turnEnded);
assertFalse(turnEnded);
connectionControl.turnEndEvent.emit(testRoundState.getTable());
assertTrue(turnEnded);
turnEnded = false;
assertSame(testRoundState.getNthPlayer(3), testRoundState.getActivePlayer());
assertFalse(connectionControl.turnStarted);
connectionControl.turnStartEvent.emit(testRoundState);
assertTrue(turnStarted);
turnStarted = false;
assertFalse(connectionControl.turnEnded);
assertFalse(turnEnded);
connectionControl.turnEndEvent.emit(testRoundState.getTable());
assertTrue(turnEnded);
turnEnded = false;
assertSame(testRoundState.getNthPlayer(0), testRoundState.getActivePlayer());
assertFalse(connectionControl.turnStarted);
connectionControl.turnStartEvent.emit(testRoundState);
assertFalse(connectionControl.turnEnded);
}
}