From 9c6e8b7b9b957829e31d308b31087a66130a7029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E7=9B=B8=E5=85=B5?= Date: Tue, 26 Dec 2023 15:02:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=20Modification=E3=80=91=E4=BF=AE=E5=A4=8DUT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cli/test/dt/CMakeLists.txt | 2 +- cli/test/dt/build.sh | 2 - cli/test/dt/testcase/gtest_mytest.cpp | 60 ++++++++++++++------------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/cli/test/dt/CMakeLists.txt b/cli/test/dt/CMakeLists.txt index 7b97ddf..aa88456 100644 --- a/cli/test/dt/CMakeLists.txt +++ b/cli/test/dt/CMakeLists.txt @@ -83,5 +83,5 @@ target_link_libraries(ut_demo -fprofile-arcs -pthread) target_include_directories(ut_demo PUBLIC ${PROJECT_SOURCE_DIR}/Depend/googletest/googletest/include) target_include_directories(ut_demo PUBLIC ${PROJECT_SOURCE_DIR}/Depend/mockcpp/3rdparty) target_include_directories(ut_demo PUBLIC ${PROJECT_SOURCE_DIR}/Depend/mockcpp/include) -target_include_directories(ut_demo PUBLIC ${PROJECT_SOURCE_DIR}/Depend/HuaweiSecureC/include) +target_include_directories(ut_demo PUBLIC ${PROJECT_SOURCE_DIR}/Depend/libboundscheck/include) target_link_libraries(ut_demo demolib) diff --git a/cli/test/dt/build.sh b/cli/test/dt/build.sh index 00f01eb..694dcaf 100644 --- a/cli/test/dt/build.sh +++ b/cli/test/dt/build.sh @@ -48,8 +48,6 @@ makepre() cp -rf ${CUR_DIR}/../../../mockcpp/* ${CUR_DIR}/Depend/mockcpp/ cd ${CUR_DIR}/Depend/mockcpp sed -i '16s/SET(MOCKCPP_SRC_ROOT ${CMAKE_SOURCE_DIR})/SET(MOCKCPP_SRC_ROOT ${CMAKE_SOURCE_DIR}\/mockcpp)/' ./src/CMakeLists.txt - cmake . - make cd ${CUR_DIR} fi diff --git a/cli/test/dt/testcase/gtest_mytest.cpp b/cli/test/dt/testcase/gtest_mytest.cpp index adb4250..9dd345c 100644 --- a/cli/test/dt/testcase/gtest_mytest.cpp +++ b/cli/test/dt/testcase/gtest_mytest.cpp @@ -25,9 +25,9 @@ using namespace std; using namespace testing; #ifndef GOOGLE_TEST -# define STATIC static +#define STATIC static #else -# define STATIC +#define STATIC #endif #define BUF_SIZE 1024 @@ -36,7 +36,7 @@ using namespace testing; typedef char *(*ParseFileLine)(char *, const char *); extern "C" int IsStrEqual(const char *s1, const char *s2); extern "C" int GetNsPath(const int pid, const char *nsType, char *buf, size_t bufSize); -extern "C" int snprintf_s(char *strDest, size_t destMax, size_t count, const char *format, ...); +extern "C" int snprintf_s(char *strDest, size_t destMax, size_t count, const char *format, ...); extern "C" int open(const char *path, int flags); extern "C" int close(int fd); extern "C" int stat(const char *file_name, struct stat *buf); @@ -64,29 +64,32 @@ extern "C" int ParseRuntimeOptions(const char *options); extern "C" bool IsOptionNoDrvSet(); extern "C" bool IsVirtual(); extern "C" int MakeMountPoints(const char *path, mode_t mode); -extern "C" int LogLoop(const char* filename); +extern "C" int LogLoop(const char *filename); extern "C" bool TakeNthWord(char **pLine, unsigned int n, char **word); extern "C" bool CheckRootDir(char **pLine); -struct MountList { +struct MountList +{ unsigned int count; char list[MAX_MOUNT_NR][PATH_MAX]; }; -struct CmdArgs { - char rootfs[BUF_SIZE]; - int pid; - char options[BUF_SIZE]; +struct CmdArgs +{ + char rootfs[BUF_SIZE]; + int pid; + char options[BUF_SIZE]; struct MountList files; struct MountList dirs; }; -struct ParsedConfig { +struct ParsedConfig +{ char rootfs[BUF_SIZE]; size_t devicesNr; char containerNsPath[BUF_SIZE]; char cgroupPath[BUF_SIZE]; - int originNsFd; + int originNsFd; const struct MountList *files; const struct MountList *dirs; }; @@ -318,7 +321,7 @@ int Stub_DoPrepare_Success(const struct CmdArgs *args, struct ParsedConfig *conf return 0; } -int Stub_ParseFileByLine_Success(char* buffer, int bufferSize, ParseFileLine fn, const char* filepath) +int Stub_ParseFileByLine_Success(char *buffer, int bufferSize, ParseFileLine fn, const char *filepath) { return 0; } @@ -338,7 +341,8 @@ bool Stub_IsOptionNoDrvSet_False() return false; } -class Test_Fhho : public Test { +class Test_Fhho : public Test +{ protected: static void SetUpTestCase() { @@ -348,7 +352,7 @@ protected: { cout << "TestSuite测试套事件：在最后一个testcase之后执行" << endl; } - //如果想在相同的测试套中设置两种事件，那么可以写在一起，运行就看到效果了 + // 如果想在相同的测试套中设置两种事件，那么可以写在一起，运行就看到效果了 virtual void SetUp() { cout << "TestSuite测试用例事件：在每个testcase之前执行" << endl; @@ -362,7 +366,7 @@ protected: TEST_F(Test_Fhho, ClassEQ) { int pid = 1; - const char* nsType = "mnt"; + const char *nsType = "mnt"; char buf[100] = {0x0}; int bufSize = 100; int ret = GetNsPath(pid, nsType, buf, 100); @@ -418,7 +422,7 @@ TEST_F(Test_Fhho, GetNsPathAndGetSelfNsPath) EXPECT_LE(0, GetSelfNsPath("mnt", nsPath, BUF_SIZE)); } -TEST_F(Test_Fhho, StatusOneDoDirectoryMounting) +TEST_F(Test_Fhho, StatusOneDoDirectoryMounting) { MOCKER(MountDir).stubs().will(invoke(Stub_MountDir_Failed)); struct MountList list = {0}; @@ -449,7 +453,6 @@ TEST_F(Test_Fhho, StatusOneCheckDirExists) EXPECT_EQ(0, ret); } - TEST_F(Test_Fhho, StatusTwoCheckDirExists) { // Test directory does not exist @@ -498,7 +501,7 @@ TEST_F(Test_Fhho, MakeMountPoints1) TEST_F(Test_Fhho, LogLoopSuccess) { // The test create directory contains the parent directory - char* filename = "/home/var/log/sys.log"; + char *filename = "/home/var/log/sys.log"; int ret = LogLoop(filename); EXPECT_EQ(-1, ret); } @@ -607,9 +610,10 @@ TEST_F(Test_Fhho, StatusOneProcess) TEST_F(Test_Fhho, StatusTwoProcess) { // Test the correct options - const int argc = 5; - const char *argvData[argc] = {"ascend-docker-cli", "--pid", "123", "--rootfs", "/home"}; - int ret = Process(argc,const_cast(argvData)); + const int argc = 7; + const char *argvData[argc] = {"ascend-docker-cli", "--allow-link", "True", "--pid", "123", "--rootfs", "/home"}; + MOCKER(SetupContainer).stubs().will(invoke(Stub_SetupContainer_Success)); + int ret = Process(argc, const_cast(argvData)); EXPECT_EQ(0, ret); } @@ -627,7 +631,7 @@ TEST_F(Test_Fhho, StatusFourProcess) const int argc = 7; const char *argvData[argc] = {"ascend-docker-cli", "--evices", "1,2", "--idd", "123", "--ootfs", "/home"}; MOCKER(SetupContainer).stubs().will(invoke(Stub_SetupContainer_Success)); - int ret = Process(argc,const_cast(argvData)); + int ret = Process(argc, const_cast(argvData)); GlobalMockObject::verify(); EXPECT_EQ(-1, ret); } @@ -636,9 +640,9 @@ TEST_F(Test_Fhho, StatusFiveProcess) { const int argc = 11; const char *argvData[argc] = {"ascend-docker-cli", "--pid", "123", "--rootfs", - "/home", "--options", "base", "--mount-file", "a.list", "--mount-dir", "/home/code"}; + "/home", "--options", "base", "--mount-file", "a.list", "--mount-dir", "/home/code"}; MOCKER(SetupContainer).stubs().will(invoke(Stub_SetupContainer_Success)); - int ret = Process(argc,const_cast(argvData)); + int ret = Process(argc, const_cast(argvData)); GlobalMockObject::verify(); EXPECT_EQ(-1, ret); } @@ -647,9 +651,9 @@ TEST_F(Test_Fhho, StatusSixProcess) { const int argc = 11; const char *argvData[argc] = {"ascend-docker-cli", "--pid", "123", "--rootfs", - "/home", "--opt", "base", "--mount-f", "a.list", "--mount-dir", "/root/sxv"}; + "/home", "--opt", "base", "--mount-f", "a.list", "--mount-dir", "/root/sxv"}; MOCKER(SetupContainer).stubs().will(invoke(Stub_SetupContainer_Success)); - int ret = Process(argc,const_cast(argvData)); + int ret = Process(argc, const_cast(argvData)); GlobalMockObject::verify(); EXPECT_EQ(-1, ret); } @@ -658,9 +662,9 @@ TEST_F(Test_Fhho, StatusSevenProcess) { const int argc = 11; const char *argvData[argc] = {"ascend-docker-cli", "--ops", "--pid", "123", - "--rootfs", "/home", "base", "--mounle", "a.list", "--mount-dir", "/home/code"}; + "--rootfs", "/home", "base", "--mounle", "a.list", "--mount-dir", "/home/code"}; MOCKER(SetupContainer).stubs().will(invoke(Stub_SetupContainer_Success)); - int ret = Process(argc,const_cast(argvData)); + int ret = Process(argc, const_cast(argvData)); GlobalMockObject::verify(); EXPECT_EQ(-1, ret); } -- Gitee