Changeset 74e0f7 for src/Patterns/unittests/ObserverUnitTest.cpp

Timestamp:

Sep 1, 2011, 11:07:47 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

9e776f

Parents:

451f17

git-author:

Frederik Heber <heber@…> (09/01/11 11:02:49)

git-committer:

Frederik Heber <heber@…> (09/01/11 11:07:47)

Message:

Extended Observables by NotificationChannels member variable.

• new class Channels that aggregates Notifications.
• NOTIFY now just takes a channel number.
• may or may not be instantiated for a given Observable.
• Observable just needs to add enum of all desired channels and addChannel on each of these.
• ObserverUnitTest has been adapted.

File:

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

src/Patterns/unittests/ObserverUnitTest.cpp

@@ -61 +61 @@
   observer4 = new UpdateCountObserver();
 
-  notificationObserver1 = new NotificationObserver(notificationObservable->notification1);
-  notificationObserver2 = new NotificationObserver(notificationObservable->notification2);
+  notificationObserver1 = new NotificationObserver(
+      notificationObservable->getChannel(NotificationObservable::Operation1Notify));
+  notificationObserver2 = new NotificationObserver(
+      notificationObservable->getChannel(NotificationObservable::Operation2Notify));
 }
 
@@ -157 +159 @@
 
 void ObserverTest::doesNotifyTest(){
+  CPPUNIT_ASSERT_EQUAL(
+      (size_t)NotificationObservable::Operation1Notify,
+      notificationObservable->getChannel(NotificationObservable::Operation1Notify)->getChannelNo());
+  CPPUNIT_ASSERT_EQUAL(
+      (size_t)NotificationObservable::Operation2Notify,
+      notificationObservable->getChannel(NotificationObservable::Operation2Notify)->getChannelNo());
   notificationObservable->signOn(notificationObserver1,
-                                 notificationObservable->notification1);
+                                 notificationObservable->getChannel(NotificationObservable::Operation1Notify));
   notificationObservable->signOn(notificationObserver2,
-                                 notificationObservable->notification2);
+                                 notificationObservable->getChannel(NotificationObservable::Operation2Notify));
 
   notificationObservable->operation1();