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 6866244b919c973d98e83ae218b5f47cd61c6c46..cb0d2c9984d7738ae255c6fd913175522beacacc 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 f4a9a32fed27d1b9a0bd47add3dd70691c58ebc4..26a906a6ccb42d1ca4ad7ef86da29ae561575cc8 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", O_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); @@ -183,21 +184,17 @@ 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++) { - fd = 10; 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);