Changes in src/unittests/manipulateAtomsTest.cpp [229e3c:57adc7]

File:

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

src/unittests/manipulateAtomsTest.cpp

@@ -22 +22 @@
 #include "atom.hpp"
 
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
-
 // Registers the fixture into the 'registry'
 CPPUNIT_TEST_SUITE_REGISTRATION( manipulateAtomsTest );
@@ -34 +30 @@
   AtomStub(int _id) :
   atom(),
-  manipulated(false),
-  id(_id)
+  id(_id),
+  manipulated(false)
   {}
 
@@ -70 +66 @@
 // set up and tear down
 void manipulateAtomsTest::setUp(){
-  World::getInstance();
+  World::get();
   for(int i=0;i<ATOM_COUNT;++i){
     atoms[i]= new AtomStub(i);
-    World::getInstance().registerAtom(atoms[i]);
+    World::get()->registerAtom(atoms[i]);
   }
 }
 void manipulateAtomsTest::tearDown(){
-  World::purgeInstance();
-  ActionRegistry::purgeInstance();
+  World::destroy();
+  ActionRegistry::purgeRegistry();
+}
+
+// some helper functions
+static bool hasAll(std::vector<atom*> atoms,int min, int max, std::set<int> excluded = std::set<int>()){
+  for(int i=min;i<max;++i){
+    if(!excluded.count(i)){
+      std::vector<atom*>::iterator iter;
+      bool res=false;
+      for(iter=atoms.begin();iter!=atoms.end();++iter){
+        res |= (*iter)->getId() == i;
+      }
+      if(!res) {
+        cout << "Atom " << i << " missing in returned list" << endl;
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+static bool hasNoDuplicates(std::vector<atom*> atoms){
+  std::set<int> found;
+  std::vector<atom*>::iterator iter;
+  for(iter=atoms.begin();iter!=atoms.end();++iter){
+    int id = (*iter)->getId();
+    if(found.count(id))
+      return false;
+    found.insert(id);
+  }
+  return true;
 }
 
@@ -89 +115 @@
 
 void manipulateAtomsTest::testManipulateSimple(){
-  ManipulateAtomsProcess *proc = World::getInstance().manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms());
+  ManipulateAtomsProcess *proc = World::get()->manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms());
   proc->call();
-  std::vector<atom*> allAtoms = World::getInstance().getAllAtoms(AllAtoms());
+  std::vector<atom*> allAtoms = World::get()->getAllAtoms(AllAtoms());
   std::vector<atom*>::iterator iter;
   for(iter=allAtoms.begin();iter!=allAtoms.end();++iter){
@@ -102 +128 @@
 
 void manipulateAtomsTest::testManipulateExcluded(){
-
-  ManipulateAtomsProcess *proc = World::getInstance().manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms() && !AtomById(ATOM_COUNT/2));
+  ManipulateAtomsProcess *proc = World::get()->manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms() && !AtomById(ATOM_COUNT/2));
   proc->call();
-  std::vector<atom*> allAtoms = World::getInstance().getAllAtoms(AllAtoms());
+  std::vector<atom*> allAtoms = World::get()->getAllAtoms(AllAtoms());
   std::vector<atom*>::iterator iter;
   for(iter=allAtoms.begin();iter!=allAtoms.end();++iter){
@@ -120 +145 @@
 void manipulateAtomsTest::testObserver(){
   countObserver *obs = new countObserver();
-  World::getInstance().signOn(obs);
-  ManipulateAtomsProcess *proc = World::getInstance().manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms());
+  World::get()->signOn(obs);
+  ManipulateAtomsProcess *proc = World::get()->manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms() && !AtomById(ATOM_COUNT/2));
   proc->call();
 
   CPPUNIT_ASSERT_EQUAL(1,obs->count);
-  World::getInstance().signOff(obs);
+  World::get()->signOff(obs);
   delete obs;
 }