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 3f5992213e4cad34f929ea3d5eca09f11926d08c..fa59054b21879f731efdcc5e158894a0633361ba 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);