diff --git a/services/samgr/native/test/unittest/src/common_event_collect_test.cpp b/services/samgr/native/test/unittest/src/common_event_collect_test.cpp index 2a61f87635bbd24082121459c0c992291eb0cfb1..3d8d959987f618f94eb082a4f2a8ee2f22fcebfc 100644 --- a/services/samgr/native/test/unittest/src/common_event_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/common_event_collect_test.cpp @@ -166,6 +166,7 @@ HWTEST_F(CommonEventCollectTest, ProcessEvent001, TestSize.Level3) EXPECT_EQ(true, ret); ret = commonEventCollect->workHandler_->SendEvent(COMMON_DIED_EVENT); EXPECT_EQ(true, ret); + commonEventCollect->workHandler_->CleanFfrt(); DTEST_LOG << " ProcessEvent001 END" << std::endl; } @@ -406,6 +407,7 @@ HWTEST_F(CommonEventCollectTest, RemoveOnDemandReasonExtraData001, TestSize.Leve commonEventCollect->SaveOnDemandReasonExtraData(eventData); commonEventCollect->RemoveOnDemandReasonExtraData(1); EXPECT_TRUE(commonEventCollect->extraDatas_.empty()); + commonEventCollect->workHandler_->CleanFfrt(); DTEST_LOG << "RemoveOnDemandReasonExtraData001 end" << std::endl; } @@ -446,6 +448,7 @@ HWTEST_F(CommonEventCollectTest, GetOnDemandReasonExtraData002, TestSize.Level3) commonEventCollect->SaveOnDemandReasonExtraData(eventData); bool ret = commonEventCollect->GetOnDemandReasonExtraData(1, onDemandReasonExtraData); EXPECT_TRUE(ret); + commonEventCollect->workHandler_->CleanFfrt(); DTEST_LOG << "GetOnDemandReasonExtraData002 end" << std::endl; } diff --git a/services/samgr/native/test/unittest/src/device_networking_collect_test.cpp b/services/samgr/native/test/unittest/src/device_networking_collect_test.cpp index 0656f2e05e7bac3770b00b4d8f0a7cc9f4b1b056..ca2d55de285363f572f1d6ccf1b621fdec8269b2 100644 --- a/services/samgr/native/test/unittest/src/device_networking_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/device_networking_collect_test.cpp @@ -681,6 +681,7 @@ HWTEST_F(DeviceNetworkingCollectTest, SendEvent001, TestSize.Level3) std::function callback = [] () {}; sptr collectOne = new DeviceNetworkingCollect(nullptr); collectOne->PostTask(callback); + networkingCollect->workHandler_->handler_ = std::make_shared("WorkHandler"); bool bRet = networkingCollect->workHandler_->SendEvent(DM_DIED_EVENT); EXPECT_EQ(true, bRet); diff --git a/services/samgr/native/test/unittest/src/device_status_collect_manager_test.cpp b/services/samgr/native/test/unittest/src/device_status_collect_manager_test.cpp index 206af003d94dcfb9dbebaa728edc3f8dfbda5a5c..cab71b5a353053ceca7f1e3b4294a6789d56529e 100644 --- a/services/samgr/native/test/unittest/src/device_status_collect_manager_test.cpp +++ b/services/samgr/native/test/unittest/src/device_status_collect_manager_test.cpp @@ -503,6 +503,7 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent002, TestSize.Level3) std::list saProfiles; collect->Init(saProfiles); OnDemandEvent event; + collect->collectHandler_ = std::make_shared("collect"); collect->ReportEvent(event); EXPECT_EQ(true, collect->collectHandler_ != nullptr); PostTask(collect->collectHandler_); @@ -510,6 +511,7 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent002, TestSize.Level3) collect->PostDelayTask(nullptr, std::numeric_limits::max()); event = { DEVICE_ONLINE, SA_TAG_DEVICE_ON_LINE, "on" }; collect->ReportEvent(event); + collect->collectHandler_->CleanFfrt(); DTEST_LOG << " ReportEvent002 END" << std::endl; } @@ -526,6 +528,7 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent003, TestSize.Level3) OnDemandEvent event = { DEVICE_ONLINE, SA_TAG_DEVICE_ON_LINE, "on" }; std::list saControlList; SaProfile saProfile; + collect->collectHandler_ = std::make_shared("collect"); OnDemandEvent event1 = { DEVICE_ONLINE, SA_TAG_DEVICE_ON_LINE, "on" }; OnDemandEvent event2 = { DEVICE_ONLINE, SA_TAG_DEVICE_ON_LINE, "off" }; saProfile.startOnDemand.onDemandEvents.emplace_back(event1); @@ -535,6 +538,7 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent003, TestSize.Level3) collect->ReportEvent(event); EXPECT_EQ(true, collect->collectHandler_ != nullptr); PostTask(collect->collectHandler_); + collect->collectHandler_->CleanFfrt(); DTEST_LOG << " ReportEvent003 END" << std::endl; }