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

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'
@@ -51 +55 @@
 // set up and tear down
 void atomsCalculationTest::setUp(){
-  World::get();
+  World::getInstance();
   for(int i=0;i<ATOM_COUNT;++i){
     atoms[i]= new AtomStub(i);
-    World::get()->registerAtom(atoms[i]);
+    World::getInstance().registerAtom(atoms[i]);
   }
 }
 void atomsCalculationTest::tearDown(){
-  World::destroy();
-  ActionRegistry::purgeRegistry();
+  World::purgeInstance();
+  ActionRegistry::purgeInstance();
 }
 
@@ -92 +96 @@
 }
 
-static void operation(atom* _atom){
-  AtomStub *atom = dynamic_cast<AtomStub*>(_atom);
-  assert(atom);
-  atom->doSomething();
-}
-
-
 void atomsCalculationTest::testCalculateSimple(){
-  AtomsCalculation<int> *calc = World::get()->calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms());
+  AtomsCalculation<int> *calc = World::getInstance().calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms());
   std::vector<int> allIds = (*calc)();
   CPPUNIT_ASSERT(hasAll(allIds,0,ATOM_COUNT));
@@ -108 +105 @@
 void atomsCalculationTest::testCalculateExcluded(){
   int excluded = ATOM_COUNT/2;
-  AtomsCalculation<int> *calc = World::get()->calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms() && !AtomById(excluded));
+  AtomsCalculation<int> *calc = World::getInstance().calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms() && !AtomById(excluded));
   std::vector<int> allIds = (*calc)();
   std::set<int> excluded_set;