diff options
author | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-06-19 16:11:23 +0200 |
---|---|---|
committer | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-06-19 16:11:23 +0200 |
commit | d0d349e5a8cd1d48bfe50fc93e762b26ee17a39a (patch) | |
tree | bc51f6e3a79684f67c193c82778dd7008acd763b /test/jrummikub/control/network/NetworkSettingsControlTest.java | |
parent | 92fe29000b3a8da2adc498154521e7969b6f9c5f (diff) | |
download | JRummikub-d0d349e5a8cd1d48bfe50fc93e762b26ee17a39a.tar JRummikub-d0d349e5a8cd1d48bfe50fc93e762b26ee17a39a.zip |
Fix warnings
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@484 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub/control/network/NetworkSettingsControlTest.java')
-rw-r--r-- | test/jrummikub/control/network/NetworkSettingsControlTest.java | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/test/jrummikub/control/network/NetworkSettingsControlTest.java b/test/jrummikub/control/network/NetworkSettingsControlTest.java index ec11960..c8bb7af 100644 --- a/test/jrummikub/control/network/NetworkSettingsControlTest.java +++ b/test/jrummikub/control/network/NetworkSettingsControlTest.java @@ -1,21 +1,23 @@ package jrummikub.control.network; -import static org.junit.Assert.*; 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.UUID; import jrummikub.model.PlayerSettings.Type; import jrummikub.util.LoginData; -import jrummikub.view.MockView; import jrummikub.view.ISettingsPanel.SettingsMode; +import jrummikub.view.MockView; import org.junit.Before; import org.junit.Test; - +/** + * Test class for network settings control + */ public class NetworkSettingsControlTest { LoginData loginData; MockConnectionControl mockConnection; @@ -36,7 +38,7 @@ public class NetworkSettingsControlTest { networkControl = new NetworkControl(loginData, mockConnection, view); networkControl.startNetwork(); - mockConnection.connectedEvent.emit(); + mockConnection.connectedEvent.emit(); } /** */ @@ -45,7 +47,8 @@ public class NetworkSettingsControlTest { view.gameListPanel.openNewGameEvent.emit(); assertFalse(view.isGameListPanelVisible); assertTrue(view.isSettingsPanelVisible); - assertEquals(SettingsMode.NETWORK_SETUP, view.settingsPanel.settingsMode); + assertEquals(SettingsMode.NETWORK_SETUP, + view.settingsPanel.settingsMode); view.settingsPanel.addPlayerEvent.emit(); view.settingsPanel.addPlayerEvent.emit(); view.settingsPanel.changePlayerTypeEvent.emit(1, Type.VACANT); @@ -53,16 +56,22 @@ public class NetworkSettingsControlTest { view.settingsPanel.changeJokerNumberEvent.emit(4); view.settingsPanel.changeHighestValueEvent.emit(10); view.settingsPanel.offerGameEvent.emit(); - - assertEquals(SettingsMode.NETWORK_OFFER, view.settingsPanel.settingsMode); - - assertEquals(4, mockConnection.offeredGame.getGameSettings().getPlayerList().size()); - assertSame(Type.VACANT, mockConnection.offeredGame.getGameSettings().getPlayerList().get(1).getType()); - assertSame(Type.COMPUTER, mockConnection.offeredGame.getGameSettings().getPlayerList().get(2).getType()); - assertSame(Type.VACANT, mockConnection.offeredGame.getGameSettings().getPlayerList().get(3).getType()); - assertEquals(4, mockConnection.offeredGame.getGameSettings().getJokerNumber()); - assertEquals(10, mockConnection.offeredGame.getGameSettings().getHighestValue()); - } + assertEquals(SettingsMode.NETWORK_OFFER, + view.settingsPanel.settingsMode); + + assertEquals(4, mockConnection.offeredGame.getGameSettings() + .getPlayerList().size()); + assertSame(Type.VACANT, mockConnection.offeredGame.getGameSettings() + .getPlayerList().get(1).getType()); + assertSame(Type.COMPUTER, mockConnection.offeredGame.getGameSettings() + .getPlayerList().get(2).getType()); + assertSame(Type.VACANT, mockConnection.offeredGame.getGameSettings() + .getPlayerList().get(3).getType()); + assertEquals(4, mockConnection.offeredGame.getGameSettings() + .getJokerNumber()); + assertEquals(10, mockConnection.offeredGame.getGameSettings() + .getHighestValue()); + } } |