From af3661fea084df6e089c2597dc4b311c77f39e4f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 7 Jun 2011 00:23:00 +0200
Subject: Always operate on cloned hands in the turn controls

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@380 72836036-5685-4462-b002-a69064685172
---
 test/jrummikub/control/turn/BaseAIControlTest.java |  6 +++---
 test/jrummikub/control/turn/TurnControlTest.java   | 15 +++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'test/jrummikub/control/turn')

diff --git a/test/jrummikub/control/turn/BaseAIControlTest.java b/test/jrummikub/control/turn/BaseAIControlTest.java
index 2c7b1fe..fe06398 100644
--- a/test/jrummikub/control/turn/BaseAIControlTest.java
+++ b/test/jrummikub/control/turn/BaseAIControlTest.java
@@ -75,7 +75,7 @@ public class BaseAIControlTest {
 	 */
 	@Test(timeout = 10000)
 	public void testTurnZeroRedealing() throws InterruptedException {
-		aiControl.setup(gameSettings, player, table, view, TurnMode.MAY_REDEAL);
+		aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.MAY_REDEAL), gameSettings, view);
 		aiControl.startTurn();
 		while (!redealt) {
 			Thread.sleep(100);
@@ -89,7 +89,7 @@ public class BaseAIControlTest {
 	 */
 	@Test(timeout = 10000)
 	public void testTurnZeroNotMelding() throws InterruptedException {
-		aiControl.setup(gameSettings, player, table, view, TurnMode.INSPECT_ONLY);
+		aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.INSPECT_ONLY), gameSettings, view);
 		aiControl.startTurn();
 		while (!turnEnded) {
 			Thread.sleep(100);
@@ -103,7 +103,7 @@ public class BaseAIControlTest {
 	 */
 	@Test(timeout = 10000)
 	public void testNormalTurnMelding() throws InterruptedException {
-		aiControl.setup(gameSettings, player, table, view, TurnMode.NORMAL_TURN);
+		aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.NORMAL_TURN), gameSettings, view);
 		aiControl.startTurn();
 		while (!turnEnded) {
 			Thread.sleep(100);
diff --git a/test/jrummikub/control/turn/TurnControlTest.java b/test/jrummikub/control/turn/TurnControlTest.java
index ed0b758..bebfff5 100644
--- a/test/jrummikub/control/turn/TurnControlTest.java
+++ b/test/jrummikub/control/turn/TurnControlTest.java
@@ -110,8 +110,7 @@ public class TurnControlTest {
 		mockPlayer = new MockPlayer(null, null);
 		mockPlayer.hand = mockHand;
 		testControl = new HumanTurnControl(mockTimer);
-		testControl.setup(new GameSettings(), mockPlayer, mockTable, mockView,
-				TurnMode.NORMAL_TURN);
+		testControl.setup(new ITurnControl.TurnInfo(mockTable, mockPlayer.getHand(), mockPlayer.getLaidOut(), TurnMode.NORMAL_TURN), new GameSettings(), mockView);
 	}
 
 	/** */
@@ -135,8 +134,7 @@ public class TurnControlTest {
 		mockHand.iterable = stones;
 
 		testControl = new HumanTurnControl(mockTimer);
-		testControl.setup(new GameSettings(), mockPlayer, mockTable, mockView,
-				TurnMode.NORMAL_TURN);
+		testControl.setup(new ITurnControl.TurnInfo(mockTable, mockPlayer.getHand(), mockPlayer.getLaidOut(), TurnMode.NORMAL_TURN), new GameSettings(), mockView);
 		testControl.startTurn();
 
 		int i = 0;
@@ -629,8 +627,7 @@ public class TurnControlTest {
 	public void testAddLeft() {
 		AccessibleTable table = new AccessibleTable();
 		HumanTurnControl turnControl = new HumanTurnControl(mockTimer);
-		turnControl.setup(new GameSettings(), mockPlayer, table, mockView,
-				TurnMode.NORMAL_TURN);
+		turnControl.setup(new ITurnControl.TurnInfo(table, mockPlayer.getHand(), mockPlayer.getLaidOut(), TurnMode.NORMAL_TURN), new GameSettings(), mockView);
 		turnControl.startTurn();
 		Stone blueOne = new Stone(1, BLUE);
 		Stone redOne = new Stone(1, RED);
@@ -747,8 +744,7 @@ public class TurnControlTest {
 	public void testAddRight() {
 		AccessibleTable table = new AccessibleTable();
 		HumanTurnControl turnControl = new HumanTurnControl(mockTimer);
-		turnControl.setup(new GameSettings(), mockPlayer, table, mockView,
-				TurnMode.NORMAL_TURN);
+		turnControl.setup(new ITurnControl.TurnInfo(table, mockPlayer.getHand(), mockPlayer.getLaidOut(), TurnMode.NORMAL_TURN), new GameSettings(), mockView);
 		turnControl.startTurn();
 		Stone blueOne = new Stone(1, BLUE);
 		Stone redOne = new Stone(1, RED);
@@ -865,8 +861,7 @@ public class TurnControlTest {
 	public void testAddNewSet() {
 		AccessibleTable table = new AccessibleTable();
 		HumanTurnControl turnControl = new HumanTurnControl(mockTimer);
-		turnControl.setup(new GameSettings(), mockPlayer, table, mockView,
-				TurnMode.NORMAL_TURN);
+		turnControl.setup(new ITurnControl.TurnInfo(table, mockPlayer.getHand(), mockPlayer.getLaidOut(), TurnMode.NORMAL_TURN), new GameSettings(), mockView);
 		turnControl.startTurn();
 		Stone blueOne = new Stone(1, BLUE);
 		Stone redOne = new Stone(1, RED);
-- 
cgit v1.2.3