Changes in src/unittests/ObserverTest.cpp [033a05:7a176b]

File:

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

src/unittests/ObserverTest.cpp

@@ -11 +11 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
+#include <set>
 
 #include "Patterns/Observer.hpp"
+#include "Patterns/ObservedIterator.hpp"
 #include "Helpers/Assert.hpp"
 
@@ -31 +33 @@
 public:
   UpdateCountObserver() :
+    Observer("UpdateCountObserver"),
     updates(0)
   {};
@@ -43 +46 @@
 class SimpleObservable : public Observable {
 public:
+  SimpleObservable() :
+    Observable("SimpleObservable")
+  {}
+
   void changeMethod() {
     OBSERVE;
@@ -52 +59 @@
 class CallObservable : public Observable {
 public:
+  CallObservable() :
+    Observable("CallObservable")
+  {}
+
   void changeMethod1() {
     OBSERVE;
@@ -68 +79 @@
 class BlockObservable : public Observable {
 public:
+  BlockObservable() :
+    Observable("BlockObservable")
+  {}
+
   void changeMethod1(){
     OBSERVE;
@@ -102 +117 @@
 class SuperObservable : public Observable {
 public:
-  SuperObservable(){
+  SuperObservable():
+    Observable("SuperObservable")
+  {
     subObservable = new SimpleObservable();
     subObservable->signOn(this);
@@ -121 +138 @@
 public:
   NotificationObservable() :
-      notification1(new Notification(this)),
-      notification2(new Notification(this))
+    Observable("NotificationObservable"),
+    notification1(new Notification(this)),
+    notification2(new Notification(this))
   {}
 
@@ -147 +165 @@
 public:
   NotificationObserver(Notification_ptr notification) :
+    Observer("NotificationObserver"),
     requestedNotification(notification),
     wasNotified(false)
@@ -162 +181 @@
   bool wasNotified;
 };
+
+class ObservableCollection : public Observable {
+public:
+  typedef std::set<SimpleObservable*> set;
+  typedef ObservedIterator<set> iterator;
+  typedef set::const_iterator const_iterator;
+
+  ObservableCollection(int _num) :
+    Observable("ObservableCollection"),
+    num(_num)
+  {
+    for(int i=0; i<num; ++i){
+      SimpleObservable *content = new SimpleObservable();
+      content->signOn(this);
+      theSet.insert(content);
+    }
+  }
+
+  ~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;
+};
+
 
 /******************* actuall tests ***************/
@@ -173 +231 @@
   blockObservable = new BlockObservable();
   notificationObservable = new NotificationObservable();
+  collection = new ObservableCollection(5);
 
   observer1 = new UpdateCountObserver();
@@ -181 +240 @@
   notificationObserver1 = new NotificationObserver(notificationObservable->notification1);
   notificationObserver2 = new NotificationObserver(notificationObservable->notification2);
-
 }
 
@@ -191 +249 @@
   delete blockObservable;
   delete notificationObservable;
+  delete collection;
 
   delete observer1;
@@ -279 +338 @@
 }
 
+void ObserverTest::iteratorTest(){
+  int i = 0;
+  // test the general iterator methods
+  for(ObservableCollection::iterator iter=collection->begin(); iter!=collection->end();++iter){
+    CPPUNIT_ASSERT(i< collection->num);
+    i++;
+  }
+
+  i=0;
+  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)
+    ObservableCollection::iterator iter;
+    for(iter=collection->begin(); iter!=collection->end(); ++iter){
+      (*iter)->changeMethod();
+    }
+    // At this point no change should have been propagated
+    CPPUNIT_ASSERT_EQUAL( 0, observer1->updates);
+  }
+  // After the Iterator has died the propagation should take place
+  CPPUNIT_ASSERT_EQUAL( 1, observer1->updates);
+
+  // when using a const_iterator no changes should be propagated
+  for(ObservableCollection::const_iterator iter = collection->begin(); iter!=collection->end();++iter);
+  CPPUNIT_ASSERT_EQUAL( 1, observer1->updates);
+  collection->signOff(observer1);
+}
+
 void ObserverTest::CircleDetectionTest() {
   cout << endl << "Warning: the next test involved methods that can produce infinite loops." << endl;
@@ -289 +382 @@
   // make this Observable its own subject. NEVER DO THIS IN ACTUAL CODE
   simpleObservable1->signOn(simpleObservable1);
+#ifndef NDEBUG
   CPPUNIT_ASSERT_THROW(simpleObservable1->changeMethod(),Assert::AssertionFailure);
+#else
+  simpleObservable1->changeMethod();
+#endif
 
   // more complex test
@@ -295 +392 @@
   simpleObservable1->signOn(simpleObservable2);
   simpleObservable2->signOn(simpleObservable1);
+#ifndef NDEBUG
   CPPUNIT_ASSERT_THROW(simpleObservable1->changeMethod(),Assert::AssertionFailure);
+#else
+  simpleObservable1->changeMethod();
+#endif
+
+
   simpleObservable1->signOff(simpleObservable2);
   simpleObservable2->signOff(simpleObservable1);