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

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"
@@ -35 +33 @@
   virtual ~canUndoActionStub(){}
 
-  virtual Dialog* fillDialog(Dialog *dialog){
-    ASSERT(dialog,"No Dialog given when filling action dialog");
-    return dialog;
+  virtual Dialog* createDialog(){
+    return NULL;
   }
 
@@ -63 +60 @@
   virtual ~cannotUndoActionStub(){}
 
-  virtual Dialog* fillDialog(Dialog *dialog){
-    ASSERT(dialog,"No Dialog given when filling action dialog");
-    return dialog;
+  virtual Dialog* createDialog(){
+    return NULL;
   }
 
@@ -94 +90 @@
   virtual ~wasCalledActionStub(){}
 
-  virtual Dialog* fillDialog(Dialog *dialog){
-    return dialog;
+  virtual Dialog* createDialog(){
+    return NULL;
   }
   virtual Action::state_ptr performCall(){
@@ -123 +119 @@
 
 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();
@@ -157 +146 @@
   ActionHistory::purgeInstance();
   ActionRegistry::purgeInstance();
-  UIFactory::purgeInstance();
 }
 
@@ -243 +231 @@
 
   CPPUNIT_ASSERT_EQUAL(true,wasCalled1->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(true,wasCalled2->wasCalled());
+  CPPUNIT_ASSERT_EQUAL(true,wasCalled1->wasCalled());
 
   ActionHistory::getInstance().undoLast();
 
   CPPUNIT_ASSERT_EQUAL(false,wasCalled1->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(false,wasCalled2->wasCalled());
-
-}
-
-
+  CPPUNIT_ASSERT_EQUAL(false,wasCalled1->wasCalled());
+
+}
+
+