From bc1fe68cbf191602ed07fccbeeb1606402c2abe8 Mon Sep 17 00:00:00 2001 From: chenbushan Date: Tue, 9 Apr 2024 21:18:12 +0800 Subject: [PATCH 1/3] bugfix : add unitest for hdf_remote_service.c Signed-off-by: chenbushan Change-Id: I1d7bc715386ecf8096b4607e47173b77e0c81832 --- adapter/uhdf2/host/test/BUILD.gn | 8 +++++++- adapter/uhdf2/host/test/unittest/devmgr_test.cpp | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/adapter/uhdf2/host/test/BUILD.gn b/adapter/uhdf2/host/test/BUILD.gn index 2c6ac183a..7b949f61b 100644 --- a/adapter/uhdf2/host/test/BUILD.gn +++ b/adapter/uhdf2/host/test/BUILD.gn @@ -16,11 +16,15 @@ import("./../../uhdf.gni") hdf_framework_path = "./../../../../framework" hdf_uhdf_path = "./../.." +hdf_interface_path = "./../../../../interface" ###########################palTest########################### ohos_unittest("DevMgrTest") { module_out_path = "hdf_core/devmgr" - sources = [ "unittest/devmgr_test.cpp" ] + sources = [ + "$hdf_uhdf_path/ipc/src/hdf_dump.cpp", + "unittest/devmgr_test.cpp", + ] include_dirs = [ "//commonlibrary/c_utils/base/include", @@ -29,6 +33,8 @@ ohos_unittest("DevMgrTest") { "$hdf_framework_path/utils/include", "$hdf_uhdf_path/hdi/include", "$hdf_uhdf_path/include/hidl", + "$hdf_uhdf_path/ipc/include", + "$hdf_interface_path/inner_api/ipc", "unittest/common/", ] diff --git a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp index 549546066..e995404fa 100644 --- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp @@ -19,6 +19,8 @@ #include #include #include +#include "hdf_dump.h" +#include "hdf_dump_reg.h" #define HDF_LOG_TAG driver_manager @@ -140,4 +142,16 @@ HWTEST_F(DevMgrTest, DriverTest, TestSize.Level1) ASSERT_TRUE(sampleService == nullptr); } } + +HWTEST_F(DevMgrTest, DevMgrDumpTest, TestSize.Level1) +{ + ASSERT_TRUE(servmgr != nullptr); + ASSERT_TRUE(devmgr != nullptr); + HdfRegisterDumpFunc(nullptr); + + int32_t illgealFd = -1; + std::vector illgealArgs = {}; + int ret = HdfDump(illgealFd, illgealArgs); + ASSERT_TRUE(ret != HDF_SUCCESS); +} } // namespace OHOS -- Gitee From 9ecbd8b5b8f34880be40ead2b55bf0aa001016ad Mon Sep 17 00:00:00 2001 From: chenbushan Date: Wed, 10 Apr 2024 03:05:12 +0000 Subject: [PATCH 2/3] update adapter/uhdf2/host/test/unittest/devmgr_test.cpp. Signed-off-by: chenbushan --- adapter/uhdf2/host/test/unittest/devmgr_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp index e995404fa..a46ea6090 100644 --- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp @@ -143,7 +143,7 @@ HWTEST_F(DevMgrTest, DriverTest, TestSize.Level1) } } -HWTEST_F(DevMgrTest, DevMgrDumpTest, TestSize.Level1) +HWTEST_F(DevMgrTest, DevMgrDumpErrorTest, TestSize.Level1) { ASSERT_TRUE(servmgr != nullptr); ASSERT_TRUE(devmgr != nullptr); -- Gitee From c97d01d8d9f37c5a191ccf03e37201836be41f5d Mon Sep 17 00:00:00 2001 From: chenbushan Date: Thu, 11 Apr 2024 01:43:29 +0000 Subject: [PATCH 3/3] update adapter/uhdf2/host/test/unittest/devmgr_test.cpp. Signed-off-by: chenbushan --- adapter/uhdf2/host/test/unittest/devmgr_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp index a46ea6090..0b5562e16 100644 --- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp @@ -149,9 +149,9 @@ HWTEST_F(DevMgrTest, DevMgrDumpErrorTest, TestSize.Level1) ASSERT_TRUE(devmgr != nullptr); HdfRegisterDumpFunc(nullptr); - int32_t illgealFd = -1; - std::vector illgealArgs = {}; - int ret = HdfDump(illgealFd, illgealArgs); + int32_t illegalFd = -1; + std::vector illegalArgs = {}; + int ret = HdfDump(illegalFd, illegalArgs); ASSERT_TRUE(ret != HDF_SUCCESS); } } // namespace OHOS -- Gitee