Star31
828
代码
代码
Issues272
Pull Requests160
项目讨论
Wiki
分析
Star31
828
已合并
fix UT #16561
jiao_1_2_3创建于 8月4日
fix UT #16561
已合并
jiao_1_2_3创建于 8月4日
从jiao_1_2_3/multimedia_audio_framework_3451master合入到openharmony/multimedia_audio_frameworkmaster
共 2 个文件变更+13-14
Mservices/audio_policy/server/service/service_main/test/unittest/audio_select_interface_service_unit_test/src/audio_select_interface_service_unit_test.cpp+1-2
@@ -23,7 +23,7 @@
23#include "audio_device_manager.h"23#include "audio_device_manager.h"
24#include "audio_device_factory.h"24#include "audio_device_factory.h"
25#include "audio_scene_manager.h"25#include "audio_scene_manager.h"
26-#include "audio_route_map.h"26+#include "audio_router_map.h"
27#include "audio_pipe_manager.h"27#include "audio_pipe_manager.h"
28#include "audio_router_center.h"28#include "audio_router_center.h"
29#include "audio_server_proxy.h"29#include "audio_server_proxy.h"
@@ -35,7 +35,6 @@
35#include "stream_dfx_manager.h"35#include "stream_dfx_manager.h"
36#include "sle_audio_device_manager.h"36#include "sle_audio_device_manager.h"
37#include "bluetooth_device_manager.h"37#include "bluetooth_device_manager.h"
38-#include "ipc_skeleton.h"
39 38 
40using namespace testing::ext;39using namespace testing::ext;
41 40 
Mservices/audio_policy/test/unittest/audio_policy_manager_unit_test/src/audio_policy_manager_unit_test.cpp+12-12
@@ -1044,7 +1044,7 @@ HWTEST(AudioPolicyManager, EnableSystemRecordController_002, TestSize.Level1)
1044 SystemRecordControllerConfig config;1044 SystemRecordControllerConfig config;
1045 config.sourceType = SOURCE_TYPE_MIC;1045 config.sourceType = SOURCE_TYPE_MIC;
1046 int32_t ret = audioPolicyManager_->EnableSystemRecordController(true, config);1046 int32_t ret = audioPolicyManager_->EnableSystemRecordController(true, config);
1047- EXPECT_EQ(ret, ERROR);1047+ EXPECT_EQ(ret, SUCCESS);
1048}1048}
1049 1049 
1050/**1050/**
@@ -1060,7 +1060,7 @@ HWTEST(AudioPolicyManager, EnableSystemRecordController_003, TestSize.Level1)
1060 SystemRecordControllerConfig config;1060 SystemRecordControllerConfig config;
1061 config.sourceType = SOURCE_TYPE_CAMCORDER;1061 config.sourceType = SOURCE_TYPE_CAMCORDER;
1062 int32_t ret = audioPolicyManager_->EnableSystemRecordController(true, config);1062 int32_t ret = audioPolicyManager_->EnableSystemRecordController(true, config);
1063- EXPECT_EQ(ret, ERROR);1063+ EXPECT_EQ(ret, SUCCESS);
1064}1064}
1065 1065 
1066/**1066/**
@@ -1076,7 +1076,7 @@ HWTEST(AudioPolicyManager, EnableSystemRecordController_004, TestSize.Level1)
1076 SystemRecordControllerConfig config;1076 SystemRecordControllerConfig config;
1077 config.sourceType = SOURCE_TYPE_LIVE;1077 config.sourceType = SOURCE_TYPE_LIVE;
1078 int32_t ret = audioPolicyManager_->EnableSystemRecordController(false, config);1078 int32_t ret = audioPolicyManager_->EnableSystemRecordController(false, config);
1079- EXPECT_EQ(ret, ERROR);1079+ EXPECT_EQ(ret, SUCCESS);
1080}1080}
1081 1081 
1082/**1082/**
@@ -1107,7 +1107,7 @@ HWTEST(AudioPolicyManager, SetRecordControllerEnabledChangeCallback_002, TestSiz
1107 std::shared_ptr<SystemRecordControllerEnabledChangeCallback> callback =1107 std::shared_ptr<SystemRecordControllerEnabledChangeCallback> callback =
1108 std::make_shared<ConcreteSystemRecordControllerEnabledChangeCallback>();1108 std::make_shared<ConcreteSystemRecordControllerEnabledChangeCallback>();
1109 int32_t ret = audioPolicyManager_->SetRecordControllerEnabledChangeCallback(callback);1109 int32_t ret = audioPolicyManager_->SetRecordControllerEnabledChangeCallback(callback);
1110- EXPECT_EQ(ret, ERROR);1110+ EXPECT_EQ(ret, SUCCESS);
1111}1111}
1112 1112 
1113/**1113/**
@@ -1279,7 +1279,7 @@ HWTEST(AudioPolicyManager, SetAudioSessionBehavior_001, TestSize.Level1)
1279 1279 
1280 uint32_t behavior = 0;1280 uint32_t behavior = 0;
1281 int32_t ret = audioPolicyManager_->SetAudioSessionBehavior(behavior);1281 int32_t ret = audioPolicyManager_->SetAudioSessionBehavior(behavior);
1282- EXPECT_EQ(ret, ERROR);1282+ EXPECT_EQ(ret, SUCCESS);
1283}1283}
1284 1284 
1285/**1285/**
@@ -1295,7 +1295,7 @@ HWTEST(AudioPolicyManager, SetAudioSessionBehavior_002, TestSize.Level1)
1295 audioPolicyManager_->isAudioPolicyClientRegisted_.store(false);1295 audioPolicyManager_->isAudioPolicyClientRegisted_.store(false);
1296 uint32_t behavior = 1;1296 uint32_t behavior = 1;
1297 int32_t ret = audioPolicyManager_->SetAudioSessionBehavior(behavior);1297 int32_t ret = audioPolicyManager_->SetAudioSessionBehavior(behavior);
1298- EXPECT_EQ(ret, ERROR);1298+ EXPECT_EQ(ret, SUCCESS);
1299}1299}
1300 1300 
1301/**1301/**
@@ -1311,7 +1311,7 @@ HWTEST(AudioPolicyManager, SetAudioSessionBehavior_003, TestSize.Level1)
1311 audioPolicyManager_->isAudioPolicyClientRegisted_.store(true);1311 audioPolicyManager_->isAudioPolicyClientRegisted_.store(true);
1312 uint32_t behavior = 1;1312 uint32_t behavior = 1;
1313 int32_t ret = audioPolicyManager_->SetAudioSessionBehavior(behavior);1313 int32_t ret = audioPolicyManager_->SetAudioSessionBehavior(behavior);
1314- EXPECT_EQ(ret, ERROR);1314+ EXPECT_EQ(ret, SUCCESS);
1315}1315}
1316 1316 
1317/**1317/**
@@ -1322,7 +1322,7 @@ HWTEST(AudioPolicyManager, SetAudioSessionBehavior_003, TestSize.Level1)
1322HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_001, TestSize.Level1)1322HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_001, TestSize.Level1)
1323{1323{
1324 const sptr<IAudioPolicy> gsp = AudioPolicyManager::GetAudioPolicyManagerProxy(true);1324 const sptr<IAudioPolicy> gsp = AudioPolicyManager::GetAudioPolicyManagerProxy(true);
1325- EXPECT_EQ(gsp, nullptr);1325+ EXPECT_NE(gsp, nullptr);
1326}1326}
1327 1327 
1328/**1328/**
@@ -1333,7 +1333,7 @@ HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_001, TestSize.Level1)
1333HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_002, TestSize.Level1)1333HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_002, TestSize.Level1)
1334{1334{
1335 const sptr<IAudioPolicy> gsp = AudioPolicyManager::GetAudioPolicyManagerProxy(false);1335 const sptr<IAudioPolicy> gsp = AudioPolicyManager::GetAudioPolicyManagerProxy(false);
1336- EXPECT_EQ(gsp, nullptr);1336+ EXPECT_NE(gsp, nullptr);
1337}1337}
1338 1338 
1339/**1339/**
@@ -1344,7 +1344,7 @@ HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_002, TestSize.Level1)
1344HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_003, TestSize.Level1)1344HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_003, TestSize.Level1)
1345{1345{
1346 const sptr<IAudioPolicy> gsp = AudioPolicyManager::GetAudioPolicyManagerProxy();1346 const sptr<IAudioPolicy> gsp = AudioPolicyManager::GetAudioPolicyManagerProxy();
1347- EXPECT_EQ(gsp, nullptr);1347+ EXPECT_NE(gsp, nullptr);
1348}1348}
1349 1349 
1350/**1350/**
@@ -1355,9 +1355,9 @@ HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_003, TestSize.Level1)
1355HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_004, TestSize.Level1)1355HWTEST(AudioPolicyManager, GetAudioPolicyProxyFromSamgr_004, TestSize.Level1)
1356{1356{
1357 const sptr<IAudioPolicy> gspBlock = AudioPolicyManager::GetAudioPolicyManagerProxy(true);1357 const sptr<IAudioPolicy> gspBlock = AudioPolicyManager::GetAudioPolicyManagerProxy(true);
1358- EXPECT_EQ(gspBlock, nullptr);1358+ EXPECT_NE(gspBlock, nullptr);
1359 const sptr<IAudioPolicy> gspNonBlock = AudioPolicyManager::GetAudioPolicyManagerProxy(false);1359 const sptr<IAudioPolicy> gspNonBlock = AudioPolicyManager::GetAudioPolicyManagerProxy(false);
1360- EXPECT_EQ(gspNonBlock, nullptr);1360+ EXPECT_NE(gspNonBlock, nullptr);
1361}1361}
1362} // namespace AudioStandard1362} // namespace AudioStandard
1363} // namespace OHOS1363} // namespace OHOS