diff --git a/services/audiomanager/test/unittest/managersink/include/daudio_sink_dev_test.h b/services/audiomanager/test/unittest/managersink/include/daudio_sink_dev_test.h index 9ec14edb856e0f1313e8622886ba43d3f4abe002..257364e360284675a60d523bbf2ddb5d51210ff2 100644 --- a/services/audiomanager/test/unittest/managersink/include/daudio_sink_dev_test.h +++ b/services/audiomanager/test/unittest/managersink/include/daudio_sink_dev_test.h @@ -18,6 +18,8 @@ #include +#include "if_system_ability_manager.h" + #define private public #include "daudio_sink_dev.h" #undef private @@ -32,6 +34,7 @@ public: void TearDown(); std::shared_ptr sinkDev_ = nullptr; + sptr samgr_ = nullptr; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp index 9e8bda7872f9b88224bba868a81d8966f531e667..b55b93d828c468027ed8885fd2fd717b4ec66c1d 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp @@ -18,9 +18,9 @@ #include "audio_event.h" #include "daudio_constants.h" #include "daudio_errorcode.h" -#include "if_system_ability_manager.h" #include "iservice_registry.h" #include "daudio_sink_ipc_callback_proxy.h" +#include "daudio_sink_load_callback.h" using namespace testing::ext; @@ -33,11 +33,14 @@ void DAudioSinkDevTest::TearDownTestCase(void) {} void DAudioSinkDevTest::SetUp() { std::string networkId = "networkId"; - sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { + std::string params = "params"; + samgr_ = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + if (samgr_ == nullptr) { return; } - sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); + sptr loadCallback(new DAudioSinkLoadCallback(params)); + samgr_->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); + sptr remoteObject = samgr_->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); if (remoteObject == nullptr) { return; } @@ -47,6 +50,9 @@ void DAudioSinkDevTest::SetUp() void DAudioSinkDevTest::TearDown() { + if (samgr_ != nullptr) { + samgr_->UnloadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); + } sinkDev_ = nullptr; } diff --git a/services/audiomanager/test/unittest/servicesink/include/daudio_sink_service_test.h b/services/audiomanager/test/unittest/servicesink/include/daudio_sink_service_test.h index 973b0ddfb382b50b9dd6110b6e43915232a4f561..660e6c326b110bba3014226d9c69270c80701672 100644 --- a/services/audiomanager/test/unittest/servicesink/include/daudio_sink_service_test.h +++ b/services/audiomanager/test/unittest/servicesink/include/daudio_sink_service_test.h @@ -18,6 +18,8 @@ #include +#include "if_system_ability_manager.h" + #define private public #define protected public #include "daudio_sink_service.h" @@ -34,6 +36,7 @@ public: void TearDown(); std::shared_ptr sinkSrv_ = nullptr; sptr remoteObject_ = nullptr; + sptr samgr_ = nullptr; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp b/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp index 33e87e874cdc3f0b2ba306a8b69e7ed4a95c7a86..37d9af0a13e8d2c4d8655e86a4609bc51a7043ca 100644 --- a/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp +++ b/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp @@ -18,9 +18,9 @@ #include "audio_event.h" #include "daudio_constants.h" #include "daudio_errorcode.h" -#include "if_system_ability_manager.h" #include "iservice_registry.h" #include "daudio_sink_ipc_callback_proxy.h" +#include "daudio_sink_load_callback.h" using namespace testing::ext; @@ -34,11 +34,14 @@ void DAudioSinkServiceTest::SetUp() { uint32_t saId = 6666; bool runOnCreate = true; - sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { + std::string params = "params"; + samgr_ = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + if (samgr_ == nullptr) { return; } - remoteObject_ = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); + sptr loadCallback(new DAudioSinkLoadCallback(params)); + samgr_->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); + remoteObject_ = samgr_->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); if (remoteObject_ == nullptr) { return; } @@ -48,6 +51,9 @@ void DAudioSinkServiceTest::SetUp() void DAudioSinkServiceTest::TearDown() { + if (samgr_ != nullptr) { + samgr_->UnloadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); + } sinkSrv_ = nullptr; }