Player Type in player settings verschoben

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

1 files changed, 10 insertions, 5 deletions

diff --git a/test/jrummikub/control/turn/BaseAIControlTest.java b/test/jrummikub/control/turn/BaseAIControlTest.java
index fe06398..51b1f1f 100644
--- a/test/jrummikub/control/turn/BaseAIControlTest.java
+++ b/test/jrummikub/control/turn/BaseAIControlTest.java
@@ -10,6 +10,7 @@ import jrummikub.model.IPlayer;
 import jrummikub.model.ITable;

 import jrummikub.model.Player;

 import jrummikub.model.PlayerSettings;

+import jrummikub.model.PlayerSettings.Type;

 import jrummikub.model.Position;

 import jrummikub.model.Stone;

 import jrummikub.model.StoneColor;

@@ -36,8 +37,7 @@ public class BaseAIControlTest {
 	/** */

 	@Before

 	public void setUp() {

-		aiControl = TurnControlFactory.getFactory(TurnControlFactory.Type.COMPUTER)

-				.create();

+		aiControl = TurnControlFactory.getFactory(Type.COMPUTER).create();

 		gameSettings = new GameSettings();

 		playerSettings = new PlayerSettings("ROBOT_01", Color.GRAY);

 		player = new Player(playerSettings);

@@ -75,7 +75,8 @@ public class BaseAIControlTest {
 	 */

 	@Test(timeout = 10000)

 	public void testTurnZeroRedealing() throws InterruptedException {

-		aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.MAY_REDEAL), gameSettings, view);

+		aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(),

+				player.getLaidOut(), TurnMode.MAY_REDEAL), gameSettings, view);

 		aiControl.startTurn();

 		while (!redealt) {

 			Thread.sleep(100);

@@ -89,7 +90,10 @@ public class BaseAIControlTest {
 	 */

 	@Test(timeout = 10000)

 	public void testTurnZeroNotMelding() throws InterruptedException {

-		aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.INSPECT_ONLY), gameSettings, view);

+		aiControl

+				.setup(new ITurnControl.TurnInfo(table, player.getHand(),

+						player.getLaidOut(), TurnMode.INSPECT_ONLY),

+						gameSettings, view);

 		aiControl.startTurn();

 		while (!turnEnded) {

 			Thread.sleep(100);

@@ -103,7 +107,8 @@ public class BaseAIControlTest {
 	 */

 	@Test(timeout = 10000)

 	public void testNormalTurnMelding() throws InterruptedException {

-		aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.NORMAL_TURN), gameSettings, view);

+		aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(),

+				player.getLaidOut(), TurnMode.NORMAL_TURN), gameSettings, view);

 		aiControl.startTurn();

 		while (!turnEnded) {

 			Thread.sleep(100);