replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / csdk / security / unittest / securityresourcemanager.cpp

diff --git a/resource/csdk/security/unittest/securityresourcemanager.cpp b/resource/csdk/security/unittest/securityresourcemanager.cpp
index 9a38f48..efc9ff7 100644 (file)
--- a/resource/csdk/security/unittest/securityresourcemanager.cpp
+++ b/resource/csdk/security/unittest/securityresourcemanager.cpp
@@ -32,6 +32,7 @@
 #include "ocstack.h"
 #include "cainterface.h"
 #include "secureresourcemanager.h"
+#include "srmtestcommon.h"
 
 using namespace std;
 
@@ -54,34 +55,6 @@ void UTErrorHandler(const CAEndpoint_t * /*endPoint*/,
      EXPECT_TRUE(true) << "UTErrorHandler\n";
 }
 
-FILE *utopen(const char *path, const char *mode)
-{
-    EXPECT_TRUE((path != NULL)) << "utopen\n";
-    FILE *stream = fopen(path, mode);
-    return stream;
-
-}
-
-size_t utread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-    return fread(ptr, size, nmemb, stream);
-}
-
-size_t utwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-    return fwrite(ptr, size, nmemb, stream);
-}
-
-int utclose(FILE *fp)
-{
-    EXPECT_TRUE((fp != NULL)) << "utclose\n";
-    return fclose(fp);
-}
-int utunlink(const char *path)
-{
-    EXPECT_TRUE((path != NULL)) << "utunlink\n";
-    return unlink(path);
-}
 static OCPersistentStorage gpsi;
 
 //RegisterHandler Tests
@@ -114,14 +87,7 @@ TEST(PersistentStorageHandlerTest, RegisterNullHandler)
 
 TEST(PersistentStorageHandlerTest, RegisterValidHandler)
 {
-    gpsi.open = utopen;
-    gpsi.read = utread;
-    gpsi.write = utwrite;
-    gpsi.close = utclose;
-    gpsi.unlink = utunlink;
-
-    EXPECT_EQ(OC_STACK_OK,
-            SRMRegisterPersistentStorageHandler(&gpsi));
+    SetPersistentHandler(&gpsi, true);
     OCPersistentStorage *ps = SRMGetPersistentStorageHandler();
     EXPECT_TRUE(&gpsi == ps);
 }