From f0b6c9619ea7616f29c78d19a9aadc47d1a2da1e Mon Sep 17 00:00:00 2001 From: wujing Date: Fri, 3 Jan 2020 13:03:39 +0800 Subject: [PATCH] using glibc library functions for unit test Signed-off-by: wujing --- test/cutils/utils_array/CMakeLists.txt | 4 +- test/cutils/utils_array/utils_array_llt.cc | 29 ----------- test/cutils/utils_convert/CMakeLists.txt | 2 +- .../cutils/utils_convert/utils_convert_llt.cc | 1 - test/cutils/utils_string/CMakeLists.txt | 2 +- test/cutils/utils_string/utils_string_llt.cc | 48 ------------------- .../image/oci/oci_config_merge/CMakeLists.txt | 2 +- .../oci_config_merge/oci_config_merge_llt.cc | 1 - test/path/CMakeLists.txt | 2 +- test/path/path_llt.cc | 9 ++-- test/{llt.sh => test.sh} | 0 11 files changed, 12 insertions(+), 88 deletions(-) rename test/{llt.sh => test.sh} (100%) diff --git a/test/cutils/utils_array/CMakeLists.txt b/test/cutils/utils_array/CMakeLists.txt index 6f7c8dd..df29cef 100644 --- a/test/cutils/utils_array/CMakeLists.txt +++ b/test/cutils/utils_array/CMakeLists.txt @@ -24,5 +24,5 @@ target_include_directories(${EXE} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils ${CMAKE_BINARY_DIR}/json ) -set_target_properties(${EXE} PROPERTIES LINK_FLAGS "-Wl,--wrap,calloc -Wl,--wrap,memcpy_s") -target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lsecurec -lz) +set_target_properties(${EXE} PROPERTIES LINK_FLAGS "-Wl,--wrap,calloc") +target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lz) diff --git a/test/cutils/utils_array/utils_array_llt.cc b/test/cutils/utils_array/utils_array_llt.cc index 830e3c9..cb18c74 100644 --- a/test/cutils/utils_array/utils_array_llt.cc +++ b/test/cutils/utils_array/utils_array_llt.cc @@ -16,7 +16,6 @@ #include #include #include -#include #include #include "mock.h" #include "utils_array.h" @@ -25,10 +24,6 @@ extern "C" { DECLARE_WRAPPER(calloc, void *, (size_t nmemb, size_t size)); DEFINE_WRAPPER(calloc, void *, (size_t nmemb, size_t size), (nmemb, size)); - - DECLARE_WRAPPER(memcpy_s, errno_t, (void* dest, size_t destMax, const void* src, size_t count)); - DEFINE_WRAPPER(memcpy_s, errno_t, (void* dest, size_t destMax, const void* src, size_t count), - (dest, destMax, src, count)); } TEST(utils_array, test_util_array_len) @@ -158,17 +153,6 @@ TEST(utils_array, test_util_grow_array) util_free_array(array); array = nullptr; capacity = 0; - - capacity = 1; - array = (char **)util_common_calloc_s(capacity * sizeof(char *)); - ASSERT_NE(array, nullptr); - MOCK_SET(memcpy_s, EINVAL); - ret = util_grow_array(&array, &capacity, 1, 1); - ASSERT_NE(ret, 0); - MOCK_CLEAR(memcpy_s); - util_free_array(array); - array = nullptr; - capacity = 0; } TEST(utils_array, test_util_array_append) @@ -219,17 +203,4 @@ TEST(utils_array, test_util_array_append) MOCK_CLEAR(calloc); util_free_array(array); array = nullptr; - - array_three = (char **)util_common_calloc_s(4 * sizeof(char *)); - ASSERT_NE(array_three, nullptr); - array_three[0] = util_strdup_s("test1"); - array_three[1] = util_strdup_s("test2"); - array_three[2] = util_strdup_s("test3"); - array_three[3] = nullptr; - MOCK_SET(memcpy_s, EINVAL); - ret = util_array_append(&array_three, "123"); - ASSERT_NE(ret, 0); - MOCK_CLEAR(memcpy_s); - util_free_array(array_three); - array_three = nullptr; } diff --git a/test/cutils/utils_convert/CMakeLists.txt b/test/cutils/utils_convert/CMakeLists.txt index 53886ad..265ac1d 100644 --- a/test/cutils/utils_convert/CMakeLists.txt +++ b/test/cutils/utils_convert/CMakeLists.txt @@ -24,4 +24,4 @@ target_include_directories(${EXE} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils ${CMAKE_BINARY_DIR}/json ) -target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lsecurec -lz) +target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lz) diff --git a/test/cutils/utils_convert/utils_convert_llt.cc b/test/cutils/utils_convert/utils_convert_llt.cc index 9808c93..0ad48f8 100644 --- a/test/cutils/utils_convert/utils_convert_llt.cc +++ b/test/cutils/utils_convert/utils_convert_llt.cc @@ -16,7 +16,6 @@ #include #include #include -#include #include #include "mock.h" #include "utils_convert.h" diff --git a/test/cutils/utils_string/CMakeLists.txt b/test/cutils/utils_string/CMakeLists.txt index 1b9d0bd..33c2373 100644 --- a/test/cutils/utils_string/CMakeLists.txt +++ b/test/cutils/utils_string/CMakeLists.txt @@ -25,4 +25,4 @@ target_include_directories(${EXE} PUBLIC ${CMAKE_BINARY_DIR}/json ) set_target_properties(${EXE} PROPERTIES LINK_FLAGS "-Wl,--wrap,util_strdup_s -Wl,--wrap,calloc -Wl,--wrap,strcat_s") -target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lsecurec -lz) +target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lz) diff --git a/test/cutils/utils_string/utils_string_llt.cc b/test/cutils/utils_string/utils_string_llt.cc index bf2486a..04210bd 100644 --- a/test/cutils/utils_string/utils_string_llt.cc +++ b/test/cutils/utils_string/utils_string_llt.cc @@ -15,7 +15,6 @@ #include #include -#include #include #include "mock.h" #include "utils_string.h" @@ -26,26 +25,6 @@ extern "C" { DECLARE_WRAPPER(calloc, void *, (size_t nmemb, size_t size)); DEFINE_WRAPPER(calloc, void *, (size_t nmemb, size_t size), (nmemb, size)); - - DECLARE_WRAPPER_V(strcat_s, errno_t, (char *strDest, size_t destMax, const char *strSrc)); - DEFINE_WRAPPER_V(strcat_s, errno_t, (char *strDest, size_t destMax, const char *strSrc), - (strDest, destMax, strSrc)); -} - -static int g_strcat_s_cnt = 0; - -static errno_t strcat_s_fail(char *strDest, size_t destMax, const char *strSrc) -{ - return (errno_t)EINVAL; -} - -static errno_t strcat_s_second_fail(char *strDest, size_t destMax, const char *strSrc) -{ - g_strcat_s_cnt++; - if (g_strcat_s_cnt == 1) { - return __real_strcat_s(strDest, destMax, strSrc); - } - return (errno_t)EINVAL; } TEST(utils_string_llt, test_strings_count) @@ -681,22 +660,6 @@ TEST(utils_string_llt, test_util_string_join) result = util_string_join(nullptr, array_long, array_long_len); ASSERT_STREQ(result, nullptr); - - MOCK_SET_V(strcat_s, strcat_s_fail); - result = util_string_join(" ", array_short, array_short_len); - ASSERT_STREQ(result, nullptr); - MOCK_CLEAR(strcat_s); - - MOCK_SET_V(strcat_s, strcat_s_fail); - result = util_string_join(" ", array_long, array_long_len); - ASSERT_STREQ(result, nullptr); - MOCK_CLEAR(strcat_s); - - g_strcat_s_cnt = 0; - MOCK_SET_V(strcat_s, strcat_s_second_fail); - result = util_string_join(" ", array_long, array_long_len); - ASSERT_STREQ(result, nullptr); - MOCK_CLEAR(strcat_s); } TEST(utils_string_llt, test_util_string_append) @@ -742,17 +705,6 @@ TEST(utils_string_llt, test_util_string_append) result = util_string_append("abc", "123"); ASSERT_STREQ(result, nullptr); MOCK_CLEAR(calloc); - - MOCK_SET_V(strcat_s, strcat_s_fail); - result = util_string_append("abc", "123"); - ASSERT_STREQ(result, nullptr); - MOCK_CLEAR(strcat_s); - - g_strcat_s_cnt = 0; - MOCK_SET_V(strcat_s, strcat_s_second_fail); - result = util_string_append("abc", "123"); - ASSERT_STREQ(result, nullptr); - MOCK_CLEAR(strcat_s); } TEST(utils_string_llt, test_dup_array_of_strings) diff --git a/test/image/oci/oci_config_merge/CMakeLists.txt b/test/image/oci/oci_config_merge/CMakeLists.txt index 23c3f18..141d120 100644 --- a/test/image/oci/oci_config_merge/CMakeLists.txt +++ b/test/image/oci/oci_config_merge/CMakeLists.txt @@ -57,4 +57,4 @@ target_include_directories(${EXE} PUBLIC ) set_target_properties(${EXE} PROPERTIES LINK_FLAGS "-Wl,--wrap,util_common_calloc_s -Wl,--wrap,util_smart_calloc_s -Wl,--wrap,merge_env") -target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lsecurec -lz) +target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lz) diff --git a/test/image/oci/oci_config_merge/oci_config_merge_llt.cc b/test/image/oci/oci_config_merge/oci_config_merge_llt.cc index 9437b14..25728ec 100644 --- a/test/image/oci/oci_config_merge/oci_config_merge_llt.cc +++ b/test/image/oci/oci_config_merge/oci_config_merge_llt.cc @@ -15,7 +15,6 @@ #include #include -#include #include #include "mock.h" #include "oci_runtime_spec.h" diff --git a/test/path/CMakeLists.txt b/test/path/CMakeLists.txt index f9afca9..62d4a10 100644 --- a/test/path/CMakeLists.txt +++ b/test/path/CMakeLists.txt @@ -24,4 +24,4 @@ target_include_directories(${EXE} PUBLIC ${CMAKE_BINARY_DIR}/json ) set_target_properties(${EXE} PROPERTIES LINK_FLAGS "-Wl,--wrap,getcwd -Wl,--wrap,readlink") -target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lsecurec -lz) +target_link_libraries(${EXE} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lyajl -lz) diff --git a/test/path/path_llt.cc b/test/path/path_llt.cc index 557573f..ba7ef7c 100644 --- a/test/path/path_llt.cc +++ b/test/path/path_llt.cc @@ -16,7 +16,6 @@ #include #include #include -#include #include #include "mock.h" #include "utils.h" @@ -36,13 +35,16 @@ extern "C" { static char *getcwd_specify(char *str, size_t size) { + const char *dst = "/home"; if (str == nullptr) { return nullptr; } - if (strcpy_s(str, size, "/home") != EOK) { + if (size <= strlen(dst)) { return nullptr; } + (void)strcpy(str, dst); + return str; } @@ -74,9 +76,10 @@ static ssize_t readlink_specify(const char *path, char *buf, size_t bufsize) return -1; } - if (strcpy_s(buf, bufsize, linkpath) != EOK) { + if (bufsize <= linkpath_length) { return -1; } + (void)strcpy(buf, linkpath); if (linkpath_length > bufsize) { return bufsize; diff --git a/test/llt.sh b/test/test.sh similarity index 100% rename from test/llt.sh rename to test/test.sh