Changeset 9e619e for src/Observer

Timestamp:

Dec 13, 2015, 5:37:05 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

afbe20

Parents:

ba6aa5

git-author:

Frederik Heber <heber@…> (12/13/15 17:01:34)

git-committer:

Frederik Heber <heber@…> (12/13/15 17:37:05)

Message:

Added UnobservedIterator to allow for an "unobserved" ObservedContainer.

• By default ObservedContainer is observed.

Location:

src/Observer

Files:

• Makefile.am (modified) (1 diff)
• unittests/ObservedContainerUnitTest.cpp (modified) (3 diffs)
• unittests/ObservedContainerUnitTest.hpp (modified) (2 diffs)

src/Observer/Makefile.am

@@ -32 +32 @@
         $(top_srcdir)/src/CodePatterns/Observer/ObservedIterator.hpp \
         $(top_srcdir)/src/CodePatterns/Observer/ObservedContainer_impl.hpp \
+        $(top_srcdir)/src/CodePatterns/Observer/UnobservedIterator.hpp \
         $(top_srcdir)/src/CodePatterns/Observer/Relay.hpp \
         $(top_srcdir)/src/CodePatterns/Observer/Zombie.hpp

src/Observer/unittests/ObservedContainerUnitTest.cpp

@@ -30 +30 @@
 #include "CodePatterns/Observer/ObservedContainer.hpp"
 #include "CodePatterns/Observer/ObservedContainer_impl.hpp"
+#include "CodePatterns/Observer/ObservedIterator.hpp"
+#include "CodePatterns/Observer/UnobservedIterator.hpp"
 
 #include "ObservedContainerUnitTest.hpp"
@@ -56 +58 @@
 void ObservedContainerTest::IteratorMapTest()
 {
-  typedef ObservedContainer< std::map<int, int> > OC;
+  typedef ObservedContainer< std::map<int, int>, ObservedIterator<std::map<int, int> > > OC;
   OC OContainer(simpleObservable1);
   int i;
@@ -121 +123 @@
 }
 
+void ObservedContainerTest::IteratorMapNotObservedTest()
+{
+  typedef ObservedContainer< std::map<int, int>, UnobservedIterator<std::map<int, int> > > OC;
+  OC OContainer(simpleObservable1);
+  int i;
+
+  OContainer.insert( std::pair<int,int> (1,1) );
+  OContainer.insert( std::pair<int,int> (2,2) );
+
+  i=0;
+  for (OC::internal_iterator iter = OContainer.begin_internal(); iter != OContainer.end_internal(); ++iter) {
+    i++;
+    CPPUNIT_ASSERT_EQUAL(i, iter->first);
+    CPPUNIT_ASSERT_EQUAL(i, iter->second);
+  }
+  CPPUNIT_ASSERT_EQUAL(i,2);
+
+  i=0;
+  for (OC::iterator iter = OContainer.begin(); iter != OContainer.end(); ++iter) {
+    i++;
+    CPPUNIT_ASSERT_EQUAL(i, iter->first);
+    CPPUNIT_ASSERT_EQUAL(i, iter->second);
+  }
+  CPPUNIT_ASSERT_EQUAL(i,2);
+
+  i=0;
+  for (OC::const_iterator iter = OContainer.begin(); iter != OContainer.end(); ++iter) {
+    i++;
+    CPPUNIT_ASSERT_EQUAL(i, iter->first);
+    CPPUNIT_ASSERT_EQUAL(i, iter->second);
+  }
+  CPPUNIT_ASSERT_EQUAL(i,2);
+
+  i=3;
+  for (OC::reverse_internal_iterator iter = OContainer.rbegin_internal(); iter != OContainer.rend_internal(); ++iter) {
+    i--;
+    CPPUNIT_ASSERT_EQUAL(i, iter->first);
+    CPPUNIT_ASSERT_EQUAL(i, iter->second);
+  }
+  CPPUNIT_ASSERT_EQUAL(i,1);
+
+  /* @todo TODO: Check whether dereferencing ObservedContainer::reverse_iterator
+   *  is working now.
+   * I am quite convinced that the reason for us having to use a
+   * const_reverse_iterator below is in stl_iterator.h, where operator* is
+   * implemented with a temporary _Iterator that is returned, i.e. a
+   * temporary object and we are not allowed to dereference from this
+   * temporary object.
+   */
+  i=3;
+  for (OC::reverse_iterator iter = OContainer.rbegin(); iter != OContainer.rend(); ++iter) {
+    i--;
+    OC::const_reverse_iterator helper = iter;
+    CPPUNIT_ASSERT_EQUAL(i, helper->first);
+    CPPUNIT_ASSERT_EQUAL(i, helper->second);
+  }
+  CPPUNIT_ASSERT_EQUAL(i,1);
+
+  i=3;
+  for (OC::const_reverse_iterator iter = OContainer.rbegin(); iter != OContainer.rend(); ++iter) {
+    i--;
+    CPPUNIT_ASSERT_EQUAL(i, iter->first);
+    CPPUNIT_ASSERT_EQUAL(i, iter->second);
+  }
+  CPPUNIT_ASSERT_EQUAL(i,1);
+}
+
 // @todo TODO: Check whether ObservedContainer with sets not maps is working now
 void ObservedContainerTest::IteratorSetTest()
 {
-//  typedef ObservedContainer< std::set<int> > OC;
+//  typedef ObservedContainer< std::set<int>, ObservedIterator<std::set<int> > > OC;
 //  OC OContainer(simpleObservable1);
 //  int i;

src/Observer/unittests/ObservedContainerUnitTest.hpp

@@ -31 +31 @@
   CPPUNIT_TEST_SUITE( ObservedContainerTest ) ;
   CPPUNIT_TEST ( IteratorMapTest );
+  CPPUNIT_TEST ( IteratorMapNotObservedTest );
   CPPUNIT_TEST ( IteratorSetTest );
   CPPUNIT_TEST_SUITE_END();
@@ -39 +40 @@
 
   void IteratorMapTest();
+  void IteratorMapNotObservedTest();
   void IteratorSetTest();