summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-07-04 17:42:37 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-07-04 17:42:37 +0200
commitce6cc738adb3c923b3e993adf5c338327df6ecf2 (patch)
tree6fb47f2b4bae1d9220a175fc5e67a4e8cb1b009b
parenta3fc740af582bd188b8a0e22645fb28ee19fd9d5 (diff)
downloadJRummikub-ce6cc738adb3c923b3e993adf5c338327df6ecf2.tar
JRummikub-ce6cc738adb3c923b3e993adf5c338327df6ecf2.zip
Finished control tests
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@603 72836036-5685-4462-b002-a69064685172
-rw-r--r--mock/jrummikub/view/MockView.java4
-rw-r--r--test/jrummikub/control/ApplicationControlTest.java3
2 files changed, 5 insertions, 2 deletions
diff --git a/mock/jrummikub/view/MockView.java b/mock/jrummikub/view/MockView.java
index dd8f5a7..a78aefe 100644
--- a/mock/jrummikub/view/MockView.java
+++ b/mock/jrummikub/view/MockView.java
@@ -88,6 +88,8 @@ public class MockView implements IView {
public MockEvent acknowledgeConnectionLostEvent = new MockEvent();
/** */
public MockEvent1<File> loadFileEvent = new MockEvent1<File>();
+ /** */
+ public boolean loadCalled = false;
@Override
public MockTablePanel getTablePanel() {
@@ -314,7 +316,7 @@ public class MockView implements IView {
@Override
public void load() {
- // TODO Auto-generated method stub
+ loadCalled = true;
}
@Override
diff --git a/test/jrummikub/control/ApplicationControlTest.java b/test/jrummikub/control/ApplicationControlTest.java
index b239e64..84b8527 100644
--- a/test/jrummikub/control/ApplicationControlTest.java
+++ b/test/jrummikub/control/ApplicationControlTest.java
@@ -113,7 +113,8 @@ public class ApplicationControlTest {
assertTrue(view.isQuitWarningPanelVisible);
assertSame(QuitMode.QUIT_GAME, view.getQuitWarningPanel().getQuitMode());
view.getQuitWarningPanel().quitEvent.emit();
- // TODO asserte was
+ assertFalse(view.isQuitWarningPanelVisible);
+ assertTrue(view.loadCalled);
}
/** */