!464 iSulad: change llt to ut

Merge pull request !464 from Jackey_1024/0616

CMakeLists.txt

@@ -53,7 +53,7 @@ configure_file(
 # parse .proto files
 include(cmake/protoc.cmake)
 
-# llt and coverage
+# unit test and coverage
 SET(CMAKE_VERBOSE_MAKEFILE OFF)
 IF(ENABLE_COVERAGE)
     MESSAGE(STATUS "Enable coverage compile option")
@@ -72,11 +72,11 @@ IF(CMAKE_BUILD_TYPE STREQUAL Debug)
 ENDIF()
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src)
-OPTION(ENABLE_LLT "llt switch" OFF)
-IF(ENABLE_LLT)
+OPTION(ENABLE_UT "ut switch" OFF)
+IF(ENABLE_UT)
     enable_testing()
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test)
-ENDIF(ENABLE_LLT)
+ENDIF(ENABLE_UT)
 
 # install all files
 install(FILES ${CMAKE_BINARY_DIR}/conf/isulad.pc

test/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 function(gmock_find_library _name)
   find_library(${_name}

test/cmd/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(isula)
 add_subdirectory(isulad-shim)

test/cmd/isula/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(infomation)
 add_subdirectory(extend)

test/cmd/isula/extend/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(pause)
 add_subdirectory(resume)

test/cmd/isula/extend/pause/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE pause_llt)
+SET(EXE pause_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cutils/utils_string.c
@@ -27,7 +27,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cmd/isula/extend/pause.c
     # ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/LcrcConnectMock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/grpc_client_mock.cc
-    pause_llt.cc)
+    pause_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/cmd/isula/extend/resume/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE resume_llt)
+SET(EXE resume_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cutils/utils_string.c
@@ -27,7 +27,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cmd/isula/extend/resume.c
     # ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/LcrcConnectMock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/grpc_client_mock.cc
-    resume_llt.cc)
+    resume_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/cmd/isula/infomation/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(ps)
 add_subdirectory(info)

test/cmd/isula/infomation/info/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE info_llt)
+SET(EXE info_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cutils/utils_string.c
@@ -27,7 +27,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/connect/client/isula_connect.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cmd/isula/information/info.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/grpc_client_mock.cc
-    info_llt.cc)
+    info_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/cmd/isula/infomation/ps/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE ps_llt)
+SET(EXE ps_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cutils/utils_string.c
@@ -26,7 +26,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/connect/client/isula_connect.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cmd/isula/information/ps.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/grpc_client_mock.cc
-    ps_llt.cc)
+    ps_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/cmd/isula/infomation/ps/ps_llt.cc → test/cmd/isula/infomation/ps/ps_ut.cpp

 /*
  * Copyright (c) Huawei Technologies Co., Ltd. 2019-2020. All rights reserved.
- * Description: ps llt
+ * Description: ps unit test
  * Author: wujing
  * Create: 2019-12-19
  */

test/cmd/isulad-shim/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE isulad-shim_llt)
+SET(EXE isulad-shim_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad-shim/process.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad-shim/common.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad-shim/terminal.c
-    isulad-shim_llt.cc)
+    isulad-shim_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/cmd/isulad-shim/isulad-shim_llt.cc → test/cmd/isulad-shim/isulad-shim_ut.cpp

 /*
  * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved.
- * Description: isulad-shim llt
+ * Description: isulad-shim unit test
  * Author: leizhongkai
  * Create: 2020-02-25
  */

test/cutils/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(utils_string)
 add_subdirectory(utils_convert)

test/cutils/utils_array/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE utils_array_llt)
+SET(EXE utils_array_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_string.c
@@ -14,7 +14,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/map/map.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/map/rb_tree.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/path.c
-    utils_array_llt.cc)
+    utils_array_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/cutils/utils_array/utils_array_llt.cc → test/cutils/utils_array/utils_array_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: utils_array llt
+ * Description: utils_array unit test
  * Author: tanyifeng
  * Create: 2019-09-24
  */

test/cutils/utils_convert/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE utils_convert_llt)
+SET(EXE utils_convert_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_string.c
@@ -14,7 +14,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/path.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/map/map.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/map/rb_tree.c
-    utils_convert_llt.cc)
+    utils_convert_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/cutils/utils_convert/utils_convert_llt.cc → test/cutils/utils_convert/utils_convert_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: utils_convert llt
+ * Description: utils_convert unit test
  * Author: tanyifeng
  * Create: 2019-07-08
  */

test/cutils/utils_string/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE utils_string_llt)
+SET(EXE utils_string_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_string.c
@@ -14,7 +14,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/map/map.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/map/rb_tree.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/path.c
-    utils_string_llt.cc)
+    utils_string_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/cutils/utils_string/utils_string_llt.cc → test/cutils/utils_string/utils_string_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: utils_string llt
+ * Description: utils_string unit test
  * Author: tanyifeng
  * Create: 2019-07-08
  */
@@ -27,7 +27,7 @@ extern "C" {
     DEFINE_WRAPPER(calloc, void *, (size_t nmemb, size_t size), (nmemb, size));
 }
 
-TEST(utils_string_llt, test_strings_count)
+TEST(utils_string_ut, test_strings_count)
 {
     ASSERT_EQ(strings_count("aaaaaaaaaaaaaaaaaaaa", 'a'), 20);
     ASSERT_EQ(strings_count("a", 'a'), 1);
@@ -35,7 +35,7 @@ TEST(utils_string_llt, test_strings_count)
     ASSERT_EQ(strings_count(nullptr, 'c'), 0);
 }
 
