Changes in src/unittests/ObserverTest.cpp [8774c5:7a176b]

File:

• src/unittests/ObserverTest.cpp (modified) (10 diffs)

src/unittests/ObserverTest.cpp

@@ -182 +182 @@
 };
 
-class ObservableSet : public Observable {
+class ObservableCollection : public Observable {
 public:
   typedef std::set<SimpleObservable*> set;
@@ -188 +188 @@
   typedef set::const_iterator const_iterator;
 
-  ObservableSet(int _num) :
+  ObservableCollection(int _num) :
     Observable("ObservableCollection"),
     num(_num)
@@ -199 +199 @@
   }
 
-  ~ObservableSet(){
+  ~ObservableCollection(){
     set::iterator iter;
     for(iter=theSet.begin(); iter!=theSet.end(); ++iter ){
       delete (*iter);
-    }
-  }
-
-  iterator begin(){
-    return iterator(theSet.begin(),this);
-  }
-
-  iterator end(){
-    return iterator(theSet.end(),this);
-  }
-
-  const int num;
-
-private:
-  set theSet;
-};
-
-class ObservableMap : public Observable {
-public:
-  typedef std::map<int,SimpleObservable*> set;
-  typedef ObservedIterator<set> iterator;
-  typedef set::const_iterator const_iterator;
-
-  ObservableMap(int _num) :
-    Observable("ObservableCollection"),
-    num(_num)
-  {
-    for(int i=0; i<num; ++i){
-      SimpleObservable *content = new SimpleObservable();
-      content->signOn(this);
-      theSet.insert(make_pair(i,content));
-    }
-  }
-
-  ~ObservableMap(){
-    set::iterator iter;
-    for(iter=theSet.begin(); iter!=theSet.end(); ++iter ){
-      delete iter->second;
     }
   }
@@ -269 +231 @@
   blockObservable = new BlockObservable();
   notificationObservable = new NotificationObservable();
-  obsset = new ObservableSet(5);
-  obsmap = new ObservableMap(5);
+  collection = new ObservableCollection(5);
 
   observer1 = new UpdateCountObserver();
@@ -288 +249 @@
   delete blockObservable;
   delete notificationObservable;
-  delete obsset;
-  delete obsmap;
+  delete collection;
 
   delete observer1;
@@ -308 +268 @@
   simpleObservable2->signOn(observer4);
 
-  CPPUNIT_ASSERT_EQUAL( 0, observer1->updates );
-  CPPUNIT_ASSERT_EQUAL( 0, observer2->updates );
-  CPPUNIT_ASSERT_EQUAL( 0, observer3->updates );
-  CPPUNIT_ASSERT_EQUAL( 0, observer4->updates );
-
-
   simpleObservable1->changeMethod();
   CPPUNIT_ASSERT_EQUAL( 1, observer1->updates );
@@ -338 +292 @@
 void ObserverTest::doesBlockUpdateTest() {
   callObservable->signOn(observer1);
-  CPPUNIT_ASSERT_EQUAL( 0, observer1->updates );
 
   callObservable->changeMethod1();
@@ -358 +311 @@
   CPPUNIT_ASSERT_EQUAL( 2, observer1->updates );
   CPPUNIT_ASSERT_EQUAL( 2, observer2->updates );
-}
-
-void ObserverTest::outsideLockTest(){
-  callObservable->signOn(observer1);
-  CPPUNIT_ASSERT_EQUAL( 0, observer1->updates );
-
-  {
-    LOCK_OBSERVABLE(*callObservable);
-    CPPUNIT_ASSERT_EQUAL( 0, observer1->updates );
-  }
-  // lock is gone now, observer should have notified
-  CPPUNIT_ASSERT_EQUAL( 1, observer1->updates );
 }
 
@@ -400 +341 @@
   int i = 0;
   // test the general iterator methods
-  for(ObservableSet::iterator iter=obsset->begin(); iter!=obsset->end();++iter){
-    CPPUNIT_ASSERT(i< obsset->num);
+  for(ObservableCollection::iterator iter=collection->begin(); iter!=collection->end();++iter){
+    CPPUNIT_ASSERT(i< collection->num);
     i++;
   }
 
   i=0;
-  for(ObservableSet::const_iterator iter=obsset->begin(); iter!=obsset->end();++iter){
-    CPPUNIT_ASSERT(i<obsset->num);
-    i++;
-  }
-
-  obsset->signOn(observer1);
+  for(ObservableCollection::const_iterator iter=collection->begin(); iter!=collection->end();++iter){
+    CPPUNIT_ASSERT(i<collection->num);
+    i++;
+  }
+
+  collection->signOn(observer1);
   {
     // we construct this out of the loop, so the iterator dies at the end of
     // the scope and not the end of the loop (allows more testing)
-    ObservableSet::iterator iter;
-    for(iter=obsset->begin(); iter!=obsset->end(); ++iter){
+    ObservableCollection::iterator iter;
+    for(iter=collection->begin(); iter!=collection->end(); ++iter){
       (*iter)->changeMethod();
     }
@@ -426 +367 @@
 
   // when using a const_iterator no changes should be propagated
-  for(ObservableSet::const_iterator iter = obsset->begin(); iter!=obsset->end();++iter);
+  for(ObservableCollection::const_iterator iter = collection->begin(); iter!=collection->end();++iter);
   CPPUNIT_ASSERT_EQUAL( 1, observer1->updates);
-
-  // we need to test the operator-> as well
-  obsmap->signOn(observer2);
-  {
-    // we construct this out of the loop, so the iterator dies at the end of
-    // the scope and not the end of the loop (allows more testing)
-    ObservableMap::iterator iter;
-    for(iter=obsmap->begin(); iter!=obsmap->end(); ++iter){
-      iter->second->changeMethod();
-    }
-    // At this point no change should have been propagated
-    CPPUNIT_ASSERT_EQUAL( 0, observer2->updates);
-  }
-  // After the Iterator has died the propagation should take place
-  CPPUNIT_ASSERT_EQUAL( 1, observer2->updates);
-
-
-  obsset->signOff(observer1);
-  obsmap->signOff(observer2);
+  collection->signOff(observer1);
 }