neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always operate on cloned hands in the turn controls

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@380 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-07 00:23:00 +02:00
parent c59332950b
commit af3661fea0
11 changed files with 157 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/jrummikub/control/turn/BaseAIControlTest.java
View file

@ -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);

15
test/jrummikub/control/turn/TurnControlTest.java
View file

@ -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);