Changes in src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp [46d958:e6fdbe]

File:

• src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp (modified) (6 diffs)

src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

@@ -17 +17 @@
 #include "AnalysisCorrelationToSurfaceUnitTest.hpp"
 
-#include "World.hpp"
 #include "atom.hpp"
 #include "boundary.hpp"
@@ -25 +24 @@
 #include "periodentafel.hpp"
 #include "tesselation.hpp"
+#include "World.hpp"
+
+#ifdef HAVE_TESTRUNNER
+#include "UnitTestMain.hpp"
+#endif /*HAVE_TESTRUNNER*/
 
 /********************************************** Test classes **************************************/
@@ -62 +66 @@
   // construct molecule (tetraeder of hydrogens) base
   TestMolecule = new molecule(tafel);
-  Walker = World::get()->createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
   Walker->node->Init(1., 0., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::get()->createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 1., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::get()->createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
   Walker->node->Init(1., 1., 0. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::get()->createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 0., 0. );
@@ -95 +99 @@
 
   // add outer atoms
-  Walker = World::get()->createAtom();
+  Walker = new atom();
   Walker->type = carbon;
   Walker->node->Init(4., 0., 4. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::get()->createAtom();
+  Walker = new atom();
   Walker->type = carbon;
   Walker->node->Init(0., 4., 4. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::get()->createAtom();
+  Walker = new atom();
   Walker->type = carbon;
   Walker->node->Init(4., 4., 0. );
   TestMolecule->AddAtom(Walker);
   // add inner atoms
-  Walker = World::get()->createAtom();
+  Walker = new atom();
   Walker->type = carbon;
   Walker->node->Init(0.5, 0.5, 0.5 );
@@ -134 +138 @@
   delete(tafel);
   // note that element is cleaned by periodentafel
+  World::destroy();
+  MemoryUsageObserver::purgeInstance();
+  logger::purgeInstance();
 };
 
@@ -212 +219 @@
 
 };
-
-/********************************************** Main routine **************************************/
-
-int main(int argc, char **argv)
-{
-  // Get the top level suite from the registry
-  CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-
-  // Adds the test to the list of test to run
-  CppUnit::TextUi::TestRunner runner;
-  runner.addTest( suite );
-
-  // Change the default outputter to a compiler error format outputter
-  runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(),
-                                                       std::cerr ) );
-  // Run the tests.
-  bool wasSucessful = runner.run();
-
-  // Return error code 1 if the one of test failed.
-  return wasSucessful ? 0 : 1;
-};