Changes in src/unittests/AnalysisCorrelationToPointUnitTest.cpp [23b547:e6fdbe]

File:

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

src/unittests/AnalysisCorrelationToPointUnitTest.cpp

@@ -17 +17 @@
 #include "AnalysisCorrelationToPointUnitTest.hpp"
 
-#include "World.hpp"
 #include "atom.hpp"
 #include "boundary.hpp"
@@ -57 +56 @@
 
   // construct periodentafel
-  tafel = World::getInstance().getPeriode();
+  tafel = new periodentafel;
   tafel->AddElement(hydrogen);
 
   // construct molecule (tetraeder of hydrogens)
-  TestMolecule = World::getInstance().createMolecule();
-  Walker = World::getInstance().createAtom();
+  TestMolecule = new molecule(tafel);
+  Walker = new atom();
   Walker->type = hydrogen;
   Walker->node->Init(1., 0., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 1., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
   Walker->node->Init(1., 1., 0. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 0., 0. );
@@ -82 +81 @@
   CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
 
-  TestList = World::getInstance().getMolecules();
+  TestList = new MoleculeListClass;
   TestMolecule->ActiveFlag = true;
   TestList->insert(TestMolecule);
@@ -103 +102 @@
     delete(binmap);
 
+  // remove
+  delete(TestList);
+  // note that all the atoms are cleaned by TestMolecule
   delete(point);
-  World::purgeInstance();
+  delete(tafel);
+  // note that element is cleaned by periodentafel
+  World::destroy();
   MemoryUsageObserver::purgeInstance();
   logger::purgeInstance();