Update UnitTest Code about "Resource Broker"

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

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp b/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
index 8aaec0c..5e9d437 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
+++ b/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
@@ -5,6 +5,7 @@
 #include "PrimitiveResource.h"
 #include "ResponseStatement.h"
 #include "ResourceBroker.h"
+#include "UnitTestHelper.h"
 
 using namespace testing;
 using namespace OIC::Service;
@@ -13,7 +14,7 @@ using namespace OC;
 typedef OCStackResult (*subscribePresenceSig1)(OC::OCPlatform::OCPresenceHandle&,
         const std::string&, OCConnectivityType, SubscribeCallback);
 
-class ResourceBrokerTest : public Test
+class ResourceBrokerTest : public TestWithMock
 {
 public:
 
@@ -25,7 +26,7 @@ public:
 
 protected:
 
-    void SetUp()
+    void SetUp() override
     {
         brokerInstance = ResourceBroker::getInstance();
         pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
@@ -33,7 +34,7 @@ protected:
         id = 0;
     }
 
-    void TearDown()
+    void TearDown() override
     {
         pResource.reset();
         id = 0;
@@ -47,70 +48,66 @@ protected:
         mocks.OnCallFuncOverload(static_cast< subscribePresenceSig1 >(OC::OCPlatform::subscribePresence)).Return(OC_STACK_OK);
     }
 
-    virtual ~ResourceBrokerTest() noexcept(true)
-    {
-    }
-
 };
  
 TEST_F(ResourceBrokerTest,HostResource_ReturnNormalValueIfNormalParams)
 {
-    SetUp();
+
     MockingFunc();
 
     BrokerID ret;
     ASSERT_NE(ret = brokerInstance->hostResource(pResource,cb),0);
 
     brokerInstance->cancelHostResource(ret);
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest, HostResource_NormalErrorHandlingIfResourceNull)
 {
-    SetUp();
+
     ASSERT_THROW(brokerInstance->hostResource(nullptr, cb),ResourceBroker::InvalidParameterException);
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest, HostResource_NormalErrorHandlingIfCbFuncNull)
 {
-    SetUp();
+
     ASSERT_THROW(brokerInstance->hostResource(pResource,nullptr),ResourceBroker::InvalidParameterException);
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest,CancelHostResource_NoThrowIfNormalParams)
 {
-    SetUp();
+
     MockingFunc();
 
     BrokerID ret;
     ret = brokerInstance->hostResource(pResource,cb);
 
     ASSERT_NO_THROW(brokerInstance->cancelHostResource(ret));
-    TearDown();
+
 
 }
 
 TEST_F(ResourceBrokerTest,CancelHostResource_NormalErrorHandlingIfAbNormalIdZero)
 {
-    SetUp();
+
     id = 0;
     ASSERT_THROW(brokerInstance->cancelHostResource(id),ResourceBroker::InvalidParameterException);
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest,CancelHostResource_NormalErrorHandlingIfAbNormalIdOutOfRangeValue)
 {
-    SetUp();
+
     id = -1;
     ASSERT_THROW(brokerInstance->cancelHostResource(id),ResourceBroker::InvalidParameterException);
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest,getResourceState_ReturnNormalValueIfNormalId)
 {
-    SetUp();
+
     MockingFunc();
 
     BrokerID ret;
@@ -125,15 +122,15 @@ TEST_F(ResourceBrokerTest,getResourceState_ReturnNormalValueIfNormalId)
 
 TEST_F(ResourceBrokerTest,getResourceState_NormalErrorHandlingIfIdZero)
 {
-    SetUp();
+
     id = 0;
     ASSERT_THROW(brokerInstance->getResourceState(id),ResourceBroker::InvalidParameterException);
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest,getResourceState_ReturnNormalValueIfNormalResource)
 {
-    SetUp();
+
     MockingFunc();
 
     BrokerID ret;
@@ -142,19 +139,19 @@ TEST_F(ResourceBrokerTest,getResourceState_ReturnNormalValueIfNormalResource)
     ASSERT_NE(brokerInstance->getResourceState(pResource),BROKER_STATE::NONE);
 
     brokerInstance->cancelHostResource(ret);
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest,getResourceState_NormalErrorHandlingIfResourceNull)
 {
-    SetUp();
+
     ASSERT_THROW(brokerInstance->getResourceState((PrimitiveResource::Ptr)nullptr),ResourceBroker::InvalidParameterException);
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest,getResourceState_NormalErrorHandlingIfAbnormalResource)
 {
-    SetUp();
+
     MockingFunc();
 
     PrimitiveResource::Ptr resource[3];
@@ -176,14 +173,14 @@ TEST_F(ResourceBrokerTest,getResourceState_NormalErrorHandlingIfAbnormalResource
     {
         brokerInstance->cancelHostResource(id[i]);
     }
-    TearDown();
+
 }
 
 TEST_F(ResourceBrokerTest,getResourceState_NormalErrorHandlingIfAbnormalId)
 {
-    SetUp();
+
     id = -1;
     ASSERT_THROW(brokerInstance->getResourceState(id),ResourceBroker::InvalidParameterException);
-    TearDown();
+
 }