Changeset 454bc54 for src/Patterns/unittests

Timestamp:

Oct 30, 2015, 11:43:01 AM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

e24dde

Parents:

1b5188

git-author:

Frederik Heber <heber@…> (06/19/15 22:28:24)

git-committer:

Frederik Heber <heber@…> (10/30/15 11:43:01)

Message:

Added new pattern ObservedValue, contrary to Cacheable.

• essentially updates immediately and caches a value for off-line use, safe- guard with mutexes.
• added unit test for ObservedValue.
• factored threeNumbers stub out of CacheableUnitTest, also used the stub in ObservedValueUnitTest.
• we may now signOn() to Notification with a priority.
• Cacheable can also update now via notification channels not just for global updates.
• Observable can now also instantiate the channels directly if given a list. This was necessary as Cacheable or ObservedValue are instantiated in the constructor, too, and if listening to channels, these must already be present.
• FIX: Channels::addChannels() used NDEBUG wrong way round.
• ObservedValue::get() returns reference.

Location:

src/Patterns/unittests

Files:

• CacheableUnitTest.cpp (modified) (3 diffs)
• CacheableUnitTest.hpp (modified) (2 diffs)
• Makefile.am (modified) (7 diffs)
• ObservedValueUnitTest.cpp (added)
• ObservedValueUnitTest.hpp (added)
• stubs/Cacheable_threeNumbers.cpp (added)
• stubs/Cacheable_threeNumbers.hpp (added)
• stubs/ObservedValue_threeNumbers.cpp (added)
• stubs/ObservedValue_threeNumbers.hpp (added)

src/Patterns/unittests/CacheableUnitTest.cpp

@@ -28 +28 @@
 #include "CodePatterns/Cacheable.hpp"
 
+#include "stubs/Cacheable_threeNumbers.hpp"
+
 #ifdef HAVE_TESTRUNNER
 #include "UnitTestMain.hpp"
@@ -37 +39 @@
 CPPUNIT_TEST_SUITE_REGISTRATION( CacheableTest );
 
-class threeNumbers : public Observable {
-public:
-  int x;
-  int y;
-  int z;
-  Cacheable<int> sum;
-  bool hasRecalced;
-
-  void setX(int _x){
-    OBSERVE;
-    x = _x;
-  }
-
-  void setY
-  (int _y){
-    OBSERVE;
-    y = _y;
-  }
-
-  void setZ(int _z){
-    OBSERVE;
-    z = _z;
-  }
-
-  int calcSum(){
-    hasRecalced = true;
-    return x+y+z;
-  }
-
-  threeNumbers(int _x,int _y, int _z) :
-    Observable("threeNumbers"),
-    x(_x),y(_y),z(_z),
-    sum(this,boost::bind(&threeNumbers::calcSum,this),"sum"),
-    hasRecalced(false)
-  {}
-};
-
-
-
-
 void CacheableTest::setUp(){
-  numbers = new threeNumbers(1,2,3);
+  numbers = new Cacheable_threeNumbers(1,2,3);
+  Observable::channels_t ychannel(1, Cacheable_threeNumbers::YChanged);
+  YChange_numbers = new Cacheable_threeNumbers(1,2,3, ychannel);
 }
 
@@ -101 +65 @@
   CPPUNIT_ASSERT_EQUAL( true, numbers->hasRecalced);
 #endif
+
+  CPPUNIT_ASSERT_EQUAL( 6, *(YChange_numbers->sum));
+  CPPUNIT_ASSERT_EQUAL( true, YChange_numbers->hasRecalced);
+  YChange_numbers->hasRecalced=false;
+  YChange_numbers->setX(4);
+  CPPUNIT_ASSERT_EQUAL( false, YChange_numbers->hasRecalced);
+  CPPUNIT_ASSERT_EQUAL( 6, *(YChange_numbers->sum));
+  CPPUNIT_ASSERT_EQUAL( false, YChange_numbers->hasRecalced);
+  YChange_numbers->hasRecalced=false;
+  YChange_numbers->setY(4);
+  CPPUNIT_ASSERT_EQUAL( false, YChange_numbers->hasRecalced);
+  CPPUNIT_ASSERT_EQUAL( 11, *(YChange_numbers->sum));
+  CPPUNIT_ASSERT_EQUAL( true, YChange_numbers->hasRecalced);
+  YChange_numbers->hasRecalced=false;
+  CPPUNIT_ASSERT_EQUAL( 11, *(YChange_numbers->sum));
+#ifndef NO_CACHING
+  CPPUNIT_ASSERT_EQUAL( false, YChange_numbers->hasRecalced);
+#else
+  CPPUNIT_ASSERT_EQUAL( true, YChange_numbers->hasRecalced);
+#endif
 }

