summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-05-05 19:49:58 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-05-05 19:49:58 +0200
commit44ee94041a1f042408033663df992803a2970872 (patch)
treecaba8b71d1829dadbc353a487516a5ea0d062ca2
parent8ad8432d857fb347ea22cd87797305b896c24e55 (diff)
downloadJRummikub-44ee94041a1f042408033663df992803a2970872.tar
JRummikub-44ee94041a1f042408033663df992803a2970872.zip
Added missing calls to startTurn
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@149 72836036-5685-4462-b002-a69064685172
-rw-r--r--src/jrummikub/control/RoundControl.java2
-rw-r--r--test/jrummikub/control/TurnControlTest.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java
index 6e02ef2..8f8180d 100644
--- a/src/jrummikub/control/RoundControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -60,7 +60,7 @@ public class RoundControl {
endOfTurn();
}
});
- // turnControl.startTurn();
+ turnControl.startTurn();
}
void deal() {
diff --git a/test/jrummikub/control/TurnControlTest.java b/test/jrummikub/control/TurnControlTest.java
index bdec8b8..6a37c67 100644
--- a/test/jrummikub/control/TurnControlTest.java
+++ b/test/jrummikub/control/TurnControlTest.java
@@ -85,6 +85,8 @@ public class TurnControlTest {
mockHand.iterable = stones;
testControl = new TurnControl(mockHand, mockTable, mockView, mockTimer);
+
+ testControl.startTurn();
int i = 0;
for (Pair<Stone, Position> pair : mockView.playerPanel.handPanel.stones) {