Changes in src/unittests/analysisbondsunittest.cpp [ead4e6:cbc5fb]

File:

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

src/unittests/analysisbondsunittest.cpp

@@ -26 +26 @@
 #include "periodentafel.hpp"
 
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
-
 /********************************************** Test classes **************************************/
 
@@ -53 +49 @@
   strcpy(hydrogen->symbol, "H");
   carbon = new element;
-  carbon->Z = 2;
+  carbon->Z = 1;
   carbon->Valence = 4;
   carbon->NoValenceOrbitals = 4;
@@ -61 +57 @@
 
   // construct periodentafel
-  tafel = World::getInstance().getPeriode();
+  tafel = World::get()->getPeriode();
   tafel->AddElement(hydrogen);
   tafel->AddElement(carbon);
 
   // construct molecule (tetraeder of hydrogens)
-  TestMolecule = World::getInstance().createMolecule();
-  Walker = World::getInstance().createAtom();
+  TestMolecule = World::get()->createMolecule();
+  Walker = World::get()->createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(1.5, 0., 1.5 );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = World::get()->createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 1.5, 1.5 );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = World::get()->createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(1.5, 1.5, 0. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = World::get()->createAtom();
   Walker->type = hydrogen;
   Walker->node->Init(0., 0., 0. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = World::get()->createAtom();
   Walker->type = carbon;
   Walker->node->Init(0.5, 0.5, 0.5 );
@@ -117 +113 @@
 
   // remove molecule
-  World::getInstance().destroyMolecule(TestMolecule);
+  World::get()->destroyMolecule(TestMolecule);
   // note that all the atoms are cleaned by TestMolecule
-  World::purgeInstance();
+  World::destroy();
 };
 
@@ -167 +163 @@
   CPPUNIT_ASSERT_EQUAL( 0. , Max );
 };
+
+
+/********************************************** 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;
+};