src/Patterns/unittests/CacheableUnitTest.hpp

@@ -18 +18 @@
 
 // stub classes
-class threeNumbers;
+class Cacheable_threeNumbers;
 
 class CacheableTest :  public CppUnit::TestFixture
@@ -31 +31 @@
 
   void doesRecalcTest();
-  threeNumbers *numbers;
+  Cacheable_threeNumbers *numbers;
+  Cacheable_threeNumbers *YChange_numbers;
 };
 

src/Patterns/unittests/Makefile.am

@@ -11 +11 @@
         ManipulableCloneUnitTest \
         ManipulablePrototypeFactoryUnitTest \
+        ObservedValueUnitTest \
         PrototypeFactoryUnitTest \
         RegistryUnitTest \
@@ -22 +23 @@
         ../Patterns/unittests/ManipulableCloneUnitTest.cpp \
         ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
+        ../Patterns/unittests/ObservedValueUnitTest.cpp \
         ../Patterns/unittests/PrototypeFactoryUnitTest.cpp \
         ../Patterns/unittests/RegistryUnitTest.cpp \
         ../Patterns/unittests/SingletonUnitTest.cpp \
+        ../Patterns/unittests/stubs/Cacheable_threeNumbers.cpp \
         ../Patterns/unittests/stubs/CloneStub.cpp \
         ../Patterns/unittests/stubs/CommonStub.cpp \
@@ -31 +34 @@
         ../Patterns/unittests/stubs/ManipulableCloneStub.cpp \
         ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
+        ../Patterns/unittests/stubs/ObservedValue_threeNumbers.cpp \
         ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
         ../Patterns/unittests/stubs/RegistryStub.cpp
@@ -41 +45 @@
         ../Patterns/unittests/ManipulableCloneUnitTest.hpp \
         ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
+        ../Patterns/unittests/ObservedValueUnitTest.hpp \
         ../Patterns/unittests/PrototypeFactoryUnitTest.hpp \
         ../Patterns/unittests/RegistryUnitTest.hpp \
         ../Patterns/unittests/SingletonUnitTest.hpp \
+        ../Patterns/unittests/stubs/Cacheable_threeNumbers.hpp \
         ../Patterns/unittests/stubs/CloneStub.hpp \
         ../Patterns/unittests/stubs/CommonStub.hpp \
@@ -57 +63 @@
         ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
         ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
+        ../Patterns/unittests/stubs/ObservedValue_threeNumbers.hpp \
         ../Patterns/unittests/stubs/PrototypeFactoryStub.def \
         ../Patterns/unittests/stubs/PrototypeFactoryStub.undef \
@@ -66 +73 @@
 CacheableUnitTest_SOURCES = UnitTestMain.cpp \
         ../Patterns/unittests/CacheableUnitTest.cpp \
-        ../Patterns/unittests/CacheableUnitTest.hpp
+        ../Patterns/unittests/CacheableUnitTest.hpp \
+        ../Patterns/unittests/stubs/Cacheable_threeNumbers.cpp \
+        ../Patterns/unittests/stubs/Cacheable_threeNumbers.hpp
 nodist_CacheableUnitTest_SOURCES = \
         $(top_srcdir)/src/CodePatterns/Cachable.hpp \
@@ -140 +149 @@
         $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory_impl.hpp
 ManipulablePrototypeFactoryUnitTest_LDADD = \
+        ../Helpers/libCodePatterns-Helpers-debug.la
+
+ObservedValueUnitTest_SOURCES = UnitTestMain.cpp \
+        ../Patterns/unittests/ObservedValueUnitTest.cpp \
+        ../Patterns/unittests/ObservedValueUnitTest.hpp \
+        ../Patterns/unittests/stubs/ObservedValue_threeNumbers.cpp \
+        ../Patterns/unittests/stubs/ObservedValue_threeNumbers.hpp
+nodist_ObservedValueUnitTest_SOURCES = \
+        $(top_srcdir)/src/CodePatterns/ObservedValue.hpp \
+        $(top_srcdir)/src/CodePatterns/Observer/Observer.hpp
+ObservedValueUnitTest_LDADD = \
+        ../Observer/libCodePatterns-Observer-debug.la \
+        ../Patterns/libCodePatterns-Patterns-debug.la \
         ../Helpers/libCodePatterns-Helpers-debug.la