From a4597acb6bb91099b7176d2bd51c79d114c2ed6b Mon Sep 17 00:00:00 2001 From: coderhyme Date: Thu, 7 Apr 2016 18:33:15 -0700 Subject: [PATCH] Fixed failed tests of RE cache module. The cause was calling a method not mocked. Change-Id: I74e20d34d793085e9888f634bb1a5e060f09e0ee Signed-off-by: coderhyme Reviewed-on: https://gerrit.iotivity.org/gerrit/7709 Reviewed-by: JungYong KIM Tested-by: jenkins-iotivity Reviewed-by: Uze Choi (cherry picked from commit 4fa510cdc72a7412fcae654d031b7d3bff9b1800) Reviewed-on: https://gerrit.iotivity.org/gerrit/7725 --- .../src/resourceCache/unittests/DataCacheTest.cpp | 2 ++ .../src/resourceCache/unittests/ResourceCacheTest.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp index ec7cd1c..41029b7 100644 --- a/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp +++ b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp @@ -51,6 +51,8 @@ class DataCacheTest : public TestWithMock { TestWithMock::SetUp(); pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource *) {}); + + mocks.OnCall(pResource.get(), PrimitiveResource::isObservable).Return(false); cacheHandler.reset(new DataCache()); cb = ([](std::shared_ptr, const RCSResourceAttributes &)->OCStackResult {return OC_STACK_OK;}); } diff --git a/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp index 14f3f40..5bf9f74 100644 --- a/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp +++ b/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp @@ -41,6 +41,7 @@ class ResourceCacheManagerTest : public TestWithMock TestWithMock::SetUp(); cacheInstance = ResourceCacheManager::getInstance(); pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource *) {}); + mocks.OnCall(pResource.get(), PrimitiveResource::isObservable).Return(false); cb = ([](std::shared_ptr, const RCSResourceAttributes &)->OCStackResult {return OC_STACK_OK;}); } -- 2.7.4