From f65aee0359c261a003bc3b2a2e6a6e6ff5d1fbcc Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Sun, 24 Apr 2022 03:27:45 -0700 Subject: [PATCH 01/11] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=8B=89=E8=B5=B7SA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- sa_profile/4801.xml | 2 +- sa_profile/BUILD.gn | 9 +++++++- .../distributedhardware_fwk.cfg | 3 ++- .../distributed_hardware_manager_factory.h | 1 + .../distributed_hardware_manager_factory.cpp | 23 ++++++++++++++++++- 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/sa_profile/4801.xml b/sa_profile/4801.xml index 1c5961fa..c67db1ba 100644 --- a/sa_profile/4801.xml +++ b/sa_profile/4801.xml @@ -20,7 +20,7 @@ libdistributedhardwarefwksvr.z.so 4802 60000 - true + false true 1 diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn index 4f5fbabd..0ded9c9d 100644 --- a/sa_profile/BUILD.gn +++ b/sa_profile/BUILD.gn @@ -11,10 +11,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos/sa_profile/sa_profile.gni") +import("//build/ohos.gni") ohos_sa_profile("dhfwk_sa_profile") { sources = [ "4801.xml" ] part_name = "distributed_hardware_fwk" } + +ohos_prebuilt_etc("distributedhardware_fwk.cfg") { + relative_install_dir = "init" + source = "distributedhardware_fwk.cfg" + part_name = "distributed_hardware_fwk" + subsystem_name = "distributedhardware" +} diff --git a/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg b/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg index 22b7ee41..c0466884 100644 --- a/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg +++ b/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg @@ -10,6 +10,7 @@ "name" : "distributedhardware_fwk", "path" : ["/system/bin/sa_main", "/system/profile/dhardware.xml"], "uid" : "system", - "gid" : ["system"] + "gid" : ["system"], + "ondemand" : true }] } \ No newline at end of file diff --git a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h index 7c9ba448..483a6f81 100644 --- a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h +++ b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h @@ -37,6 +37,7 @@ private: void UnInit(); int32_t LoadLibrary(); void CloseLibrary(); + void CheckAallDevicesOffline(); private: void *handler_ { nullptr }; diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index afa23a97..a40d9ad8 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -18,6 +18,7 @@ #include #include +#include "device_manager.h" #include "distributed_hardware_errno.h" #include "distributed_hardware_log.h" @@ -61,7 +62,27 @@ void DistributedHardwareManagerFactory::UnInit() distributedHardwareMgrPtr_->Release(); CloseLibrary(); - DHLOGD("success"); + CheckAllDevicesOffline(); +} + +void DistributedHardwareManagerFactory::CheckAallDevicesOffline() +{ + std::vector deviceList; + DeviceManager::GetInstance().GetTrustedDeviceList(DH_FWK_PKG_NAME, "", deviceList); + if (deviceList.size() == 0) { + DHLOGI("exit sa process"); + exit(0); + } + + DHLOGI("reinitialize"); + Init(); + for (const auto &deviceInfo : deviceList) { + const auto networkId = std::string(deviceInfo.deviceId); + const auto uuid = GetUUIDBySoftBus(networkId); + DHLOGI("Send trusted device online, networkId = %s, uuid = %s", GetAnonyString(networkId).c_str(), + GetAnonyString(uuid).c_str()); + SendOnLineEvent(networkId, uuid, deviceInfo.deviceTypeId); + } } bool DistributedHardwareManagerFactory::IsInit() -- Gitee From e4124babf2242ed2bd8168ad3e29cf3c5d1f062c Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Sun, 24 Apr 2022 03:30:54 -0700 Subject: [PATCH 02/11] start system ability on demand Signed-off-by: wanderer-dl122 --- .../include/distributed_hardware_manager_factory.h | 2 +- .../src/distributed_hardware_manager_factory.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h index 483a6f81..c0668121 100644 --- a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h +++ b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h @@ -37,7 +37,7 @@ private: void UnInit(); int32_t LoadLibrary(); void CloseLibrary(); - void CheckAallDevicesOffline(); + void CheckAllDevicesOffline(); private: void *handler_ { nullptr }; diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index a40d9ad8..d1f08b93 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -65,7 +65,7 @@ void DistributedHardwareManagerFactory::UnInit() CheckAllDevicesOffline(); } -void DistributedHardwareManagerFactory::CheckAallDevicesOffline() +void DistributedHardwareManagerFactory::CheckAllDevicesOffline() { std::vector deviceList; DeviceManager::GetInstance().GetTrustedDeviceList(DH_FWK_PKG_NAME, "", deviceList); -- Gitee From 74b83d1c7139db310966e6b6c299d342adbd8daa Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 25 Apr 2022 14:40:59 +0800 Subject: [PATCH 03/11] start system ability on demand Signed-off-by: wanderer-dl122 --- .../src/distributed_hardware_manager_factory.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index d1f08b93..ddba5c3e 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -18,7 +18,10 @@ #include #include +#include "anonymous_string.h" +#include "constants.h" #include "device_manager.h" +#include "dh_utils_tool.h" #include "distributed_hardware_errno.h" #include "distributed_hardware_log.h" -- Gitee From df52782b7c470839669eb90d2fa9263cfe1a49ad Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 26 Apr 2022 11:43:50 +0800 Subject: [PATCH 04/11] start system ability on demand Signed-off-by: wanderer-dl122 --- .../distributedhardware_fwk.cfg | 7 ------- .../include/distributed_hardware_manager_factory.h | 2 +- .../src/distributed_hardware_manager_factory.cpp | 8 ++++---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg b/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg index c0466884..a46201be 100644 --- a/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg +++ b/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg @@ -1,11 +1,4 @@ { - "jobs" : [{ - "name" : "post-fs-data", - "cmds" : [ - "start distributedhardware_fwk" - ] - } - ], "services" : [{ "name" : "distributedhardware_fwk", "path" : ["/system/bin/sa_main", "/system/profile/dhardware.xml"], diff --git a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h index c0668121..6fbaae81 100644 --- a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h +++ b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h @@ -37,7 +37,7 @@ private: void UnInit(); int32_t LoadLibrary(); void CloseLibrary(); - void CheckAllDevicesOffline(); + void CheckExitSAOrNot(); private: void *handler_ { nullptr }; diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index ddba5c3e..59312f05 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -65,19 +65,19 @@ void DistributedHardwareManagerFactory::UnInit() distributedHardwareMgrPtr_->Release(); CloseLibrary(); - CheckAllDevicesOffline(); + CheckExitSAOrNot(); } -void DistributedHardwareManagerFactory::CheckAllDevicesOffline() +void DistributedHardwareManagerFactory::CheckExitSAOrNot() { std::vector deviceList; DeviceManager::GetInstance().GetTrustedDeviceList(DH_FWK_PKG_NAME, "", deviceList); if (deviceList.size() == 0) { - DHLOGI("exit sa process"); + DHLOGI("DM report devices offline, exit sa process"); exit(0); } - DHLOGI("reinitialize"); + DHLOGI("After uninit, DM report devices online, reinit"); Init(); for (const auto &deviceInfo : deviceList) { const auto networkId = std::string(deviceInfo.deviceId); -- Gitee From 2c65bee38a1c850f4417128188dd99b99447ed3f Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 26 Apr 2022 20:35:04 +0800 Subject: [PATCH 05/11] start system ability on demand Signed-off-by: wanderer-dl122 --- bundle.json | 3 ++- .../distributedhardware_fwk.cfg | 0 services/distributedhardwarefwkservice/BUILD.gn | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename {services/distributedhardwarefwkservice => sa_profile}/distributedhardware_fwk.cfg (100%) diff --git a/bundle.json b/bundle.json index dce07b82..d2bcc183 100644 --- a/bundle.json +++ b/bundle.json @@ -42,7 +42,8 @@ "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributedhardwarefwk/sa_profile:dhfwk_sa_profile" + "//foundation/distributedhardware/distributedhardwarefwk/sa_profile:dhfwk_sa_profile", + "//foundation/distributedhardware/distributedhardwarefwk/sa_profile:distributedhardware_fwk.cfg" ], "test": [ "//foundation/distributedhardware/distributedhardwarefwk/utils/test/unittest:utils_test", diff --git a/services/distributedhardwarefwkservice/distributedhardware_fwk.cfg b/sa_profile/distributedhardware_fwk.cfg similarity index 100% rename from services/distributedhardwarefwkservice/distributedhardware_fwk.cfg rename to sa_profile/distributedhardware_fwk.cfg diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 982d8793..40209256 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -43,7 +43,6 @@ ohos_shared_library("distributedhardwarefwksvr") { "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//utils/native/base:utils", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", - ":distributedhardware_fwk.cfg", "${services_path}/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl" ] -- Gitee From 36ea0c815658ad142e653c543e2e9709bccc6e66 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 26 Apr 2022 20:51:09 +0800 Subject: [PATCH 06/11] start system ability on demand Signed-off-by: wanderer-dl122 --- .../distributedhardwarefwkservice/BUILD.gn | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 40209256..312f5b4b 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -13,7 +13,8 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") +import( + "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ohos_shared_library("distributedhardwarefwksvr") { include_dirs = [ @@ -31,25 +32,25 @@ ohos_shared_library("distributedhardwarefwksvr") { ] sources = [ + "src/accessmanager/access_manager.cpp", + "src/distributed_hardware_manager_factory.cpp", "src/distributed_hardware_service.cpp", "src/distributed_hardware_stub.cpp", - "src/distributed_hardware_manager_factory.cpp", - "src/accessmanager/access_manager.cpp", ] deps = [ + "${services_path}/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", "${utils_path}:distributedhardwareutils", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//utils/native/base:utils", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", - "${services_path}/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl" + "//utils/native/base:utils", ] defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dhfwksvr\"", - "LOG_DOMAIN=0xD004100", + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"dhfwksvr\"", + "LOG_DOMAIN=0xD004100", ] external_deps = [ @@ -73,4 +74,4 @@ ohos_prebuilt_etc("distributedhardware_fwk.cfg") { source = "distributedhardware_fwk.cfg" part_name = "distributed_hardware_fwk" subsystem_name = "distributedhardware" -} \ No newline at end of file +} -- Gitee From bc8877daf84e183814e3712612e2b69ec57eee8c Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 26 Apr 2022 20:55:34 +0800 Subject: [PATCH 07/11] start system ability on demand Signed-off-by: wanderer-dl122 --- .../unittest/common/accessmanager/access_manager_test.cpp | 4 ---- 1 file changed, 4 deletions(-) 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 15db9dbd..6945a167 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -212,10 +212,6 @@ HWTEST_F(AccessManagerTest, SendOffLineEvent_003, TestSize.Level0) threadVec.emplace_back( std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[0].first, TEST_DEVICES[0].second, DH_FWK_SUCCESS)); - std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); - - threadVec.emplace_back( - std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[2].first, TEST_DEVICES[2].second, DH_FWK_SUCCESS)); for_each(threadVec.begin(), threadVec.end(), [](std::thread &t) { t.join(); }); } -- Gitee From 086b06a444f0bc03de8d929eb7f07d45e19dfb28 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 27 Apr 2022 12:13:09 +0800 Subject: [PATCH 08/11] start system ability on demand Signed-off-by: wanderer-dl122 --- sa_profile/4801.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sa_profile/4801.xml b/sa_profile/4801.xml index c67db1ba..236e5282 100644 --- a/sa_profile/4801.xml +++ b/sa_profile/4801.xml @@ -18,8 +18,8 @@ 4801 libdistributedhardwarefwksvr.z.so - 4802 - 60000 + + false true 1 -- Gitee From 957902ef262cbfaf53e1c80d8b5a1428b94b914b Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 27 Apr 2022 20:06:42 +0800 Subject: [PATCH 09/11] start system ability on demand Signed-off-by: wanderer-dl122 --- bundle.json | 2 +- sa_profile/BUILD.gn | 4 ++-- sa_profile/{distributedhardware_fwk.cfg => dhardware.cfg} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename sa_profile/{distributedhardware_fwk.cfg => dhardware.cfg} (100%) diff --git a/bundle.json b/bundle.json index d2bcc183..39000b91 100644 --- a/bundle.json +++ b/bundle.json @@ -43,7 +43,7 @@ "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", "//foundation/distributedhardware/distributedhardwarefwk/sa_profile:dhfwk_sa_profile", - "//foundation/distributedhardware/distributedhardwarefwk/sa_profile:distributedhardware_fwk.cfg" + "//foundation/distributedhardware/distributedhardwarefwk/sa_profile:dhardware.cfg" ], "test": [ "//foundation/distributedhardware/distributedhardwarefwk/utils/test/unittest:utils_test", diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn index 0ded9c9d..f30568c3 100644 --- a/sa_profile/BUILD.gn +++ b/sa_profile/BUILD.gn @@ -19,9 +19,9 @@ ohos_sa_profile("dhfwk_sa_profile") { part_name = "distributed_hardware_fwk" } -ohos_prebuilt_etc("distributedhardware_fwk.cfg") { +ohos_prebuilt_etc("dhardware.cfg") { relative_install_dir = "init" - source = "distributedhardware_fwk.cfg" + source = "dhardware.cfg" part_name = "distributed_hardware_fwk" subsystem_name = "distributedhardware" } diff --git a/sa_profile/distributedhardware_fwk.cfg b/sa_profile/dhardware.cfg similarity index 100% rename from sa_profile/distributedhardware_fwk.cfg rename to sa_profile/dhardware.cfg -- Gitee From 8d42a41fae895729e54498c4cc4fd7fbcc321006 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 28 Apr 2022 09:59:05 +0800 Subject: [PATCH 10/11] start system ability on demand Signed-off-by: wanderer-dl122 --- sa_profile/dhardware.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa_profile/dhardware.cfg b/sa_profile/dhardware.cfg index a46201be..f521718d 100644 --- a/sa_profile/dhardware.cfg +++ b/sa_profile/dhardware.cfg @@ -1,6 +1,6 @@ { "services" : [{ - "name" : "distributedhardware_fwk", + "name" : "dhardware", "path" : ["/system/bin/sa_main", "/system/profile/dhardware.xml"], "uid" : "system", "gid" : ["system"], -- Gitee From f5087372155a6f7dd177586fcded1d631407da07 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 28 Apr 2022 16:47:16 +0800 Subject: [PATCH 11/11] start system ability on demand Signed-off-by: wanderer-dl122 --- .../accessmanager/access_manager_test.cpp | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) 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 6945a167..a42e6744 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -54,7 +54,13 @@ public: std::mutex testAccessMutex_; }; -void AccessManagerTest::SetUp() {} +void AccessManagerTest::SetUp() +{ + // at last one device online, ensure sa not exit + std::string networkId = "00000000000000000000000000000000"; + std::string uuid = "99999999999999999999999999999999"; + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, TEST_DEV_TYPE_PAD); +} void AccessManagerTest::TearDown() { @@ -76,7 +82,7 @@ void AccessManagerTest::TearDownTestCase() {} */ HWTEST_F(AccessManagerTest, SendOnLineEvent_001, TestSize.Level1) { - ASSERT_FALSE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); for (const auto &dev : TEST_DEVICES) { auto ret = @@ -94,17 +100,17 @@ HWTEST_F(AccessManagerTest, SendOnLineEvent_001, TestSize.Level1) */ HWTEST_F(AccessManagerTest, SendOnLineEvent_002, TestSize.Level1) { - ASSERT_FALSE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); auto ret = DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent("", 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().SendOnLineEvent(TEST_DEVICES[0].first, "", TEST_DEV_TYPE_PAD); ASSERT_EQ(ERR_DH_FWK_REMOTE_DEVICE_ID_IS_EMPTY, ret); - ASSERT_FALSE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); } /** @@ -129,7 +135,7 @@ HWTEST_F(AccessManagerTest, SendOffLineEvent_001, TestSize.Level1) DistributedHardwareManagerFactory::GetInstance().SendOffLineEvent(dev.first, dev.second, TEST_DEV_TYPE_PAD); ASSERT_EQ(DH_FWK_SUCCESS, ret); } - ASSERT_FALSE(DistributedHardwareManagerFactory::GetInstance().IsInit()); + ASSERT_TRUE(DistributedHardwareManagerFactory::GetInstance().IsInit()); } /** @@ -212,6 +218,10 @@ HWTEST_F(AccessManagerTest, SendOffLineEvent_003, TestSize.Level0) threadVec.emplace_back( std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[0].first, TEST_DEVICES[0].second, DH_FWK_SUCCESS)); + std::this_thread::sleep_for(std::chrono::milliseconds(INTERVAL_TIME_MS)); + + threadVec.emplace_back( + std::thread(handler, Status::DEVICE_OFFLINE, TEST_DEVICES[2].first, TEST_DEVICES[2].second, DH_FWK_SUCCESS)); for_each(threadVec.begin(), threadVec.end(), [](std::thread &t) { t.join(); }); } -- Gitee