diff --git a/services/samgr/native/source/collect/ref_count_collect.cpp b/services/samgr/native/source/collect/ref_count_collect.cpp index 2062fbbf4a128021e7590b50ef653938e875d216..1372a612b15ee9422253d5abc0c7510667b2189b 100644 --- a/services/samgr/native/source/collect/ref_count_collect.cpp +++ b/services/samgr/native/source/collect/ref_count_collect.cpp @@ -40,7 +40,7 @@ void RefCountCollect::Init(const std::list& saProfiles) int32_t RefCountCollect::OnStart() { uint32_t timerId = 0; - timer_ = std::make_unique("RefCountCollectTimer"); + timer_ = std::make_unique("RefCountCollectTimer", -1); timer_->Setup(); if (!residentSaList_.empty()) { diff --git a/services/samgr/native/source/system_ability_manager.cpp b/services/samgr/native/source/system_ability_manager.cpp index 4dc5a7c9073b4db005ad6e6a11a37c39637c54d9..24a0cad9a7a0c38cc86308239fabf0debd62ccee 100644 --- a/services/samgr/native/source/system_ability_manager.cpp +++ b/services/samgr/native/source/system_ability_manager.cpp @@ -170,7 +170,7 @@ void SystemAbilityManager::Init() collectManager_ = sptr(new DeviceStatusCollectManager()); abilityStateScheduler_ = std::make_shared(); InitSaProfile(); - reportEventTimer_ = std::make_unique("DfxReporter"); + reportEventTimer_ = std::make_unique("DfxReporter", -1); OndemandLoadForPerf(); SetKey(DYNAMIC_CACHE_PARAM); SamgrUtil::InvalidateSACache(); diff --git a/services/samgr/native/test/unittest/include/ref_count_collect_test.h b/services/samgr/native/test/unittest/include/ref_count_collect_test.h index c85bb686e5a600685f693d7c93b3b3da98b00cd1..646ffc01bf510ee55915c12dee45c9558299b2b9 100644 --- a/services/samgr/native/test/unittest/include/ref_count_collect_test.h +++ b/services/samgr/native/test/unittest/include/ref_count_collect_test.h @@ -26,7 +26,6 @@ protected: static void TearDownTestCase(); void SetUp(); void TearDown(); - std::shared_ptr collect; }; } // namespace OHOS #endif /* SAMGR_TEST_UNITTEST_REF_COUNT_COLLECT_TEST_H */ \ No newline at end of file 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 e505408c54186a344d0e313ed26bf4f83ebaf317..77e3d1537fc54e90f1ce35f6805987244a7970c7 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 @@ -34,8 +34,6 @@ void RefCountCollectTest::TearDownTestCase() void RefCountCollectTest::SetUp() { - sptr manager = new DeviceStatusCollectManager(); - collect = std::make_shared(manager); DTEST_LOG << "SetUp" << std::endl; } @@ -51,6 +49,8 @@ void RefCountCollectTest::TearDown() */ HWTEST_F(RefCountCollectTest, Init001, TestSize.Level1) { + sptr manager = new DeviceStatusCollectManager(); + sptr collect = new RefCountCollect(manager); std::list saProfiles; { SaProfile saProfile; @@ -76,6 +76,8 @@ HWTEST_F(RefCountCollectTest, Init001, TestSize.Level1) */ HWTEST_F(RefCountCollectTest, Init002, TestSize.Level1) { + sptr manager = new DeviceStatusCollectManager(); + sptr collect = new RefCountCollect(manager); std::list saProfiles; { SaProfile saProfile; @@ -101,6 +103,8 @@ HWTEST_F(RefCountCollectTest, Init002, TestSize.Level1) */ HWTEST_F(RefCountCollectTest, Init003, TestSize.Level1) { + sptr manager = new DeviceStatusCollectManager(); + sptr collect = new RefCountCollect(manager); std::list saProfiles; SaProfile saProfile; saProfile.saId = 1; @@ -120,6 +124,8 @@ HWTEST_F(RefCountCollectTest, Init003, TestSize.Level1) */ HWTEST_F(RefCountCollectTest, OnStart001, TestSize.Level1) { + sptr manager = new DeviceStatusCollectManager(); + sptr collect = new RefCountCollect(manager); collect->residentSaList_.push_back(1); auto ret = collect->OnStart(); EXPECT_EQ(ret, ERR_OK); @@ -134,6 +140,8 @@ HWTEST_F(RefCountCollectTest, OnStart001, TestSize.Level1) */ HWTEST_F(RefCountCollectTest, OnStart002, TestSize.Level1) { + sptr manager = new DeviceStatusCollectManager(); + sptr collect = new RefCountCollect(manager); collect->residentSaList_.clear(); collect->unrefUnloadSaList_.push_back(1); auto ret = collect->OnStart(); @@ -149,6 +157,8 @@ HWTEST_F(RefCountCollectTest, OnStart002, TestSize.Level1) */ HWTEST_F(RefCountCollectTest, OnStart003, TestSize.Level1) { + sptr manager = new DeviceStatusCollectManager(); + sptr collect = new RefCountCollect(manager); collect->residentSaList_.clear(); collect->unrefUnloadSaList_.clear(); auto ret = collect->OnStart(); @@ -164,6 +174,8 @@ HWTEST_F(RefCountCollectTest, OnStart003, TestSize.Level1) */ HWTEST_F(RefCountCollectTest, OnStop001, TestSize.Level1) { + sptr manager = new DeviceStatusCollectManager(); + sptr collect = new RefCountCollect(manager); collect->timer_ = nullptr; auto ret = collect->OnStop(); EXPECT_EQ(ret, ERR_OK); @@ -173,7 +185,7 @@ HWTEST_F(RefCountCollectTest, IdentifyUnrefOndemand001, TestSize.Level1) { DTEST_LOG<<"IdentifyUnrefOndemand001 BEGIN"< manager = new DeviceStatusCollectManager(); - std::shared_ptr statuCollect = std::make_shared(manager); + sptr statuCollect = new RefCountCollect(manager); uint32_t timerId = 0; statuCollect->timer_ = std::make_unique("refCountCollectTimer"); statuCollect->timer_->Setup();