Merge branch 'simulator'.

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

diff --git a/resource/csdk/security/unittest/credentialresource.cpp b/resource/csdk/security/unittest/credentialresource.cpp
index f840955..ee342ce 100644 (file)
--- a/resource/csdk/security/unittest/credentialresource.cpp
+++ b/resource/csdk/security/unittest/credentialresource.cpp
@@ -38,8 +38,8 @@ extern "C" {
 OCStackResult CreateCredResource();
 OCEntityHandlerResult CredEntityHandler (OCEntityHandlerFlag flag,
                 OCEntityHandlerRequest * ehRequest);
-char * BinToCredJSON(const OicSecCred_t * pstat, const bool isIncResName);
-OicSecCred_t * JSONToCredBin(const char * jsonStr, const bool isIncResName);
+char * BinToCredJSON(const OicSecCred_t * pstat);
+OicSecCred_t * JSONToCredBin(const char * jsonStr);
 void InitSecCredInstance(OicSecCred_t * cred);
 void DeleteCredList(OicSecCred_t* cred);
 const OicSecCred_t* GetCredResourceData(const OicUuid_t* subject);
@@ -120,21 +120,21 @@ static void printCred(const OicSecCred_t * cred)
     const OicSecCred_t *credTmp1 = NULL;
     for(credTmp1 = cred; credTmp1; credTmp1 = credTmp1->next)
     {
-        OC_LOG_V(INFO, TAG, "\ncred->credId = %d", credTmp1->credId);
-        OC_LOG_V(INFO, TAG, "cred->subject.id = %s", credTmp1->subject.id);
-        OC_LOG_V(INFO, TAG, "cred->credType = %d", credTmp1->credType);
+        OIC_LOG_V(INFO, TAG, "\ncred->credId = %d", credTmp1->credId);
+        OIC_LOG_V(INFO, TAG, "cred->subject.id = %s", credTmp1->subject.id);
+        OIC_LOG_V(INFO, TAG, "cred->credType = %d", credTmp1->credType);
         if(credTmp1->privateData.data)
         {
-            OC_LOG_V(INFO, TAG, "cred->privateData.data = %s", credTmp1->privateData.data);
+            OIC_LOG_V(INFO, TAG, "cred->privateData.data = %s", credTmp1->privateData.data);
         }
         if(credTmp1->publicData.data)
         {
-           OC_LOG_V(INFO, TAG, "cred->publicData.data = %s", credTmp1->publicData.data);
+           OIC_LOG_V(INFO, TAG, "cred->publicData.data = %s", credTmp1->publicData.data);
         }
-        OC_LOG_V(INFO, TAG, "cred->ownersLen = %zu", credTmp1->ownersLen);
+        OIC_LOG_V(INFO, TAG, "cred->ownersLen = %zu", credTmp1->ownersLen);
         for(size_t i = 0; i < cred->ownersLen; i++)
         {
-            OC_LOG_V(INFO, TAG, "cred->owners[%zu].id = %s", i, credTmp1->owners[i].id);
+            OIC_LOG_V(INFO, TAG, "cred->owners[%zu].id = %s", i, credTmp1->owners[i].id);
         }
     }
 }
@@ -194,7 +194,7 @@ TEST(CredEntityHandlerTest, CredEntityHandlerDeleteTest)
     OicSecCred_t *cred = getCredList();
     VERIFY_NON_NULL(TAG, cred, ERROR);
 
-    jsonStr = BinToCredJSON(cred, false);
+    jsonStr = BinToCredJSON(cred);
     VERIFY_NON_NULL(TAG, jsonStr, ERROR);
 
     // Create Entity Handler POST request payload
@@ -235,7 +235,7 @@ exit:
 //BinToCredJSON Tests
 TEST(BinToCredJSONTest, BinToCredJSONNullCred)
 {
-    char* value = BinToCredJSON(NULL, true);
+    char* value = BinToCredJSON(NULL);
     EXPECT_TRUE(value == NULL);
 }
 
@@ -244,9 +244,9 @@ TEST(BinToCredJSONTest, BinToCredJSONValidCred)
     char* json = NULL;
     OicSecCred_t * cred = getCredList();
 
-    json = BinToCredJSON(cred, true);
+    json = BinToCredJSON(cred);
 
-    OC_LOG_V(INFO, TAG, "BinToCredJSON:%s\n", json);
+    OIC_LOG_V(INFO, TAG, "BinToCredJSON:%s\n", json);
     EXPECT_TRUE(json != NULL);
     DeleteCredList(cred);
     OICFree(json);
@@ -256,10 +256,10 @@ TEST(BinToCredJSONTest, BinToCredJSONValidCred)
 TEST(JSONToCredBinTest, JSONToCredBinValidJSON)
 {
     OicSecCred_t* cred1 = getCredList();
-    char* json = BinToCredJSON(cred1, true);
+    char* json = BinToCredJSON(cred1);
 
     EXPECT_TRUE(json != NULL);
-    OicSecCred_t *cred2 = JSONToCredBin(json, true);
+    OicSecCred_t *cred2 = JSONToCredBin(json);
     EXPECT_TRUE(cred2 != NULL);
     DeleteCredList(cred1);
     DeleteCredList(cred2);
@@ -268,7 +268,7 @@ TEST(JSONToCredBinTest, JSONToCredBinValidJSON)
 
 TEST(JSONToCredBinTest, JSONToCredBinNullJSON)
 {
-    OicSecCred_t *cred = JSONToCredBin(NULL, true);
+    OicSecCred_t *cred = JSONToCredBin(NULL);
     EXPECT_TRUE(cred == NULL);
 }