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

Fix NetworkRoundControl test

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@508 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-20 04:25:14 +02:00
parent 39da662f0d
commit 477e8e9b82
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,15 +38,18 @@ public class NetworkRoundControlTest {
gameSettings.getPlayerList().add(new PlayerSettings("Jannis", Color.GREEN)); gameSettings.getPlayerList().add(new PlayerSettings("Jannis", Color.GREEN));
gameSettings.getPlayerList().add(new PlayerSettings("Bennet", Color.BLACK)); gameSettings.getPlayerList().add(new PlayerSettings("Bennet", Color.BLACK));
gameSettings.getPlayerList().get(1).setType(Type.COMPUTER);
gameSettings.getPlayerList().get(2).setType(Type.NETWORK);
gameSettings.getPlayerList().get(3).setType(Type.COMPUTER);
view = new MockView(); view = new MockView();
connectionControl = new MockConnectionControl(); connectionControl = new MockConnectionControl();
} }
@Test @Test
public void testHostRound() { public void testHostRound() {
gameSettings.getPlayerList().get(1).setType(Type.COMPUTER); connectionControl.nickname = gameSettings.getPlayerList().get(0).getName();
gameSettings.getPlayerList().get(2).setType(Type.NETWORK);
gameSettings.getPlayerList().get(3).setType(Type.COMPUTER);
testRoundState = new RoundState(gameSettings, null); testRoundState = new RoundState(gameSettings, null);
testRound = new NetworkRoundControl(testRoundState, view, testRound = new NetworkRoundControl(testRoundState, view,
connectionControl, true); connectionControl, true);
@ -119,9 +122,8 @@ public class NetworkRoundControlTest {
@Test @Test
public void testClientRound() { public void testClientRound() {
gameSettings.getPlayerList().get(0).setType(Type.NETWORK); connectionControl.nickname = gameSettings.getPlayerList().get(2).getName();
gameSettings.getPlayerList().get(1).setType(Type.COMPUTER);
gameSettings.getPlayerList().get(3).setType(Type.COMPUTER);
testRoundState = new RoundState(gameSettings, null); testRoundState = new RoundState(gameSettings, null);
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
IPlayer player = testRoundState.getNthPlayer(i); IPlayer player = testRoundState.getNthPlayer(i);