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

Added NetworkGameControl

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@503 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-20 03:59:04 +02:00
parent e79295f271
commit f3f8ffe462
22 changed files with 227 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/jrummikub/control/network/GameJoinControlTest.java
View file

@ -1,7 +1,6 @@
package jrummikub.control.network;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;
import java.awt.Color;
import java.util.UUID;
@ -37,7 +36,7 @@ public class GameJoinControlTest {
mockConnection.nickname = "Karl";
view = new MockView();
loginData = new LoginData("Karl", "server", "password", "channel");
networkControl = new NetworkControl(loginData, mockConnection, view);
networkControl = new NetworkControl(loginData, mockConnection, null, view);
networkControl.startNetwork();
mockConnection.connectedEvent.emit();

7
test/jrummikub/control/network/GameOfferControlTest.java
View file

@ -1,9 +1,6 @@
package jrummikub.control.network;
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 static org.junit.Assert.*;
import java.awt.Color;
import java.util.UUID;
@ -36,7 +33,7 @@ public class GameOfferControlTest {
mockConnection.nickname = "Karl";
view = new MockView();
loginData = new LoginData("Karl", "server", "password", "channel");
networkControl = new NetworkControl(loginData, mockConnection, view);
networkControl = new NetworkControl(loginData, mockConnection, null, view);
networkControl.startNetwork();
mockConnection.connectedEvent.emit();

7
test/jrummikub/control/network/NetworkControlTest.java
View file

@ -1,9 +1,6 @@
package jrummikub.control.network;
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 static org.junit.Assert.*;
import java.awt.Color;
import java.util.UUID;
@ -38,7 +35,7 @@ public class NetworkControlTest {
mockConnection.nickname = "Karl";
view = new MockView();
loginData = new LoginData("Karl", "server", "password", "channel");
networkControl = new NetworkControl(loginData, mockConnection, view);
networkControl = new NetworkControl(loginData, mockConnection, null, view);
networkControl.startNetwork();
}

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

@ -47,7 +47,7 @@ public class NetworkRoundControlTest {
gameSettings.getPlayerList().get(1).setType(Type.COMPUTER);
gameSettings.getPlayerList().get(2).setType(Type.NETWORK);
gameSettings.getPlayerList().get(3).setType(Type.COMPUTER);
testRoundState = new RoundState(gameSettings);
testRoundState = new RoundState(gameSettings, null);
testRound = new NetworkRoundControl(testRoundState, view,
connectionControl, true);
@ -122,7 +122,7 @@ public class NetworkRoundControlTest {
gameSettings.getPlayerList().get(0).setType(Type.NETWORK);
gameSettings.getPlayerList().get(1).setType(Type.COMPUTER);
gameSettings.getPlayerList().get(3).setType(Type.COMPUTER);
testRoundState = new RoundState(gameSettings);
testRoundState = new RoundState(gameSettings, null);
for (int i = 0; i < 4; ++i) {
IPlayer player = testRoundState.getNthPlayer(i);

7
test/jrummikub/control/network/NetworkSettingsControlTest.java
View file

@ -1,9 +1,6 @@
package jrummikub.control.network;
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 static org.junit.Assert.*;
import java.util.UUID;
@ -35,7 +32,7 @@ public class NetworkSettingsControlTest {
mockConnection.nickname = "Karl";
view = new MockView();
loginData = new LoginData("Karl", "server", "password", "channel");
networkControl = new NetworkControl(loginData, mockConnection, view);
networkControl = new NetworkControl(loginData, mockConnection, null, view);
networkControl.startNetwork();
mockConnection.connectedEvent.emit();