X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fc_common%2Foic_malloc%2Ftest%2Flinux%2Foic_malloc_tests.cpp;fp=resource%2Fcsdk%2Focmalloc%2Ftest%2Flinux%2Funittest.cpp;h=dd94aad4569966657028a541c3b85c3801b48808;hb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;hp=acd957342e8749ad4d0258766050834bfcfabfa1;hpb=935fdb9b67b6c10d007e652e9e2e028fd6ccfe09;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/ocmalloc/test/linux/unittest.cpp b/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp
similarity index 69%
rename from resource/csdk/ocmalloc/test/linux/unittest.cpp
rename to resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp
index acd9573..dd94aad 100644
--- a/resource/csdk/ocmalloc/test/linux/unittest.cpp
+++ b/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp
@@ -20,7 +20,7 @@
 
 
 extern "C" {
-    #include "ocmalloc.h"
+    #include "oic_malloc.h"
 }
 
 #include "gtest/gtest.h"
@@ -51,90 +51,90 @@ static uint8_t *pBuffer;
 //  Tests
 //-----------------------------------------------------------------------------
 
-TEST(OCMalloc, MallocPass1)
+TEST(OICMalloc, MallocPass1)
 {
     // Try to allocate a small buffer
-    pBuffer = (uint8_t *)OCMalloc(1);
+    pBuffer = (uint8_t *)OICMalloc(1);
     EXPECT_TRUE(pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCMalloc, MallocPass2)
+TEST(OICMalloc, MallocPass2)
 {
     // Try to allocate a small buffer
-    pBuffer = (uint8_t *)OCMalloc(128);
+    pBuffer = (uint8_t *)OICMalloc(128);
     EXPECT_TRUE(pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCMalloc, MallocFail1)
+TEST(OICMalloc, MallocFail1)
 {
     // Try to allocate a buffer of size 0
-    pBuffer = (uint8_t *)OCMalloc(0);
+    pBuffer = (uint8_t *)OICMalloc(0);
     EXPECT_TRUE(NULL == pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCMalloc, MallocFail2)
+TEST(OICMalloc, MallocFail2)
 {
     // Try to allocate a ridiculous amount of RAM
-    pBuffer = (uint8_t *)OCMalloc((size_t)0x7FFFFFFFFFFFFFFF);
+    pBuffer = (uint8_t *)OICMalloc((size_t)0x7FFFFFFFFFFFFFFF);
     EXPECT_TRUE(NULL == pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCCalloc, CallocPass1)
+TEST(OICCalloc, CallocPass1)
 {
     // Try to allocate a small buffer
-    pBuffer = (uint8_t *)OCCalloc(1, 1);
+    pBuffer = (uint8_t *)OICCalloc(1, 1);
     EXPECT_TRUE(pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCCalloc, CallocPass2)
+TEST(OICCalloc, CallocPass2)
 {
     // Try to allocate a small buffer
-    pBuffer = (uint8_t *)OCCalloc(1, 128);
+    pBuffer = (uint8_t *)OICCalloc(1, 128);
     EXPECT_TRUE(pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCCalloc, CallocPass3)
+TEST(OICCalloc, CallocPass3)
 {
     // Try to allocate a buffer for an array
-    pBuffer = (uint8_t *)OCCalloc(5, 128);
+    pBuffer = (uint8_t *)OICCalloc(5, 128);
     EXPECT_TRUE(pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCCalloc, CallocFail1)
+TEST(OICCalloc, CallocFail1)
 {
     // Try to allocate a buffer of size 0
-    pBuffer = (uint8_t *)OCCalloc(1, 0);
+    pBuffer = (uint8_t *)OICCalloc(1, 0);
     EXPECT_TRUE(NULL == pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCCalloc, CallocFail2)
+TEST(OICCalloc, CallocFail2)
 {
     // Try to allocate a buffer with num of 0
-    pBuffer = (uint8_t *)OCCalloc(0, 5);
+    pBuffer = (uint8_t *)OICCalloc(0, 5);
     EXPECT_TRUE(NULL == pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCCalloc, CallocFail3)
+TEST(OICCalloc, CallocFail3)
 {
     // Try to allocate a buffer with size and num 0
-    pBuffer = (uint8_t *)OCCalloc(0, 0);
+    pBuffer = (uint8_t *)OICCalloc(0, 0);
     EXPECT_TRUE(NULL == pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }
 
-TEST(OCCalloc, CallocFail4)
+TEST(OICCalloc, CallocFail4)
 {
     // Try to allocate a ridiculous amount of RAM
-    pBuffer = (uint8_t *)OCCalloc(1, (size_t)0x7FFFFFFFFFFFFFFF);
+    pBuffer = (uint8_t *)OICCalloc(1, (size_t)0x7FFFFFFFFFFFFFFF);
     EXPECT_TRUE(NULL == pBuffer);
-    OCFree(pBuffer);
+    OICFree(pBuffer);
 }