projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d93d848)
Update ResourceCache Unittest code files
authorYounghyunJoo <yh_.joo@samsung.com>
Mon, 27 Jul 2015 07:41:22 +0000 (16:41 +0900)
committerMadan Lanka <lanka.madan@samsung.com>
Mon, 27 Jul 2015 08:32:22 +0000 (08:32 +0000)
Change-Id: Ic5dab8f0f90fad94f464c68b5ae608415547ed2b
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1931
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp patch | blob | history
service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp patch | blob | history

diff --git a/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp
index c93fe6b..3dca911 100644 (file)
--- a/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp
+++ b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp
@@ -58,7 +58,7 @@ TEST_F(DataCacheTest, initializeDataCache_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 }
@@ -122,7 +122,7 @@ TEST_F(DataCacheTest, initializeDataCache_normalCaseTimeOut)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 
@@ -135,7 +135,7 @@ TEST_F(DataCacheTest, addSubscriber_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
     REPORT_FREQUENCY rf = REPORT_FREQUENCY::UPTODATE;
@@ -150,7 +150,7 @@ TEST_F(DataCacheTest, deleteSubsciber_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 
@@ -168,7 +168,7 @@ TEST_F(DataCacheTest, getCacheState_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 
@@ -181,7 +181,7 @@ TEST_F(DataCacheTest, getCachedData_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 
@@ -194,7 +194,7 @@ TEST_F(DataCacheTest, getPrimitiveResource_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 
@@ -208,7 +208,7 @@ TEST_F(DataCacheTest, requestGet_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 
@@ -221,7 +221,7 @@ TEST_F(DataCacheTest, isEmptySubscriber_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 
@@ -250,7 +250,7 @@ TEST_F(DataCacheTest, requestGet_normalCasetest)
         return;
     }
     );
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);
 
diff --git a/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp
index 3f82f03..f966d6f 100644 (file)
--- a/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp
+++ b/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp
@@ -68,7 +68,7 @@ TEST_F(ResourceCacheManagerTest, requestResourceCache_reportTimeIsNULL)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     CacheCB func = cb;
     REPORT_FREQUENCY rf = REPORT_FREQUENCY::UPTODATE;
@@ -86,7 +86,7 @@ TEST_F(ResourceCacheManagerTest, requestResourceCache_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     CacheCB func = cb;
     REPORT_FREQUENCY rf = REPORT_FREQUENCY::UPTODATE;
@@ -111,7 +111,7 @@ TEST_F(ResourceCacheManagerTest, cancelResourceCache_normalCase)
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::isObservable).Return(true);
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestObserve);
-    mocks.ExpectCall(pResource.get(), PrimitiveResource::cancelObserve);
+    mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     CacheCB func = cb;
     REPORT_FREQUENCY rf = REPORT_FREQUENCY::UPTODATE;
Domain: Network & Connectivity / IoT Connectivity;