Update UnitTest Code about "Resource Cache"

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

Change-Id: I0d7f279c178a14eaef1b465ce3bce80253c97dae
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1880
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/src/resourceCache/unittests/DataCacheTest.cpp b/service/resource-manipulation/src/resourceCache/unittests/DataCacheTest.cpp
index 7417118..f215e7c 100644 (file)
--- a/service/resource-manipulation/src/resourceCache/unittests/DataCacheTest.cpp
+++ b/service/resource-manipulation/src/resourceCache/unittests/DataCacheTest.cpp
@@ -6,10 +6,11 @@
 #include "DataCache.h"
 #include "ResourceAttributes.h"
 #include "ResponseStatement.h"
+#include "UnitTestHelper.h"
 
 using namespace OIC::Service;
 
-class DataCacheTest : public ::testing::Test
+class DataCacheTest : public TestWithMock
 {
     public:
         typedef std::function <
@@ -20,7 +21,6 @@ class DataCacheTest : public ::testing::Test
         void(const OIC::Service::HeaderOptions &, const OIC::Service::ResponseStatement &, int,
              int) > ObserveCallback;
     public:
-        MockRepository mocks;
         DataCache *cacheHandler;
         PrimitiveResource::Ptr pResource;
         CacheCB cb;
@@ -39,6 +39,7 @@ class DataCacheTest : public ::testing::Test
 
         virtual void SetUp()
         {
+            TestWithMock::SetUp();
             pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource *) {});
             cacheHandler = new DataCache();
             cb = ([](std::shared_ptr<PrimitiveResource >, const ResourceAttributes &)->OCStackResult {return OC_STACK_OK;});
@@ -47,6 +48,7 @@ class DataCacheTest : public ::testing::Test
         virtual void TearDown()
         {
             delete cacheHandler;
+            TestWithMock::TearDown();
         }
 };
 

diff --git a/service/resource-manipulation/src/resourceCache/unittests/ResourceCacheTest.cpp b/service/resource-manipulation/src/resourceCache/unittests/ResourceCacheTest.cpp
index e70aca5..bdd3414 100644 (file)
--- a/service/resource-manipulation/src/resourceCache/unittests/ResourceCacheTest.cpp
+++ b/service/resource-manipulation/src/resourceCache/unittests/ResourceCacheTest.cpp
@@ -3,15 +3,13 @@
 #include <HippoMocks/hippomocks.h>
 
 #include "ResourceCacheManager.h"
+#include "UnitTestHelper.h"
 
 using namespace OIC::Service;
 
-
-
-class ResourceCacheManagerTest : public ::testing::Test
+class ResourceCacheManagerTest : public TestWithMock
 {
     public:
-        MockRepository mocks;
         ResourceCacheManager *cacheInstance;
         PrimitiveResource::Ptr pResource;
         CacheCB cb;
@@ -30,6 +28,7 @@ class ResourceCacheManagerTest : public ::testing::Test
 
         virtual void SetUp()
         {
+            TestWithMock::SetUp();
             cacheInstance = ResourceCacheManager::getInstance();
             pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource *) {});
             cb = ([](std::shared_ptr<PrimitiveResource >, const ResourceAttributes &)->OCStackResult {return OC_STACK_OK;});
@@ -37,7 +36,7 @@ class ResourceCacheManagerTest : public ::testing::Test
 
         virtual void TearDown()
         {
-
+            TestWithMock::TearDown();
         }
 };
 

diff --git a/service/resource-manipulation/src/resourceCache/unittests/SConscript b/service/resource-manipulation/src/resourceCache/unittests/SConscript
index 43397f7..4a08b61 100644 (file)
--- a/service/resource-manipulation/src/resourceCache/unittests/SConscript
+++ b/service/resource-manipulation/src/resourceCache/unittests/SConscript
@@ -56,6 +56,7 @@ cache_test_env.AppendUnique(CPPPATH = ['../../../include'])
 cache_test_env.AppendUnique(CPPPATH = ['../../common/primitiveResource/include'])
 cache_test_env.AppendUnique(CPPPATH = ['../../common/expiryTimer/include'])
 cache_test_env.AppendUnique(CPPPATH = ['../../common/expiryTimer/src'])
+cache_test_env.AppendUnique(CPPPATH = ['../../common/utils/include'])
 cache_test_env.PrependUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs/hippomocks-master',
                              gtest_dir + '/include'])
 cache_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])