X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fc_common%2Foic_string%2Ftest%2Flinux%2Foic_string_tests.cpp;h=320d30fc15fcbac8c4c978b45827482c7dba6d15;hb=17c68b2fd1e74586f85e552eeab4e32dc121f8a0;hp=eccf05e3a2d60250f938d6d2c7d0e0c8d8000261;hpb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;p=platform%2Fupstream%2Fiotivity.git

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
--- 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);
 
-    ASSERT_TRUE(result != NULL);
+    EXPECT_TRUE(result != NULL);
 
     // ensure not the same pointer
     EXPECT_NE(param, result);
@@ -80,6 +80,11 @@ TEST(StringTests, StrcpyExactSizeSentinel)
 
     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);
@@ -99,6 +104,11 @@ TEST(StringTests, StrcpyShorterSource)
 
     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);
@@ -118,6 +128,11 @@ TEST(StringTests, StrcpyShorterDestination)
 
     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);
@@ -134,6 +149,11 @@ TEST(StringTests, StrcpyShorterDestinationSentinel)
 
     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);
@@ -153,6 +173,11 @@ TEST(StringTests, StrcpyZeroSource)
 
     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);
@@ -185,6 +210,11 @@ TEST(StringTests, StrcpyZeroDestinationSentinel)
 
     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)