summaryrefslogtreecommitdiffstats
path: root/test/jrummikub/control
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-05-04 18:47:12 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-05-04 18:47:12 +0200
commitac08bc112f161e26f9dfc7a8f6f6c632597e36f0 (patch)
tree1d47dc3acb01db943010a22d66719af3baa16b0d /test/jrummikub/control
parent3cd6dee363700133ec827ea9fdb40ae302b35459 (diff)
downloadJRummikub-ac08bc112f161e26f9dfc7a8f6f6c632597e36f0.tar
JRummikub-ac08bc112f161e26f9dfc7a8f6f6c632597e36f0.zip
Implemented end of turn event handling, tested
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@112 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub/control')
-rw-r--r--test/jrummikub/control/TurnControlTest.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/jrummikub/control/TurnControlTest.java b/test/jrummikub/control/TurnControlTest.java
index 8ba7bc4..288214e 100644
--- a/test/jrummikub/control/TurnControlTest.java
+++ b/test/jrummikub/control/TurnControlTest.java
@@ -19,7 +19,8 @@ import static org.junit.Assert.*;
public class TurnControlTest {
class MockTimer implements ITurnTimer {
- boolean timerRunning;
+ public boolean timerRunning;
+ public Event timeRunOutEvent = new Event();
@Override
public void startTimer() {
@@ -33,7 +34,7 @@ public class TurnControlTest {
@Override
public IEvent getTimeRunOutEvent() {
- return null;
+ return timeRunOutEvent;
}
}
@@ -82,7 +83,7 @@ public class TurnControlTest {
}
});
- mockView.playerPanel.endTurnEvent.emit();
+ mockTimer.timeRunOutEvent.emit();
assertTrue(eventFired);
assertFalse(mockTimer.timerRunning);