From 23683f8a64c8788d382707c7b5a993e3af8a6c30 Mon Sep 17 00:00:00 2001
From: w30042960 <wangyupan1@huawei.com>
Date: Tue, 19 Dec 2023 11:28:18 +0800
Subject: [PATCH] modify UT

Signed-off-by: w30042960 <wangyupan1@huawei.com>
---
 .../managersink/include/daudio_sink_dev_test.h     |  3 +++
 .../managersink/src/daudio_sink_dev_test.cpp       | 14 ++++++++++----
 .../servicesink/include/daudio_sink_service_test.h |  3 +++
 .../servicesink/src/daudio_sink_service_test.cpp   | 14 ++++++++++----
 4 files changed, 26 insertions(+), 8 deletions(-)

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 9ec14edb..257364e3 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 <gtest/gtest.h>
 
+#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<DAudioSinkDev> sinkDev_ = nullptr;
+    sptr<ISystemAbilityManager> 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 9e8bda78..b55b93d8 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<ISystemAbilityManager> samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
-    if (samgr == nullptr) {
+    std::string params = "params";
+    samgr_ = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
+    if (samgr_ == nullptr) {
         return;
     }
-    sptr<IRemoteObject> remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID);
+    sptr<DAudioSinkLoadCallback> loadCallback(new DAudioSinkLoadCallback(params));
+    samgr_->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback);
+    sptr<IRemoteObject> 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 973b0ddf..660e6c32 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 <gtest/gtest.h>
 
+#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<DAudioSinkService> sinkSrv_ = nullptr;
     sptr<IRemoteObject> remoteObject_ = nullptr;
+    sptr<ISystemAbilityManager> 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 33e87e87..37d9af0a 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<ISystemAbilityManager> 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<DAudioSinkLoadCallback> 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;
 }
 
-- 
Gitee