-TEST(utils_string_llt, test_strings_contains_any)
+TEST(utils_string_ut, test_strings_contains_any)
 {
     ASSERT_EQ(strings_contains_any("1234567890abcdefgh!@", "ijklmnopq#123456789"), true);
     ASSERT_EQ(strings_contains_any("1234567890abcdefgh!@", "ijklmnopqrstuvw)(*x&-"), false);
@@ -47,7 +47,7 @@ TEST(utils_string_llt, test_strings_contains_any)
 }
 
 
-TEST(utils_string_llt, test_strings_to_lower)
+TEST(utils_string_ut, test_strings_to_lower)
 {
     char *result = nullptr;
 
@@ -86,7 +86,7 @@ TEST(utils_string_llt, test_strings_to_lower)
     MOCK_CLEAR(util_strdup_s);
 }
 
-TEST(utils_string_llt, test_strings_to_upper)
+TEST(utils_string_ut, test_strings_to_upper)
 {
     char *result = nullptr;
 
@@ -125,7 +125,7 @@ TEST(utils_string_llt, test_strings_to_upper)
 }
 
 
-TEST(utils_string_llt, test_strings_in_slice)
+TEST(utils_string_ut, test_strings_in_slice)
 {
     const char *array_long[] = { "abcd", "1234", nullptr, "", "&^%abc" };
     size_t array_long_len = sizeof(array_long) / sizeof(array_long[0]);
@@ -143,7 +143,7 @@ TEST(utils_string_llt, test_strings_in_slice)
     ASSERT_FALSE(strings_in_slice(nullptr, 0, nullptr));
 }
 
-TEST(utils_string_llt, test_util_parse_byte_size_string)
+TEST(utils_string_ut, test_util_parse_byte_size_string)
 {
     int64_t converted = 0;
     int ret;
@@ -279,7 +279,7 @@ TEST(utils_string_llt, test_util_parse_byte_size_string)
     MOCK_CLEAR(util_strdup_s);
 }
 
-TEST(utils_string_llt, test_util_string_split_multi)
+TEST(utils_string_ut, test_util_string_split_multi)
 {
     char **result = nullptr;
 
@@ -363,7 +363,7 @@ TEST(utils_string_llt, test_util_string_split_multi)
     MOCK_CLEAR(calloc);
 }
 
-TEST(utils_string_llt, test_util_string_split)
+TEST(utils_string_ut, test_util_string_split)
 {
     char **result = nullptr;
 
@@ -437,7 +437,7 @@ TEST(utils_string_llt, test_util_string_split)
     MOCK_CLEAR(calloc);
 }
 
-TEST(utils_string_llt, test_str_skip_str)
+TEST(utils_string_ut, test_str_skip_str)
 {
     const char *str = "abcdefghij1234567890";
     const char *substr = "abcdefgh";
@@ -465,7 +465,7 @@ TEST(utils_string_llt, test_str_skip_str)
     ASSERT_STREQ(result, nullptr);
 }
 
-TEST(utils_string_llt, test_util_string_delchar)
+TEST(utils_string_ut, test_util_string_delchar)
 {
     char *result = nullptr;
 
@@ -490,7 +490,7 @@ TEST(utils_string_llt, test_util_string_delchar)
     MOCK_CLEAR(util_strdup_s);
 }
 
-TEST(utils_string_llt, test_util_trim_newline)
+TEST(utils_string_ut, test_util_trim_newline)
 {
     char s_all[ ] = { '\n', '\n', '\n', '\n', '\0' };
     char s_tail[ ] = { '\n', 'a', '\n', 'b', '\n', '\0' };
@@ -514,7 +514,7 @@ TEST(utils_string_llt, test_util_trim_newline)
     ASSERT_STREQ(s_nullptr, nullptr);
 }
 
-TEST(utils_string_llt, test_util_trim_space)
+TEST(utils_string_ut, test_util_trim_space)
 {
     char s_all[ ] = { '\f', '\n', '\r', '\t', '\v', ' ', '\0' };
     char s_head[ ] = { '\f', '\n', '\r', 'a', 'b', 'c', '\0' };
@@ -551,7 +551,7 @@ TEST(utils_string_llt, test_util_trim_space)
     ASSERT_STREQ(result, nullptr);
 }
 
-TEST(utils_string_llt, test_util_trim_quotation)
+TEST(utils_string_ut, test_util_trim_quotation)
 {
     char s_all[ ] = { '"', '"', '"', '\n', '"', '\0' };
     char s_head[ ] = { '"', '"', 'a', 'b', 'c', '\0' };
@@ -592,7 +592,7 @@ TEST(utils_string_llt, test_util_trim_quotation)
     ASSERT_STREQ(result, nullptr);
 }
 
-TEST(utils_string_llt, test_str_array_dup)
+TEST(utils_string_ut, test_str_array_dup)
 {
     const char *array_long[] = { "abcd", "1234", nullptr, "", "&^%abc" };
     size_t array_long_len = sizeof(array_long) / sizeof(array_long[0]);
@@ -627,7 +627,7 @@ TEST(utils_string_llt, test_str_array_dup)
     ASSERT_EQ(result, nullptr);
 }
 
-TEST(utils_string_llt, test_util_string_join)
+TEST(utils_string_ut, test_util_string_join)
 {
     const char *array_long[] = { "abcd", "1234", "5678", "", "&^%abc" };
     size_t array_long_len = sizeof(array_long) / sizeof(array_long[0]);
@@ -662,7 +662,7 @@ TEST(utils_string_llt, test_util_string_join)
     ASSERT_STREQ(result, nullptr);
 }
 
-TEST(utils_string_llt, test_util_string_append)
+TEST(utils_string_ut, test_util_string_append)
 {
     char *result = nullptr;
 
@@ -707,7 +707,7 @@ TEST(utils_string_llt, test_util_string_append)
     MOCK_CLEAR(calloc);
 }
 
