Changes in src/unittests/DescriptorUnittest.cpp [46d958:7a1ce5]

File:

• src/unittests/DescriptorUnittest.cpp (modified) (8 diffs)

src/unittests/DescriptorUnittest.cpp

@@ -22 +22 @@
 CPPUNIT_TEST_SUITE_REGISTRATION( DescriptorUnittest );
 
+// some stubs
+class AtomStub : public atom {
+public:
+  AtomStub(int _id) :
+  atom(),
+  id(_id)
+  {}
+
+  virtual int getId(){
+    return id;
+  }
+
+private:
+  int id;
+};
+
+
 // set up and tear down
 void DescriptorUnittest::setUp(){
   World::get();
   for(int i=0;i<ATOM_COUNT;++i){
-    atoms[i]= World::get()->createAtom();
-    atomIds[i] = atoms[i]->getId();
+    atoms[i]= new AtomStub(i);
   }
 }
 void DescriptorUnittest::tearDown(){
   World::destroy();
+  for(int i=0;i<ATOM_COUNT;++i){
+    delete atoms[i];
+  }
 }
 
 // some helper functions
-bool hasAll(std::vector<atom*> atoms,int ids[ATOM_COUNT], std::set<int> excluded = std::set<int>()){
-  for(int i=0;i<ATOM_COUNT;++i){
-    int id = ids[i];
-    if(!excluded.count(id)){
+bool hasAll(std::vector<atom*> atoms,int min, int max, std::set<int> excluded = std::set<int>()){
+  for(int i=min;i<max;++i){
+    if(!excluded.count(i)){
       std::vector<atom*>::iterator iter;
       bool res=false;
       for(iter=atoms.begin();iter!=atoms.end();++iter){
-        res |= (*iter)->getId() == id;
+        res |= (*iter)->getId() == i;
       }
       if(!res) {
-        cout << "Atom " << id << " missing in returned list" << endl;
+        cout << "Atom " << i << " missing in returned list" << endl;
         return false;
       }
@@ -68 +86 @@
 void DescriptorUnittest::AtomBaseSetsTest(){
   std::vector<atom*> allAtoms = World::get()->getAllAtoms(AllAtoms());
-  CPPUNIT_ASSERT_EQUAL( true , hasAll(allAtoms,atomIds));
+  CPPUNIT_ASSERT_EQUAL( true , hasAll(allAtoms,0,ATOM_COUNT));
   CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicates(allAtoms));
 
@@ -77 +95 @@
   // test Atoms from boundaries and middle of the set
   atom* testAtom;
-  testAtom = World::get()->getAtom(AtomById(atomIds[0]));
-  CPPUNIT_ASSERT(testAtom);
-  CPPUNIT_ASSERT_EQUAL( atomIds[0], testAtom->getId());
-  testAtom = World::get()->getAtom(AtomById(atomIds[ATOM_COUNT/2]));
-  CPPUNIT_ASSERT(testAtom);
-  CPPUNIT_ASSERT_EQUAL( atomIds[ATOM_COUNT/2], testAtom->getId());
-  testAtom = World::get()->getAtom(AtomById(atomIds[ATOM_COUNT-1]));
-  CPPUNIT_ASSERT(testAtom);
-  CPPUNIT_ASSERT_EQUAL( atomIds[ATOM_COUNT-1], testAtom->getId());
+  testAtom = World::get()->getAtom(AtomById(0));
+  CPPUNIT_ASSERT_EQUAL( 0, testAtom->getId());
+  testAtom = World::get()->getAtom(AtomById(ATOM_COUNT/2));
+  CPPUNIT_ASSERT_EQUAL( ATOM_COUNT/2, testAtom->getId());
+  testAtom = World::get()->getAtom(AtomById(ATOM_COUNT-1));
+  CPPUNIT_ASSERT_EQUAL( ATOM_COUNT-1, testAtom->getId());
 
-  // find some ID that has not been created
-  int outsideId =-1;
-  bool res = false;
-  while(!res) {
-    ++outsideId;
-    res = true;
-    for(int i = 0; i < ATOM_COUNT; ++i){
-      res &= atomIds[i]!=outsideId;
-    }
-  }
   // test from outside of set
-  testAtom = World::get()->getAtom(AtomById(outsideId));
+  testAtom = World::get()->getAtom(AtomById(ATOM_COUNT));
   CPPUNIT_ASSERT(!testAtom);
 }
@@ -105 +110 @@
   {
     std::vector<atom*> testAtoms = World::get()->getAllAtoms(AllAtoms()||NoAtoms());
-    CPPUNIT_ASSERT_EQUAL( true , hasAll(testAtoms,atomIds));
+    CPPUNIT_ASSERT_EQUAL( true , hasAll(testAtoms,0,ATOM_COUNT));
     CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicates(testAtoms));
   }
@@ -111 +116 @@
   {
     std::vector<atom*> testAtoms = World::get()->getAllAtoms(NoAtoms()||AllAtoms());
-    CPPUNIT_ASSERT_EQUAL( true , hasAll(testAtoms,atomIds));
+    CPPUNIT_ASSERT_EQUAL( true , hasAll(testAtoms,0,ATOM_COUNT));
     CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicates(testAtoms));
   }
@@ -132 +137 @@
   {
     std::vector<atom*> testAtoms = World::get()->getAllAtoms(!NoAtoms());
-    CPPUNIT_ASSERT_EQUAL( true , hasAll(testAtoms,atomIds));
+    CPPUNIT_ASSERT_EQUAL( true , hasAll(testAtoms,0,ATOM_COUNT));
     CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicates(testAtoms));
   }
@@ -138 +143 @@
   // exclude and include some atoms
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(AllAtoms()&&(!AtomById(atomIds[ATOM_COUNT/2])));
+    std::vector<atom*> testAtoms = World::get()->getAllAtoms(AllAtoms()&&(!AtomById(ATOM_COUNT/2)));
     std::set<int> excluded;
-    excluded.insert(atomIds[ATOM_COUNT/2]);
-    CPPUNIT_ASSERT_EQUAL( true , hasAll(testAtoms,atomIds,excluded));
+    excluded.insert(ATOM_COUNT/2);
+    CPPUNIT_ASSERT_EQUAL( true , hasAll(testAtoms,0,ATOM_COUNT,excluded));
     CPPUNIT_ASSERT_EQUAL( true , hasNoDuplicates(testAtoms));
     CPPUNIT_ASSERT_EQUAL( (size_t)(ATOM_COUNT-1), testAtoms.size());
@@ -147 +152 @@
 
   {
-    std::vector<atom*> testAtoms = World::get()->getAllAtoms(NoAtoms()||(AtomById(atomIds[ATOM_COUNT/2])));
+    std::vector<atom*> testAtoms = World::get()->getAllAtoms(NoAtoms()||(AtomById(ATOM_COUNT/2)));
     CPPUNIT_ASSERT_EQUAL( (size_t)1, testAtoms.size());
-    CPPUNIT_ASSERT_EQUAL( atomIds[ATOM_COUNT/2], testAtoms[0]->getId());
+    CPPUNIT_ASSERT_EQUAL( ATOM_COUNT/2, testAtoms[0]->getId());
   }
 }