replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / resource-encapsulation / src / resourceBroker / unittest / ResourcePresenceUnitTest.cpp

diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
index 31ca22e..0199887 100644 (file)
--- a/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
+++ b/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
@@ -59,8 +59,15 @@ protected:
     {
         TestWithMock::SetUp();
         instance.reset(new ResourcePresence());
-        pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
-        cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
+        pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(),
+                                           [](PrimitiveResource*)
+                                           {
+
+                                           });
+        cb = ([](BROKER_STATE)->OCStackResult
+                {
+                    return OC_STACK_OK;
+                });
         id = 0;
     }
 
@@ -75,7 +82,11 @@ protected:
 
     void MockingFunc()
     {
-        mocks.OnCall(pResource.get(), PrimitiveResource::requestGet).Do([](GetCallback){});
+        mocks.OnCall(pResource.get(), PrimitiveResource::requestGet).Do(
+                [](GetCallback)
+                {
+
+                });
         mocks.OnCall(pResource.get(), PrimitiveResource::getHost).Return(std::string());
         mocks.OnCallFuncOverload(static_cast< subscribePresenceSig1 >(OC::OCPlatform::subscribePresence)).Return(OC_STACK_OK);
     }
@@ -86,7 +97,7 @@ TEST_F(ResourcePresenceTest,timeoutCB_TimeOverWhenIsRequestGet)
     MockingFunc();
     instance->initializeResourcePresence(pResource);
     std::cout<<"wait while done timeout requestGet\n";
-    BROKER_STATE state;
+    BROKER_STATE state = BROKER_STATE::NONE;
     state = instance->getResourceState();
     sleep((BROKER_DEVICE_PRESENCE_TIMEROUT/1000)+1);
     ASSERT_EQ(state,instance->getResourceState());
@@ -218,30 +229,32 @@ TEST_F(ResourcePresenceTest,getCB_NormalHandlingIfMessageOC_STACK_OK)
 {
 
     mocks.ExpectCall(pResource.get(), PrimitiveResource::requestGet).Do(
-                [](GetCallback callback){
-
-        OIC::Service::HeaderOptions op;
-        RCSResourceAttributes attr;
-        OIC::Service::ResponseStatement res(attr);
+                [](GetCallback callback)
+                {
+                    OIC::Service::HeaderOptions op;
+                    RCSResourceAttributes attr;
+                    OIC::Service::ResponseStatement res(attr);
 
-        callback(op,res,OC_STACK_OK);
+                    callback(op,res,OC_STACK_OK);
 
-    });
+                });
 
     mocks.OnCall(pResource.get(), PrimitiveResource::requestGet).Do(
-                                [](GetCallback){
-        std::cout <<"End call requestGetFunc()\n";
-                    });
+                [](GetCallback)
+                {
+                    std::cout <<"End call requestGetFunc()\n";
+                });
     mocks.OnCall(pResource.get(), PrimitiveResource::getHost).Return("address1");
 
     mocks.OnCallFuncOverload(static_cast< subscribePresenceSig1 >(OC::OCPlatform::subscribePresence)).Do(
             [](OC::OCPlatform::OCPresenceHandle&,
-                    const std::string&, OCConnectivityType, SubscribeCallback callback)->OCStackResult{
-
-        callback(OC_STACK_OK,0,std::string());
-        return OC_STACK_OK;
+                    const std::string&, OCConnectivityType, SubscribeCallback callback)->OCStackResult
+                {
+                    callback(OC_STACK_OK,0,std::string());
+                    return OC_STACK_OK;
 
-    }).Return(OC_STACK_OK);
+                }
+    ).Return(OC_STACK_OK);
 
     instance->initializeResourcePresence(pResource);
     sleep(3);