replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / resource-encapsulation / src / resourceCache / unittests / DataCacheTest.cpp

diff --git a/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp
index b51c8cb..e00d506 100644 (file)
--- a/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp
+++ b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp
@@ -41,33 +41,34 @@ class DataCacheTest : public TestWithMock
         void(const OIC::Service::HeaderOptions &, const OIC::Service::ResponseStatement &, int,
              int) > ObserveCallback;
     public:
-        DataCache *cacheHandler;
+        std::shared_ptr<DataCache> cacheHandler;
         PrimitiveResource::Ptr pResource;
         CacheCB cb;
         CacheID id;
 
     protected:
-        DataCacheTest()
-        {
-
-        }
-
-        virtual ~DataCacheTest() noexcept(true)
-        {
-
-        }
-
         virtual void SetUp()
         {
             TestWithMock::SetUp();
-            pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource *) {});
-            cacheHandler = new DataCache();
-            cb = ([](std::shared_ptr<PrimitiveResource >, const RCSResourceAttributes &)->OCStackResult {return OC_STACK_OK;});
+            pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(),
+                                               [](PrimitiveResource *)
+                                               {
+
+                                               });
+
+            mocks.OnCall(pResource.get(), PrimitiveResource::isObservable).Return(false);
+            cacheHandler.reset(new DataCache());
+            cb = ([](std::shared_ptr<PrimitiveResource >,
+                    const RCSResourceAttributes &, int) -> OCStackResult
+                    {
+                        return OC_STACK_OK;
+                    });
         }
 
         virtual void TearDown()
         {
-            delete cacheHandler;
+            cacheHandler.reset();
+            pResource.reset();
             TestWithMock::TearDown();
         }
 };
@@ -104,7 +105,7 @@ TEST_F(DataCacheTest, initializeDataCache_normalCaseObservable)
         OIC::Service::HeaderOptions hos;
         OIC::Service::RCSResourceAttributes attr;
         OIC::Service::ResponseStatement rep(attr);
-        int seq;
+        int seq = 0;
         callback(hos, rep, OC_STACK_OK, seq);
         return;
     }
@@ -257,19 +258,12 @@ TEST_F(DataCacheTest, requestGet_normalCasetest)
     mocks.OnCall(pResource.get(), PrimitiveResource::requestGet).Do(
         [](GetCallback callback)
     {
-        std::cout << "HelloWorld" << std::endl;
         OIC::Service::HeaderOptions hos;
-
         OIC::Service::RCSResourceAttributes attr;
-        //attr = mocks.Mcok< OIC::Service::RCSResourceAttributes >();
         OIC::Service::ResponseStatement rep(attr);
-        //rep = mocks.Mock< OIC::Service::ResponseStatement >(attr);
-        //fakeResource = mocks.Mock< FakeOCResource >();
-        //mocks.OnCallFunc(RCSResourceAttributes::empty()).Return(false);
         callback(hos, rep, OC_STACK_OK);
         return;
-    }
-    );
+    });
     mocks.OnCall(pResource.get(), PrimitiveResource::cancelObserve);
 
     cacheHandler->initializeDataCache(pResource);