Changes in src/unittests/manipulateAtomsTest.cpp [cd5047:112f90]

File:

• src/unittests/manipulateAtomsTest.cpp (modified) (5 diffs)

src/unittests/manipulateAtomsTest.cpp

@@ -22 +22 @@
 #include "World.hpp"
 #include "atom.hpp"
+
+#include "DummyUI.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -72 +74 @@
 // set up and tear down
 void manipulateAtomsTest::setUp(){
+  static bool hasDescriptor = false;
   ActionHistory::init();
   World::getInstance();
+  // 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");
   for(int i=0;i<ATOM_COUNT;++i){
     atoms[i]= new AtomStub(i);
@@ -83 +92 @@
   ActionRegistry::purgeInstance();
   ActionHistory::purgeInstance();
+  UIFactory::purgeInstance();
 }
 
 static void operation(atom* _atom){
   AtomStub *atom = dynamic_cast<AtomStub*>(_atom);
-  assert(atom);
+  CPPUNIT_ASSERT(atom);
   atom->doSomething();
 }
@@ -100 +110 @@
     AtomStub *atom;
     atom = dynamic_cast<AtomStub*>(*iter);
-    assert(atom);
+    CPPUNIT_ASSERT(atom);
     CPPUNIT_ASSERT(atom->manipulated);
   }
@@ -114 +124 @@
     AtomStub *atom;
     atom = dynamic_cast<AtomStub*>(*iter);
-    assert(atom);
+    CPPUNIT_ASSERT(atom);
     if(atom->getId()!=(int)ATOM_COUNT/2)
       CPPUNIT_ASSERT(atom->manipulated);