-TEST(utils_string_llt, test_dup_array_of_strings)
+TEST(utils_string_ut, test_dup_array_of_strings)
 {
     const char *array_long[] = { "abcd", "1234", nullptr, "", "&^%abc" };
     size_t array_long_len = sizeof(array_long) / sizeof(array_long[0]);
@@ -757,7 +757,7 @@ TEST(utils_string_llt, test_dup_array_of_strings)
     MOCK_CLEAR(calloc);
 }
 
-TEST(utils_string_llt, test_parse_percent_string)
+TEST(utils_string_ut, test_parse_percent_string)
 {
     long converted = 0;
     int ret = 0;

test/image/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(oci)

test/image/oci/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(oci_config_merge)

test/image/oci/oci_config_merge/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE oci_config_merge_llt)
+SET(EXE oci_config_merge_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/image/oci/oci_config_merge.c
@@ -22,13 +22,13 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/services/execution/spec/sysinfo.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cmd/commander.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cmd/isulad/arguments.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/image/oci/oci_llt_common.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/image/oci/oci_ut_common.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/mocks/containers_store_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/mocks/namespace_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/mocks/container_unix_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/services/execution/spec/specs_mount.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/mocks/selinux_label_mock.cc
-    oci_config_merge_llt.cc)
+    oci_config_merge_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/image/oci/oci_config_merge/oci_config_merge_llt.cc → test/image/oci/oci_config_merge/oci_config_merge_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: oci_config_merge llt
+ * Description: oci_config_merge unit test
  * Author: wangfengtu
  * Create: 2019-08-20
  */
@@ -21,7 +21,7 @@
 #include "isula_libutils/imagetool_image.h"
 #include "isula_libutils/container_config.h"
 #include "oci_config_merge.h"
-#include "oci_llt_common.h"
+#include "oci_ut_common.h"
 
 #define IMAGETOOL_IMAGE_FILE "image/oci/oci_config_merge/imagetool_image.json"
 #define OCI_RUNTIME_SPEC_FILE "image/oci/oci_config_merge/oci_runtime_spec.json"
@@ -68,7 +68,7 @@ void *util_smart_calloc_s_fail(size_t size, size_t len)
     }
 }
 
-TEST(oci_config_merge_llt, test_oci_image_merge_config)
+TEST(oci_config_merge_ut, test_oci_image_merge_config)
 {
     char *imagetool_image_file = NULL;
     imagetool_image *tool_image = NULL;

test/image/oci/oci_llt_common.cc → test/image/oci/oci_ut_common.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: oci_rootfs_remove llt
+ * Description: oci_rootfs_remove unit test
  * Author: wangfengtu
  * Create: 2019-08-29
  */
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include "utils.h"
-#include "oci_llt_common.h"
+#include "oci_ut_common.h"
 
 int execvp_success(const char *file, char * const argv[])
 {

test/image/oci/oci_llt_common.h → test/image/oci/oci_ut_common.h

@@ -8,24 +8,24 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: oci_rootfs_remove llt
+ * Description: oci_rootfs_remove unit test
  * Author: wangfengtu
  * Create: 2019-08-29
  */
 
-#ifndef __OCI_LLT_COMMON_H
-#define __OCI_LLT_COMMON_H
+#ifndef __OCI_UT_COMMON_H
+#define __OCI_UT_COMMON_H
 
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils.h"
-#include "oci_llt_common.h"
+#include "oci_ut_common.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define DECLARE_OCI_LLT_COMMON_WRAPPER \
+#define DECLARE_OCI_UT_COMMON_WRAPPER \
     extern "C" {\
         DECLARE_WRAPPER_V(conf_get_graph_rootpath, char *, ());\
         DEFINE_WRAPPER_V(conf_get_graph_rootpath, char *, (), ());\

test/path/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE path_llt)
+SET(EXE path_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/cutils/utils.c
@@ -14,7 +14,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/cutils/utils_regex.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/cutils/utils_verify.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/sha256/sha256.c
-    path_llt.cc)
+    path_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include

test/path/path_llt.cc → test/path/path_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: path llt
+ * Description: path unit test
  * Author: jikui
  * Create: 2019-08-22
  */
@@ -87,7 +87,7 @@ static ssize_t readlink_specify(const char *path, char *buf, size_t bufsize)
     return linkpath_length;
 }
 
-TEST(path_llt, test_cleanpath)
+TEST(path_ut, test_cleanpath)
 {
     char *result = nullptr;
     std::string str;
@@ -123,7 +123,7 @@ TEST(path_llt, test_cleanpath)
     ASSERT_STREQ(result, nullptr);
 }
 
-TEST(path_llt, test_specify_current_dir)
+TEST(path_ut, test_specify_current_dir)
 {
     ASSERT_FALSE(specify_current_dir(nullptr));
     ASSERT_TRUE(specify_current_dir(""));
@@ -135,7 +135,7 @@ TEST(path_llt, test_specify_current_dir)
     ASSERT_FALSE(specify_current_dir("home"));
 }
 
-TEST(path_llt, test_follow_symlink_in_scope)
+TEST(path_ut, test_follow_symlink_in_scope)
 {
     std::string fullpath, rootpath;
     char *res = nullptr;
@@ -173,22 +173,22 @@ TEST(path_llt, test_follow_symlink_in_scope)
     free(res);
     res = nullptr;
 
-    fullpath = "/tmp/just_for_llt/link";
+    fullpath = "/tmp/just_for_ut/link";
     rootpath = "/tmp";
-    const char *path = "/tmp/just_for_llt";
+    const char *path = "/tmp/just_for_ut";
     const char *path_file = "./testdir/test/../file";
-    const char *path_link = "/tmp/just_for_llt/link";
+    const char *path_link = "/tmp/just_for_ut/link";
     ASSERT_EQ(create_tmp_symbolic_link(path, path_file, path_link), 0);
     MOCK_SET_V(readlink, readlink_specify);
     res = follow_symlink_in_scope(fullpath.c_str(), rootpath.c_str());
-    ASSERT_STREQ(res, "/tmp/just_for_llt/dir/file");
+    ASSERT_STREQ(res, "/tmp/just_for_ut/dir/file");
     MOCK_CLEAR(readlink);
-    ASSERT_EQ(util_recursive_rmdir("/tmp/just_for_llt", 0), 0);
+    ASSERT_EQ(util_recursive_rmdir("/tmp/just_for_ut", 0), 0);
     free(res);
     res = nullptr;
 }
 
-TEST(path_llt, test_split_dir_and_base_name)
+TEST(path_ut, test_split_dir_and_base_name)
 {
     char *dir = nullptr;
     char *base = nullptr;
@@ -226,7 +226,7 @@ TEST(path_llt, test_split_dir_and_base_name)
     base = nullptr;
 }
 
-TEST(path_llt, test_filepath_split)
+TEST(path_ut, test_filepath_split)
 {
     char *dir = nullptr;
     char *base = nullptr;
@@ -272,7 +272,7 @@ TEST(path_llt, test_filepath_split)
     base = nullptr;
 }
 
-TEST(path_llt, test_get_resource_path)
+TEST(path_ut, test_get_resource_path)
 {
     char *res = nullptr;
 
@@ -307,7 +307,7 @@ TEST(path_llt, test_get_resource_path)
     res = nullptr;
 }
 
-TEST(path_llt, test_resolve_path)
+TEST(path_ut, test_resolve_path)
 {
     std::string rootpath, path;
     char *resolvedpath = nullptr;
@@ -336,7 +336,7 @@ TEST(path_llt, test_resolve_path)
     abspath = nullptr;
 }
 
-TEST(path_llt, test_has_trailing_path_separator)
+TEST(path_ut, test_has_trailing_path_separator)
 {
     ASSERT_FALSE(has_trailing_path_separator(nullptr));
     ASSERT_FALSE(has_trailing_path_separator(""));
@@ -344,7 +344,7 @@ TEST(path_llt, test_has_trailing_path_separator)
     ASSERT_FALSE(has_trailing_path_separator("/home"));
 }
 
-TEST(path_llt, test_preserve_trailing_dot_or_separator)
+TEST(path_ut, test_preserve_trailing_dot_or_separator)
 {
     std::string cleanedpath, originalpath;
     char *res = nullptr;

test/runtime/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(lcr)
 add_subdirectory(isula)

test/runtime/isula/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE isula_rt_ops_llt)
+SET(EXE isula_rt_ops_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils.c
@@ -17,14 +17,14 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/services/execution/spec/sysinfo.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/commander.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad/arguments.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_llt_common.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/containers_store_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/namespace_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/container_unix_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/engine_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/isulad_config_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/runtime/isula/isula_rt_ops.c
-    isula_rt_ops_llt.cc)
+    isula_rt_ops_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/runtime/isula/isula_rt_ops_llt.cc → test/runtime/isula/isula_rt_ops_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: isula runtime ops llt
+ * Description: isula runtime ops unit test
  * Author: jingrui
  * Create: 2020-02-15
  */
@@ -57,7 +57,7 @@ public:
     NiceMock<MockIsuladConf> m_isulad_conf;
 };
 
