Changeset 1c291d for src/Observer/unittests/ObserverUnitTest.cpp

Timestamp:

Mar 18, 2013, 6:29:41 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

3f30cc

Parents:

b9273a

git-author:

Frederik Heber <heber@…> (03/18/13 18:22:47)

git-committer:

Frederik Heber <heber@…> (03/18/13 18:29:41)

Message:

Channels and Notifications pass on subjectKilled().

• if we only sign on to a single notification channel, we miss on subjectKilled() completely. Hence, we have to chance of properly signing off again or, at least, to know that we must not anymore.
• Hence, Observable's dstor now calls subjectKilled() on its Channels which passes the call on to all its Notifications that in turn use the subjectKilled() slot of their targets along with the passed-through Observable instance.
• also added observerLog verbosity when signing on/off to channels.
• explained this in header documentation of Observable, Channels, and Notification.
• TESTFIX: ObserverUnitTest did not properly signOff() before deleting instances in relayNotificationTest().

File:

• src/Observer/unittests/ObserverUnitTest.cpp (modified) (2 diffs)

src/Observer/unittests/ObserverUnitTest.cpp

@@ -298 +298 @@
 
   RelayNotified->wasNotified=false;
+  notificationObserver1->wasNotified=false;
 
   // operation2
   notificationObservable->operation2();
   CPPUNIT_ASSERT(!RelayNotified->wasNotified);
-  CPPUNIT_ASSERT(notificationObserver1->wasNotified);
+  CPPUNIT_ASSERT(!notificationObserver1->wasNotified);
 
   // signOff relay from 1 and operation1
@@ -313 +314 @@
 
   // test kill subject
+  RelayNotifier->signOff(RelayNotified, NotificationObservable::Operation1Notify);
   delete RelayNotified;
   RelayNotified = NULL; // delete in tearDown is allowed for NULL
   notificationObservable->operation1();
+  notificationObservable->signOff(RelayNotifier, NotificationObservable::Operation2Notify);
   delete notificationObservable;
   notificationObservable = NULL; // delete in tearDown is allowed for NULL