Changes in src/unittests/bondgraphunittest.cpp [4eb4fe:e5ad5c]

File:

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

src/unittests/bondgraphunittest.cpp

@@ -14 +14 @@
 #include <iostream>
 #include <stdio.h>
-#include <cstring>
 
-#include "Helpers/Assert.hpp"
-
-#include "World.hpp"
 #include "atom.hpp"
 #include "bond.hpp"
@@ -27 +23 @@
 #include "periodentafel.hpp"
 #include "bondgraphunittest.hpp"
-#include "World.hpp"
-
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
 
 /********************************************** Test classes **************************************/
@@ -43 +34 @@
   atom *Walker = NULL;
 
+  // init private all pointers to zero
+  TestMolecule = NULL;
+  hydrogen = NULL;
+  tafel = NULL;
+
   // construct element
-  hydrogen = World::getInstance().getPeriode()->FindElement(1);
-  carbon = World::getInstance().getPeriode()->FindElement(6);
-  CPPUNIT_ASSERT(hydrogen != NULL && "could not find element hydrogen");
-  CPPUNIT_ASSERT(carbon != NULL && "could not find element carbon");
+  hydrogen = new element;
+  hydrogen->Z = 1;
+  hydrogen->CovalentRadius = 0.23;
+  hydrogen->VanDerWaalsRadius = 1.09;
+  strcpy(hydrogen->name, "hydrogen");
+  strcpy(hydrogen->symbol, "H");
+  carbon = new element;
+  carbon->Z = 2;
+  carbon->CovalentRadius = 0.68;
+  carbon->VanDerWaalsRadius = 1.7;
+  strcpy(carbon->name, "carbon");
+  strcpy(carbon->symbol, "C");
+
+
+  // construct periodentafel
+  tafel = new periodentafel;
+  tafel->AddElement(hydrogen);
+  tafel->AddElement(carbon);
 
   // construct molecule (tetraeder of hydrogens)
-  TestMolecule = World::getInstance().createMolecule();
-  CPPUNIT_ASSERT(TestMolecule != NULL && "could not create molecule");
-  Walker = World::getInstance().createAtom();
-  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
+  TestMolecule = new molecule(tafel);
+  Walker = new atom();
   Walker->type = carbon;
-  *Walker->node = Vector(1., 0., 1. );
+  Walker->node->Init(1., 0., 1. );
   TestMolecule->AddAtom(Walker);
-
-  Walker = World::getInstance().createAtom();
-  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
+  Walker = new atom();
   Walker->type = carbon;
-  *Walker->node = Vector(0., 1., 1. );
+  Walker->node->Init(0., 1., 1. );
   TestMolecule->AddAtom(Walker);
-
-  Walker = World::getInstance().createAtom();
-  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
+  Walker = new atom();
   Walker->type = carbon;
-  *Walker->node = Vector(1., 1., 0. );
+  Walker->node->Init(1., 1., 0. );
   TestMolecule->AddAtom(Walker);
-
-  Walker = World::getInstance().createAtom();
-  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
+  Walker = new atom();
   Walker->type = carbon;
-  *Walker->node = Vector(0., 0., 0. );
+  Walker->node->Init(0., 0., 0. );
   TestMolecule->AddAtom(Walker);
 
@@ -81 +83 @@
   // create a small file with table
   dummyname = new string("dummy.dat");
-  CPPUNIT_ASSERT(dummyname != NULL && "could not create string");
   filename = new string("test.dat");
-  CPPUNIT_ASSERT(filename != NULL && "could not create string");
   ofstream test(filename->c_str());
-  test << ".\tH\tHe\tLi\tBe\tB\tC\n";
-  test << "H\t1.\t1.\t1.\t1.\t1.\t1.2\n";
-  test << "He\t1.\t1.\t1.\t1.\t1.\t1.\n";
-  test << "Li\t1.\t1.\t1.\t1.\t1.\t1.\n";
-  test << "Be\t1.\t1.\t1.\t1.\t1.\t1.\n";
-  test << "B\t1.\t1.\t1.\t1.\t1.\t1.\n";
-  test << "C\t1.2\t1.\t1.\t1.\t1.\t1.5\n";
-  test.close();
+  test << ".\tH\tC\n";
+  test << "H\t1.\t1.2\n";
+  test << "C\t1.2\t1.5\n";
   BG = new BondGraph(true);
-  CPPUNIT_ASSERT(BG != NULL && "could not create BondGraph");
 };
 
@@ -107 +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();
-  MemoryUsageObserver::purgeInstance();
-  logger::purgeInstance();
+  delete(TestMolecule);
+  // note that all the atoms are cleaned by TestMolecule
+  delete(tafel);
+  // note that element is cleaned by periodentafel
 };
 
@@ -121 +113 @@
   CPPUNIT_ASSERT_EQUAL( true , BG->LoadBondLengthTable(*filename) );
   CPPUNIT_ASSERT_EQUAL( 1., BG->GetBondLength(0,0) );
-  CPPUNIT_ASSERT_EQUAL( 1.2, BG->GetBondLength(0,5) );
-  CPPUNIT_ASSERT_EQUAL( 1.5, BG->GetBondLength(5,5) );
+  CPPUNIT_ASSERT_EQUAL( 1.2, BG->GetBondLength(0,1) );
+  CPPUNIT_ASSERT_EQUAL( 1.5, BG->GetBondLength(1,1) );
 };
 
@@ -149 +141 @@
 };
 
+
+/********************************************** 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;
+};