-TEST(isula_rt_ops_llt, test_rt_isula_detect)
+TEST(isula_rt_ops_ut, test_rt_isula_detect)
 {
     // All parameter NULL
     ASSERT_FALSE(rt_isula_detect(NULL));

test/runtime/lcr/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE lcr_rt_ops_llt)
+SET(EXE lcr_rt_ops_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils.c
@@ -19,14 +19,14 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/services/execution/spec/sysinfo.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/commander.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad/arguments.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_llt_common.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/containers_store_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/namespace_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/container_unix_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/engine_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/isulad_config_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/runtime/lcr/lcr_rt_ops.c
-    lcr_rt_ops_llt.cc)
+    lcr_rt_ops_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/runtime/lcr/lcr_rt_ops_llt.cc → test/runtime/lcr/lcr_rt_ops_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: lcr runtime ops llt
+ * Description: lcr runtime ops unit test
  * Author: lifeng
  * Create: 2020-02-15
  */
@@ -57,7 +57,7 @@ public:
     NiceMock<MockIsuladConf> m_isulad_conf;
 };
 
-TEST(lcr_rt_ops_llt, test_rt_lcr_detect)
+TEST(lcr_rt_ops_ut, test_rt_lcr_detect)
 {
     // All parameter NULL
     ASSERT_FALSE(rt_lcr_detect(NULL));

test/services/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(graphdriver)
 add_subdirectory(execution)

test/services/execution/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(spec)
 add_subdirectory(execute)

test/services/execution/execute/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(execution_extend)

test/services/execution/execute/execution_extend/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE execution_extend_llt)
+SET(EXE execution_extend_ut)
 
 add_executable(${EXE}
 
@@ -41,7 +41,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/driver_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/restartmanager_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/specs_mock.cc
-    execution_extend_llt.cc)
+    execution_extend_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/services/execution/execute/execution_extend/execution_extend_llt.cc → test/services/execution/execute/execution_extend/execution_extend_ut.cpp

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  * Author: jikui
  * Create: 2020-02-25
- * Description: provide execution_extend llt test
+ * Description: provide execution_extend unit test
  ******************************************************************************/
 
 #include "execution_extend.h"

