projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.0.0
[platform/upstream/iotivity.git]
/
resource
/
c_common
/
oic_string
/
test
/
linux
/
oic_string_tests.cpp
diff --git
a/resource/c_common/oic_string/test/linux/oic_string_tests.cpp
b/resource/c_common/oic_string/test/linux/oic_string_tests.cpp
index
eccf05e
..
320d30f
100644
(file)
--- a/
resource/c_common/oic_string/test/linux/oic_string_tests.cpp
+++ b/
resource/c_common/oic_string/test/linux/oic_string_tests.cpp
@@
-45,7
+45,7
@@
TEST(StringTests, StrdupNormalDup)
char* result = OICStrdup(param);
char* result = OICStrdup(param);
-
ASSER
T_TRUE(result != NULL);
+
EXPEC
T_TRUE(result != NULL);
// ensure not the same pointer
EXPECT_NE(param, result);
// ensure not the same pointer
EXPECT_NE(param, result);
@@
-80,6
+80,11
@@
TEST(StringTests, StrcpyExactSizeSentinel)
char* result = OICStrcpy(target, sizeof(target) - 5, source);
char* result = OICStrcpy(target, sizeof(target) - 5, source);
+ if (!result)
+ {
+ FAIL() << "OICStrcpy returned NULL";
+ }
+
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(target) - 1 - 5, strlen(target));
EXPECT_STREQ(source, result);
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(target) - 1 - 5, strlen(target));
EXPECT_STREQ(source, result);
@@
-99,6
+104,11
@@
TEST(StringTests, StrcpyShorterSource)
char* result = OICStrcpy(target, sizeof(target), source);
char* result = OICStrcpy(target, sizeof(target), source);
+ if (!result)
+ {
+ FAIL() << "OICStrcpy returned NULL";
+ }
+
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(source) - 1, strlen(result));
EXPECT_STREQ(source, result);
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(source) - 1, strlen(result));
EXPECT_STREQ(source, result);
@@
-118,6
+128,11
@@
TEST(StringTests, StrcpyShorterDestination)
char *result = OICStrcpy(target, sizeof(target), source);
char *result = OICStrcpy(target, sizeof(target), source);
+ if (!result)
+ {
+ FAIL() << "OICStrcpy returned NULL";
+ }
+
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(target) - 1, strlen(result));
EXPECT_STREQ("123456789", result);
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(target) - 1, strlen(result));
EXPECT_STREQ("123456789", result);
@@
-134,6
+149,11
@@
TEST(StringTests, StrcpyShorterDestinationSentinel)
char *result = OICStrcpy(target, sizeof(target) - 5, source);
char *result = OICStrcpy(target, sizeof(target) - 5, source);
+ if (!result)
+ {
+ FAIL() << "OICStrcpy returned NULL";
+ }
+
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(target) - 1 - 5, strlen(result));
EXPECT_STREQ("123456789", result);
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(target) - 1 - 5, strlen(result));
EXPECT_STREQ("123456789", result);
@@
-153,6
+173,11
@@
TEST(StringTests, StrcpyZeroSource)
char *result = OICStrcpy(target, sizeof(target), source);
char *result = OICStrcpy(target, sizeof(target), source);
+ if (!result)
+ {
+ FAIL() << "OICStrcpy returned NULL";
+ }
+
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(source) - 1, strlen(result));
EXPECT_STREQ("", result);
EXPECT_EQ(target, result);
EXPECT_EQ(sizeof(source) - 1, strlen(result));
EXPECT_STREQ("", result);
@@
-185,6
+210,11
@@
TEST(StringTests, StrcpyZeroDestinationSentinel)
char *result = OICStrcpy(target, sizeof(target) - 5, source);
char *result = OICStrcpy(target, sizeof(target) - 5, source);
+ if (!result)
+ {
+ FAIL() << "OICStrcpy returned NULL";
+ }
+
EXPECT_EQ(target, result);
for(size_t i = 0; i < sizeof(target); ++i)
EXPECT_EQ(target, result);
for(size_t i = 0; i < sizeof(target); ++i)