From dfcf1283cd78c6ce46c9c8424fb2ace67b7a98a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Tue, 24 Jun 2025 10:35:26 +0800 Subject: [PATCH 01/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../source/collect/ref_count_collect.cpp | 2 +- .../native/source/samgr_time_handler.cpp | 2 +- .../src/device_timed_collect_test.cpp | 144 ++++++++---------- .../unittest/src/ref_count_collect_test.cpp | 3 + 4 files changed, 72 insertions(+), 79 deletions(-) diff --git a/services/samgr/native/source/collect/ref_count_collect.cpp b/services/samgr/native/source/collect/ref_count_collect.cpp index 1372a612..214067a4 100644 --- a/services/samgr/native/source/collect/ref_count_collect.cpp +++ b/services/samgr/native/source/collect/ref_count_collect.cpp @@ -64,7 +64,7 @@ int32_t RefCountCollect::OnStop() { if (timer_ != nullptr) { HILOGI("RefCountCollect stop timer"); - timer_->Shutdown(); + timer_->Shutdown(false); } return ERR_OK; } diff --git a/services/samgr/native/source/samgr_time_handler.cpp b/services/samgr/native/source/samgr_time_handler.cpp index d0b97552..2d4a790b 100644 --- a/services/samgr/native/source/samgr_time_handler.cpp +++ b/services/samgr/native/source/samgr_time_handler.cpp @@ -109,7 +109,7 @@ int SamgrTimeHandler::CreateAndRetry() bool SamgrTimeHandler::PostTask(TaskType func, uint64_t delayTime) { - HILOGI("SamgrTimeHandler postTask start: %{public}" PRId64 "s", delayTime); + HILOGI("SamgrTimeHandler postTask start: %{public}lu s", delayTime); int timerfd = CreateAndRetry(); if (timerfd == -1) { timerfd = timerfd_create(CLOCK_MONOTONIC, 0); diff --git a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp index a75f0a4f..3a227d0c 100644 --- a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp @@ -68,8 +68,7 @@ HWTEST_F(DeviceTimedCollectTest, Init001, TestSize.Level3) saProfile.startOnDemand.onDemandEvents.push_back(onDemandEvent); saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 1); DTEST_LOG << "Init001 end" << std::endl; @@ -89,8 +88,7 @@ HWTEST_F(DeviceTimedCollectTest, Init002, TestSize.Level3) saProfile.startOnDemand.onDemandEvents.push_back(onDemandEvent); saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init002 end" << std::endl; @@ -110,8 +108,7 @@ HWTEST_F(DeviceTimedCollectTest, Init003, TestSize.Level3) saProfile.stopOnDemand.onDemandEvents.push_back(onDemandEvent); saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 1); DTEST_LOG << "Init003 end" << std::endl; @@ -131,8 +128,7 @@ HWTEST_F(DeviceTimedCollectTest, Init004, TestSize.Level3) saProfile.stopOnDemand.onDemandEvents.push_back(onDemandEvent); saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init004 end" << std::endl; @@ -152,8 +148,7 @@ HWTEST_F(DeviceTimedCollectTest, Init005, TestSize.Level3) saProfile.stopOnDemand.onDemandEvents.push_back(onDemandEvent); saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init005 end" << std::endl; @@ -173,8 +168,7 @@ HWTEST_F(DeviceTimedCollectTest, Init006, TestSize.Level3) saProfile.startOnDemand.onDemandEvents.push_back(onDemandEvent); saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init006 end" << std::endl; @@ -194,8 +188,7 @@ HWTEST_F(DeviceTimedCollectTest, Init007, TestSize.Level3) saProfile.startOnDemand.onDemandEvents.push_back(onDemandEvent); saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init007 end" << std::endl; @@ -223,8 +216,7 @@ HWTEST_F(DeviceTimedCollectTest, Init008, TestSize.Level3) saProfile3.startOnDemand.onDemandEvents.push_back(onDemandEvent3); saProfiles.push_back(saProfile3); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 2); deviceTimedCollect->timeInfos_.clear(); @@ -240,8 +232,8 @@ HWTEST_F(DeviceTimedCollectTest, OnStart001, TestSize.Level0) { DTEST_LOG << "OnStart001 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->nonPersitenceLoopEventSet_.insert(101); deviceTimedCollect->OnStart(); EXPECT_NE(collect, nullptr); @@ -260,12 +252,12 @@ HWTEST_F(DeviceTimedCollectTest, OnStart002, TestSize.Level3) #ifdef PREFERENCES_ENABLE std::shared_ptr preferencesUtil_ = PreferencesUtil::GetInstance(); sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); int64_t currentTime = TimeUtils::GetTimestamp(); preferencesUtil_->SaveString("timedevent_2017-9-1-16:59:10", "start#149999#"); - preferencesUtil_->SaveLong("2017-9-1-16:59:10", currentTime + 10); - preferencesUtil_->SaveLong("2017-9-1-16:59:11", currentTime - 10); + preferencesUtil_->SaveLong("2017-9-1-16:59:10", currentTime + 1000); + preferencesUtil_->SaveLong("2017-9-1-16:59:11", currentTime - 1000); deviceTimedCollect->OnStart(); EXPECT_NE(collect, nullptr); preferencesUtil_->RefreshSync(); @@ -289,8 +281,7 @@ HWTEST_F(DeviceTimedCollectTest, ReportEventByTimeInfo001, TestSize.Level3) { DTEST_LOG << "ReportEventByTimeInfo001 begin" << std::endl; sptr collect = nullptr; - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); TimeInfo info; info.awake = true; info.normal = true; @@ -310,8 +301,7 @@ HWTEST_F(DeviceTimedCollectTest, PostDelayTaskByTimeInfo001, TestSize.Level3) { DTEST_LOG << "PostDelayTaskByTimeInfo001 begin" << std::endl; sptr collect = nullptr; - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); TimeInfo info; info.awake = true; info.normal = true; @@ -332,8 +322,7 @@ HWTEST_F(DeviceTimedCollectTest, ReportEvent001, TestSize.Level3) { DTEST_LOG << "ReportEvent001 begin" << std::endl; sptr collect = nullptr; - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); OnDemandEvent event; deviceTimedCollect->ReportEvent(event); EXPECT_EQ(collect, nullptr); @@ -350,8 +339,7 @@ HWTEST_F(DeviceTimedCollectTest, PostDelayTask001, TestSize.Level3) { DTEST_LOG << "PostDelayTask001 begin" << std::endl; sptr collect = nullptr; - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->PostDelayTask(deviceTimedCollect->nonPersitenceLoopTasks_[0], 0); EXPECT_EQ(collect, nullptr); DTEST_LOG << "PostDelayTask001 end" << std::endl; @@ -368,8 +356,7 @@ HWTEST_F(DeviceTimedCollectTest, PostDelayTask002, TestSize.Level3) DTEST_LOG << "PostDelayTask002 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->nonPersitenceLoopTasks_[0] = [] () {}; deviceTimedCollect->PostDelayTask(deviceTimedCollect->nonPersitenceLoopTasks_[0], 0); EXPECT_NE(collect, nullptr); @@ -386,8 +373,8 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent001, TestSize.Level3) { DTEST_LOG << "AddCollectEvent001 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); OnDemandEvent event; std::vector events; events.emplace_back(event); @@ -406,8 +393,8 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent002, TestSize.Level3) { DTEST_LOG << "AddCollectEvent002 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); OnDemandEvent event = {TIMED_EVENT, "mockevent", "10"}; std::vector events; events.emplace_back(event); @@ -426,8 +413,8 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent003, TestSize.Level3) { DTEST_LOG << "AddCollectEvent003 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); OnDemandEvent event = {TIMED_EVENT, "loopevent", "10"}; std::vector events; events.emplace_back(event); @@ -446,8 +433,8 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent004, TestSize.Level3) { DTEST_LOG << "AddCollectEvent004 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); OnDemandEvent event = {TIMED_EVENT, "order_timed_event", "10", -1, true}; std::vector events; events.emplace_back(event); @@ -466,8 +453,8 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent005, TestSize.Level3) { DTEST_LOG << "AddCollectEvent005 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); OnDemandEvent event = {TIMED_EVENT, "order_timed_event", "10"}; std::vector events; events.emplace_back(event); @@ -486,8 +473,8 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent006, TestSize.Level3) { DTEST_LOG << "AddCollectEvent006 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); OnDemandEvent event = {TIMED_EVENT, "mockevent", "10", -1, true}; std::vector events; events.emplace_back(event); @@ -506,8 +493,8 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent007, TestSize.Level3) DTEST_LOG << "AddCollectEvent007 begin" << std::endl; #ifdef PREFERENCES_ENABLE sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); std::vector events; OnDemandEvent event = {TIMED_EVENT, "timedevent", "2017-9-1-16:59:10", -1, true}; @@ -522,11 +509,11 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent007, TestSize.Level3) events.emplace_back(event2); ret = deviceTimedCollect->AddCollectEvent(events); EXPECT_EQ(ret, ERR_OK); - OnDemandEvent event3 = {TIMED_EVENT, "awakeloopevent", "100", -1, true}; + OnDemandEvent event3 = {TIMED_EVENT, "awakeloopevent", "1000", -1, true}; events.emplace_back(event3); ret = deviceTimedCollect->AddCollectEvent(events); EXPECT_EQ(ret, ERR_INVALID_VALUE); - OnDemandEvent event4 = {TIMED_EVENT, "awakeloopevent", "100", -1, false}; + OnDemandEvent event4 = {TIMED_EVENT, "awakeloopevent", "1000", -1, false}; events.emplace_back(event4); ret = deviceTimedCollect->AddCollectEvent(events); EXPECT_EQ(ret, ERR_INVALID_VALUE); @@ -545,8 +532,8 @@ HWTEST_F(DeviceTimedCollectTest, OnStop001, TestSize.Level0) { DTEST_LOG << "OnStop001 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = - std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); int32_t ret = deviceTimedCollect->OnStop(); EXPECT_EQ(ret, ERR_OK); DTEST_LOG << "OnStop001 end" << std::endl; @@ -562,8 +549,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent001, TestSize.Level3) { DTEST_LOG << "RemoveUnusedEvent001 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = - std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(report); OnDemandEvent event = {TIMED_EVENT, "invalid", "10"}; int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); EXPECT_EQ(ret, ERR_INVALID_VALUE); @@ -580,8 +566,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent002, TestSize.Level3) { DTEST_LOG << "RemoveUnusedEvent002 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = - std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(report); OnDemandEvent event = {TIMED_EVENT, "loopevent", "10"}; deviceTimedCollect->nonPersitenceLoopEventSet_.clear(); int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); @@ -599,8 +584,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent003, TestSize.Level3) { DTEST_LOG << "RemoveUnusedEvent003 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = - std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(report); OnDemandEvent event = {TIMED_EVENT, "loopevent", "10"}; deviceTimedCollect->nonPersitenceLoopEventSet_.insert(10); int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); @@ -618,8 +602,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent004, TestSize.Level3) { DTEST_LOG << "RemoveUnusedEvent004 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = - std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(report); OnDemandEvent event = {TIMED_EVENT, "loopevent", "10", -1, true}; deviceTimedCollect->nonPersitenceLoopEventSet_.insert(10); int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); @@ -637,8 +620,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent005, TestSize.Level3) { DTEST_LOG << "RemoveUnusedEvent005 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = - std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(report); OnDemandEvent event = {TIMED_EVENT, "awakeloopevent", "3600", -1, true}; deviceTimedCollect->nonPersitenceLoopEventSet_.insert(3600); int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); @@ -715,14 +697,14 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask001, TestSize.Level3 { DTEST_LOG << "ProcessPersistenceTimedTask001 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(report); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = 0; std::string strTime = "IntervalTime"; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); EXPECT_EQ(disTime, 0); - disTime = 50; + disTime = 5000; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); EXPECT_NE(disTime, 0); DTEST_LOG << "ProcessPersistenceTimedTask001 end" << std::endl; @@ -734,7 +716,7 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTask001, TestSize.Level3) { DTEST_LOG << "PostPersistenceDelayTask001 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(report); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int32_t interval = 1; int32_t disTime = 1; @@ -750,7 +732,8 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked001, TestSize. { DTEST_LOG << "PostNonPersistenceTimedTaskLocked001 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); @@ -763,14 +746,14 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask003, TestSize.Level3 { DTEST_LOG << " ProcessPersistenceTimedTask003 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = 0; std::string strTime = "IntervalTime"; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); EXPECT_EQ(disTime, 0); - disTime = 50; + disTime = 5000; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); EXPECT_NE(disTime, 0); DTEST_LOG << " ProcessPersistenceTimedTask003 end" << std::endl; @@ -782,7 +765,7 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTask002, TestSize.Level3) { DTEST_LOG << " PostPersistenceDelayTask002 begin" << std::endl; sptr report; - std::shared_ptr deviceTimedCollect = std::make_shared(report); + sptr deviceTimedCollect = new DeviceTimedCollect(report); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int32_t interVal = 1; int32_t disTime = 1; @@ -798,7 +781,8 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked002, TestSize. { DTEST_LOG << " PostNonPersistenceTimedTaskLocked002 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); @@ -811,14 +795,15 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask002, TestSize.Level3 { DTEST_LOG << " ProcessPersistenceTimedTask002 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = -1; std::string strTime = "time_2017_9-1-16:59:10"; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); EXPECT_NE(nullptr, deviceTimedCollect->preferencesUtil_); - disTime = 100; + disTime = 1000; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); EXPECT_NE(nullptr, deviceTimedCollect->preferencesUtil_); DTEST_LOG << " ProcessPersistenceTimedTask002 end" << std::endl; @@ -829,7 +814,8 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceLoopTask001, TestSize.Level3) { DTEST_LOG << " ProcessPersistenceLoopTask001 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = 0; @@ -837,7 +823,7 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceLoopTask001, TestSize.Level3) std::string strInterval = "1729909174"; deviceTimedCollect->ProcessPersistenceLoopTask(disTime, triggerTime, strInterval); EXPECT_EQ(0, disTime); - disTime = 100; + disTime = 1000; deviceTimedCollect->ProcessPersistenceLoopTask(disTime, triggerTime, strInterval); EXPECT_NE(0, disTime); DTEST_LOG << " ProcessPersistenceLoopTask001 end" << std::endl; @@ -847,7 +833,8 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceLoopTaskLocked001, TestSize.L { DTEST_LOG << " PostNonPersistenceLoopTaskLocked001 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); int32_t interVal = 65; deviceTimedCollect->nonPersitenceLoopTasks_[interVal] = [interVal] () {}; deviceTimedCollect->PostNonPersistenceLoopTaskLocked(interVal); @@ -868,7 +855,8 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTaskd001, TestSize.Level3) { DTEST_LOG << " PostPersistenceDelayTaskd001 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); std::function postTask = [] () {}; @@ -884,12 +872,13 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked003, TestSize. { DTEST_LOG << " PostNonPersistenceTimedTaskLocked003 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); std::string strTime = "100"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); EXPECT_EQ(0, timeGap); - timeGap = 50; + timeGap = 5000; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); EXPECT_NE(0, timeGap); DTEST_LOG << " PostNonPersistenceTimedTaskLocked003 end" << std::endl; @@ -899,7 +888,8 @@ HWTEST_F(DeviceTimedCollectTest, RemovePersistenceLoopTask001, TestSize.Level3) { DTEST_LOG << " RemovePersistenceLoopTask001 begin" << std::endl; sptr collect = new DeviceStatusCollectManager(); - std::shared_ptr deviceTimedCollect = std::make_shared(collect); + collect->collectHandler_ = std::make_shared("collect"); + sptr deviceTimedCollect = new DeviceTimedCollect(collect); int32_t interVal = 64; deviceTimedCollect->persitenceLoopEventSet_.insert(interVal); diff --git a/services/samgr/native/test/unittest/src/ref_count_collect_test.cpp b/services/samgr/native/test/unittest/src/ref_count_collect_test.cpp index 77e3d153..b0a9c480 100644 --- a/services/samgr/native/test/unittest/src/ref_count_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/ref_count_collect_test.cpp @@ -130,6 +130,7 @@ HWTEST_F(RefCountCollectTest, OnStart001, TestSize.Level1) auto ret = collect->OnStart(); EXPECT_EQ(ret, ERR_OK); ret = collect->OnStop(); + usleep(500 * 1000); EXPECT_EQ(ret, ERR_OK); } @@ -147,6 +148,7 @@ HWTEST_F(RefCountCollectTest, OnStart002, TestSize.Level1) auto ret = collect->OnStart(); EXPECT_EQ(ret, ERR_OK); ret = collect->OnStop(); + usleep(500 * 1000); EXPECT_EQ(ret, ERR_OK); } @@ -164,6 +166,7 @@ HWTEST_F(RefCountCollectTest, OnStart003, TestSize.Level1) auto ret = collect->OnStart(); EXPECT_EQ(ret, ERR_OK); ret = collect->OnStop(); + usleep(500 * 1000); EXPECT_EQ(ret, ERR_OK); } -- Gitee From 55d32b2950b46ef1fc608d184be48203687199f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Tue, 24 Jun 2025 15:57:17 +0800 Subject: [PATCH 02/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- samgr.diff | 0 services/samgr/native/source/samgr_time_handler.cpp | 2 +- .../native/test/unittest/src/device_timed_collect_test.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 samgr.diff diff --git a/samgr.diff b/samgr.diff new file mode 100644 index 00000000..e69de29b diff --git a/services/samgr/native/source/samgr_time_handler.cpp b/services/samgr/native/source/samgr_time_handler.cpp index 2d4a790b..bf941329 100644 --- a/services/samgr/native/source/samgr_time_handler.cpp +++ b/services/samgr/native/source/samgr_time_handler.cpp @@ -109,7 +109,7 @@ int SamgrTimeHandler::CreateAndRetry() bool SamgrTimeHandler::PostTask(TaskType func, uint64_t delayTime) { - HILOGI("SamgrTimeHandler postTask start: %{public}lu s", delayTime); + HILOGI("SamgrTimeHandler postTask start: %{public}llu s", delayTime); int timerfd = CreateAndRetry(); if (timerfd == -1) { timerfd = timerfd_create(CLOCK_MONOTONIC, 0); diff --git a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp index 3a227d0c..93d8024b 100644 --- a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp @@ -746,7 +746,7 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask003, TestSize.Level3 { DTEST_LOG << " ProcessPersistenceTimedTask003 begin" << std::endl; sptr report; - sptr deviceTimedCollect = new DeviceTimedCollect(collect); + sptr deviceTimedCollect = new DeviceTimedCollect(report); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = 0; std::string strTime = "IntervalTime"; -- Gitee From 3e2365b54fa205a4d0be1628f9f25fa2a50f66aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Tue, 24 Jun 2025 16:34:18 +0800 Subject: [PATCH 03/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- samgr.diff | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 samgr.diff diff --git a/samgr.diff b/samgr.diff deleted file mode 100644 index e69de29b..00000000 -- Gitee From 539df841aef782186dc10d38e502b86a14446f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Tue, 24 Jun 2025 17:21:01 +0800 Subject: [PATCH 04/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../test/unittest/src/device_status_collect_manager_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6c644ae6..24f1838e 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 @@ -514,7 +514,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(); + collect->collectPluginMap_[DEVICE_ONLINE]->CleanFfrt(); DTEST_LOG << " ReportEvent002 END" << std::endl; } @@ -541,7 +541,7 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent003, TestSize.Level3) collect->ReportEvent(event); EXPECT_EQ(true, collect->collectHandler_ != nullptr); PostTask(collect->collectHandler_); - collect->collectHandler_->CleanFfrt(); + collect->collectPluginMap_[DEVICE_ONLINE]->CleanFfrt(); DTEST_LOG << " ReportEvent003 END" << std::endl; } -- Gitee From 18aeb9ab2e63a73fafc80887540a90f1d4c7d18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Wed, 25 Jun 2025 10:26:20 +0800 Subject: [PATCH 05/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- services/samgr/native/source/samgr_time_handler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/samgr/native/source/samgr_time_handler.cpp b/services/samgr/native/source/samgr_time_handler.cpp index bf941329..d0b97552 100644 --- a/services/samgr/native/source/samgr_time_handler.cpp +++ b/services/samgr/native/source/samgr_time_handler.cpp @@ -109,7 +109,7 @@ int SamgrTimeHandler::CreateAndRetry() bool SamgrTimeHandler::PostTask(TaskType func, uint64_t delayTime) { - HILOGI("SamgrTimeHandler postTask start: %{public}llu s", delayTime); + HILOGI("SamgrTimeHandler postTask start: %{public}" PRId64 "s", delayTime); int timerfd = CreateAndRetry(); if (timerfd == -1) { timerfd = timerfd_create(CLOCK_MONOTONIC, 0); -- Gitee From a2f611a5577c7f8e863ff9e63d0e7b7d9acc4952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Thu, 26 Jun 2025 09:35:06 +0800 Subject: [PATCH 06/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../collect/device_networking_collect.cpp | 1 + services/samgr/native/test/unittest/BUILD.gn | 1 + .../device_status_collect_manager_test.cpp | 29 +++++----- .../unittest/src/mock_dbinder_service.cpp | 57 +++++++++++++++++++ 4 files changed, 72 insertions(+), 16 deletions(-) create mode 100644 services/samgr/native/test/unittest/src/mock_dbinder_service.cpp diff --git a/services/samgr/native/source/collect/device_networking_collect.cpp b/services/samgr/native/source/collect/device_networking_collect.cpp index cc4e6c15..7520b91d 100644 --- a/services/samgr/native/source/collect/device_networking_collect.cpp +++ b/services/samgr/native/source/collect/device_networking_collect.cpp @@ -269,6 +269,7 @@ void WorkHandler::CleanFfrt() { if (handler_ != nullptr) { handler_->CleanFfrt(); + handler_ = nullptr; } } diff --git a/services/samgr/native/test/unittest/BUILD.gn b/services/samgr/native/test/unittest/BUILD.gn index 8ff86f26..2a17423c 100644 --- a/services/samgr/native/test/unittest/BUILD.gn +++ b/services/samgr/native/test/unittest/BUILD.gn @@ -144,6 +144,7 @@ ohos_unittest("SystemAbilityMgrTest") { if (support_common_event) { sources += [ "${samgr_services_dir}/source/collect/common_event_collect.cpp", + "${samgr_services_dir}/test/unittest/src/mock_dbinder_service.cpp", "${samgr_services_dir}/test/unittest/src/system_ability_mgr_load_test.cpp", "${samgr_services_dir}/test/unittest/src/system_ability_mgr_new_test.cpp", "${samgr_services_dir}/test/unittest/src/system_ability_mgr_ondemand_test.cpp", 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 24f1838e..d1bc72ed 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 @@ -504,17 +504,14 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent002, TestSize.Level3) { DTEST_LOG << " ReportEvent002 BEGIN" << std::endl; std::list saProfiles; - collect->Init(saProfiles); + sptr collectMgr = new DeviceStatusCollectManager(); + collectMgr->Init(saProfiles); OnDemandEvent event; - collect->collectHandler_ = std::make_shared("collect"); - collect->ReportEvent(event); - EXPECT_EQ(true, collect->collectHandler_ != nullptr); - PostTask(collect->collectHandler_); - collect->PostDelayTask(nullptr, -1); - collect->PostDelayTask(nullptr, std::numeric_limits::max()); - event = { DEVICE_ONLINE, SA_TAG_DEVICE_ON_LINE, "on" }; - collect->ReportEvent(event); - collect->collectPluginMap_[DEVICE_ONLINE]->CleanFfrt(); + collectMgr->ReportEvent(event); + EXPECT_EQ(true, collectMgr->collectHandler_ != nullptr); + PostTask(collectMgr->collectHandler_); + collectMgr->PostDelayTask(nullptr, -1); + collectMgr->PostDelayTask(nullptr, std::numeric_limits::max()); DTEST_LOG << " ReportEvent002 END" << std::endl; } @@ -527,7 +524,8 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent003, TestSize.Level3) { DTEST_LOG << " ReportEvent003 BEGIN" << std::endl; std::list saProfiles; - collect->Init(saProfiles); + sptr collectMgr = new DeviceStatusCollectManager(); + collectMgr->Init(saProfiles); OnDemandEvent event = { DEVICE_ONLINE, SA_TAG_DEVICE_ON_LINE, "on" }; std::list saControlList; SaProfile saProfile; @@ -537,11 +535,10 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent003, TestSize.Level3) saProfile.startOnDemand.onDemandEvents.emplace_back(event1); saProfile.stopOnDemand.onDemandEvents.emplace_back(event2); saProfiles.emplace_back(saProfile); - collect->FilterOnDemandSaProfiles(saProfiles); - collect->ReportEvent(event); - EXPECT_EQ(true, collect->collectHandler_ != nullptr); - PostTask(collect->collectHandler_); - collect->collectPluginMap_[DEVICE_ONLINE]->CleanFfrt(); + collectMgr->FilterOnDemandSaProfiles(saProfiles); + collectMgr->ReportEvent(event); + EXPECT_EQ(true, collectMgr->collectHandler_!= nullptr); + PostTask(collectMgr->collectHandler_); DTEST_LOG << " ReportEvent003 END" << std::endl; } diff --git a/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp b/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp new file mode 100644 index 00000000..e939b5c6 --- /dev/null +++ b/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2021-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dbinder_service.h" + +namespace OHOS { +DBinderService::DBinderService() +{ +} + +DBinderService::~DBinderService() +{ +} + +sptr DBinderService::MakeRemoteBinder(const std::u16string &serviceName, + const std::string &deviceID, int32_t binderObject, uint32_t pid, uint32_t uid) +{ + return nullptr; +} + +void DBinderService::LoadSystemAbilityComplete(const std::string& srcNetworkId, int32_t systemAbilityId, + const sptr& remoteObject) +{ +} + +bool DBinderService::RegisterRemoteProxy(std::u16string serviceName, sptr binderObject) +{ + return true; +} + +bool DBinderService::StartDBinderService(std::shared_ptr &callbackImpl) +{ + return true; +} + +int32_t DBinderService::NoticeServiceDie(const std::u16string &serviceName, const std::string &deviceID) +{ + return ERR_NONE; +} + +int32_t DBinderService::NoticeDeviceDie(const std::string &deviceID) +{ + return ERR_NONE; +} +} // namespace OHOS -- Gitee From 024fb591490351f53bdc18aa1e6874e7c1e981c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Thu, 26 Jun 2025 09:47:28 +0800 Subject: [PATCH 07/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../samgr/native/source/collect/device_networking_collect.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/samgr/native/source/collect/device_networking_collect.cpp b/services/samgr/native/source/collect/device_networking_collect.cpp index 7520b91d..cc4e6c15 100644 --- a/services/samgr/native/source/collect/device_networking_collect.cpp +++ b/services/samgr/native/source/collect/device_networking_collect.cpp @@ -269,7 +269,6 @@ void WorkHandler::CleanFfrt() { if (handler_ != nullptr) { handler_->CleanFfrt(); - handler_ = nullptr; } } -- Gitee From 56cab8fad5097345896ad69643435071235dc03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Thu, 26 Jun 2025 15:19:01 +0800 Subject: [PATCH 08/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../native/test/unittest/src/mock_dbinder_service.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp b/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp index e939b5c6..2c356b1b 100644 --- a/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp +++ b/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp @@ -18,40 +18,48 @@ namespace OHOS { DBinderService::DBinderService() { + HILOGI("Mock_DBinderService::DBinderService"); } DBinderService::~DBinderService() { + HILOGI("Mock_DBinderService::~DBinderService"); } sptr DBinderService::MakeRemoteBinder(const std::u16string &serviceName, const std::string &deviceID, int32_t binderObject, uint32_t pid, uint32_t uid) { + HILOGI("Mock_DBinderService::MakeRemoteBinder"); return nullptr; } void DBinderService::LoadSystemAbilityComplete(const std::string& srcNetworkId, int32_t systemAbilityId, const sptr& remoteObject) { + HILOGI("Mock_DBinderService::LoadSystemAbilityComplete"); } -bool DBinderService::RegisterRemoteProxy(std::u16string serviceName, sptr binderObject) +bool DBinderService::RegisterRemoteProxy(std::u16string serviceName, int32_t systemAbilityId) { + HILOGI("Mock_DBinderService::RegisterRemoteProxy"); return true; } bool DBinderService::StartDBinderService(std::shared_ptr &callbackImpl) { + HILOGI("Mock_DBinderService::StartDBinderService"); return true; } int32_t DBinderService::NoticeServiceDie(const std::u16string &serviceName, const std::string &deviceID) { + HILOGI("Mock_DBinderService::NoticeServiceDie"); return ERR_NONE; } int32_t DBinderService::NoticeDeviceDie(const std::string &deviceID) { + HILOGI("Mock_DBinderService::NoticeDeviceDie"); return ERR_NONE; } } // namespace OHOS -- Gitee From fff0cd9403d2642112284dff74cfbdebfc9c1828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Thu, 26 Jun 2025 15:25:22 +0800 Subject: [PATCH 09/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../samgr/native/test/unittest/src/mock_dbinder_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp b/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp index 2c356b1b..db25a651 100644 --- a/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp +++ b/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp @@ -16,7 +16,7 @@ #include "dbinder_service.h" namespace OHOS { -DBinderService::DBinderService() +DBinderService::DBinderService() { HILOGI("Mock_DBinderService::DBinderService"); } -- Gitee From f58c7b7b1f5036d54f6a6d79f1d98a4815aa765f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Thu, 26 Jun 2025 15:53:52 +0800 Subject: [PATCH 10/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- services/samgr/native/test/unittest/src/mock_dbinder_service.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp b/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp index db25a651..c9011460 100644 --- a/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp +++ b/services/samgr/native/test/unittest/src/mock_dbinder_service.cpp @@ -14,6 +14,7 @@ */ #include "dbinder_service.h" +#include "sam_log.h" namespace OHOS { DBinderService::DBinderService() -- Gitee From 7db050f9e2f4a24e82288002ea352a24822ea6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Thu, 26 Jun 2025 17:15:35 +0800 Subject: [PATCH 11/11] fix tdd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../device_status_collect_manager_test.cpp | 2 + .../src/device_timed_collect_test.cpp | 40 +++++++++++++++++++ 2 files changed, 42 insertions(+) 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 d1bc72ed..1cadd123 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 @@ -505,6 +505,7 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent002, TestSize.Level3) DTEST_LOG << " ReportEvent002 BEGIN" << std::endl; std::list saProfiles; sptr collectMgr = new DeviceStatusCollectManager(); + EXPECT_EQ(true, collectMgr != nullptr); collectMgr->Init(saProfiles); OnDemandEvent event; collectMgr->ReportEvent(event); @@ -525,6 +526,7 @@ HWTEST_F(DeviceStatusCollectManagerTest, ReportEvent003, TestSize.Level3) DTEST_LOG << " ReportEvent003 BEGIN" << std::endl; std::list saProfiles; sptr collectMgr = new DeviceStatusCollectManager(); + EXPECT_EQ(true, collectMgr != nullptr); collectMgr->Init(saProfiles); OnDemandEvent event = { DEVICE_ONLINE, SA_TAG_DEVICE_ON_LINE, "on" }; std::list saControlList; diff --git a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp index 93d8024b..dee78a4d 100644 --- a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp @@ -69,6 +69,7 @@ HWTEST_F(DeviceTimedCollectTest, Init001, TestSize.Level3) saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 1); DTEST_LOG << "Init001 end" << std::endl; @@ -89,6 +90,7 @@ HWTEST_F(DeviceTimedCollectTest, Init002, TestSize.Level3) saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init002 end" << std::endl; @@ -109,6 +111,7 @@ HWTEST_F(DeviceTimedCollectTest, Init003, TestSize.Level3) saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 1); DTEST_LOG << "Init003 end" << std::endl; @@ -129,6 +132,7 @@ HWTEST_F(DeviceTimedCollectTest, Init004, TestSize.Level3) saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init004 end" << std::endl; @@ -149,6 +153,7 @@ HWTEST_F(DeviceTimedCollectTest, Init005, TestSize.Level3) saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init005 end" << std::endl; @@ -169,6 +174,7 @@ HWTEST_F(DeviceTimedCollectTest, Init006, TestSize.Level3) saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init006 end" << std::endl; @@ -189,6 +195,7 @@ HWTEST_F(DeviceTimedCollectTest, Init007, TestSize.Level3) saProfiles.push_back(saProfile); sptr collect = new DeviceStatusCollectManager(); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 0); DTEST_LOG << "Init007 end" << std::endl; @@ -217,6 +224,7 @@ HWTEST_F(DeviceTimedCollectTest, Init008, TestSize.Level3) saProfiles.push_back(saProfile3); sptr collect = new DeviceStatusCollectManager(); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->Init(saProfiles); EXPECT_EQ(deviceTimedCollect->nonPersitenceLoopEventSet_.size(), 2); deviceTimedCollect->timeInfos_.clear(); @@ -234,6 +242,7 @@ HWTEST_F(DeviceTimedCollectTest, OnStart001, TestSize.Level0) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->nonPersitenceLoopEventSet_.insert(101); deviceTimedCollect->OnStart(); EXPECT_NE(collect, nullptr); @@ -254,6 +263,7 @@ HWTEST_F(DeviceTimedCollectTest, OnStart002, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); int64_t currentTime = TimeUtils::GetTimestamp(); preferencesUtil_->SaveString("timedevent_2017-9-1-16:59:10", "start#149999#"); preferencesUtil_->SaveLong("2017-9-1-16:59:10", currentTime + 1000); @@ -282,6 +292,7 @@ HWTEST_F(DeviceTimedCollectTest, ReportEventByTimeInfo001, TestSize.Level3) DTEST_LOG << "ReportEventByTimeInfo001 begin" << std::endl; sptr collect = nullptr; sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); TimeInfo info; info.awake = true; info.normal = true; @@ -302,6 +313,7 @@ HWTEST_F(DeviceTimedCollectTest, PostDelayTaskByTimeInfo001, TestSize.Level3) DTEST_LOG << "PostDelayTaskByTimeInfo001 begin" << std::endl; sptr collect = nullptr; sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); TimeInfo info; info.awake = true; info.normal = true; @@ -323,6 +335,7 @@ HWTEST_F(DeviceTimedCollectTest, ReportEvent001, TestSize.Level3) DTEST_LOG << "ReportEvent001 begin" << std::endl; sptr collect = nullptr; sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event; deviceTimedCollect->ReportEvent(event); EXPECT_EQ(collect, nullptr); @@ -340,6 +353,7 @@ HWTEST_F(DeviceTimedCollectTest, PostDelayTask001, TestSize.Level3) DTEST_LOG << "PostDelayTask001 begin" << std::endl; sptr collect = nullptr; sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->PostDelayTask(deviceTimedCollect->nonPersitenceLoopTasks_[0], 0); EXPECT_EQ(collect, nullptr); DTEST_LOG << "PostDelayTask001 end" << std::endl; @@ -357,6 +371,7 @@ HWTEST_F(DeviceTimedCollectTest, PostDelayTask002, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->nonPersitenceLoopTasks_[0] = [] () {}; deviceTimedCollect->PostDelayTask(deviceTimedCollect->nonPersitenceLoopTasks_[0], 0); EXPECT_NE(collect, nullptr); @@ -375,6 +390,7 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent001, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event; std::vector events; events.emplace_back(event); @@ -395,6 +411,7 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent002, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "mockevent", "10"}; std::vector events; events.emplace_back(event); @@ -415,6 +432,7 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent003, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "loopevent", "10"}; std::vector events; events.emplace_back(event); @@ -435,6 +453,7 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent004, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "order_timed_event", "10", -1, true}; std::vector events; events.emplace_back(event); @@ -455,6 +474,7 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent005, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "order_timed_event", "10"}; std::vector events; events.emplace_back(event); @@ -475,6 +495,7 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent006, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "mockevent", "10", -1, true}; std::vector events; events.emplace_back(event); @@ -495,6 +516,7 @@ HWTEST_F(DeviceTimedCollectTest, AddCollectEvent007, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); std::vector events; OnDemandEvent event = {TIMED_EVENT, "timedevent", "2017-9-1-16:59:10", -1, true}; @@ -534,6 +556,7 @@ HWTEST_F(DeviceTimedCollectTest, OnStop001, TestSize.Level0) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); int32_t ret = deviceTimedCollect->OnStop(); EXPECT_EQ(ret, ERR_OK); DTEST_LOG << "OnStop001 end" << std::endl; @@ -550,6 +573,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent001, TestSize.Level3) DTEST_LOG << "RemoveUnusedEvent001 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "invalid", "10"}; int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); EXPECT_EQ(ret, ERR_INVALID_VALUE); @@ -567,6 +591,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent002, TestSize.Level3) DTEST_LOG << "RemoveUnusedEvent002 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "loopevent", "10"}; deviceTimedCollect->nonPersitenceLoopEventSet_.clear(); int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); @@ -585,6 +610,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent003, TestSize.Level3) DTEST_LOG << "RemoveUnusedEvent003 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "loopevent", "10"}; deviceTimedCollect->nonPersitenceLoopEventSet_.insert(10); int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); @@ -603,6 +629,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent004, TestSize.Level3) DTEST_LOG << "RemoveUnusedEvent004 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "loopevent", "10", -1, true}; deviceTimedCollect->nonPersitenceLoopEventSet_.insert(10); int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); @@ -621,6 +648,7 @@ HWTEST_F(DeviceTimedCollectTest, RemoveUnusedEvent005, TestSize.Level3) DTEST_LOG << "RemoveUnusedEvent005 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); OnDemandEvent event = {TIMED_EVENT, "awakeloopevent", "3600", -1, true}; deviceTimedCollect->nonPersitenceLoopEventSet_.insert(3600); int32_t ret = deviceTimedCollect->RemoveUnusedEvent(event); @@ -698,6 +726,7 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask001, TestSize.Level3 DTEST_LOG << "ProcessPersistenceTimedTask001 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = 0; std::string strTime = "IntervalTime"; @@ -717,6 +746,7 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTask001, TestSize.Level3) DTEST_LOG << "PostPersistenceDelayTask001 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int32_t interval = 1; int32_t disTime = 1; @@ -734,6 +764,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked001, TestSize. sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); @@ -747,6 +778,7 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask003, TestSize.Level3 DTEST_LOG << " ProcessPersistenceTimedTask003 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = 0; std::string strTime = "IntervalTime"; @@ -766,6 +798,7 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTask002, TestSize.Level3) DTEST_LOG << " PostPersistenceDelayTask002 begin" << std::endl; sptr report; sptr deviceTimedCollect = new DeviceTimedCollect(report); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int32_t interVal = 1; int32_t disTime = 1; @@ -783,6 +816,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked002, TestSize. sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); @@ -797,6 +831,7 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask002, TestSize.Level3 sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = -1; @@ -816,6 +851,7 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceLoopTask001, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); int64_t disTime = 0; @@ -835,6 +871,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceLoopTaskLocked001, TestSize.L sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); int32_t interVal = 65; deviceTimedCollect->nonPersitenceLoopTasks_[interVal] = [interVal] () {}; deviceTimedCollect->PostNonPersistenceLoopTaskLocked(interVal); @@ -857,6 +894,7 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTaskd001, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); deviceTimedCollect->preferencesUtil_ = PreferencesUtil::GetInstance(); std::function postTask = [] () {}; @@ -874,6 +912,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked003, TestSize. sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); std::string strTime = "100"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); @@ -890,6 +929,7 @@ HWTEST_F(DeviceTimedCollectTest, RemovePersistenceLoopTask001, TestSize.Level3) sptr collect = new DeviceStatusCollectManager(); collect->collectHandler_ = std::make_shared("collect"); sptr deviceTimedCollect = new DeviceTimedCollect(collect); + EXPECT_EQ(true, deviceTimedCollect != nullptr); int32_t interVal = 64; deviceTimedCollect->persitenceLoopEventSet_.insert(interVal); -- Gitee