Implemented most of network settings control

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@425 72836036-5685-4462-b002-a69064685172

1 files changed, 30 insertions, 14 deletions

diff --git a/test/jrummikub/control/SettingsControlTest.java b/test/jrummikub/control/SettingsControlTest.java
index a8e9849..cb527d2 100644
--- a/test/jrummikub/control/SettingsControlTest.java
+++ b/test/jrummikub/control/SettingsControlTest.java
@@ -7,7 +7,6 @@ import java.awt.Color;
 import java.util.Arrays;
 import java.util.HashSet;
 
-import jrummikub.control.turn.TurnControlFactory;
 import jrummikub.model.GameSettings;
 import jrummikub.model.PlayerSettings.Type;
 import jrummikub.model.StoneColor;
@@ -42,12 +41,15 @@ public class SettingsControlTest {
 	/** */
 	@Test
 	public void initialStateTest() {
-		assertSame(ISettingsPanel.SettingsError.NO_ERROR,
-				view.settingsPanel.error);
+		assertSame(ISettingsPanel.SettingsError.NO_ERROR, view.settingsPanel.error);
 		view.settingsPanel.startGameEvent.emit();
 		assertNotNull(gameSettings);
 		assertEquals(2, gameSettings.getPlayerList().size());
-		assertFalse(view.settingsPanel.removePlayerButtonsEnabled);
+		assertEquals(2, view.settingsPanel.removePlayerButtonsEnabled.size());
+
+		for (Boolean enabled : view.settingsPanel.removePlayerButtonsEnabled) {
+			assertFalse(enabled);
+		}
 	}
 
 	/** */
@@ -57,7 +59,11 @@ public class SettingsControlTest {
 		view.settingsPanel.startGameEvent.emit();
 		assertNotNull(gameSettings);
 		assertEquals(3, gameSettings.getPlayerList().size());
-		assertTrue(view.settingsPanel.removePlayerButtonsEnabled);
+		assertEquals(3, view.settingsPanel.removePlayerButtonsEnabled.size());
+
+		for (Boolean enabled : view.settingsPanel.removePlayerButtonsEnabled) {
+			assertTrue(enabled);
+		}
 	}
 
 	/** */
@@ -70,8 +76,12 @@ public class SettingsControlTest {
 		view.settingsPanel.startGameEvent.emit();
 		assertNotNull(gameSettings);
 		assertEquals(16, gameSettings.getPlayerList().size());
-		assertTrue(view.settingsPanel.removePlayerButtonsEnabled);
+		assertEquals(16, view.settingsPanel.removePlayerButtonsEnabled.size());
 		assertFalse(view.settingsPanel.addPlayerButtonEnabled);
+
+		for (Boolean enabled : view.settingsPanel.removePlayerButtonsEnabled) {
+			assertTrue(enabled);
+		}
 	}
 
 	/** */
@@ -85,8 +95,13 @@ public class SettingsControlTest {
 		view.settingsPanel.startGameEvent.emit();
 		assertNotNull(gameSettings);
 		assertEquals(15, gameSettings.getPlayerList().size());
-		assertTrue(view.settingsPanel.removePlayerButtonsEnabled);
+		assertEquals(15, view.settingsPanel.removePlayerButtonsEnabled.size());
+
 		assertTrue(view.settingsPanel.addPlayerButtonEnabled);
+
+		for (Boolean enabled : view.settingsPanel.removePlayerButtonsEnabled) {
+			assertTrue(enabled);
+		}
 	}
 
 	/** */
@@ -97,7 +112,11 @@ public class SettingsControlTest {
 		view.settingsPanel.startGameEvent.emit();
 		assertNotNull(gameSettings);
 		assertEquals(2, gameSettings.getPlayerList().size());
-		assertFalse(view.settingsPanel.removePlayerButtonsEnabled);
+		assertEquals(2, view.settingsPanel.removePlayerButtonsEnabled.size());
+
+		for (Boolean enabled : view.settingsPanel.removePlayerButtonsEnabled) {
+			assertFalse(enabled);
+		}
 	}
 
 	/** */
@@ -164,8 +183,7 @@ public class SettingsControlTest {
 		view.settingsPanel.changePlayerNameEvent.emit(1, name2);
 
 		assertTrue(view.settingsPanel.startButtonEnabled);
-		assertSame(ISettingsPanel.SettingsError.NO_ERROR,
-				view.settingsPanel.error);
+		assertSame(ISettingsPanel.SettingsError.NO_ERROR, view.settingsPanel.error);
 
 		view.settingsPanel.startGameEvent.emit();
 		assertNotNull(gameSettings);
@@ -262,10 +280,8 @@ public class SettingsControlTest {
 		view.settingsPanel.startGameEvent.emit();
 		assertNotNull(gameSettings);
 		assertEquals(2, gameSettings.getPlayerList().size());
-		assertSame(Type.COMPUTER, gameSettings.getPlayerList().get(0)
-				.getTurnControlType());
-		assertSame(Type.HUMAN, gameSettings.getPlayerList().get(1)
-				.getTurnControlType());
+		assertSame(Type.COMPUTER, gameSettings.getPlayerList().get(0).getType());
+		assertSame(Type.HUMAN, gameSettings.getPlayerList().get(1).getType());
 	}
 
 }