Modify UnitTest Code about "Resource Broker"

- Modify inherit class : "Test" class -> "TestWithMock" class
- Support 4.6, 4.7, 4.8 gcc compiler

Change-Id: Ie4de09086ba737033f17f5d87bf1a809019351b6
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1878
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/SConscript b/service/resource-manipulation/SConscript
index a7d3402..e3c69ff 100644 (file)
--- a/service/resource-manipulation/SConscript
+++ b/service/resource-manipulation/SConscript
@@ -99,5 +99,5 @@ SConscript('examples/SConscript')
 ################################################ ######################
 SConscript('unittests/SConscript')
 SConscript('src/resourceCache/unittests/SConscript')
-#SConscript('src/resourceBroker/unittest/SConscript')
+SConscript('src/resourceBroker/unittest/SConscript')
 

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp b/service/resource-manipulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp
index b7ee7e8..cbf6614 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp
+++ b/service/resource-manipulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp
@@ -25,7 +25,6 @@ class DeviceAssociationTest : public TestWithMock
 {
 public:
 
-    MockRepository mocks;
     DeviceAssociation * instance;
     DevicePresencePtr device;
     PrimitiveResource::Ptr pResource;
@@ -45,15 +44,17 @@ protected:
         instance->addDevice(device);
     }
 
-    void SetUp() override
+    void SetUp() 
     {
+        TestWithMock::SetUp();
         instance = DeviceAssociation::getInstance();
         device = (DevicePresencePtr)new DevicePresence();
         pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
     }
 
-    void TearDown() override
+    void TearDown() 
     {
+        TestWithMock::TearDown();
         device.reset();
         pResource.reset();
 

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp b/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
index b2270ac..fbf4d37 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
+++ b/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
@@ -20,7 +20,6 @@ class DevicePresenceTest : public TestWithMock
 {
 public:
 
-    MockRepository mocks;
     DevicePresence * instance;
     PrimitiveResource::Ptr pResource;
     BrokerCB cb;
@@ -28,16 +27,18 @@ public:
 
 protected:
 
-    void SetUp() override
+    void SetUp() 
     {
+        TestWithMock::SetUp();
         instance = (DevicePresence*)new DevicePresence();
         pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
         cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
         id = 0;
     }
 
-    void TearDown() override
+    void TearDown() 
     {
+        TestWithMock::TearDown();
         pResource.reset();
         id = 0;
         cb = nullptr;

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp b/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
index 5e9d437..346ef43 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
+++ b/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
@@ -18,7 +18,6 @@ class ResourceBrokerTest : public TestWithMock
 {
 public:
 
-    MockRepository mocks;
     ResourceBroker * brokerInstance;
     PrimitiveResource::Ptr pResource;
     BrokerCB cb;
@@ -26,16 +25,18 @@ public:
 
 protected:
 
-    void SetUp() override
+    void SetUp() 
     {
+        TestWithMock::SetUp();
         brokerInstance = ResourceBroker::getInstance();
         pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
         cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
         id = 0;
     }
 
-    void TearDown() override
+    void TearDown() 
     {
+        TestWithMock::TearDown();
         pResource.reset();
         id = 0;
         cb = nullptr;

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp b/service/resource-manipulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
index 32699d7..da7ff8b 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
+++ b/service/resource-manipulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
@@ -28,7 +28,6 @@ public:
 
     typedef std::function<void(const HeaderOptions&, const ResponseStatement&, int)> GetCallback;
 
-    MockRepository mocks;
     ResourcePresence * instance;
     PrimitiveResource::Ptr pResource;
     BrokerCB cb;
@@ -36,16 +35,19 @@ public:
 
 protected:
 
-    void SetUp() override
+    void SetUp() 
     {
+        TestWithMock::SetUp();
+
         instance = (ResourcePresence*)new ResourcePresence();
         pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
         cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
         id = 0;
     }
 
-    void TearDown() override
+    void TearDown() 
     {
+        TestWithMock::TearDown();
         pResource.reset();
         id = 0;
         cb = nullptr;