Changeset 74e0f7 for src/Patterns/unittests

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.

Location:

src/Patterns/unittests

Files:

• ObserverUnitTest.cpp (modified) (2 diffs)
• stubs/ObserverStub.cpp (modified) (3 diffs)
• stubs/ObserverStub.hpp (modified) (6 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();

src/Patterns/unittests/stubs/ObserverStub.cpp

@@ -31 +31 @@
 {};
 
+UpdateCountObserver::~UpdateCountObserver()
+{}
+
 void UpdateCountObserver::update(Observable *publisher){
   updates++;
@@ -127 +130 @@
 
 NotificationObservable::NotificationObservable() :
-  Observable("NotificationObservable"),
-  notification1(new Notification(this)),
-  notification2(new Notification(this))
-{}
-
-NotificationObservable::~NotificationObservable(){
-  delete notification1;
-  delete notification2;
+  Observable("NotificationObservable")
+{
+  NotificationChannels = new Channels(this);
+  NotificationChannels->addChannel(Operation1Notify);
+  NotificationChannels->addChannel(Operation2Notify);
+}
+
+NotificationObservable::~NotificationObservable()
+{
+  delete NotificationChannels;
 }
 
 void NotificationObservable::operation1(){
   OBSERVE;
-  NOTIFY(notification1);
+  NOTIFY(Operation1Notify);
 }
 
 void NotificationObservable::operation2(){
   OBSERVE;
-  NOTIFY(notification2);
+  NOTIFY(Operation2Notify);
 }
 
@@ -153 +158 @@
   requestedNotification(notification),
   wasNotified(false)
+{}
+
+NotificationObserver::~NotificationObserver()
 {}
 

src/Patterns/unittests/stubs/ObserverStub.hpp

@@ -15 +15 @@
 public:
   UpdateCountObserver();
+  virtual ~UpdateCountObserver();
+
   void update(Observable *publisher);
   void subjectKilled(Observable *publisher);
@@ -52 +54 @@
 public:
   SuperObservable();
-  ~SuperObservable();
+  virtual ~SuperObservable();
 
   void changeMethod();
@@ -62 +64 @@
 public:
   NotificationObservable();
-  ~NotificationObservable();
+  virtual ~NotificationObservable();
+
+  enum NotificationType {
+    Operation1Notify = 0,
+    Operation2Notify = 1
+  };
 
   void operation1();
   void operation2();
-
-  Notification_ptr notification1;
-  Notification_ptr notification2;
 };
 
@@ -74 +78 @@
 public:
   NotificationObserver(Notification_ptr notification);
+  virtual ~NotificationObserver();
 
   void update(Observable*);
@@ -91 +96 @@
 
   ObservableSet(int _num);
-  ~ObservableSet();
+  virtual ~ObservableSet();
 
   iterator begin();
@@ -109 +114 @@
 
   ObservableMap(int _num);
-  ~ObservableMap();
+  virtual ~ObservableMap();
 
   iterator begin();