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

File:

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

src/unittests/bondgraphunittest.cpp

@@ -16 +16 @@
 #include <cstring>
 
+#include "World.hpp"
 #include "atom.hpp"
 #include "bond.hpp"
@@ -23 +24 @@
 #include "periodentafel.hpp"
 #include "bondgraphunittest.hpp"
-#include "World.hpp"
-
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
 
 /********************************************** Test classes **************************************/
@@ -62 +58 @@
   // construct molecule (tetraeder of hydrogens)
   TestMolecule = new molecule(tafel);
-  Walker = new atom();
+  Walker = World::get()->createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(1., 0., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = new atom();
+  Walker = World::get()->createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 1., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = new atom();
+  Walker = World::get()->createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(1., 1., 0. );
   TestMolecule->AddAtom(Walker);
-  Walker = new atom();
+  Walker = World::get()->createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 0., 0. );
@@ -105 +101 @@
   delete(tafel);
   // note that element is cleaned by periodentafel
-  World::destroy();
-  MemoryUsageObserver::purgeInstance();
-  logger::purgeInstance();
 };
 
@@ -131 +124 @@
   CPPUNIT_ASSERT_EQUAL( true , Walker->IsBondedTo(Runner) );
 };
+
+
+/********************************************** 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;
+};