projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
connectivity
/
test
/
ca_api_unittest.cpp
diff --git
a/resource/csdk/connectivity/test/ca_api_unittest.cpp
b/resource/csdk/connectivity/test/ca_api_unittest.cpp
index
f773e9c
..
100beac
100644
(file)
--- a/
resource/csdk/connectivity/test/ca_api_unittest.cpp
+++ b/
resource/csdk/connectivity/test/ca_api_unittest.cpp
@@
-24,6
+24,7
@@
#include "cautilinterface.h"
#include "cacommon.h"
#include "oic_string.h"
#include "cautilinterface.h"
#include "cacommon.h"
#include "oic_string.h"
+#include "oic_malloc.h"
#define CA_TRANSPORT_ADAPTER_SCOPE 1000
#define CA_TRANSPORT_ADAPTER_SCOPE 1000
@@
-31,7
+32,7
@@
class CATests : public testing::Test {
protected:
virtual void SetUp()
{
protected:
virtual void SetUp()
{
- CAInitialize();
+ CAInitialize(
CA_ADAPTER_IP
);
}
virtual void TearDown()
}
virtual void TearDown()
@@
-163,7
+164,7
@@
int32_t CAGetDtlsPskCredentials( CADtlsPskCredType_t type,
// CAInitialize TC
TEST(InitializeTest, CAInitializeTest)
{
// CAInitialize TC
TEST(InitializeTest, CAInitializeTest)
{
- EXPECT_EQ(CA_STATUS_OK, CAInitialize());
+ EXPECT_EQ(CA_STATUS_OK, CAInitialize(
CA_ADAPTER_IP
));
CATerminate();
}
CATerminate();
}
@@
-175,7
+176,7
@@
TEST_F(CATests, TerminateTest)
char* check = (char *) "terminate success";
EXPECT_STREQ(check, "terminate success");
char* check = (char *) "terminate success";
EXPECT_STREQ(check, "terminate success");
- CAInitialize();
+ CAInitialize(
CA_ADAPTER_IP
);
}
// CAStartListeningServer TC
}
// CAStartListeningServer TC
@@
-298,7
+299,7
@@
TEST(SendRequestTest, DISABLED_TC_16_Positive_01)
requestData.token = tempToken;
requestData.tokenLength = tokenLength;
requestData.token = tempToken;
requestData.tokenLength = tokenLength;
-
in
t length = strlen(NORMAL_INFO_DATA) + strlen("a/light");
+
size_
t length = strlen(NORMAL_INFO_DATA) + strlen("a/light");
requestData.payload = (CAPayload_t) calloc(length, sizeof(char));
if(!requestData.payload)
{
requestData.payload = (CAPayload_t) calloc(length, sizeof(char));
if(!requestData.payload)
{
@@
-343,7
+344,7
@@
TEST_F(CATests, SendResponseTestWithInvalidCode)
memset(&responseData, 0, sizeof(CAInfo_t));
responseData.type = CA_MSG_RESET;
responseData.messageId = 1;
memset(&responseData, 0, sizeof(CAInfo_t));
responseData.type = CA_MSG_RESET;
responseData.messageId = 1;
- responseData.payload = (CAPayload_t)
m
alloc(sizeof("response payload"));
+ responseData.payload = (CAPayload_t)
OICM
alloc(sizeof("response payload"));
responseData.dataType = CA_RESPONSE_DATA;
EXPECT_TRUE(responseData.payload != NULL);
responseData.dataType = CA_RESPONSE_DATA;
EXPECT_TRUE(responseData.payload != NULL);
@@
-362,7
+363,7
@@
TEST_F(CATests, SendResponseTestWithInvalidCode)
CADestroyToken(tempToken);
CADestroyEndpoint(tempRep);
CADestroyToken(tempToken);
CADestroyEndpoint(tempRep);
-
f
ree(responseData.payload);
+
OICF
ree(responseData.payload);
tempRep = NULL;
}
}
tempRep = NULL;
}
}
@@
-525,7
+526,7
@@
TEST_F (CATests, GetNetworkInformationTest)
TEST_F(CATests, RegisterDTLSCredentialsHandlerTest)
{
#ifdef __WITH_DTLS__
TEST_F(CATests, RegisterDTLSCredentialsHandlerTest)
{
#ifdef __WITH_DTLS__
- EXPECT_EQ(CA_STATUS_OK, CA
RegisterDTLS
CredentialsHandler(CAGetDtlsPskCredentials));
+ EXPECT_EQ(CA_STATUS_OK, CA
registerPsk
CredentialsHandler(CAGetDtlsPskCredentials));
#endif
}
#endif
}