Changeset d85532 for src/Patterns/Observer/unittests

Timestamp:

Dec 13, 2011, 12:00:30 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

b760ac5

Parents:

2c11c1

git-author:

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

git-committer:

Frederik Heber <heber@…> (12/13/11 12:00:30)

Message:

Added unit test on Relay.

• added new stubs to ObserverStub implementing Relay.
• Relay is friend of Notification.

Location:

src/Patterns/Observer/unittests

Files:

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

src/Patterns/Observer/unittests/ObserverUnitTest.cpp

@@ -68 +68 @@
   notificationObserver2 = new NotificationObserver(
       notificationObservable->getChannel(NotificationObservable::Operation2Notify));
+
+  RelayObservable = new RelayTest;
+  RelayObserver = new RelayCountObserver(RelayObservable);
 }
 
@@ -79 +82 @@
   delete obsset;
   delete obsmap;
+  delete RelayObservable;
+  delete RelayObserver;
 
   delete observer1;
@@ -237 +242 @@
 }
 
+void ObserverTest::relayTest()
+{
+  // sign on some observables to the relay
+  simpleObservable1->signOn(RelayObservable);
+  simpleObservable2->signOn(RelayObservable);
+
+  // sign on an observer to the relay
+  RelayObservable->signOn(RelayObserver);
+  simpleObservable1->signOn(observer1);
+
+  // check that all is zero
+  CPPUNIT_ASSERT_EQUAL( 0, RelayObserver->updates );
+  CPPUNIT_ASSERT_EQUAL( 0, observer1->updates );
+
+  // signal update
+  simpleObservable1->changeMethod();
+
+  // check that both the change
+  // (and RelayObserver checks being called correctly)
+  CPPUNIT_ASSERT_EQUAL( 1, RelayObserver->updates );
+  CPPUNIT_ASSERT_EQUAL( 1, observer1->updates );
+
+  // signal update through relay only
+  simpleObservable2->changeMethod();
+
+  // check that only one got the change
+  CPPUNIT_ASSERT_EQUAL( 2, RelayObserver->updates );
+  CPPUNIT_ASSERT_EQUAL( 1, observer1->updates );
+
+  // check on signOff
+  simpleObservable1->signOff(RelayObservable);
+  simpleObservable1->signOff(observer1);
+}
+
 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

@@ -24 +24 @@
 class ObservableSet;
 class ObservableMap;
+class RelayObservable;
 class BlockObservable;
 class NotificationObservable;
+class RelayCountObserver;
 
 class ObserverTest :  public CppUnit::TestFixture
@@ -37 +39 @@
   CPPUNIT_TEST ( doesReportTest );
   CPPUNIT_TEST ( iteratorTest );
+  CPPUNIT_TEST ( relayTest );
   CPPUNIT_TEST ( CircleDetectionTest );
   CPPUNIT_TEST_SUITE_END();
@@ -51 +54 @@
   void doesReportTest();
   void iteratorTest();
+  void relayTest();
   void CircleDetectionTest();
 
@@ -70 +74 @@
   ObservableSet *obsset;
   ObservableMap *obsmap;
-
+  RelayTest *RelayObservable;
+  RelayCountObserver *RelayObserver;
 };
 

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

@@ -230 +230 @@
 }
 
+/****************** Relay *********************/
+
+RelayTest::RelayTest() :
+    Relay(std::string("RelayTest"))
+{}
+
+RelayTest::~RelayTest()
+{}
+
+/************ RelayCountObserver ***************/
+
+RelayCountObserver::RelayCountObserver(const Observable * const _relay) :
+    Observer("RelayCountObserver"),
+    updates(0),
+    relay(_relay)
+{}
+
+RelayCountObserver::~RelayCountObserver()
+{}
+
+void RelayCountObserver::update(Observable *publisher){
+  // check that we are not called by the relay itself
+  CPPUNIT_ASSERT(publisher != relay);
+  updates++;
+}
+
+void RelayCountObserver::subjectKilled(Observable *publisher) {
+}
+

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

@@ -12 +12 @@
 #include "Observer/Observable.hpp"
 #include "Observer/ObservedIterator.hpp"
+#include "Observer/Relay.hpp"
 
 class UpdateCountObserver : public Observer {
@@ -126 +127 @@
 };
 
+class RelayTest : public Relay
+{
+public:
+  RelayTest();
+  ~RelayTest();
+private:
+};
+
+class RelayCountObserver : public Observer {
+public:
+  RelayCountObserver(const Observable * const relay);
+  virtual ~RelayCountObserver();
+
+  void update(Observable *publisher);
+  void subjectKilled(Observable *publisher);
+
+  int updates;
+private:
+  const Observable * const relay;
+};
 
 #endif /* OBSERVERSTUB_HPP_ */