From 8b857f7917c8734a6e2da3432dc040c2db4fd556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Sat, 23 Nov 2024 11:15:27 +0800 Subject: [PATCH 1/6] commit msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../src/system_ability_mgr_subscribe_test.cpp | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_subscribe_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_subscribe_test.cpp index b48dc827..a03ab272 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_subscribe_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_subscribe_test.cpp @@ -35,6 +35,7 @@ #include "system_ability_manager.h" #ifdef SUPPORT_COMMON_EVENT #include "common_event_collect.h" +#include "ability_death_recipient.h" #endif using namespace std; @@ -47,6 +48,18 @@ namespace { constexpr int32_t SAID = 1234; constexpr int32_t OVERFLOW_TIME = 257; constexpr int32_t TEST_OVERFLOW_SAID = 99999; + +void InitSaMgr(sptr& saMgr) +{ + saMgr->abilityDeath_ = sptr(new AbilityDeathRecipient()); + saMgr->systemProcessDeath_ = sptr(new SystemProcessDeathRecipient()); + saMgr->abilityStatusDeath_ = sptr(new AbilityStatusDeathRecipient()); + saMgr->abilityCallbackDeath_ = sptr(new AbilityCallbackDeathRecipient()); + saMgr->remoteCallbackDeath_ = sptr(new RemoteCallbackDeathRecipient()); + saMgr->workHandler_ = make_shared("workHandler"); + saMgr->collectManager_ = sptr(new DeviceStatusCollectManager()); + saMgr->abilityStateScheduler_ = std::make_shared(); +} } /** @@ -57,7 +70,8 @@ constexpr int32_t TEST_OVERFLOW_SAID = 99999; */ HWTEST_F(SystemAbilityMgrTest, SubscribeSystemAbility001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); int32_t systemAbilityId = -1; const sptr listener; int32_t ret = saMgr->SubscribeSystemAbility(systemAbilityId, listener); @@ -72,7 +86,8 @@ HWTEST_F(SystemAbilityMgrTest, SubscribeSystemAbility001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemAbility001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); int32_t systemAbilityId = -1; const sptr listener; int32_t ret = saMgr->UnSubscribeSystemAbility(systemAbilityId, listener); @@ -86,9 +101,8 @@ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemAbility001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrTest, ReportSubscribeOverflow001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - saMgr->workHandler_ = make_shared("workHandler"); - ASSERT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); std::vector> tmpCallbak; sptr callback = nullptr; for (int i = 0; i < OVERFLOW_TIME; ++i) { @@ -108,8 +122,8 @@ HWTEST_F(SystemAbilityMgrTest, ReportSubscribeOverflow001, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemAbilityDied001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - ASSERT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback(new SaStatusChangeMock()); saMgr->listenerMap_[SAID].push_back({callback, SAID}); auto& count = saMgr->subscribeCountMap_[SAID]; @@ -126,9 +140,9 @@ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemAbilityDied001, TestSize.Level1) HWTEST_F(SystemAbilityMgrTest, SubscribeSystemProcess001, TestSize.Level3) { DTEST_LOG << " SubscribeSystemProcess001 " << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr systemProcessStatusChange = new SystemProcessStatusChange(); - saMgr->abilityStateScheduler_ = std::make_shared(); int32_t ret = saMgr->SubscribeSystemProcess(systemProcessStatusChange); EXPECT_EQ(ret, ERR_OK); } @@ -142,7 +156,8 @@ HWTEST_F(SystemAbilityMgrTest, SubscribeSystemProcess001, TestSize.Level3) HWTEST_F(SystemAbilityMgrTest, SubscribeSystemProcess002, TestSize.Level3) { DTEST_LOG << " SubscribeSystemProcess002 " << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->abilityStateScheduler_ = nullptr; sptr systemProcessStatusChange = new SystemProcessStatusChange(); int32_t ret = saMgr->SubscribeSystemProcess(systemProcessStatusChange); @@ -157,9 +172,9 @@ HWTEST_F(SystemAbilityMgrTest, SubscribeSystemProcess002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrTest, SubscribeSystemProcess003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener = new SystemProcessStatusChange(); - saMgr->abilityStateScheduler_ = nullptr; std::list systemProcessInfos; int32_t ret = saMgr->SubscribeSystemProcess(listener); EXPECT_EQ(ret, ERR_INVALID_VALUE); @@ -174,7 +189,8 @@ HWTEST_F(SystemAbilityMgrTest, SubscribeSystemProcess003, TestSize.Level3) HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemProcess001, TestSize.Level3) { DTEST_LOG << " UnSubscribeSystemProcess001" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr systemProcessStatusChange = new SystemProcessStatusChange(); int32_t ret = saMgr->UnSubscribeSystemProcess(systemProcessStatusChange); EXPECT_EQ(ret, ERR_INVALID_VALUE); @@ -189,9 +205,9 @@ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemProcess001, TestSize.Level3) HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemProcess002, TestSize.Level3) { DTEST_LOG << " UnSubscribeSystemProcess002" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr systemProcessStatusChange = new SystemProcessStatusChange(); - saMgr->abilityStateScheduler_ = std::make_shared(); int32_t ret = saMgr->UnSubscribeSystemProcess(systemProcessStatusChange); EXPECT_EQ(ret, ERR_OK); } @@ -204,9 +220,9 @@ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemProcess002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemProcess003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener = new SystemProcessStatusChange(); - saMgr->abilityStateScheduler_ = nullptr; std::list systemProcessInfos; int32_t ret = saMgr->UnSubscribeSystemProcess(listener); EXPECT_EQ(ret, ERR_INVALID_VALUE); -- Gitee From 9e6c3b9d254bae8e975e2a6dfc34a02e03a2a47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Sat, 23 Nov 2024 17:41:48 +0800 Subject: [PATCH 2/6] commit msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../src/system_ability_mgr_stub_load_test.cpp | 341 +++++++++--------- .../src/system_ability_mgr_stub_test.cpp | 185 ++++++---- .../system_ability_mgr_stub_unload_test.cpp | 133 ++++--- .../src/system_ability_mgr_subscribe_test.cpp | 3 + 4 files changed, 360 insertions(+), 302 deletions(-) diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp index 26cc1a6b..17b4d1da 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp @@ -24,6 +24,7 @@ #include "string_ex.h" #include "system_ability_definition.h" #include "test_log.h" +#include "ability_death_recipient.h" #define private public #include "sa_status_change_mock.h" @@ -41,12 +42,24 @@ const string DEFAULT_LOAD_NAME = "loadevent"; constexpr uint32_t SAID = 1499; constexpr int64_t DEFAULT_EVENTID = 0; constexpr int32_t INVALID_SAID = -1; + +void InitSaMgr(sptr& saMgr) +{ + saMgr->abilityDeath_ = sptr(new AbilityDeathRecipient()); + saMgr->systemProcessDeath_ = sptr(new SystemProcessDeathRecipient()); + saMgr->abilityStatusDeath_ = sptr(new AbilityStatusDeathRecipient()); + saMgr->abilityCallbackDeath_ = sptr(new AbilityCallbackDeathRecipient()); + saMgr->remoteCallbackDeath_ = sptr(new RemoteCallbackDeathRecipient()); + saMgr->workHandler_ = make_shared("workHandler"); + saMgr->collectManager_ = sptr(new DeviceStatusCollectManager()); + saMgr->abilityStateScheduler_ = std::make_shared(); +} } HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->AddSystemAbilityInner(data, reply); @@ -55,8 +68,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner001, TestSize.Level4) HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcessInner001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->AddSystemProcessInner(data, reply); @@ -66,8 +79,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcessInner001, TestSize.Level4) HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemProcessInner001, TestSize.Level3) { DTEST_LOG << "SubscribeSystemProcessInner001" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->SubscribeSystemProcessInner(data, reply); @@ -76,8 +89,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemProcessInner001, TestSize.Leve HWTEST_F(SystemAbilityMgrStubTest, SubsSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -87,8 +100,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubsSystemAbilityInner002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, SubsSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -98,8 +111,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubsSystemAbilityInner003, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, SubsSystemAbilityInner004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); SAInfo saInfo; saMgr->abilityMap_[SAID] = saInfo; @@ -114,8 +127,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubsSystemAbilityInner004, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityImmeInner004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); EXPECT_TRUE(testAbility != nullptr); SAInfo saInfo; @@ -131,8 +144,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityImmeInner004, TestSize.Leve HWTEST_F(SystemAbilityMgrStubTest, UnmarshalingSaExtraProp003, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; SystemAbilityManager::SAExtraProp extraProp; bool isExist = false; @@ -149,8 +162,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnmarshalingSaExtraProp003, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -161,8 +174,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityInner002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityInner003, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); MessageParcel data; MessageParcel reply; @@ -176,8 +189,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityInner003, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -188,8 +201,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityInner002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityInner003, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); MessageParcel data; MessageParcel reply; @@ -203,8 +216,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityInner003, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->LoadRemoteSystemAbilityInner(data, reply); @@ -213,8 +226,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner001, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -224,8 +237,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner002, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -237,9 +250,9 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner003, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = new SystemAbilityLoadCallbackMock(); - EXPECT_TRUE(saMgr != nullptr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -252,8 +265,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner004, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner005, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -263,8 +276,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadRemoteSystemAbilityInner005, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, InitSaProfile001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->workHandler_ = make_shared("workHandler1"); saMgr->InitSaProfile(); EXPECT_NE(saMgr->workHandler_, nullptr); @@ -272,8 +285,8 @@ HWTEST_F(SystemAbilityMgrStubTest, InitSaProfile001, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, InitSaProfile002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->workHandler_ = nullptr; saMgr->InitSaProfile(); EXPECT_EQ(saMgr->workHandler_, nullptr); @@ -281,8 +294,8 @@ HWTEST_F(SystemAbilityMgrStubTest, InitSaProfile002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, GetSaProfile001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); CommonSaProfile saProfilein; CommonSaProfile SaProfileout; saMgr->saProfileMap_[SAID] = saProfilein; @@ -293,16 +306,16 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSaProfile001, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbility001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr res = saMgr->GetSystemAbility(INVALID_SAID); EXPECT_EQ(res, nullptr); } HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbility002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); string deviceId = "test"; sptr res = saMgr->GetSystemAbility(SAID, deviceId); EXPECT_EQ(res, nullptr); @@ -310,24 +323,24 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbility002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityFromRemote001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr res = saMgr->GetSystemAbilityFromRemote(INVALID_SAID); EXPECT_EQ(res, nullptr); } HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityFromRemote002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr res = saMgr->GetSystemAbilityFromRemote(SAID); EXPECT_EQ(res, nullptr); } HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityFromRemote003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saInfo.isDistributed = false; saMgr->abilityMap_[SAID] = saInfo; @@ -338,8 +351,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityFromRemote003, TestSize.Level HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityFromRemote004, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saInfo.isDistributed = true; saInfo.remoteObj = saMgr; @@ -351,16 +364,16 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityFromRemote004, TestSize.Level HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr res = saMgr->CheckSystemAbility(INVALID_SAID); EXPECT_EQ(res, nullptr); } HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saInfo.remoteObj = saMgr; saMgr->abilityMap_[SAID] = saInfo; @@ -371,8 +384,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, NotifySystemAbilityChanged001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); string deviceId = "test"; int32_t code = 1; saMgr->NotifySystemAbilityChanged(SAID, deviceId, code, nullptr); @@ -381,8 +394,8 @@ HWTEST_F(SystemAbilityMgrStubTest, NotifySystemAbilityChanged001, TestSize.Level HWTEST_F(SystemAbilityMgrStubTest, NotifySystemAbilityChanged002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); string deviceId = "test"; int32_t code = 1; @@ -392,8 +405,8 @@ HWTEST_F(SystemAbilityMgrStubTest, NotifySystemAbilityChanged002, TestSize.Level HWTEST_F(SystemAbilityMgrStubTest, FindSystemAbilityNotify001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); int32_t pid = 1; saMgr->listenerMap_[SAID].push_back({nullptr, pid}); string deviceId = "test"; @@ -405,8 +418,8 @@ HWTEST_F(SystemAbilityMgrStubTest, FindSystemAbilityNotify001, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, FindSystemAbilityNotify002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->listenerMap_.clear(); string deviceId = "test"; int32_t code = 1; @@ -417,8 +430,8 @@ HWTEST_F(SystemAbilityMgrStubTest, FindSystemAbilityNotify002, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbility001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"test"; saMgr->StartOnDemandAbility(procName, SAID); EXPECT_NE(saMgr, nullptr); @@ -426,8 +439,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbility001, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbility002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"test"; SystemAbilityManager::AbilityItem abilityItem; abilityItem.state = SystemAbilityManager::AbilityState::STARTING; @@ -439,8 +452,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbility002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbilityInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"test"; SystemAbilityManager::AbilityItem abilityItem; abilityItem.state = SystemAbilityManager::AbilityState::STARTING; @@ -450,8 +463,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbilityInner001, TestSize.Level3 HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u""; SystemAbilityManager::AbilityItem abilityItem; abilityItem.state = SystemAbilityManager::AbilityState::INIT; @@ -461,8 +474,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbilityInner002, TestSize.Level3 HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u""; SystemAbilityManager::AbilityItem abilityItem; abilityItem.state = SystemAbilityManager::AbilityState::STARTING; @@ -472,8 +485,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbilityInner003, TestSize.Level3 HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbilityInner004, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u""; SystemAbilityManager::AbilityItem abilityItem; abilityItem.state = SystemAbilityManager::AbilityState::STARTED; @@ -483,8 +496,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbilityInner004, TestSize.Level3 HWTEST_F(SystemAbilityMgrStubTest, AddOnDemandSystemAbilityInfo001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"test"; int maxService = 1002; for (int tempSaid = 1; tempSaid < maxService; tempSaid++) { @@ -497,8 +510,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddOnDemandSystemAbilityInfo001, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, AddOnDemandSystemAbilityInfo002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"test"; saMgr->systemProcessMap_[procName] = saMgr; int32_t res = saMgr->AddOnDemandSystemAbilityInfo(SAID, procName); @@ -508,8 +521,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddOnDemandSystemAbilityInfo002, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, AddOnDemandSystemAbilityInfo003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"test"; saMgr->systemProcessMap_[procName] = saMgr; SystemAbilityManager::AbilityItem abilityItem; @@ -523,8 +536,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddOnDemandSystemAbilityInfo003, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, AddOnDemandSystemAbilityInfo004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"test"; saMgr->systemProcessMap_[procName] = saMgr; SystemAbilityManager::AbilityItem abilityItem; @@ -539,8 +552,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddOnDemandSystemAbilityInfo004, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbility003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"test"; saMgr->onDemandAbilityMap_[SAID] = procName; bool isExist = false; @@ -551,8 +564,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartOnDemandAbility003, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); bool isExist = false; sptr res = saMgr->CheckSystemAbility(INVALID_SAID, isExist); EXPECT_EQ(res, nullptr); @@ -560,8 +573,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility003, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saInfo.remoteObj = saMgr; saMgr->abilityMap_[SAID] = saInfo; @@ -573,8 +586,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility004, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility005, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); bool isExist = false; sptr res = saMgr->CheckSystemAbility(SAID, isExist); EXPECT_EQ(res, nullptr); @@ -582,8 +595,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility005, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility006, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SystemAbilityManager::AbilityItem abilityItem; abilityItem.state = SystemAbilityManager::AbilityState::STARTING; saMgr->startingAbilityMap_[SAID] = abilityItem; @@ -599,8 +612,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility006, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility007, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SystemAbilityManager::AbilityItem abilityItem; abilityItem.state = SystemAbilityManager::AbilityState::INIT; saMgr->startingAbilityMap_[SAID] = abilityItem; @@ -619,8 +632,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility007, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemAbility001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(new SaStatusChangeMock()); int32_t res = saMgr->SubscribeSystemAbility(INVALID_SAID, listener); EXPECT_EQ(res, ERR_INVALID_VALUE); @@ -628,8 +641,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemAbility001, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemAbility002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(nullptr); int32_t res = saMgr->SubscribeSystemAbility(SAID, listener); EXPECT_EQ(res, ERR_INVALID_VALUE); @@ -637,8 +650,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemAbility002, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemAbility003, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(nullptr); int32_t res = saMgr->SubscribeSystemAbility(INVALID_SAID, listener); EXPECT_EQ(res, ERR_INVALID_VALUE); @@ -646,8 +659,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemAbility003, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemAbility004, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(new SaStatusChangeMock()); saMgr->listenerMap_[SAID].push_back({listener, SAID}); int32_t res = saMgr->SubscribeSystemAbility(SAID, listener); @@ -656,8 +669,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemAbility004, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); SystemAbilityManager::SAExtraProp extraProp; int32_t res = saMgr->AddSystemAbility(INVALID_SAID, testAbility, extraProp); @@ -668,8 +681,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility001, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(nullptr); SystemAbilityManager::SAExtraProp extraProp; int32_t res = saMgr->AddSystemAbility(SAID, testAbility, extraProp); @@ -683,8 +696,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility002, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility003, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(nullptr); SystemAbilityManager::SAExtraProp extraProp; int32_t res = saMgr->AddSystemAbility(INVALID_SAID, testAbility, extraProp); @@ -705,8 +718,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility003, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility004, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); SystemAbilityManager::SAExtraProp extraProp; extraProp.isDistributed = false; @@ -729,8 +742,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility004, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility005, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->workHandler_ = make_shared("workHandler"); sptr testAbility(new SaStatusChangeMock()); SystemAbilityManager::SAExtraProp extraProp; @@ -754,8 +767,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility005, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility006, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->workHandler_ = make_shared("workHandler"); sptr testAbility(new SaStatusChangeMock()); SystemAbilityManager::SAExtraProp extraProp; @@ -780,8 +793,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbility006, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcess001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->workHandler_ = make_shared("workHandler"); sptr testAbility(new SaStatusChangeMock()); u16string procName = u""; @@ -806,8 +819,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcess001, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcess002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->workHandler_ = make_shared("workHandler"); sptr testAbility(nullptr); u16string procName = u"proname"; @@ -834,8 +847,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcess002, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, GetSystemProcess001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); u16string procName = u"proTest"; int32_t res = saMgr->AddSystemProcess(procName, testAbility); @@ -851,8 +864,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemProcess001, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, StartingSystemProcess001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); u16string procName = u"proTest"; saMgr->startingProcessMap_.clear(); int countNum = 2; @@ -869,8 +882,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartingSystemProcess001, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, StartingSystemProcess002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); u16string procName = u"proTest"; saMgr->startingProcessMap_.clear(); @@ -887,8 +900,8 @@ HWTEST_F(SystemAbilityMgrStubTest, StartingSystemProcess002, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SaProfile saProfile; string srcDeviceId; sptr callback = new SystemAbilityLoadCallbackMock(); @@ -904,8 +917,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc001, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); CommonSaProfile saProfile; saProfile.distributed = false; string srcDeviceId; @@ -922,8 +935,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc002, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); sptr callback = new SystemAbilityLoadCallbackMock(); CommonSaProfile saProfile; @@ -947,8 +960,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc003, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc004, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = new SystemAbilityLoadCallbackMock(); CommonSaProfile saProfile; u16string procName = u"procname"; @@ -977,8 +990,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc004, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc005, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = nullptr; string srcDeviceId = "srcDeviceId"; bool res = saMgr->LoadSystemAbilityFromRpc(srcDeviceId, SAID, callback); @@ -992,8 +1005,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc005, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc006, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = new SystemAbilityLoadCallbackMock(); string srcDeviceId = "srcDeviceId"; bool res = saMgr->LoadSystemAbilityFromRpc(srcDeviceId, INVALID_SAID, callback); @@ -1007,8 +1020,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc006, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = new SystemAbilityLoadCallbackMock(); pair, int32_t> itemPair; int countNum = 2; @@ -1027,8 +1040,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility001, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->OnRemoteCallbackDied(nullptr); int32_t res = saMgr->LoadSystemAbility(SAID, nullptr); EXPECT_EQ(res, INVALID_INPUT_PARA); @@ -1041,8 +1054,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility002, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility003, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = new SystemAbilityLoadCallbackMock(); list> callbacks; callbacks.push_back(callback); @@ -1059,8 +1072,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility003, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); CommonSaProfile saProfile; SAInfo saInfo; sptr callback = new SystemAbilityLoadCallbackMock(); @@ -1083,8 +1096,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility004, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility005, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); CommonSaProfile saProfile; SAInfo saInfo; sptr callback = new SystemAbilityLoadCallbackMock(); @@ -1107,8 +1120,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility005, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility006, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = new SystemAbilityLoadCallbackMock(); string deviceId = "deviceId"; saMgr->remoteCallbacks_["1499_deviceId"].push_back(callback); @@ -1123,8 +1136,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility006, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility007, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = new SystemAbilityLoadCallbackMock(); string deviceId = "deviceId"; saMgr->remoteCallbacks_.clear(); @@ -1140,8 +1153,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility007, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility008, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); CommonSaProfile saProfile; SAInfo saInfo; sptr callback = new SystemAbilityLoadCallbackMock(); @@ -1165,8 +1178,8 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility008, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, DoMakeRemoteBinder001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = nullptr; string deviceId = "deviceId"; auto callingPid = IPCSkeleton::GetCallingPid(); @@ -1184,8 +1197,8 @@ HWTEST_F(SystemAbilityMgrStubTest, DoMakeRemoteBinder001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, DoMakeRemoteBinder002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr callback = new SystemAbilityLoadCallbackMock(); string deviceId = "deviceId"; auto callingPid = IPCSkeleton::GetCallingPid(); @@ -1342,8 +1355,8 @@ HWTEST_F(SystemAbilityMgrStubTest, OnLoadSACompleteForRemoteInner001, TestSize.L HWTEST_F(SystemAbilityMgrStubTest, CancelUnloadSystemAbilityInner001, TestSize.Level3) { DTEST_LOG << "CancelUnloadSystemAbilityInner001" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -1360,8 +1373,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CancelUnloadSystemAbilityInner001, TestSize.L HWTEST_F(SystemAbilityMgrStubTest, CancelUnloadSystemAbilityInner002, TestSize.Level3) { DTEST_LOG << "CancelUnloadSystemAbilityInner002" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -1376,8 +1389,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CancelUnloadSystemAbilityInner002, TestSize.L */ HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityInner004, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp index 3f599221..fa59054b 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp @@ -24,6 +24,7 @@ #include "string_ex.h" #include "system_ability_definition.h" #include "test_log.h" +#include "ability_death_recipient.h" #define private public #include "sa_status_change_mock.h" @@ -43,6 +44,18 @@ constexpr uint32_t SAID = 1499; constexpr int64_t DEFAULT_EVENTID = 0; constexpr int32_t INVALID_SAID = -1; constexpr uint32_t INVALID_CODE = 50; + +void InitSaMgr(sptr& saMgr) +{ + saMgr->abilityDeath_ = sptr(new AbilityDeathRecipient()); + saMgr->systemProcessDeath_ = sptr(new SystemProcessDeathRecipient()); + saMgr->abilityStatusDeath_ = sptr(new AbilityStatusDeathRecipient()); + saMgr->abilityCallbackDeath_ = sptr(new AbilityCallbackDeathRecipient()); + saMgr->remoteCallbackDeath_ = sptr(new RemoteCallbackDeathRecipient()); + saMgr->workHandler_ = make_shared("workHandler"); + saMgr->collectManager_ = sptr(new DeviceStatusCollectManager()); + saMgr->abilityStateScheduler_ = std::make_shared(); +} } void SystemProcessStatusChange::OnSystemProcessStarted(SystemProcessInfo& systemProcessInfo) @@ -57,8 +70,8 @@ void SystemProcessStatusChange::OnSystemProcessStopped(SystemProcessInfo& system void SystemAbilityMgrStubTest::SetUpTestCase() { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->abilityStateScheduler_ = std::make_shared(); std::list saProfiles; saMgr->abilityStateScheduler_->Init(saProfiles); @@ -82,8 +95,8 @@ void SystemAbilityMgrStubTest::TearDown() void SystemAbilityMgrStubTest::AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); EXPECT_TRUE(saMgr->abilityStateScheduler_ != nullptr); std::unique_lock processWriteLock(saMgr->abilityStateScheduler_->processMapLock_); if (saMgr->abilityStateScheduler_->processContextMap_.count(processName) == 0) { @@ -109,8 +122,8 @@ void SystemAbilityMgrStubTest::AddSystemAbilityContext(int32_t systemAbilityId, HWTEST_F(SystemAbilityMgrStubTest, OnRemoteRequest001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; data.WriteInterfaceToken(SAMANAGER_INTERFACE_TOKEN); MessageParcel reply; @@ -121,8 +134,8 @@ HWTEST_F(SystemAbilityMgrStubTest, OnRemoteRequest001, TestSize.Level4) HWTEST_F(SystemAbilityMgrStubTest, ListSystemAbilityInner001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->ListSystemAbilityInner(data, reply); @@ -131,8 +144,8 @@ HWTEST_F(SystemAbilityMgrStubTest, ListSystemAbilityInner001, TestSize.Level4) HWTEST_F(SystemAbilityMgrStubTest, SubsSystemAbilityInner001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->SubsSystemAbilityInner(data, reply); @@ -141,8 +154,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubsSystemAbilityInner001, TestSize.Level4) HWTEST_F(SystemAbilityMgrStubTest, UnSubsSystemAbilityInner001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->UnSubsSystemAbilityInner(data, reply); @@ -151,8 +164,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubsSystemAbilityInner001, TestSize.Level4) HWTEST_F(SystemAbilityMgrStubTest, CheckRemtSystemAbilityInner001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->CheckRemtSystemAbilityInner(data, reply); @@ -161,8 +174,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckRemtSystemAbilityInner001, TestSize.Leve HWTEST_F(SystemAbilityMgrStubTest, AddOndemandSystemAbilityInner001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->AddOndemandSystemAbilityInner(data, reply); @@ -171,8 +184,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddOndemandSystemAbilityInner001, TestSize.Le HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbilityInner001, TestSize.Level4) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->RemoveSystemAbilityInner(data, reply); @@ -182,8 +195,8 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbilityInner001, TestSize.Level4) HWTEST_F(SystemAbilityMgrStubTest, GetSystemProcessInfoInner001, TestSize.Level3) { DTEST_LOG << "GetSystemProcessInfoInner001" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); - MessageParcel data; + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->GetSystemProcessInfoInner(data, reply); EXPECT_EQ(ret, ERR_PERMISSION_DENIED); @@ -192,7 +205,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemProcessInfoInner001, TestSize.Level3 HWTEST_F(SystemAbilityMgrStubTest, GetRunningSystemProcessInner001, TestSize.Level3) { DTEST_LOG << "GetRunningSystemProcessInner001" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->GetRunningSystemProcessInner(data, reply); @@ -202,7 +216,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetRunningSystemProcessInner001, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemProcessInner001, TestSize.Level3) { DTEST_LOG << "UnSubscribeSystemProcessInner001" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->UnSubscribeSystemProcessInner(data, reply); @@ -212,7 +227,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemProcessInner001, TestSize.Le HWTEST_F(SystemAbilityMgrStubTest, GetOnDemandPolicyInner001, TestSize.Level3) { DTEST_LOG << "GetOnDemandPolicyInner001" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->GetOnDemandPolicyInner(data, reply); @@ -228,7 +244,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetOnDemandPolicyInner001, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, UpdateOnDemandPolicyInner001, TestSize.Level3) { DTEST_LOG << "UpdateOnDemandPolicyInner001" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->UpdateOnDemandPolicyInner(data, reply); @@ -243,7 +260,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UpdateOnDemandPolicyInner001, TestSize.Level3 */ HWTEST_F(SystemAbilityMgrStubTest, GetOnDemandReasonExtraDataInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->GetOnDemandReasonExtraDataInner(data, reply); @@ -258,7 +276,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetOnDemandReasonExtraDataInner001, TestSize. */ HWTEST_F(SystemAbilityMgrStubTest, GetExtensionSaIdsInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->GetExtensionSaIdsInner(data, reply); @@ -273,7 +292,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetExtensionSaIdsInner001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, GetExtensionRunningSaListInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->GetExtensionRunningSaListInner(data, reply); @@ -288,7 +308,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetExtensionRunningSaListInner001, TestSize.L */ HWTEST_F(SystemAbilityMgrStubTest, GetCommonEventExtraDataIdlistInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->GetCommonEventExtraDataIdlistInner(data, reply); @@ -303,8 +324,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetCommonEventExtraDataIdlistInner001, TestSi HWTEST_F(SystemAbilityMgrStubTest, ListSystemAbilityInner002, TestSize.Level3) { SamMockPermission::MockPermission(); - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->ListSystemAbilityInner(data, reply); @@ -318,8 +339,8 @@ HWTEST_F(SystemAbilityMgrStubTest, ListSystemAbilityInner002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, ListSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t invalidDump = 1; @@ -335,7 +356,8 @@ HWTEST_F(SystemAbilityMgrStubTest, ListSystemAbilityInner003, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, ListSystemAbilityInner004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saMgr->abilityMap_[SAID] = saInfo; EXPECT_TRUE(saMgr != nullptr); @@ -354,8 +376,8 @@ HWTEST_F(SystemAbilityMgrStubTest, ListSystemAbilityInner004, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, CheckRemtSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -370,8 +392,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckRemtSystemAbilityInner002, TestSize.Leve */ HWTEST_F(SystemAbilityMgrStubTest, CheckRemtSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -386,8 +408,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckRemtSystemAbilityInner003, TestSize.Leve */ HWTEST_F(SystemAbilityMgrStubTest, CheckRemtSystemAbilityInner004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -404,8 +426,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckRemtSystemAbilityInner004, TestSize.Leve */ HWTEST_F(SystemAbilityMgrStubTest, AddOndemandSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -420,8 +442,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddOndemandSystemAbilityInner002, TestSize.Le */ HWTEST_F(SystemAbilityMgrStubTest, AddOndemandSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -436,8 +458,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddOndemandSystemAbilityInner003, TestSize.Le */ HWTEST_F(SystemAbilityMgrStubTest, AddOndemandSystemAbilityInner004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -454,8 +476,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddOndemandSystemAbilityInner004, TestSize.Le */ HWTEST_F(SystemAbilityMgrStubTest, UnmarshalingSaExtraProp001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; SystemAbilityManager::SAExtraProp extraProp; int32_t result = saMgr->UnmarshalingSaExtraProp(data, extraProp); @@ -469,8 +491,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnmarshalingSaExtraProp001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, UnmarshalingSaExtraProp002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; SystemAbilityManager::SAExtraProp extraProp; data.WriteBool(false); @@ -485,8 +507,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnmarshalingSaExtraProp002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityImmeInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -501,8 +523,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityImmeInner001, TestSize.Leve */ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityImmeInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -517,8 +539,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityImmeInner002, TestSize.Leve */ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityImmeInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -534,8 +556,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityImmeInner003, TestSize.Leve */ HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->GetSystemAbilityInner(data, reply); @@ -549,8 +571,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemAbilityInner001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->CheckSystemAbilityInner(data, reply); @@ -564,8 +586,8 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbilityInner001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -580,8 +602,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -596,7 +618,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner003, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner004, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); EXPECT_TRUE(saMgr != nullptr); MessageParcel data; @@ -614,7 +637,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner004, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner005, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); EXPECT_TRUE(saMgr != nullptr); SystemAbilityManager::SAExtraProp extraProp; @@ -643,7 +667,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemAbilityInner005, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, GetSystemProcessInfoInner002, TestSize.Level3) { DTEST_LOG << "GetSystemProcessInfoInner002" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -660,7 +685,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemProcessInfoInner002, TestSize.Level3 HWTEST_F(SystemAbilityMgrStubTest, GetSystemProcessInfoInner003, TestSize.Level3) { DTEST_LOG << "GetSystemProcessInfoInner003" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t systemAbilityId = -1; @@ -675,8 +701,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetSystemProcessInfoInner003, TestSize.Level3 */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcessInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->AddSystemProcessInner(data, reply); @@ -690,8 +716,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcessInner002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcessInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; std::u16string procName = u"test"; @@ -707,8 +733,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcessInner003, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcessInner004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); MessageParcel data; MessageParcel reply; @@ -728,7 +754,8 @@ HWTEST_F(SystemAbilityMgrStubTest, AddSystemProcessInner004, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, GetRunningSystemProcessInner002, TestSize.Level3) { DTEST_LOG << "GetRunningSystemProcessInner002" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t ret = saMgr->GetRunningSystemProcessInner(data, reply); @@ -744,7 +771,8 @@ HWTEST_F(SystemAbilityMgrStubTest, GetRunningSystemProcessInner002, TestSize.Lev HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemProcessInner002, TestSize.Level3) { DTEST_LOG << "SubscribeSystemProcessInner002" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; data.WriteRemoteObject(nullptr); MessageParcel reply; @@ -761,7 +789,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemProcessInner002, TestSize.Leve HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemProcessInner003, TestSize.Level3) { DTEST_LOG << "SubscribeSystemProcessInner003" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; sptr ptr = new SystemProcessStatusChange(); data.WriteRemoteObject(ptr); @@ -777,8 +806,8 @@ HWTEST_F(SystemAbilityMgrStubTest, SubscribeSystemProcessInner003, TestSize.Leve */ HWTEST_F(SystemAbilityMgrStubTest, SendStrategyInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; int32_t result = saMgr->SendStrategyInner(data, reply); diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_unload_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_unload_test.cpp index cb2c5f25..e6c6a12b 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_unload_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_unload_test.cpp @@ -24,6 +24,7 @@ #include "string_ex.h" #include "system_ability_definition.h" #include "test_log.h" +#include "ability_death_recipient.h" #define private public #include "sa_status_change_mock.h" @@ -38,12 +39,24 @@ namespace OHOS { namespace { constexpr uint32_t SAID = 1499; constexpr int32_t INVALID_SAID = -1; + +void InitSaMgr(sptr& saMgr) +{ + saMgr->abilityDeath_ = sptr(new AbilityDeathRecipient()); + saMgr->systemProcessDeath_ = sptr(new SystemProcessDeathRecipient()); + saMgr->abilityStatusDeath_ = sptr(new AbilityStatusDeathRecipient()); + saMgr->abilityCallbackDeath_ = sptr(new AbilityCallbackDeathRecipient()); + saMgr->remoteCallbackDeath_ = sptr(new RemoteCallbackDeathRecipient()); + saMgr->workHandler_ = make_shared("workHandler"); + saMgr->collectManager_ = sptr(new DeviceStatusCollectManager()); + saMgr->abilityStateScheduler_ = std::make_shared(); +} } HWTEST_F(SystemAbilityMgrStubTest, UnSubsSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -53,8 +66,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubsSystemAbilityInner002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, UnSubsSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -64,8 +77,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubsSystemAbilityInner003, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, UnSubsSystemAbilityInner004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); SAInfo saInfo; saMgr->abilityMap_[SAID] = saInfo; @@ -79,8 +92,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubsSystemAbilityInner004, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -90,8 +103,8 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbilityInner002, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -102,24 +115,24 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbilityInner003, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); int32_t res = saMgr->RemoveSystemAbility(INVALID_SAID); EXPECT_EQ(res, ERR_INVALID_VALUE); } HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); int32_t res = saMgr->RemoveSystemAbility(SAID); EXPECT_EQ(res, ERR_INVALID_VALUE); } HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saInfo.remoteObj = nullptr; saMgr->abilityMap_[SAID] = saInfo; @@ -129,8 +142,8 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility003, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility004, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saInfo.remoteObj = saMgr; saMgr->abilityMap_[SAID] = saInfo; @@ -142,16 +155,16 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility004, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility005, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); int32_t res = saMgr->RemoveSystemAbility(nullptr); EXPECT_EQ(res, ERR_INVALID_VALUE); } HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility006, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saInfo.remoteObj = saMgr; saMgr->abilityMap_[SAID] = saInfo; @@ -162,8 +175,8 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility006, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility007, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); SAInfo saInfo; saInfo.remoteObj = saMgr; uint32_t saId = 0; @@ -175,8 +188,8 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemAbility007, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(new SaStatusChangeMock()); int32_t res = saMgr->UnSubscribeSystemAbility(INVALID_SAID, listener); u16string name = u"device_saname"; @@ -186,8 +199,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility001, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility002, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(nullptr); int32_t res = saMgr->UnSubscribeSystemAbility(SAID, listener); u16string name = u"deviceSaname"; @@ -199,8 +212,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility002, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility003, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(nullptr); int32_t res = saMgr->UnSubscribeSystemAbility(INVALID_SAID, listener); string deviceId = "device"; @@ -210,8 +223,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility003, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility004, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(new SaStatusChangeMock()); saMgr->listenerMap_[SAID].push_back({listener, SAID}); saMgr->abilityStatusDeath_ = nullptr; @@ -226,8 +239,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility004, TestSize.Level1) HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility005, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr listener(new SaStatusChangeMock()); saMgr->listenerMap_[SAID].push_back({listener, SAID}); saMgr->abilityStatusDeath_ = nullptr; @@ -239,8 +252,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemAbility005, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemProcess001, TestSize.Level1) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->workHandler_ = make_shared("workHandler"); sptr testAbility(nullptr); int32_t res = saMgr->RemoveSystemProcess(testAbility); @@ -262,8 +275,8 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemProcess001, TestSize.Level1) */ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemProcess002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); u16string procName = u"proname"; int32_t res = saMgr->AddSystemProcess(procName, testAbility); @@ -282,8 +295,8 @@ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemProcess002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, RemoveSystemProcess003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); sptr testAbility(new SaStatusChangeMock()); saMgr->systemProcessMap_.clear(); int32_t res = saMgr->RemoveSystemProcess(testAbility); @@ -332,8 +345,8 @@ HWTEST_F(SystemAbilityMgrStubTest, OnRemoveSystemAbilityInner002, TestSize.Level */ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbilityInner001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(INVALID_SAID); @@ -349,8 +362,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbilityInner001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbilityInner002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); @@ -366,8 +379,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbilityInner002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility001, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); int32_t result = saMgr->UnloadSystemAbility(INVALID_SAID); EXPECT_EQ(result, PROFILE_NOT_EXIST); } @@ -380,8 +393,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility001, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility002, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); int32_t result = saMgr->UnloadSystemAbility(SAID); EXPECT_EQ(result, INVALID_CALL_PROC); } @@ -394,8 +407,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility002, TestSize.Level3) */ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); CommonSaProfile saProfile; saMgr->saProfileMap_[SAID] = saProfile; int32_t result = saMgr->UnloadSystemAbility(SAID); @@ -411,8 +424,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility003, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility004, TestSize.Level3) { SamMockPermission::MockProcess("invalidProcess"); - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); CommonSaProfile saProfile; saProfile.process = u"testProcess"; saMgr->saProfileMap_[SAID] = saProfile; @@ -429,8 +442,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility004, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility005, TestSize.Level3) { SamMockPermission::MockProcess("memmgrservice"); - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); saMgr->abilityStateScheduler_->processContextMap_.clear(); saMgr->abilityStateScheduler_->abilityContextMap_.clear(); CommonSaProfile saProfile; @@ -449,8 +462,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbility005, TestSize.Level3) HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemProcessInner002, TestSize.Level3) { DTEST_LOG << "UnSubscribeSystemProcessInner002" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; data.WriteRemoteObject(nullptr); MessageParcel reply; @@ -461,8 +474,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemProcessInner002, TestSize.Le HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemProcessInner003, TestSize.Level3) { DTEST_LOG << "UnSubscribeSystemProcessInner003" << std::endl; - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; sptr ptr = new SystemProcessStatusChange(); data.WriteRemoteObject(ptr); @@ -473,8 +486,8 @@ HWTEST_F(SystemAbilityMgrStubTest, UnSubscribeSystemProcessInner003, TestSize.Le HWTEST_F(SystemAbilityMgrStubTest, UnloadSystemAbilityInner003, TestSize.Level3) { - sptr saMgr = SystemAbilityManager::GetInstance(); - EXPECT_TRUE(saMgr != nullptr); + sptr saMgr = new SystemAbilityManager; + InitSaMgr(saMgr); MessageParcel data; MessageParcel reply; data.WriteInt32(SAID); diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_subscribe_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_subscribe_test.cpp index a03ab272..7d896f5d 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_subscribe_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_subscribe_test.cpp @@ -175,6 +175,7 @@ HWTEST_F(SystemAbilityMgrTest, SubscribeSystemProcess003, TestSize.Level3) sptr saMgr = new SystemAbilityManager; InitSaMgr(saMgr); sptr listener = new SystemProcessStatusChange(); + saMgr->abilityStateScheduler_ = nullptr; std::list systemProcessInfos; int32_t ret = saMgr->SubscribeSystemProcess(listener); EXPECT_EQ(ret, ERR_INVALID_VALUE); @@ -191,6 +192,7 @@ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemProcess001, TestSize.Level3) DTEST_LOG << " UnSubscribeSystemProcess001" << std::endl; sptr saMgr = new SystemAbilityManager; InitSaMgr(saMgr); + saMgr->abilityStateScheduler_ = nullptr; sptr systemProcessStatusChange = new SystemProcessStatusChange(); int32_t ret = saMgr->UnSubscribeSystemProcess(systemProcessStatusChange); EXPECT_EQ(ret, ERR_INVALID_VALUE); @@ -223,6 +225,7 @@ HWTEST_F(SystemAbilityMgrTest, UnSubscribeSystemProcess003, TestSize.Level3) sptr saMgr = new SystemAbilityManager; InitSaMgr(saMgr); sptr listener = new SystemProcessStatusChange(); + saMgr->abilityStateScheduler_ = nullptr; std::list systemProcessInfos; int32_t ret = saMgr->UnSubscribeSystemProcess(listener); EXPECT_EQ(ret, ERR_INVALID_VALUE); -- Gitee From e8ae6188bbbb1ee59101864a6c139aeedd8a8069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Mon, 25 Nov 2024 19:58:57 +0800 Subject: [PATCH 3/6] commit msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../include/system_ability_mgr_stub_test.h | 2 +- .../src/system_ability_mgr_stub_load_test.cpp | 14 +++++++------- .../unittest/src/system_ability_mgr_stub_test.cpp | 4 +--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h b/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h index 37058b5b..3ec6e75b 100644 --- a/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h +++ b/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h @@ -27,7 +27,7 @@ public: static void TearDownTestCase(); void SetUp(); void TearDown(); - void AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName); + void AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName, sptr& saMgr); }; class SystemProcessStatusChange : public SystemProcessStatusChangeStub { diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp index 17b4d1da..35622148 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp @@ -600,7 +600,7 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility006, TestSize.Level3) SystemAbilityManager::AbilityItem abilityItem; abilityItem.state = SystemAbilityManager::AbilityState::STARTING; saMgr->startingAbilityMap_[SAID] = abilityItem; - AddSystemAbilityContext(SAID, u"test"); + AddSystemAbilityContext(SAID, u"test", saMgr); saMgr->abilityStateScheduler_->processContextMap_[u"test"]->state = SystemProcessState::STARTED; bool isExist = false; sptr res = saMgr->CheckSystemAbility(SAID, isExist); @@ -619,7 +619,7 @@ HWTEST_F(SystemAbilityMgrStubTest, CheckSystemAbility007, TestSize.Level3) saMgr->startingAbilityMap_[SAID] = abilityItem; u16string proName = u"test"; saMgr->onDemandAbilityMap_[SAID] = proName; - AddSystemAbilityContext(SAID, u"test"); + AddSystemAbilityContext(SAID, u"test", saMgr); saMgr->abilityStateScheduler_->processContextMap_[u"test"]->state = SystemProcessState::STARTED; bool isExist = false; sptr res = saMgr->CheckSystemAbility(SAID, isExist); @@ -946,7 +946,7 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc003, TestSize.Level3) string srcDeviceId; saMgr->saProfileMap_[SAID] = saProfile; saMgr->abilityMap_[SAID] = saInfo; - AddSystemAbilityContext(SAID, u"listen_test"); + AddSystemAbilityContext(SAID, u"listen_test", saMgr); bool res = saMgr->LoadSystemAbilityFromRpc(srcDeviceId, SAID, callback); saMgr->abilityStateScheduler_->processContextMap_.clear(); saMgr->abilityStateScheduler_->abilityContextMap_.clear(); @@ -976,7 +976,7 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbilityFromRpc004, TestSize.Level3) saMgr->abilityMap_[SAID] = saInfo; saMgr->startingAbilityMap_[SAID] = abilityItem; saMgr->startingProcessMap_[procName] = countNum; - AddSystemAbilityContext(SAID, procName); + AddSystemAbilityContext(SAID, procName, saMgr); bool res = saMgr->LoadSystemAbilityFromRpc(srcDeviceId, SAID, callback); saMgr->abilityStateScheduler_->processContextMap_.clear(); saMgr->abilityStateScheduler_->abilityContextMap_.clear(); @@ -1082,7 +1082,7 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility004, TestSize.Level1) saMgr->abilityMap_[SAID] = saInfo; saMgr->startingAbilityMap_[SAID] = abilityItem; abilityItem.callbackMap["local"].push_back(make_pair(callback, SAID)); - AddSystemAbilityContext(SAID, u"listen_test"); + AddSystemAbilityContext(SAID, u"listen_test", saMgr); int32_t res = saMgr->LoadSystemAbility(SAID, callback); saMgr->abilityStateScheduler_->processContextMap_.clear(); saMgr->abilityStateScheduler_->abilityContextMap_.clear(); @@ -1106,7 +1106,7 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility005, TestSize.Level3) saMgr->abilityMap_[SAID] = saInfo; saMgr->startingAbilityMap_[SAID] = abilityItem; saMgr->abilityCallbackDeath_ = nullptr; - AddSystemAbilityContext(SAID, u"listen_test"); + AddSystemAbilityContext(SAID, u"listen_test", saMgr); int32_t res = saMgr->LoadSystemAbility(SAID, callback); saMgr->abilityStateScheduler_->processContextMap_.clear(); saMgr->abilityStateScheduler_->abilityContextMap_.clear(); @@ -1164,7 +1164,7 @@ HWTEST_F(SystemAbilityMgrStubTest, LoadSystemAbility008, TestSize.Level3) abilityItem.callbackMap["local"].push_back(make_pair(callbackTwo, SAID)); saMgr->saProfileMap_[SAID] = saProfile; saMgr->startingAbilityMap_[SAID] = abilityItem; - AddSystemAbilityContext(SAID, u"listen_test"); + AddSystemAbilityContext(SAID, u"listen_test", saMgr); int32_t res = saMgr->LoadSystemAbility(SAID, callbackTwo); saMgr->abilityStateScheduler_->processContextMap_.clear(); saMgr->abilityStateScheduler_->abilityContextMap_.clear(); diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp index fa59054b..305fc8d7 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp @@ -93,10 +93,8 @@ void SystemAbilityMgrStubTest::TearDown() DTEST_LOG << "TearDown" << std::endl; } -void SystemAbilityMgrStubTest::AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName) +void SystemAbilityMgrStubTest::AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName, sptr& saMgr) { - sptr saMgr = new SystemAbilityManager; - InitSaMgr(saMgr); EXPECT_TRUE(saMgr->abilityStateScheduler_ != nullptr); std::unique_lock processWriteLock(saMgr->abilityStateScheduler_->processMapLock_); if (saMgr->abilityStateScheduler_->processContextMap_.count(processName) == 0) { -- Gitee From 7d3616128972166477bd1f7867e5e726e75367fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Mon, 25 Nov 2024 20:06:27 +0800 Subject: [PATCH 4/6] commit msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../test/unittest/include/system_ability_mgr_stub_test.h | 3 ++- .../native/test/unittest/src/system_ability_mgr_stub_test.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h b/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h index 3ec6e75b..7d228222 100644 --- a/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h +++ b/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h @@ -27,7 +27,8 @@ public: static void TearDownTestCase(); void SetUp(); void TearDown(); - void AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName, sptr& saMgr); + void AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName, + sptr& saMgr); }; class SystemProcessStatusChange : public SystemProcessStatusChangeStub { diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp index 305fc8d7..06ba703e 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_test.cpp @@ -93,7 +93,8 @@ void SystemAbilityMgrStubTest::TearDown() DTEST_LOG << "TearDown" << std::endl; } -void SystemAbilityMgrStubTest::AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName, sptr& saMgr) +void SystemAbilityMgrStubTest::AddSystemAbilityContext(int32_t systemAbilityId, const std::u16string& processName, + sptr& saMgr) { EXPECT_TRUE(saMgr->abilityStateScheduler_ != nullptr); std::unique_lock processWriteLock(saMgr->abilityStateScheduler_->processMapLock_); -- Gitee From 5ce9630ef82f719a6a04aba6a6271a16702cfd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Mon, 25 Nov 2024 21:10:00 +0800 Subject: [PATCH 5/6] commit msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../native/test/unittest/include/system_ability_mgr_stub_test.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h b/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h index 7d228222..7fdd3d19 100644 --- a/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h +++ b/services/samgr/native/test/unittest/include/system_ability_mgr_stub_test.h @@ -20,6 +20,7 @@ #define private public #define protected public #include "system_process_status_change_stub.h" +#include "system_ability_manager.h" namespace OHOS { class SystemAbilityMgrStubTest : public testing::Test { public: -- Gitee From 530517104f3b57ea02d8b8c7f7042b35888d9fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Mon, 25 Nov 2024 23:03:19 +0800 Subject: [PATCH 6/6] commit msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../test/unittest/src/system_ability_mgr_stub_load_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp index 35622148..c31918aa 100644 --- a/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_mgr_stub_load_test.cpp @@ -278,7 +278,6 @@ HWTEST_F(SystemAbilityMgrStubTest, InitSaProfile001, TestSize.Level1) { sptr saMgr = new SystemAbilityManager; InitSaMgr(saMgr); - saMgr->workHandler_ = make_shared("workHandler1"); saMgr->InitSaProfile(); EXPECT_NE(saMgr->workHandler_, nullptr); } -- Gitee