From 864c5154ac7ed4ae45e019312f9da86b11bcb199 Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 11 Dec 2024 11:49:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- .../hdi/test/servmgr/service_manager_hdi_test.cpp | 12 ++++++------ adapter/uhdf2/host/test/unittest/devmgr_test.cpp | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp index 6866244b9..cb0d2c998 100644 --- a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp +++ b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp @@ -896,7 +896,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListenerTest001, TestSize.Level1) { ::OHOS::sptr listener = new ServStatListener( - ServStatListener::StatusCallback([&](const ServiceStatus &status) { + ServStatListener::StatusCallback([&](const ::OHOS::HDI::ServiceManager::V1_0::ServiceStatus &status) { HDF_LOGI("service status callback, service is %{public}s", status.serviceName.data()); })); @@ -917,7 +917,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListenerTest002, TestSize.Level1) { ::OHOS::sptr listener = new ServStatListener( - ServStatListener::StatusCallback([&](const ServiceStatus &status) { + ServStatListener::StatusCallback([&](const ::OHOS::HDI::ServiceManager::V1_0::ServiceStatus &status) { HDF_LOGI("service status callback, service is %{public}s", status.serviceName.data()); })); @@ -935,7 +935,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListenerTest003, TestSize.Level1) { ::OHOS::sptr listener = new ServStatListener( - ServStatListener::StatusCallback([&](const ServiceStatus &status) { + ServStatListener::StatusCallback([&](const ::OHOS::HDI::ServiceManager::V1_0::ServiceStatus &status) { HDF_LOGI("service status callback, service is %{public}s", status.serviceName.data()); })); @@ -956,7 +956,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListenerTest004, TestSize.Level1) { ::OHOS::sptr listener = new ServStatListener( - ServStatListener::StatusCallback([&](const ServiceStatus &status) { + ServStatListener::StatusCallback([&](const ::OHOS::HDI::ServiceManager::V1_0::ServiceStatus &status) { HDF_LOGI("service status callback, service is %{public}s", status.serviceName.data()); })); @@ -977,7 +977,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListenerTest005, TestSize.Level1) { ::OHOS::sptr listener = new ServStatListener( - ServStatListener::StatusCallback([&](const ServiceStatus &status) { + ServStatListener::StatusCallback([&](const ::OHOS::HDI::ServiceManager::V1_0::ServiceStatus &status) { HDF_LOGI("service status callback, service is %{public}s", status.serviceName.data()); })); @@ -1001,7 +1001,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ListenerTest006, TestSize.Level1) { ::OHOS::sptr listener = new ServStatListener( - ServStatListener::StatusCallback([&](const ServiceStatus &status) { + ServStatListener::StatusCallback([&](const ::OHOS::HDI::ServiceManager::V1_0::ServiceStatus &status) { HDF_LOGI("service status callback, service is %{public}s", status.serviceName.data()); })); diff --git a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp index f4a9a32fe..03961dab2 100644 --- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include "hdf_dump.h" #include "hdf_dump_reg.h" #include "hcs_tree_if.h" @@ -160,7 +161,7 @@ HWTEST_F(DevMgrTest, DevMgrDumpErrorTest, TestSize.Level1) ASSERT_TRUE(servmgr != nullptr); ASSERT_TRUE(devmgr != nullptr); HdfRegisterDumpFunc(nullptr); - int32_t fd = 0; + int32_t fd = open("/dev/null", P_WRONLY); HdfRegisterDumpFunc(TestDump); const std::vector vcr = {u"123", u"456"}; const std::vector vcr1 = { @@ -169,8 +170,8 @@ HWTEST_F(DevMgrTest, DevMgrDumpErrorTest, TestSize.Level1) u"21", u"22", u"23", u"24" }; int ret = HdfDump(fd, vcr); - ASSERT_TRUE(ret != HDF_SUCCESS); - fd = 1; + ASSERT_TRUE(ret == HDF_SUCCESS); + fd = -1; ret = HdfDump(fd, vcr1); ASSERT_TRUE(ret != HDF_SUCCESS); @@ -187,17 +188,15 @@ HWTEST_F(DevMgrTest, DevMgrDumpTest, TestSize.Level1) constexpr int loop = 100; for (int i = 0; i < loop; i++) { - fd = 10; + int32_t fd = open("/dev/null", P_WRONLY); const std::vector vcr = {u"--ipc", u"all", u"--start-stat"}; ret = HdfDump(fd, vcr); ASSERT_TRUE(ret == HDF_SUCCESS); - fd = 11; const std::vector vcr1 = {u"--ipc", u"all", u"--stop-stat"}; ret = HdfDump(fd, vcr1); ASSERT_TRUE(ret == HDF_SUCCESS); - fd = 12; const std::vector vcr2 = {u"--ipc", u"all", u"--stat"}; ret = HdfDump(fd, vcr2); ASSERT_TRUE(ret == HDF_SUCCESS); -- Gitee From 424ba7f7a17d38e3cc677338b955a3becd372129 Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 11 Dec 2024 16:29:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- adapter/uhdf2/host/test/unittest/devmgr_test.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp index 03961dab2..b6853641d 100644 --- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp @@ -186,9 +186,8 @@ HWTEST_F(DevMgrTest, DevMgrDumpTest, TestSize.Level1) int32_t ret; int32_t fd; constexpr int loop = 100; - + int32_t fd = open("/dev/null", P_WRONLY); for (int i = 0; i < loop; i++) { - int32_t fd = open("/dev/null", P_WRONLY); const std::vector vcr = {u"--ipc", u"all", u"--start-stat"}; ret = HdfDump(fd, vcr); ASSERT_TRUE(ret == HDF_SUCCESS); -- Gitee From 3cbd79106db7f5022b0a7ba271ea88b3c5562659 Mon Sep 17 00:00:00 2001 From: huyx Date: Thu, 12 Dec 2024 09:18:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- 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 b6853641d..33a7f04cd 100644 --- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp @@ -186,7 +186,7 @@ HWTEST_F(DevMgrTest, DevMgrDumpTest, TestSize.Level1) int32_t ret; int32_t fd; constexpr int loop = 100; - int32_t fd = open("/dev/null", P_WRONLY); + int32_t fd = open("/dev/null", O_WRONLY); for (int i = 0; i < loop; i++) { const std::vector vcr = {u"--ipc", u"all", u"--start-stat"}; ret = HdfDump(fd, vcr); -- Gitee From 8c9ae08e520f7cb8a88bdb7ccd0dee813dd17718 Mon Sep 17 00:00:00 2001 From: huyx Date: Thu, 12 Dec 2024 15:20:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- 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 33a7f04cd..6f13f2099 100644 --- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp @@ -161,7 +161,7 @@ HWTEST_F(DevMgrTest, DevMgrDumpErrorTest, TestSize.Level1) ASSERT_TRUE(servmgr != nullptr); ASSERT_TRUE(devmgr != nullptr); HdfRegisterDumpFunc(nullptr); - int32_t fd = open("/dev/null", P_WRONLY); + int32_t fd = open("/dev/null", O_WRONLY); HdfRegisterDumpFunc(TestDump); const std::vector vcr = {u"123", u"456"}; const std::vector vcr1 = { -- Gitee From 91029c6a5647fabf2c5652f5f0aefb2d39068f83 Mon Sep 17 00:00:00 2001 From: huyx Date: Fri, 13 Dec 2024 09:30:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- adapter/uhdf2/host/test/unittest/devmgr_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp index 6f13f2099..26a906a6c 100644 --- a/adapter/uhdf2/host/test/unittest/devmgr_test.cpp +++ b/adapter/uhdf2/host/test/unittest/devmgr_test.cpp @@ -184,7 +184,6 @@ HWTEST_F(DevMgrTest, DevMgrDumpErrorTest, TestSize.Level1) HWTEST_F(DevMgrTest, DevMgrDumpTest, TestSize.Level1) { int32_t ret; - int32_t fd; constexpr int loop = 100; int32_t fd = open("/dev/null", O_WRONLY); for (int i = 0; i < loop; i++) { -- Gitee