diff options
| author | Bennet Gerlach <bennet_gerlach@web.de> | 2011-05-04 23:14:10 +0200 |
|---|---|---|
| committer | Bennet Gerlach <bennet_gerlach@web.de> | 2011-05-04 23:14:10 +0200 |
| commit | db7489a5c78551e4db52acd11656f2b872740f89 (patch) | |
| tree | 59b89508489554b84f44fc208585b3e681dbfe52 /test/jrummikub/control | |
| parent | b0a90ad6f052037260c6304b537a9550a7422e30 (diff) | |
| download | JRummikub-db7489a5c78551e4db52acd11656f2b872740f89.tar JRummikub-db7489a5c78551e4db52acd11656f2b872740f89.zip | |
New main
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@127 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub/control')
| -rw-r--r-- | test/jrummikub/control/TurnControlTest.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/test/jrummikub/control/TurnControlTest.java b/test/jrummikub/control/TurnControlTest.java index 8c58352..8a2416f 100644 --- a/test/jrummikub/control/TurnControlTest.java +++ b/test/jrummikub/control/TurnControlTest.java @@ -21,7 +21,7 @@ import org.junit.Test; public class TurnControlTest { class MockTimer implements ITurnTimer { - public boolean timerRunning; + public boolean timerRunning = false; public Event timeRunOutEvent = new Event(); @Override @@ -56,6 +56,11 @@ public class TurnControlTest { } @Test + public void startTimer() { + assertTrue(mockTimer.timerRunning); + } + + @Test public void viewEndOfTurn() { eventFired = false; mockTimer.timerRunning = true; @@ -141,8 +146,8 @@ public class TurnControlTest { mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true); mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true); - mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit( - firstStone, false); + mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(firstStone, + false); assertCollection(Arrays.asList(secondStone)); } @@ -156,8 +161,8 @@ public class TurnControlTest { mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true); mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true); - mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit( - firstStone, true); + mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(firstStone, + true); assertCollection(Arrays.asList(secondStone, firstStone)); } @@ -262,8 +267,7 @@ public class TurnControlTest { Stone stone2 = new Stone(2, StoneColor.RED); Stone stone3 = new Stone(3, StoneColor.RED); Stone stone4 = new Stone(4, StoneColor.RED); - StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, - stone4)); + StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, stone4)); mockTable.findStoneSet.put(stone1, set1); mockTable.findStoneSet.put(stone3, set1); @@ -283,8 +287,7 @@ public class TurnControlTest { Stone stone2 = new Stone(2, StoneColor.RED); Stone stone3 = new Stone(3, StoneColor.RED); Stone stone4 = new Stone(4, StoneColor.RED); - StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, - stone4)); + StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, stone4)); mockTable.findStoneSet.put(stone1, set1); mockTable.findStoneSet.put(stone3, set1); |