Changeset 4c60ef for molecuilder/src/unittests/AnalysisCorrelationToPointUnitTest.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/AnalysisCorrelationToPointUnitTest.cpp (modified) (3 diffs)

molecuilder/src/unittests/AnalysisCorrelationToPointUnitTest.cpp

@@ -57 +57 @@
 
   // construct periodentafel
-  tafel = World::get()->getPeriode();
+  tafel = World::getInstance().getPeriode();
   tafel->AddElement(hydrogen);
 
   // construct molecule (tetraeder of hydrogens)
-  TestMolecule = World::get()->createMolecule();
-  Walker = World::get()->createAtom();
+  TestMolecule = World::getInstance().createMolecule();
+  Walker = World::getInstance().createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(1., 0., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::get()->createAtom();
+  Walker = World::getInstance().createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 1., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::get()->createAtom();
+  Walker = World::getInstance().createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(1., 1., 0. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::get()->createAtom();
+  Walker = World::getInstance().createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 0., 0. );
@@ -82 +82 @@
   CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
 
-  TestList = World::get()->getMolecules();
+  TestList = World::getInstance().getMolecules();
   TestMolecule->ActiveFlag = true;
   TestList->insert(TestMolecule);
@@ -104 +104 @@
 
   delete(point);
-  World::destroy();
+  World::purgeInstance();
   MemoryUsageObserver::purgeInstance();
   logger::purgeInstance();