diff options
Diffstat (limited to 'test/jrummikub/control/network')
5 files changed, 10 insertions, 20 deletions
diff --git a/test/jrummikub/control/network/GameJoinControlTest.java b/test/jrummikub/control/network/GameJoinControlTest.java index d2f3f9c..179c583 100644 --- a/test/jrummikub/control/network/GameJoinControlTest.java +++ b/test/jrummikub/control/network/GameJoinControlTest.java @@ -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(); diff --git a/test/jrummikub/control/network/GameOfferControlTest.java b/test/jrummikub/control/network/GameOfferControlTest.java index a922967..635ea57 100644 --- a/test/jrummikub/control/network/GameOfferControlTest.java +++ b/test/jrummikub/control/network/GameOfferControlTest.java @@ -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(); diff --git a/test/jrummikub/control/network/NetworkControlTest.java b/test/jrummikub/control/network/NetworkControlTest.java index f805c73..2be4da0 100644 --- a/test/jrummikub/control/network/NetworkControlTest.java +++ b/test/jrummikub/control/network/NetworkControlTest.java @@ -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(); } diff --git a/test/jrummikub/control/network/NetworkRoundControlTest.java b/test/jrummikub/control/network/NetworkRoundControlTest.java index d13287b..b388998 100644 --- a/test/jrummikub/control/network/NetworkRoundControlTest.java +++ b/test/jrummikub/control/network/NetworkRoundControlTest.java @@ -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); diff --git a/test/jrummikub/control/network/NetworkSettingsControlTest.java b/test/jrummikub/control/network/NetworkSettingsControlTest.java index c8bb7af..bacbd6a 100644 --- a/test/jrummikub/control/network/NetworkSettingsControlTest.java +++ b/test/jrummikub/control/network/NetworkSettingsControlTest.java @@ -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(); |