Changeset 40f2e6 for src/Patterns/Observer/unittests

Timestamp:

Dec 13, 2011, 9:46:12 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

2c11c1

Parents:

75d156

git-author:

Frederik Heber <heber@…> (12/02/11 10:05:36)

git-committer:

Frederik Heber <heber@…> (12/13/11 09:46:12)

Message:

Observable::signOn() now just needs channelno (enum) and not Notification_ptr.

• this makes life a bit easier and allows for relaying notifications.

Location:

src/Patterns/Observer/unittests

Files:

• ObserverUnitTest.cpp (modified) (3 diffs)
• stubs/ObserverStub.cpp (modified) (1 diff)

src/Patterns/Observer/unittests/ObserverUnitTest.cpp

@@ -160 +160 @@
 
 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->getChannel(NotificationObservable::Operation1Notify));
-  notificationObservable->signOn(notificationObserver2,
-                                 notificationObservable->getChannel(NotificationObservable::Operation2Notify));
+  notificationObservable->signOn(notificationObserver1, NotificationObservable::Operation1Notify);
+  notificationObservable->signOn(notificationObserver2, NotificationObservable::Operation2Notify);
 
   notificationObservable->operation1();
@@ -180 +172 @@
   CPPUNIT_ASSERT(!notificationObserver1->wasNotified);
   CPPUNIT_ASSERT(notificationObserver2->wasNotified);
-
 }
 
@@ -237 +228 @@
   CPPUNIT_ASSERT_EQUAL( 1, observer2->updates);
 
-
   obsset->signOff(observer1);
   obsmap->signOff(observer2);

src/Patterns/Observer/unittests/stubs/ObserverStub.cpp

@@ -170 +170 @@
 void NotificationObserver::subjectKilled(Observable*){}
 void NotificationObserver::recieveNotification(Observable *publisher, Notification_ptr notification){
-  ASSERT(requestedNotification==notification,"Notification received that was not requested");
+  CPPUNIT_ASSERT(requestedNotification==notification);
   wasNotified = true;
 }