Changes in src/unittests/atomsCalculationTest.cpp [57adc7:229e3c]

File:

• src/unittests/atomsCalculationTest.cpp (modified) (3 diffs)

src/unittests/atomsCalculationTest.cpp

@@ -24 +24 @@
 #include "atom.hpp"
 
+#ifdef HAVE_TESTRUNNER
+#include "UnitTestMain.hpp"
+#endif /*HAVE_TESTRUNNER*/
+
 // Registers the fixture into the 'registry'
 CPPUNIT_TEST_SUITE_REGISTRATION( atomsCalculationTest );
 
-// some stubs
-class AtomStub : public atom {
-public:
-  AtomStub(atomId_t _id) :
-  atom(),
-  id(_id),
-  manipulated(false)
-  {}
-
-  virtual atomId_t getId(){
-    return id;
-  }
-
-  virtual void doSomething(){
-    manipulated = true;
-  }
-
-  bool manipulated;
-private:
-  atomId_t id;
-};
-
 // set up and tear down
 void atomsCalculationTest::setUp(){
-  World::get();
+  World::getInstance();
   for(int i=0;i<ATOM_COUNT;++i){
-    atoms[i]= new AtomStub(i);
-    World::get()->registerAtom(atoms[i]);
+    atoms[i]= World::getInstance().createAtom();
+    atomIds[i]= atoms[i]->getId();
   }
 }
 void atomsCalculationTest::tearDown(){
-  World::destroy();
-  ActionRegistry::purgeRegistry();
+  World::purgeInstance();
+  ActionRegistry::purgeInstance();
 }
 
 // some helper functions
-static bool hasAll(std::vector<int> ids,int min, int max, std::set<int> excluded = std::set<int>()){
-  for(int i=min;i<max;++i){
-    if(!excluded.count(i)){
-      std::vector<int>::iterator iter;
+static bool hasAllIds(std::vector<atomId_t> atoms,atomId_t ids[ATOM_COUNT], std::set<atomId_t> excluded = std::set<atomId_t>()){
+  for(int i=0;i<ATOM_COUNT;++i){
+    atomId_t id = ids[i];
+    if(!excluded.count(id)){
+      std::vector<atomId_t>::iterator iter;
       bool res=false;
-      for(iter=ids.begin();iter!=ids.end();++iter){
-        res |= (*iter) == i;
+      for(iter=atoms.begin();iter!=atoms.end();++iter){
+        res |= (*iter) == id;
       }
       if(!res) {
-        cout << "Atom " << i << " missing in returned list" << endl;
+        cout << "Atom " << id << " missing in returned list" << endl;
         return false;
       }
@@ -80 +63 @@
 }
 
-static bool hasNoDuplicates(std::vector<int> ids){
-  std::set<int> found;
-  std::vector<int>::iterator iter;
+static bool hasNoDuplicates(std::vector<atomId_t> ids){
+  std::set<atomId_t> found;
+  std::vector<atomId_t>::iterator iter;
   for(iter=ids.begin();iter!=ids.end();++iter){
     int id = (*iter);
@@ -92 +75 @@
 }
 
-static void operation(atom* _atom){
-  AtomStub *atom = dynamic_cast<AtomStub*>(_atom);
-  assert(atom);
-  atom->doSomething();
-}
-
-
 void atomsCalculationTest::testCalculateSimple(){
-  AtomsCalculation<int> *calc = World::get()->calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms());
-  std::vector<int> allIds = (*calc)();
-  CPPUNIT_ASSERT(hasAll(allIds,0,ATOM_COUNT));
+  AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),"FOO",AllAtoms());
+  std::vector<atomId_t> allIds = (*calc)();
+  CPPUNIT_ASSERT(hasAllIds(allIds,atomIds));
   CPPUNIT_ASSERT(hasNoDuplicates(allIds));
 }
 
 void atomsCalculationTest::testCalculateExcluded(){
-  int excluded = ATOM_COUNT/2;
-  AtomsCalculation<int> *calc = World::get()->calcOnAtoms<int>(boost::bind(&atom::getId,_1),"FOO",AllAtoms() && !AtomById(excluded));
-  std::vector<int> allIds = (*calc)();
-  std::set<int> excluded_set;
+  atomId_t excluded = atomIds[ATOM_COUNT/2];
+  AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),"FOO",AllAtoms() && !AtomById(excluded));
+  std::vector<atomId_t> allIds = (*calc)();
+  std::set<atomId_t> excluded_set;
   excluded_set.insert(excluded);
-  CPPUNIT_ASSERT(hasAll(allIds,0,ATOM_COUNT,excluded_set));
+  CPPUNIT_ASSERT(hasAllIds(allIds,atomIds,excluded_set));
   CPPUNIT_ASSERT(hasNoDuplicates(allIds));
   CPPUNIT_ASSERT_EQUAL((size_t)(ATOM_COUNT-1),allIds.size());