test/services/execution/spec/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE selinux_label_llt)
-SET(MOCK_EXE selinux_label_mock_llt)
+SET(EXE selinux_label_ut)
+SET(MOCK_EXE selinux_label_mock_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cutils/utils.c
@@ -18,7 +18,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libisulad.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../mocks/namespace_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/services/execution/spec/selinux_label.c
-    selinux_label_llt.cc)
+    selinux_label_ut.cpp)
 
 add_executable(${MOCK_EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cutils/utils.c
@@ -37,7 +37,7 @@ add_executable(${MOCK_EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../mocks/syscall_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../mocks/selinux_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/services/execution/spec/selinux_label.c
-    selinux_label_mock_llt.cc)
+    selinux_label_mock_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/services/graphdriver/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(driver)

test/services/graphdriver/driver/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE driver_llt)
+SET(EXE driver_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cutils/utils.c
@@ -20,7 +20,7 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/services/graphdriver/driver.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/services/graphdriver/devmapper/driver_devmapper.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libisulad.c
-    driver_llt.cc)
+    driver_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/services/graphdriver/driver/driver_llt.cc → test/services/graphdriver/driver/driver_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: driver llt
+ * Description: driver unit test
  * Author: wangfengtu
  * Create: 2020-02-19
  */
@@ -63,13 +63,13 @@ public:
 };
 
 // All parameter NULL
-TEST(graphdriver_init_llt, test_graphdriver_init_1)
+TEST(graphdriver_init_ut, test_graphdriver_init_1)
 {
     ASSERT_TRUE(graphdriver_init(NULL, NULL, 0) == NULL);
 }
 
 // All parameter correct
-TEST(graphdriver_init_llt, test_graphdriver_init_2)
+TEST(graphdriver_init_ut, test_graphdriver_init_2)
 {
     struct graphdriver *driver = NULL;
     char **options = NULL;
@@ -86,7 +86,7 @@ TEST(graphdriver_init_llt, test_graphdriver_init_2)
 }
 
 // Parameter dm.fs invalid
-TEST(graphdriver_init_llt, test_graphdriver_init_3)
+TEST(graphdriver_init_ut, test_graphdriver_init_3)
 {
     struct graphdriver *driver = NULL;
     char **options = NULL;
@@ -100,7 +100,7 @@ TEST(graphdriver_init_llt, test_graphdriver_init_3)
 }
 
 // Parameter dm.thinpooldev invalid
-TEST(graphdriver_init_llt, test_graphdriver_init_4)
+TEST(graphdriver_init_ut, test_graphdriver_init_4)
 {
     struct graphdriver *driver = NULL;
     char **options = NULL;
@@ -114,7 +114,7 @@ TEST(graphdriver_init_llt, test_graphdriver_init_4)
 }
 
 // Parameter dm.min_free_space invalid
-TEST(graphdriver_init_llt, test_graphdriver_init_5)
+TEST(graphdriver_init_ut, test_graphdriver_init_5)
 {
     struct graphdriver *driver = NULL;
     char **options = NULL;
@@ -134,7 +134,7 @@ TEST(graphdriver_init_llt, test_graphdriver_init_5)
 }
 
 // Parameter dm.basesize invalid
-TEST(graphdriver_init_llt, test_graphdriver_init_6)
+TEST(graphdriver_init_ut, test_graphdriver_init_6)
 {
     struct graphdriver *driver = NULL;
     char **options = NULL;
@@ -148,7 +148,7 @@ TEST(graphdriver_init_llt, test_graphdriver_init_6)
 }
 
 // None exist parameter
-TEST(graphdriver_init_llt, test_graphdriver_init_7)
+TEST(graphdriver_init_ut, test_graphdriver_init_7)
 {
     struct graphdriver *driver = NULL;
     char **options = NULL;

test/specs/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
 add_subdirectory(specs)
 add_subdirectory(specs_extend)

test/specs/specs/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE specs_llt)
+SET(EXE specs_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils.c
@@ -23,14 +23,14 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/services/execution/spec/sysinfo.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/commander.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad/arguments.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_llt_common.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/containers_store_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/namespace_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/container_unix_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/engine_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/selinux_label_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/isulad_config_mock.cc
-    specs_llt.cc)
+    specs_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/specs/specs/specs_llt.cc → test/specs/specs/specs_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: specs llt
+ * Description: specs unit test
  * Author: lifeng
  * Create: 2020-02-18
  */
@@ -21,7 +21,7 @@
 #include "specs.h"
 #include "isula_libutils/host_config.h"
 #include "isula_libutils/container_config.h"
-#include "oci_llt_common.h"
+#include "oci_ut_common.h"
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include "isulad_config_mock.h"
@@ -58,13 +58,13 @@ public:
 #define HOST_CONFIG_FILE "specs/specs/hostconfig.json"
 #define OCI_RUNTIME_SPEC_FILE "specs/specs/oci_runtime_spec.json"
 
-TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup_1)
+TEST(merge_conf_cgroup_ut, test_merge_conf_cgroup_1)
 {
     // All parameter NULL
     ASSERT_NE(merge_conf_cgroup(NULL, NULL), 0);
 }
 
-TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup_2)
+TEST(merge_conf_cgroup_ut, test_merge_conf_cgroup_2)
 {
     oci_runtime_spec *oci_spec = NULL;
 
@@ -76,7 +76,7 @@ TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup_2)
     oci_spec = NULL;
 }
 
-TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup_3)
+TEST(merge_conf_cgroup_ut, test_merge_conf_cgroup_3)
 {
     char *host_config_file = NULL;
     host_config *host_spec = NULL;
@@ -96,7 +96,7 @@ TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup_3)
     host_spec = NULL;
 }
 
-TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup)
+TEST(merge_conf_cgroup_ut, test_merge_conf_cgroup)
 {
     char *host_config_file = NULL;
     host_config *host_spec = NULL;
@@ -124,7 +124,7 @@ TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup)
     oci_spec = NULL;
 }
 
-TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup_cpu)
+TEST(merge_conf_cgroup_ut, test_merge_conf_cgroup_cpu)
 {
     char *host_config_file = NULL;
     host_config *host_spec = NULL;
@@ -177,7 +177,7 @@ TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup_cpu)
     oci_spec = NULL;
 }
 
-TEST(merge_conf_cgroup_llt, test_merge_conf_cgroup_mem)
+TEST(merge_conf_cgroup_ut, test_merge_conf_cgroup_mem)
 {
     char *host_config_file = NULL;
     host_config *host_spec = NULL;

test/specs/specs_extend/CMakeLists.txt

-project(iSulad_LLT)
+project(iSulad_UT)
 
-SET(EXE specs_extend_llt)
+SET(EXE specs_extend_ut)
 
 add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils.c
@@ -23,14 +23,14 @@ add_executable(${EXE}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/services/execution/spec/sysinfo.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/commander.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad/arguments.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_llt_common.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/containers_store_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/namespace_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/container_unix_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/engine_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/selinux_label_mock.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/isulad_config_mock.cc
-    specs_extend_llt.cc)
+    specs_extend_ut.cpp)
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}

test/specs/specs_extend/specs_extend_llt.cc → test/specs/specs_extend/specs_extend_ut.cpp

@@ -8,7 +8,7 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Description: specs extend llt
+ * Description: specs extend unit test
  * Author: lifeng
  * Create: 2020-02-18
  */
@@ -21,7 +21,7 @@
 #include "specs.h"
 #include "isula_libutils/host_config.h"
 #include "isula_libutils/container_config.h"
-#include "oci_llt_common.h"
+#include "oci_ut_common.h"
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include "isulad_config_mock.h"
@@ -44,7 +44,7 @@ using namespace std;
 
 #define HOOKS_CONFIG_FILE "specs/specs_extend/hooks.json"
 
-TEST(make_sure_oci_spec_linux_llt, test_make_sure_oci_spec_linux)
+TEST(make_sure_oci_spec_linux_ut, test_make_sure_oci_spec_linux)
 {
     oci_runtime_spec *oci_spec = NULL;
     oci_spec = (oci_runtime_spec *) util_common_calloc_s(sizeof(oci_runtime_spec));
@@ -55,7 +55,7 @@ TEST(make_sure_oci_spec_linux_llt, test_make_sure_oci_spec_linux)
     oci_spec = NULL;
 }
 
-TEST(make_sure_oci_spec_process_llt, test_make_sure_oci_spec_process)
+TEST(make_sure_oci_spec_process_ut, test_make_sure_oci_spec_process)
 {
     oci_runtime_spec *oci_spec = NULL;
     oci_spec = (oci_runtime_spec *) util_common_calloc_s(sizeof(oci_runtime_spec));
@@ -66,7 +66,7 @@ TEST(make_sure_oci_spec_process_llt, test_make_sure_oci_spec_process)
     oci_spec = NULL;
 }
 
