Changes in src/unittests/ActionSequenceTest.cpp [80951de:ec149d]

File:

• src/unittests/ActionSequenceTest.cpp (modified) (7 diffs)

src/unittests/ActionSequenceTest.cpp

@@ -17 +17 @@
 #include "Actions/ActionRegistry.hpp"
 
+#include "DummyUI.hpp"
+
 #ifdef HAVE_TESTRUNNER
 #include "UnitTestMain.hpp"
@@ -33 +35 @@
   virtual ~canUndoActionStub(){}
 
-  virtual Dialog* createDialog(){
-    return NULL;
+  virtual Dialog* fillDialog(Dialog *dialog){
+    ASSERT(dialog,"No Dialog given when filling action dialog");
+    return dialog;
   }
 
@@ -60 +63 @@
   virtual ~cannotUndoActionStub(){}
 
-  virtual Dialog* createDialog(){
-    return NULL;
+  virtual Dialog* fillDialog(Dialog *dialog){
+    ASSERT(dialog,"No Dialog given when filling action dialog");
+    return dialog;
   }
 
@@ -90 +94 @@
   virtual ~wasCalledActionStub(){}
 
-  virtual Dialog* createDialog(){
-    return NULL;
+  virtual Dialog* fillDialog(Dialog *dialog){
+    return dialog;
   }
   virtual Action::state_ptr performCall(){
@@ -119 +123 @@
 
 void ActionSequenceTest::setUp(){
+  static bool hasDescriptor = false;
   ActionHistory::init();
+  // TODO: find a way to really reset the factory to a clean state in tear-down
+  if(!hasDescriptor){
+    UIFactory::registerFactory(new DummyUIFactory::description());
+    hasDescriptor = true;
+  }
+  UIFactory::makeUserInterface("Dummy");
   // create some necessary stubs used in this test
   positive1 = new canUndoActionStub();
@@ -146 +157 @@
   ActionHistory::purgeInstance();
   ActionRegistry::purgeInstance();
+  UIFactory::purgeInstance();
 }
 
@@ -231 +243 @@
 
   CPPUNIT_ASSERT_EQUAL(true,wasCalled1->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(true,wasCalled1->wasCalled());
+  CPPUNIT_ASSERT_EQUAL(true,wasCalled2->wasCalled());
 
   ActionHistory::getInstance().undoLast();
 
   CPPUNIT_ASSERT_EQUAL(false,wasCalled1->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(false,wasCalled1->wasCalled());
-
-}
-
-
+  CPPUNIT_ASSERT_EQUAL(false,wasCalled2->wasCalled());
+
+}
+
+