Changeset 454bc54 for src/Patterns/unittests/CacheableUnitTest.cpp

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.

File:

• src/Patterns/unittests/CacheableUnitTest.cpp (modified) (3 diffs)

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
 }