summaryrefslogtreecommitdiffstats
path: root/test/jrummikub
diff options
context:
space:
mode:
authorBennet Gerlach <bennet_gerlach@web.de>2011-05-05 00:19:02 +0200
committerBennet Gerlach <bennet_gerlach@web.de>2011-05-05 00:19:02 +0200
commitbc827302d0753a67774fd625d0c90eba7d83094f (patch)
treebcdbec60daa269507fb286e55b2aad4742cb759b /test/jrummikub
parent0318d8cee285d98e69851c450a029a434cd4dce7 (diff)
downloadJRummikub-bc827302d0753a67774fd625d0c90eba7d83094f.tar
JRummikub-bc827302d0753a67774fd625d0c90eba7d83094f.zip
Show initial hand succeeds
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@136 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub')
-rw-r--r--test/jrummikub/control/TurnControlTest.java28
-rw-r--r--test/jrummikub/model/MockHand.java8
2 files changed, 20 insertions, 16 deletions
diff --git a/test/jrummikub/control/TurnControlTest.java b/test/jrummikub/control/TurnControlTest.java
index 2efab67..2cca3e8 100644
--- a/test/jrummikub/control/TurnControlTest.java
+++ b/test/jrummikub/control/TurnControlTest.java
@@ -59,14 +59,14 @@ public class TurnControlTest {
mockTimer = new MockTimer();
mockTable = new MockTable();
mockHand = new MockHand();
- testControl = new TurnControl(null, mockTable, mockView, mockTimer);
+ testControl = new TurnControl(mockHand, mockTable, mockView, mockTimer);
}
@Test
public void startTimer() {
assertTrue(mockTimer.timerRunning);
}
-
+
@SuppressWarnings("unchecked")
@Test
public void showInitialHand() {
@@ -74,25 +74,25 @@ public class TurnControlTest {
mockTimer = new MockTimer();
mockTable = new MockTable();
mockHand = new MockHand();
-
-
- mockView.displayStartTurnPanel = false;
-
- List<Pair<Stone, Position>> stones = Arrays.asList(new Pair<Stone, Position>(new Stone(RED), new Position(0,0)),
- new Pair<Stone, Position>(new Stone(BLACK), new Position(1,0)));
-
+
+ mockView.displayStartTurnPanel = true;
+
+ List<Pair<Stone, Position>> stones = Arrays.asList(
+ new Pair<Stone, Position>(new Stone(RED), new Position(0, 0)),
+ new Pair<Stone, Position>(new Stone(BLACK), new Position(1, 0)));
+
mockHand.iterable = stones;
-
- testControl = new TurnControl(null, mockTable, mockView, mockTimer);
-
+
+ testControl = new TurnControl(mockHand, mockTable, mockView, mockTimer);
+
int i = 0;
for (Pair<Stone, Position> pair : mockView.playerPanel.handPanel.stones) {
assertSame(stones.get(i), pair);
i++;
}
assertEquals(stones.size(), i);
-
- assertTrue(mockView.displayStartTurnPanel);
+
+ assertFalse(mockView.displayStartTurnPanel);
}
@Test
diff --git a/test/jrummikub/model/MockHand.java b/test/jrummikub/model/MockHand.java
index 0d0c523..2132ff4 100644
--- a/test/jrummikub/model/MockHand.java
+++ b/test/jrummikub/model/MockHand.java
@@ -9,7 +9,7 @@ import jrummikub.util.Pair;
public class MockHand implements IHand {
public List<Stone> stones = new ArrayList<Stone>();
-
+
public Iterable<Pair<Stone, Position>> iterable;
@Override
@@ -45,6 +45,10 @@ public class MockHand implements IHand {
}
public MockHand clone() {
- return null;
+ try {
+ return (MockHand) super.clone();
+ } catch (CloneNotSupportedException e) {
+ return null;
+ }
}
}