-TEST(make_sure_oci_spec_linux_resources_llt, test_make_sure_oci_spec_linux_resources)
+TEST(make_sure_oci_spec_linux_resources_ut, test_make_sure_oci_spec_linux_resources)
 {
     oci_runtime_spec *oci_spec = NULL;
     oci_spec = (oci_runtime_spec *) util_common_calloc_s(sizeof(oci_runtime_spec));
@@ -78,7 +78,7 @@ TEST(make_sure_oci_spec_linux_resources_llt, test_make_sure_oci_spec_linux_resou
     oci_spec = NULL;
 }
 
-TEST(make_sure_oci_spec_linux_resources_blkio_llt, test_make_sure_oci_spec_linux_resources_blkio)
+TEST(make_sure_oci_spec_linux_resources_blkio_ut, test_make_sure_oci_spec_linux_resources_blkio)
 {
     oci_runtime_spec *oci_spec = NULL;
     oci_spec = (oci_runtime_spec *) util_common_calloc_s(sizeof(oci_runtime_spec));
@@ -91,12 +91,12 @@ TEST(make_sure_oci_spec_linux_resources_blkio_llt, test_make_sure_oci_spec_linux
     oci_spec = NULL;
 }
 
-TEST(merge_hooks_llt, test_merge_hooks_invalid)
+TEST(merge_hooks_ut, test_merge_hooks_invalid)
 {
     ASSERT_NE(merge_hooks(nullptr, nullptr), 0);
 }
 
-TEST(merge_hooks_llt, test_merge_hooks_llt_2)
+TEST(merge_hooks_ut, test_merge_hooks_ut_2)
 {
     oci_runtime_spec *oci_spec = NULL;
 
@@ -108,7 +108,7 @@ TEST(merge_hooks_llt, test_merge_hooks_llt_2)
     oci_spec = NULL;
 }
 
-TEST(merge_hooks_llt, test_merge_hooks_llt_3)
+TEST(merge_hooks_ut, test_merge_hooks_ut_3)
 {
     char *hooks_config_file = NULL;
     oci_runtime_spec_hooks *hooks_spec = NULL;
@@ -127,7 +127,7 @@ TEST(merge_hooks_llt, test_merge_hooks_llt_3)
     hooks_spec = NULL;
 }
 
-TEST(merge_hooks_llt, test_merge_hooks_llt_4)
+TEST(merge_hooks_ut, test_merge_hooks_ut_4)
 {
     char *hooks_config_file = NULL;
     oci_runtime_spec_hooks *hooks_spec = NULL;
@@ -155,7 +155,7 @@ TEST(merge_hooks_llt, test_merge_hooks_llt_4)
     free_oci_runtime_spec(oci_spec);
     oci_spec = NULL;
 }
-TEST(merge_hooks_llt, test_merge_hooks_llt_prestart)
+TEST(merge_hooks_ut, test_merge_hooks_ut_prestart)
 {
     char *hooks_config_file = NULL;
     oci_runtime_spec_hooks *hooks_spec = NULL;
@@ -193,7 +193,7 @@ TEST(merge_hooks_llt, test_merge_hooks_llt_prestart)
     oci_spec = NULL;
 }
 
-TEST(merge_hooks_llt, test_merge_hooks_llt_poststart)
+TEST(merge_hooks_ut, test_merge_hooks_ut_poststart)
 {
     char *hooks_config_file = NULL;
     oci_runtime_spec_hooks *hooks_spec = NULL;
@@ -240,7 +240,7 @@ TEST(merge_hooks_llt, test_merge_hooks_llt_poststart)
     oci_spec = NULL;
 }
 
-TEST(merge_hooks_llt, test_merge_hooks_llt_poststop)
+TEST(merge_hooks_ut, test_merge_hooks_ut_poststop)
 {
     char *hooks_config_file = NULL;
     oci_runtime_spec_hooks *hooks_spec = NULL;

test/test.sh

@@ -19,8 +19,8 @@
 
 function usage()
 {
-    echo  "Usage: sh llt.sh [OPTIONS]"
-    echo  "Use llt.sh to control llt operation"
+    echo  "Usage: sh test.sh [OPTIONS]"
+    echo  "Use test.sh to control unit test operation"
     echo  ""
     echo  "Misc:"
     echo  "  -h, --help                      Print this help, then exit"
@@ -31,8 +31,8 @@ function usage()
     echo  "  -e, --empty                     Enable compile empty(make clean)"
     echo
     echo  "TestRun Options"
-    echo  "  -r, --run-llt <option>          Run all llt, eg: -r, -rscreen(default), -rxml, --run-llt, --run-llt=screen, --run-llt=xml"
-    echo  "  -s, --specify-llt FILE          Only Run specify llt executable FILE, eg: -smain_llt, --specify-llt=main_llt"
+    echo  "  -r, --run-ut <option>          Run all unit test, eg: -r, -rscreen(default), -rxml, --run-ut, --run-ut=screen, --run-ut=xml"
+    echo  "  -s, --specify-ut FILE          Only Run specify unit test executable FILE, eg: -smain_ut, --specify-ut=main_ut"
     echo
     echo  "Coverage Options"
     echo  "  -t, --cover-report <option>     Enable coverage report. eg: -t, -thtml(default), -ttxt, --cover-report, --cover-report=html, --cover-report=txt"
@@ -40,7 +40,7 @@ function usage()
     echo
 }
 
-ARGS=`getopt -o "hcer::m::t::s:f:" -l "help,cmake::,empty,cover-report::,run-llt::,specify-llt:,cover-file:" -n "run_llt.sh" -- "$@"`
+ARGS=`getopt -o "hcer::m::t::s:f:" -l "help,cmake::,empty,cover-report::,run-ut::,specify-ut:,cover-file:" -n "run_test.sh" -- "$@"`
 if [ $? != 0 ]; then
     usage
     exit
@@ -53,7 +53,7 @@ if [ x"$ARGS" = x" --" ]; then
     COMPILE_ENABLE=no
     COVERAGE_ENABLE=no
     EMPTY_ENABLE=no
-    RUN_LLT=yes
+    RUN_UT=yes
     RUN_MODE=screen #value: screen or xml
     COVER_REPORT_ENABLE=no
 fi
@@ -76,8 +76,8 @@ while true; do
         -e|--empty)
             EMPTY_ENABLE=yes
             shift ;;
-        -r|--run-llt)
-            RUN_LLT=yes
+        -r|--run-ut)
+            RUN_UT=yes
             case "$2" in
                 "") RUN_MODE=screen;shift 2 ;;
                 screen) RUN_MODE=screen;shift 2 ;;
@@ -92,8 +92,8 @@ while true; do
                 txt) COVER_STYLE=txt;shift 2 ;;
                 *)echo "Error param: $2";exit 1 ;;
             esac ;;
-        -s|--specify-llt)
-            SPECIFY_LLT=$2
+        -s|--specify-ut)
+            SPECIFY_UT=$2
             shift 2 ;;
         -f|--cover-file)
             COVER_FILE=$2
@@ -103,9 +103,9 @@ while true; do
     esac
 done
 
-function llt_empty()
+function ut_empty()
 {
-    echo ---------------------- llt empty begin ----------------------
+    echo ---------------------- unit test empty begin ----------------------
     set -x
     make clean
     find -name "*.gcda" |xargs rm -f
@@ -121,13 +121,13 @@ function llt_empty()
     rm coverage -rf
     rm test_result.log -f
     set +x
-    echo ---------------------- llt empty end ------------------------
+    echo ---------------------- unit test empty end ------------------------
 }
-function llt_cmake()
+function ut_cmake()
 {
     ret=0
-    local CMAKE_OPTION="-DCMAKE_BUILD_TYPE=Debug -DENABLE_LLT=ON"
-    echo ---------------------- llt cmake begin ----------------------
+    local CMAKE_OPTION="-DCMAKE_BUILD_TYPE=Debug -DENABLE_UT=ON"
+    echo ---------------------- unit test cmake begin ----------------------
     cd ..
     if [ x"${COVERAGE_ENABLE}" = x"yes" ]; then
         CMAKE_OPTION="${CMAKE_OPTION} -DENABLE_COVERAGE=1"
@@ -138,18 +138,18 @@ function llt_cmake()
     cmake . ${CMAKE_OPTION}
     ret=$?
     cd -
-    echo ---------------------- llt cmake end ------------------------
+    echo ---------------------- unit test cmake end ------------------------
     echo
     return $ret
 }
 
