From c64cad601b7422edd4d9269221494382ab0b3201 Mon Sep 17 00:00:00 2001 From: dl Date: Thu, 31 Mar 2022 16:58:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E4=B8=8B=E7=BA=BF=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dl --- .../src/distributed_hardware_manager_factory.cpp | 2 +- .../common/accessmanager/access_manager_test.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index b4028301..afa23a97 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -110,7 +110,7 @@ int32_t DistributedHardwareManagerFactory::SendOffLineEvent(const std::string &n } std::lock_guard lock(mutex_); - if (distributedHardwareMgrPtr_ == nullptr) { + if (distributedHardwareMgrPtr_ == nullptr && !Init()) { DHLOGE("distributedHardwareMgr is null"); return ERR_DH_FWK_HARDWARE_MANAGER_LOAD_IMPL_FAILED; } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 0c6b882b..15db9dbd 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -115,7 +115,7 @@ HWTEST_F(AccessManagerTest, SendOnLineEvent_002, TestSize.Level1) */ HWTEST_F(AccessManagerTest, SendOffLineEvent_001, TestSize.Level1) { - ASSERT_FALSE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); for (const auto &dev : TEST_DEVICES) { auto ret = @@ -140,17 +140,17 @@ HWTEST_F(AccessManagerTest, SendOffLineEvent_001, TestSize.Level1) */ HWTEST_F(AccessManagerTest, SendOffLineEvent_002, TestSize.Level1) { - ASSERT_FALSE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); auto ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent("", TEST_DEVICES[0].second, TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_REMOTE_NETWORK_ID_IS_EMPTY, ret); - ASSERT_FALSE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); ret = DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(TEST_DEVICES[0].first, "", TEST_DEV_TYPE_PAD); - ASSERT_EQ(ERR_DH_FWK_HARDWARE_MANAGER_LOAD_IMPL_FAILED, ret); - ASSERT_FALSE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + ASSERT_EQ(ERR_DH_FWK_REMOTE_DEVICE_ID_IS_EMPTY, ret); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); } /** -- Gitee