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

File:

• src/unittests/bondgraphunittest.cpp (modified) (3 diffs)

src/unittests/bondgraphunittest.cpp

@@ -16 +16 @@
 #include <cstring>
 
-#include "World.hpp"
 #include "atom.hpp"
 #include "bond.hpp"
@@ -57 +56 @@
 
   // construct periodentafel
-  tafel = World::getInstance().getPeriode();
+  tafel = new periodentafel;
   tafel->AddElement(hydrogen);
   tafel->AddElement(carbon);
 
   // 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. );
@@ -102 +101 @@
 
   // remove molecule
-  World::getInstance().destroyMolecule(TestMolecule);
-  // note that all the atoms, molecules, the tafel and the elements
-  // are all cleaned when the world is destroyed
-  World::purgeInstance();
+  delete(TestMolecule);
+  // note that all the atoms are cleaned by TestMolecule
+  delete(tafel);
+  // note that element is cleaned by periodentafel
+  World::destroy();
   MemoryUsageObserver::purgeInstance();
   logger::purgeInstance();