-function llt_compile()
+function ut_compile()
 {
     ret=0
-    echo ---------------------- llt compile begin ----------------------
-    make -j
+    echo ---------------------- unit test compile begin ----------------------
+    make -j $(nproc)
     ret=$?
-    echo ---------------------- llt compile end ------------------------
+    echo ---------------------- unit test compile end ------------------------
     echo
     return $ret
 }
@@ -180,9 +180,9 @@ function xml_add_succeed()
     done < ${xmlfile}
 }
 
-function llt_run_all_test()
+function ut_run_all_test()
 {
-    echo ---------------------- llt run begin --------------------------
+    echo ---------------------- unit test run begin --------------------------
     if [ x"${RUN_MODE}" = x"screen" ]; then
         RUN_MODE=0
     elif [ x"${RUN_MODE}" = x"xml" ]; then
@@ -195,23 +195,23 @@ function llt_run_all_test()
         exit 1
     fi
 
-    if [ x"${SPECIFY_LLT}" = x"" ]; then
-        SPECIFY_LLT=`find -name "*_llt"` # run all test
+    if [ x"${SPECIFY_UT}" = x"" ]; then
+        SPECIFY_UT=`find -name "*_ut"` # run all test
     else
-        SPECIFY_LLT=`find -name "${SPECIFY_LLT}"`
+        SPECIFY_UT=`find -name "${SPECIFY_UT}"`
     fi
 
     TEST_LOG=test_result.log
     >$TEST_LOG
 
     ret=0
-    for TEST in $SPECIFY_LLT
+    for TEST in $SPECIFY_UT
     do
         echo $TEST
         tret=0
         if [ $RUN_MODE -eq 1 ];then
             xmlfile=${TEST##*/}
-            xmlfile=${xmlfile%_llt}-Results.xml
+            xmlfile=${xmlfile%_ut}-Results.xml
             $TEST --gtest_output=xml:${xmlfile}
             tret=$?
             xml_add_succeed ${xmlfile}
@@ -227,18 +227,18 @@ function llt_run_all_test()
         fi
     done
     echo ""
-    echo '######################test result begin######################'
+    echo '######################unit test result begin######################'
     cat $TEST_LOG
-    echo '#######################test result end#######################'
+    echo '#######################unit test result end#######################'
     echo ""
-    echo ---------------------- llt run end --------------------------
+    echo ---------------------- unit test run end --------------------------
     echo
     return $ret
 }
 
-function llt_coverage()
+function ut_coverage()
 {
-    echo ------------------ llt generate coverage begin --------------
+    echo ------------------ unit test generate coverage begin --------------
     if [ x"${COVER_STYLE}" = x"txt" ]; then
         GCDAS=`find -name "${COVER_FILE}.gcda"`
         if [ x"$GCDAS" = x"" ]; then
@@ -279,10 +279,10 @@ function llt_coverage()
             done
         fi
 
-        #lcov -c ${LCOV_CMD} -o coverage/coverage.info --exclude '*_llt.c' --include '*.c' --include '*.cpp' --include '*.cc' --rc lcov_branch_coverage=1 --ignore-errors gcov --ignore-errors source --ignore-errors graph
+        #lcov -c ${LCOV_CMD} -o coverage/coverage.info --exclude '*_ut.cpp' --include '*.c' --include '*.cpp' --include '*.cc' --rc lcov_branch_coverage=1 --ignore-errors gcov --ignore-errors source --ignore-errors graph
         lcov --help | grep "\-\-exclude"
         if [[ $? -eq 0 ]]; then
-            lcov -c ${LCOV_CMD} -b $(dirname $(pwd)) --no-external --exclude '*_llt*.cc' -o coverage/coverage.info --rc lcov_branch_coverage=1 --ignore-errors gcov --ignore-errors source --ignore-errors graph
+            lcov -c ${LCOV_CMD} -b $(dirname $(pwd)) --no-external --exclude '*_ut.cpp' -o coverage/coverage.info --rc lcov_branch_coverage=1 --ignore-errors gcov --ignore-errors source --ignore-errors graph
         else
             lcov -c ${LCOV_CMD} -b $(dirname $(pwd)) --no-external -o coverage/coverage.info --rc lcov_branch_coverage=1 --ignore-errors gcov --ignore-errors source --ignore-errors graph
         fi
@@ -299,36 +299,36 @@ function llt_coverage()
         fi
         chmod 755 -R coverage
     fi
-    echo ------------------ llt generate coverage end ----------------
+    echo ------------------ unit test generate coverage end ----------------
 }
 
 if [ x"${CMAKE_ENABLE}" = x"yes" ]; then
-    llt_cmake
+    ut_cmake
     if [[ $? -ne 0 ]];then
         exit 1
     fi
 fi
 
 if [ x"${EMPTY_ENABLE}" = x"yes" ]; then
-    llt_empty
+    ut_empty
 fi
 
 if [ x"${COMPILE_ENABLE}" = x"yes" ]; then
-    llt_compile
+    ut_compile
     if [[ $? -ne 0 ]];then
         exit 1
     fi
 fi
 
-if [ x"${RUN_LLT}" = x"yes" ]; then
-    llt_run_all_test
+if [ x"${RUN_UT}" = x"yes" ]; then
+    ut_run_all_test
     if [[ $? -ne 0 ]];then
         exit 1
     fi
 fi
 
 if [ x"${COVER_REPORT_ENABLE}" = x"yes" ]; then
-    llt_coverage
+    ut_coverage
     if [[ $? -ne 0 ]];then
         exit 1
     fi