From f5cff88ec9177b23dc8979aa9645a427a78c6f46 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 21 Jun 2011 00:04:16 +0200
Subject: Major refactoring of RoundControl and TurnControl

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@516 72836036-5685-4462-b002-a69064685172
---
 test/jrummikub/control/GameControlTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/jrummikub/control/GameControlTest.java')

diff --git a/test/jrummikub/control/GameControlTest.java b/test/jrummikub/control/GameControlTest.java
index e1af261..7555714 100644
--- a/test/jrummikub/control/GameControlTest.java
+++ b/test/jrummikub/control/GameControlTest.java
@@ -49,10 +49,8 @@ public class GameControlTest {
 	public void testEndOfRound() {
 		gameControl.startGame();
 
-		view.startTurnEvent.emit();
-
 		// Manipulate first player's hand, to allow player1 to win
-		IHand playerHand = gameControl.roundControl.clonedHand;
+		IHand playerHand = gameControl.roundControl.roundState.getActivePlayer().getHand();
 		for (Pair<Stone, Position> entry : playerHand.clone()) {
 			playerHand.pickUp(entry.getFirst());
 		}
@@ -64,6 +62,8 @@ public class GameControlTest {
 		playerHand.drop(stone3, new Position(0, 0));
 		// Done setting up first players hand
 
+		view.startTurnEvent.emit();
+
 		view.playerPanel.endTurnEvent.emit();
 		view.startTurnEvent.emit();
 		view.playerPanel.endTurnEvent.emit();
-- 
cgit v1.2.3