Changeset b760ac5 for src/Patterns/Observer/unittests

Timestamp:

Dec 13, 2011, 12:02:21 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

3324cf

Parents:

d85532

git-author:

Frederik Heber <heber@…> (12/02/11 13:13:44)

git-committer:

Frederik Heber <heber@…> (12/13/11 12:02:21)

Message:

Relay can now also relay notifications.

• NOTE: We do not yet notify the Observables, whose update() we combine, when the Relay is destroyed. They have to signOff before by themselves (or by some other means, e.g. be destroyed before.).

Location:

src/Patterns/Observer/unittests

Files:

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

src/Patterns/Observer/unittests/ObserverUnitTest.cpp

@@ -71 +71 @@
   RelayObservable = new RelayTest;
   RelayObserver = new RelayCountObserver(RelayObservable);
+
+  RelayNotifier = new RelayNotification;
+  RelayNotified = new RelayNotificationObserver(RelayObservable);
 }
 
@@ -84 +87 @@
   delete RelayObservable;
   delete RelayObserver;
+  delete RelayNotifier;
+  delete RelayNotified;
 
   delete observer1;
@@ -276 +281 @@
 }
 
+void ObserverTest::relayNotificationTest()
+{
+  observerLog().enableLogging();
+
+  // sign on some observables to the relay
+  notificationObservable->signOn(RelayNotifier, NotificationObservable::Operation1Notify);
+  notificationObservable->signOn(RelayNotifier, NotificationObservable::Operation2Notify);
+  notificationObservable->signOn(notificationObserver1, NotificationObservable::Operation1Notify);
+
+  RelayNotifier->signOn(RelayNotified, NotificationObservable::Operation1Notify);
+
+  // operation1
+  notificationObservable->operation1();
+  CPPUNIT_ASSERT(RelayNotified->wasNotified);
+  CPPUNIT_ASSERT(notificationObserver1->wasNotified);
+
+  RelayNotified->wasNotified=false;
+
+  // operation2
+  notificationObservable->operation2();
+  CPPUNIT_ASSERT(!RelayNotified->wasNotified);
+  CPPUNIT_ASSERT(notificationObserver1->wasNotified);
+
+  // signOff relay from 1 and operation1
+  notificationObserver1->wasNotified=false;
+  notificationObservable->signOff(RelayNotifier, NotificationObservable::Operation1Notify);
+
+  notificationObservable->operation1();
+  CPPUNIT_ASSERT(!RelayNotified->wasNotified);
+  CPPUNIT_ASSERT(notificationObserver1->wasNotified);
+
+  // test kill subject
+  delete RelayNotified;
+  RelayNotified = NULL; // delete in tearDown is allowed for NULL
+  notificationObservable->operation1();
+  delete notificationObservable;
+  notificationObservable = NULL; // delete in tearDown is allowed for NULL
+
+  observerLog().disableLogging();
+}
+
 void ObserverTest::CircleDetectionTest() {
   std::cout << std::endl << "Warning: the next test involved methods that can produce infinite loops." << std::endl;

src/Patterns/Observer/unittests/ObserverUnitTest.hpp

@@ -28 +28 @@
 class NotificationObservable;
 class RelayCountObserver;
+class RelayNotification;
+class RelayNotificationObserver;
 
 class ObserverTest :  public CppUnit::TestFixture
@@ -40 +42 @@
   CPPUNIT_TEST ( iteratorTest );
   CPPUNIT_TEST ( relayTest );
+  CPPUNIT_TEST ( relayNotificationTest );
   CPPUNIT_TEST ( CircleDetectionTest );
   CPPUNIT_TEST_SUITE_END();
@@ -55 +58 @@
   void iteratorTest();
   void relayTest();
+  void relayNotificationTest();
   void CircleDetectionTest();
 
@@ -76 +80 @@
   RelayTest *RelayObservable;
   RelayCountObserver *RelayObserver;
+  RelayNotification *RelayNotifier;
+  RelayNotificationObserver *RelayNotified;
 };
 

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

@@ -239 +239 @@
 {}
 
+/************ RelayNotification ***************/
+
+RelayNotification::RelayNotification() :
+    Relay(std::string("RelayTest"))
+{
+  Channels *OurChannel = new Channels();
+  NotificationChannels.insert( std::make_pair(this, OurChannel) );
+  OurChannel->addChannel(NotificationObservable::Operation1Notify);
+  OurChannel->addChannel(NotificationObservable::Operation2Notify);
+}
+
+RelayNotification::~RelayNotification()
+{}
+
 /************ RelayCountObserver ***************/
 
@@ -259 +273 @@
 }
 
+/********* RelayNotificationObserver ***********/
+
+RelayNotificationObserver::RelayNotificationObserver(const Observable * const _relay) :
+  Observer("RelayNotificationObserver"),
+  wasNotified(false),
+  relay(_relay)
+{}
+
+RelayNotificationObserver::~RelayNotificationObserver()
+{}
+
+void RelayNotificationObserver::update(Observable*){}
+void RelayNotificationObserver::subjectKilled(Observable*){}
+void RelayNotificationObserver::recieveNotification(Observable *publisher, Notification_ptr notification){
+  // check that we are not called by the relay itself
+  CPPUNIT_ASSERT(publisher != relay);
+  wasNotified = true;
+}
+

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

@@ -148 +148 @@
 };
 
+class RelayNotification : public Relay
+{
+public:
+  RelayNotification();
+  ~RelayNotification();
+private:
+};
+
+class RelayNotificationObserver : public Observer {
+public:
+  RelayNotificationObserver(const Observable * const _relay);
+  virtual ~RelayNotificationObserver();
+
+  void update(Observable*);
+  void subjectKilled(Observable*);
+  void recieveNotification(Observable *publisher, Notification_ptr notification);
+
+  bool wasNotified;
+private:
+  const Observable * const relay;
+};
+
 #endif /* OBSERVERSTUB_HPP_ */