Changes in src/unittests/atomsCalculationTest.cpp [e73a8a2:57adc7]

File:

• src/unittests/atomsCalculationTest.cpp (modified) (4 diffs)

src/unittests/atomsCalculationTest.cpp

@@ -23 +23 @@
 #include "World_calculations.hpp"
 #include "atom.hpp"
-
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
 
 // Registers the fixture into the 'registry'
@@ -55 +51 @@
 // set up and tear down
 void atomsCalculationTest::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 atomsCalculationTest::tearDown(){
-  World::purgeInstance();
-  ActionRegistry::purgeInstance();
+  World::destroy();
+  ActionRegistry::purgeRegistry();
 }
 
@@ -96 +92 @@
 }
 
+static void operation(atom* _atom){
+  AtomStub *atom = dynamic_cast<AtomStub*>(_atom);
+  assert(atom);
+  atom->doSomething();
+}
+
+
 void atomsCalculationTest::testCalculateSimple(){
-  AtomsCalculation<int> *calc = World::getInstance().calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms());
+  AtomsCalculation<int> *calc = World::get()->calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms());
   std::vector<int> allIds = (*calc)();
   CPPUNIT_ASSERT(hasAll(allIds,0,ATOM_COUNT));
@@ -105 +108 @@
 void atomsCalculationTest::testCalculateExcluded(){
   int excluded = ATOM_COUNT/2;
-  AtomsCalculation<int> *calc = World::getInstance().calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms() && !AtomById(excluded));
+  AtomsCalculation<int> *calc = World::get()->calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms() && !AtomById(excluded));
   std::vector<int> allIds = (*calc)();
   std::set<int> excluded_set;