Update secure resource related modules(SRM,OTM,SRP,CKM,unit tests,samples)

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

diff --git a/resource/csdk/security/unittest/doxmresource.cpp b/resource/csdk/security/unittest/doxmresource.cpp
index f2de1dd..6c9f33a 100644 (file)
--- a/resource/csdk/security/unittest/doxmresource.cpp
+++ b/resource/csdk/security/unittest/doxmresource.cpp
@@ -38,8 +38,8 @@ extern "C" {
 OCStackResult CreateDoxmResource();
 OCEntityHandlerResult DoxmEntityHandler (OCEntityHandlerFlag flag,
                 OCEntityHandlerRequest * ehRequest);
-char * BinToDoxmJSON(const OicSecDoxm_t * doxm);
-OicSecDoxm_t * JSONToDoxmBin(const char * jsonStr);
+char * BinToDoxmJSON(const OicSecDoxm_t * doxm, const bool isIncResName);
+OicSecDoxm_t * JSONToDoxmBin(const char * jsonStr, const bool isIncResName);
 void InitSecDoxmInstance(OicSecDoxm_t * doxm);
 OCEntityHandlerResult HandleDoxmPostRequest (const OCEntityHandlerRequest * ehRequest);
 void DeleteDoxmBinData(OicSecDoxm_t* doxm);
@@ -56,28 +56,10 @@ OicSecDoxm_t * getBinDoxm()
     {
         return NULL;
     }
-    doxm->oxmTypeLen =  1;
-    doxm->oxmType    = (OicUrn_t *)OICCalloc(doxm->oxmTypeLen, sizeof(char *));
-    if(!doxm->oxmType)
-    {
-        OICFree(doxm);
-        return NULL;
-    }
-    doxm->oxmType[0] = (char*)OICMalloc(strlen(OXM_JUST_WORKS) + 1);
-    if(!doxm->oxmType[0])
-    {
-        OICFree(doxm->oxmType);
-        OICFree(doxm);
-        return NULL;
-    }
-
-    strcpy(doxm->oxmType[0], OXM_JUST_WORKS);
-    doxm->oxmLen     = 1;
+    doxm->oxmLen = 1;
     doxm->oxm        = (OicSecOxm_t *)OICCalloc(doxm->oxmLen, sizeof(OicSecOxm_t));
     if(!doxm->oxm)
     {
-        OICFree(doxm->oxmType[0]);
-        OICFree(doxm->oxmType);
         OICFree(doxm);
         return NULL;
     }
@@ -156,7 +138,7 @@ TEST(DoxmEntityHandlerTest, DoxmEntityHandlerDeviceIdQuery)
 //BinToDoxmJSON Tests
 TEST(BinToDoxmJSONTest, BinToDoxmJSONNullDoxm)
 {
-    char* value = BinToDoxmJSON(NULL);
+    char* value = BinToDoxmJSON(NULL, true);
     EXPECT_TRUE(value == NULL);
 }
 
@@ -164,7 +146,7 @@ TEST(BinToDoxmJSONTest, BinToDoxmJSONValidDoxm)
 {
     OicSecDoxm_t * doxm =  getBinDoxm();
 
-    char * json = BinToDoxmJSON(doxm);
+    char * json = BinToDoxmJSON(doxm, true);
     OC_LOG_V(INFO, TAG, "BinToDoxmJSON:%s", json);
     EXPECT_TRUE(json != NULL);
 
@@ -176,10 +158,10 @@ TEST(BinToDoxmJSONTest, BinToDoxmJSONValidDoxm)
 TEST(JSONToDoxmBinTest, JSONToDoxmBinValidJSON)
 {
     OicSecDoxm_t * doxm1 =  getBinDoxm();
-    char * json = BinToDoxmJSON(doxm1);
+    char * json = BinToDoxmJSON(doxm1, true);
     EXPECT_TRUE(json != NULL);
 
-    OicSecDoxm_t *doxm2 = JSONToDoxmBin(json);
+    OicSecDoxm_t *doxm2 = JSONToDoxmBin(json, true);
     EXPECT_TRUE(doxm2 != NULL);
 
     DeleteDoxmBinData(doxm1);
@@ -189,7 +171,7 @@ TEST(JSONToDoxmBinTest, JSONToDoxmBinValidJSON)
 
 TEST(JSONToDoxmBinTest, JSONToDoxmBinNullJSON)
 {
-    OicSecDoxm_t *doxm = JSONToDoxmBin(NULL);
+    OicSecDoxm_t *doxm = JSONToDoxmBin(NULL, true);
     EXPECT_TRUE(doxm == NULL);
 }
 
@@ -206,7 +188,7 @@ TEST(HandleDoxmPostRequestTest, HandleDoxmPostRequestValidInput)
     svRequest.addressInfo.IP.port = 2345;
     svRequest.connectivityType = CA_ETHERNET;
 
-    ehRequest.reqJSONPayload = (unsigned char *) BinToDoxmJSON(doxm);
+    ehRequest.reqJSONPayload = (unsigned char *) BinToDoxmJSON(doxm, true);
     ehRequest.requestHandle = (OCRequestHandle) &svRequest;
 
     EXPECT_EQ(OC_EH_ERROR, HandleDoxmPostRequest(&ehRequest));