Changeset 8d9d38 for molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

Timestamp:

Feb 25, 2010, 4:43:02 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

3db67e

Parents:

2e6496

Message:

Made the world solely responsible for creating and erasing molecules.

File:

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

molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

@@ -56 +56 @@
 
   // construct periodentafel
-  tafel = new periodentafel;
+  tafel = World::get()->getPeriode();
   tafel->AddElement(hydrogen);
   tafel->AddElement(carbon);
 
   // construct molecule (tetraeder of hydrogens) base
-  TestMolecule = new molecule(tafel);
+  TestMolecule = World::get()->createMolecule();
   Walker = World::get()->createAtom();
   Walker->type = hydrogen;
@@ -82 +82 @@
   CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
 
-  TestList = new MoleculeListClass;
+  TestList = World::get()->getMolecules();
   TestMolecule->ActiveFlag = true;
   TestList->insert(TestMolecule);
@@ -127 +127 @@
     delete(binmap);
 
-  // remove
-  delete(TestList);
   delete(Surface);
   // note that all the atoms are cleaned by TestMolecule
   delete(LC);
-  delete(tafel);
-  // note that element is cleaned by periodentafel
+  World::destroy();
 };