Update UnitTest Code about "Resource Broker"

[platform/upstream/iotivity.git] / service / resource-manipulation / src / resourceBroker / unittest / DevicePresenceUnitTest.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp b/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
index 257e7ab..b2270ac 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
+++ b/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
@@ -7,6 +7,7 @@
 #include "OCPlatform.h"
 #include "DevicePresence.h"
 #include "ResourcePresence.h"
+#include "UnitTestHelper.h"
 
 using namespace testing;
 using namespace OIC::Service;
@@ -15,7 +16,7 @@ using namespace OC;
 typedef OCStackResult (*subscribePresenceSig1)(OC::OCPlatform::OCPresenceHandle&,
         const std::string&, OCConnectivityType, SubscribeCallback);
 
-class DevicePresenceTest : public Test
+class DevicePresenceTest : public TestWithMock
 {
 public:
 
@@ -27,7 +28,7 @@ public:
 
 protected:
 
-    void SetUp()
+    void SetUp() override
     {
         instance = (DevicePresence*)new DevicePresence();
         pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
@@ -35,7 +36,7 @@ protected:
         id = 0;
     }
 
-    void TearDown()
+    void TearDown() override
     {
         pResource.reset();
         id = 0;
@@ -48,64 +49,59 @@ protected:
         mocks.OnCall(pResource.get(), PrimitiveResource::getHost).Return(std::string());
         mocks.OnCallFuncOverload(static_cast< subscribePresenceSig1 >(OC::OCPlatform::subscribePresence)).Return(OC_STACK_OK);
     }
-
-    virtual ~DevicePresenceTest() noexcept(true)
-    {
-    }
-
 };
 
 TEST_F(DevicePresenceTest,initializeDevicePresence_NormalHandlingIfNormalResource)
 {
-    SetUp();
+
     MockingFunc();
 
     ASSERT_NO_THROW(instance->initializeDevicePresence(pResource));
-    TearDown();
+
 }
 
 TEST_F(DevicePresenceTest,initializeDevicePresence_ErrorHandlingIfAbnormalResource)
 {
-    SetUp();
+
     MockingFunc();
     mocks.OnCallFuncOverload(static_cast< subscribePresenceSig1 >(OC::OCPlatform::subscribePresence)).Return(OC_STACK_ERROR);
 
     ASSERT_THROW(instance->initializeDevicePresence(pResource),PlatformException);
-    TearDown();
+
 }
 
 TEST_F(DevicePresenceTest,addPresenceResource_NormalHandlingIfNormalResource)
 {
-    SetUp();
+
     ResourcePresence * resource = (ResourcePresence *)new ResourcePresence();
     instance->addPresenceResource(resource);
 
-    ASSERT_EQ(false,instance->isEmptyResourcePresence());
-    TearDown();
+    ASSERT_FALSE(instance->isEmptyResourcePresence());
+
 }
 
 TEST_F(DevicePresenceTest,isEmptyResourcePresence_NormalHandling)
 {
-    SetUp();
+
     MockingFunc();
 
     ASSERT_TRUE(instance->isEmptyResourcePresence());
-    TearDown();
+
 }
 
 TEST_F(DevicePresenceTest,getAddress_NormalHandling)
 {
-    SetUp();
+
     MockingFunc();
 
     instance->initializeDevicePresence(pResource);
     instance->getAddress();
-    TearDown();
+
 }
 
 TEST_F(DevicePresenceTest,NormalHandlingWhenReceivedCallbackMessage)
 {
-    SetUp();
+
     MockingFunc();
-    TearDown();
+
 }