Changes in src/unittests/AnalysisCorrelationToPointUnitTest.cpp [4eb4fe:3d9df5]

File:

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

src/unittests/AnalysisCorrelationToPointUnitTest.cpp

@@ -18 +18 @@
 
 #include "atom.hpp"
+#include "boundary.hpp"
 #include "element.hpp"
 #include "molecule.hpp"
 #include "linkedcell.hpp"
 #include "periodentafel.hpp"
-#include "World.hpp"
-
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
+#include "tesselation.hpp"
 
 /********************************************** Test classes **************************************/
@@ -40 +37 @@
   TestList = NULL;
   TestMolecule = NULL;
+  hydrogen = NULL;
+  tafel = NULL;
   pointmap = NULL;
   binmap = NULL;
   point = NULL;
 
+  // construct element
+  hydrogen = new element;
+  hydrogen->Z = 1;
+  strcpy(hydrogen->name, "hydrogen");
+  strcpy(hydrogen->symbol, "H");
+
+
+  // construct periodentafel
+  tafel = new periodentafel;
+  tafel->AddElement(hydrogen);
+
   // construct molecule (tetraeder of hydrogens)
-  hydrogen = World::getInstance().getPeriode()->FindElement(1);
-  CPPUNIT_ASSERT(hydrogen != NULL && "hydrogen element not found");
-  TestMolecule = World::getInstance().createMolecule();
-  Walker = World::getInstance().createAtom();
+  TestMolecule = new molecule(tafel);
+  Walker = new atom();
   Walker->type = hydrogen;
-  *Walker->node = Vector(1., 0., 1. );
+  Walker->node->Init(1., 0., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
-  *Walker->node = Vector(0., 1., 1. );
+  Walker->node->Init(0., 1., 1. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
-  *Walker->node = Vector(1., 1., 0. );
+  Walker->node->Init(1., 1., 0. );
   TestMolecule->AddAtom(Walker);
-  Walker = World::getInstance().createAtom();
+  Walker = new atom();
   Walker->type = hydrogen;
-  *Walker->node = Vector(0., 0., 0. );
+  Walker->node->Init(0., 0., 0. );
   TestMolecule->AddAtom(Walker);
 
@@ -68 +76 @@
   CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
 
-  TestList = World::getInstance().getMolecules();
+  TestList = new MoleculeListClass;
+  TestMolecule->ActiveFlag = true;
   TestList->insert(TestMolecule);
-  TestMolecule->ActiveFlag = true;
 
   // init point
@@ -89 +97 @@
     delete(binmap);
 
+  // remove
+  delete(TestList);
+  // note that all the atoms are cleaned by TestMolecule
   delete(point);
-  World::purgeInstance();
-  MemoryUsageObserver::purgeInstance();
-  logger::purgeInstance();
+  delete(tafel);
+  // note that element is cleaned by periodentafel
 };
 
@@ -130 +140 @@
 
 };
+
+/********************************************** 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;
+};