replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / csdk / connectivity / test / cablocktransfertest.cpp

diff --git a/resource/csdk/connectivity/test/cablocktransfertest.cpp b/resource/csdk/connectivity/test/cablocktransfertest.cpp
index 77cb32f..9fdb526 100644 (file)
--- a/resource/csdk/connectivity/test/cablocktransfertest.cpp
+++ b/resource/csdk/connectivity/test/cablocktransfertest.cpp
@@ -31,7 +31,7 @@ class CABlockTransferTests : public testing::Test {
     protected:
     virtual void SetUp()
     {
-        CAInitialize();
+        CAInitialize(CA_ADAPTER_IP);
     }
 
     virtual void TearDown()
@@ -47,7 +47,7 @@ TEST_F(CABlockTransferTests, CACreateNewDataSetTest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -100,7 +100,7 @@ TEST_F(CABlockTransferTests, CARemoveBlockDataFromListWithSeed)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -151,7 +151,7 @@ TEST_F(CABlockTransferTests, CAGetBlockDataFromBlockDataListTest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -194,7 +194,7 @@ TEST_F(CABlockTransferTests, CAGetPayloadFromBlockDataListTest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -213,14 +213,18 @@ TEST_F(CABlockTransferTests, CAGetPayloadFromBlockDataListTest)
     CABlockData_t *currData = CACreateNewBlockData(cadata);
     EXPECT_TRUE(currData != NULL);
 
-    size_t fullPayload = 0;
-    CAPayload_t payload = CAGetPayloadFromBlockDataList(currData->blockDataId,
-                                                        &fullPayload);
+    if (currData)
+    {
+        size_t fullPayload = 0;
+        CAPayload_t payload = CAGetPayloadFromBlockDataList(currData->blockDataId,
+                                                            &fullPayload);
 
-    size_t payloadLen = (payload != NULL) ? strlen((const char*) payload) : 0;
-    EXPECT_TRUE(fullPayload == payloadLen);
+        size_t payloadLen = (payload != NULL) ? strlen((const char*) payload) : 0;
+        EXPECT_TRUE(fullPayload == payloadLen);
+
+        CARemoveBlockDataFromList(currData->blockDataId);
+    }
 
-    CARemoveBlockDataFromList(currData->blockDataId);
     CADestroyDataSet(cadata);
     coap_delete_list(options);
     coap_delete_pdu(pdu);
@@ -238,7 +242,7 @@ TEST_F(CABlockTransferTests, CAAddBlockOptionTest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -278,7 +282,7 @@ TEST_F(CABlockTransferTests, CAAddBlockOption1InRequest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -306,12 +310,15 @@ TEST_F(CABlockTransferTests, CAAddBlockOption1InRequest)
     CABlockData_t *currData = CACreateNewBlockData(cadata);
     EXPECT_TRUE(currData != NULL);
 
-    EXPECT_EQ(CA_STATUS_OK, CAUpdateBlockOptionType(currData->blockDataId,
-                                                    COAP_OPTION_BLOCK1));
+    if (currData)
+    {
+        EXPECT_EQ(CA_STATUS_OK, CAUpdateBlockOptionType(currData->blockDataId,
+                                                        COAP_OPTION_BLOCK1));
 
-    EXPECT_EQ(CA_STATUS_OK, CAAddBlockOption1(&pdu, &requestData,
-                                              requestData.payloadSize,
-                                              currData->blockDataId, &options));
+        EXPECT_EQ(CA_STATUS_OK, CAAddBlockOption1(&pdu, &requestData,
+                                                  requestData.payloadSize,
+                                                  currData->blockDataId, &options));
+    }
 
     CADestroyDataSet(cadata);
     coap_delete_list(options);
@@ -330,7 +337,7 @@ TEST_F(CABlockTransferTests, CAAddBlockOption1InResponse)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -359,12 +366,15 @@ TEST_F(CABlockTransferTests, CAAddBlockOption1InResponse)
     CABlockData_t *currData = CACreateNewBlockData(cadata);
     EXPECT_TRUE(currData != NULL);
 
-    EXPECT_EQ(CA_STATUS_OK, CAUpdateBlockOptionType(currData->blockDataId,
-                                                    COAP_OPTION_BLOCK1));
+    if (currData)
+    {
+        EXPECT_EQ(CA_STATUS_OK, CAUpdateBlockOptionType(currData->blockDataId,
+                                                        COAP_OPTION_BLOCK1));
 
-    EXPECT_EQ(CA_STATUS_OK, CAAddBlockOption1(&pdu, &responseData,
-                                              responseData.payloadSize,
-                                              currData->blockDataId, &options));
+        EXPECT_EQ(CA_STATUS_OK, CAAddBlockOption1(&pdu, &responseData,
+                                                  responseData.payloadSize,
+                                                  currData->blockDataId, &options));
+    }
 
     CADestroyDataSet(cadata);
     coap_delete_list(options);
@@ -383,7 +393,7 @@ TEST_F(CABlockTransferTests, CAAddBlockOption2InResponse)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -412,12 +422,15 @@ TEST_F(CABlockTransferTests, CAAddBlockOption2InResponse)
     CABlockData_t *currData = CACreateNewBlockData(cadata);
     EXPECT_TRUE(currData != NULL);
 
-    EXPECT_EQ(CA_STATUS_OK, CAUpdateBlockOptionType(currData->blockDataId,
-                                                    COAP_OPTION_BLOCK2));
+    if (currData)
+    {
+        EXPECT_EQ(CA_STATUS_OK, CAUpdateBlockOptionType(currData->blockDataId,
+                                                        COAP_OPTION_BLOCK2));
 
-    EXPECT_EQ(CA_STATUS_OK, CAAddBlockOption2(&pdu, &responseData,
-                                              responseData.payloadSize,
-                                              currData->blockDataId, &options));
+        EXPECT_EQ(CA_STATUS_OK, CAAddBlockOption2(&pdu, &responseData,
+                                                  responseData.payloadSize,
+                                                  currData->blockDataId, &options));
+    }
 
     CADestroyDataSet(cadata);
     coap_delete_list(options);
@@ -436,7 +449,7 @@ TEST_F(CABlockTransferTests, CAAddBlockOption2InRequest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -464,14 +477,16 @@ TEST_F(CABlockTransferTests, CAAddBlockOption2InRequest)
     CABlockData_t *currData = CACreateNewBlockData(cadata);
     EXPECT_TRUE(currData != NULL);
 
-    EXPECT_EQ(CA_STATUS_OK, CAUpdateBlockOptionType(currData->blockDataId,
-                                                    COAP_OPTION_BLOCK2));
+    if (currData)
+    {
+        EXPECT_EQ(CA_STATUS_OK, CAUpdateBlockOptionType(currData->blockDataId,
+                                                        COAP_OPTION_BLOCK2));
 
-    EXPECT_EQ(CA_STATUS_OK, CAAddBlockOption2(&pdu, &requestData,
-                                              requestData.payloadSize,
-                                              currData->blockDataId, &options));
+        EXPECT_EQ(CA_STATUS_OK, CAAddBlockOption2(&pdu, &requestData,
+                                                  requestData.payloadSize,
+                                                  currData->blockDataId, &options));
+    }
 
-    CARemoveBlockDataFromList(currData->blockDataId);
     CADestroyDataSet(cadata);
     coap_delete_list(options);
     coap_delete_pdu(pdu);
@@ -488,7 +503,7 @@ TEST_F(CABlockTransferTests, CAGetBlockSizeOptionFromPduTest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -520,7 +535,7 @@ TEST_F(CABlockTransferTests, CASetNextBlockOption1WithRequest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -558,7 +573,7 @@ TEST_F(CABlockTransferTests, CASetNextBlockOption1WithResponse)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -597,7 +612,7 @@ TEST_F(CABlockTransferTests, CASetNextBlockOption2WithRequest)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);
@@ -635,7 +650,7 @@ TEST_F(CABlockTransferTests, CASetNextBlockOption2WithResponse)
 
     coap_pdu_t *pdu = NULL;
     coap_list_t *options = NULL;
-    coap_transport_type transport = coap_udp;
+    coap_transport_t transport = COAP_UDP;
 
     CAToken_t tempToken = NULL;
     CAGenerateToken(&tempToken, CA_MAX_TOKEN_LEN);