Changeset 4c60ef for molecuilder/src/unittests/atomsCalculationTest.cpp

Timestamp:

Mar 10, 2010, 5:51:48 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

4fc41a

Parents:

025ca2

Message:

Added generic singleton Pattern that can be inherited to any class making that class a singleton.

File:

• molecuilder/src/unittests/atomsCalculationTest.cpp (modified) (3 diffs)

molecuilder/src/unittests/atomsCalculationTest.cpp

@@ -51 +51 @@
 // 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();
+  World::purgeInstance();
   ActionRegistry::purgeRegistry();
 }
@@ -92 +92 @@
 }
 
-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 +101 @@
 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;