From 113fb052eada37e3820c2d2704588b6721c115f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AF=8C=E5=86=9B?= Date: Thu, 28 Aug 2025 16:40:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3DT=20issue=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 朱富军 --- .../src/audio_adapter_manager_unit_test.cpp | 24 +++++++++---------- ...udio_policy_service_thirdext_unit_test.cpp | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp index 35363a0bae..df43f57051 100644 --- a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp @@ -621,12 +621,12 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_002, TestSize.Level1) (audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos.end() != audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos.find(deviceType)) && (audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType] != nullptr)) { - audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType]->maxLevel = 10; + audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType]->maxLevel = 15; } } int32_t ret = audioAdapterManager->GetMaxVolumeLevel(volumeType, DEVICE_TYPE_SPEAKER); - EXPECT_EQ(ret, 10); + EXPECT_EQ(ret, 15); } /** @@ -638,21 +638,21 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_002, TestSize.Level1) HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_003, TestSize.Level1) { auto audioAdapterManager = std::make_shared(); - int32_t ret = audioAdapterManager->GetMaxVolumeLevel(STREAM_ALARM, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, audioAdapterManager->maxVolumeIndexMap_[STREAM_ALARM]); + int32_t ret = audioAdapterManager->GetMaxVolumeLevel(STREAM_MUSIC, DEVICE_TYPE_NONE); + EXPECT_EQ(ret, audioAdapterManager->maxVolumeIndexMap_[STREAM_MUSIC]); } /** * @tc.name: Test GetMaxVolumeLevel * @tc.number: GetMaxVolumeLevel_004 * @tc.type: FUNC - * @tc.desc: the volume Type is not valid, return maxVolumeIndexMap_[STREAM_MUSIC]. + * @tc.desc: the volume Type is not valid, return ERR_INVALID_PARAM. */ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_004, TestSize.Level1) { auto audioAdapterManager = std::make_shared(); int32_t ret = audioAdapterManager->GetMaxVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, audioAdapterManager->maxVolumeIndexMap_[STREAM_MUSIC]); + EXPECT_EQ(ret, ERR_INVALID_PARAM); } /** @@ -684,12 +684,12 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_002, TestSize.Level1) (audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos.end() != audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos.find(deviceType)) && (audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType] != nullptr)) { - audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType]->minLevel = 2; + audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType]->minLevel = 0; } } int32_t ret = audioAdapterManager->GetMinVolumeLevel(volumeType, DEVICE_TYPE_SPEAKER); - EXPECT_EQ(ret, 2); + EXPECT_EQ(ret, 0); } /** @@ -701,21 +701,21 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_002, TestSize.Level1) HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_003, TestSize.Level1) { auto audioAdapterManager = std::make_shared(); - int32_t ret = audioAdapterManager->GetMinVolumeLevel(STREAM_ALARM, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, audioAdapterManager->minVolumeIndexMap_[STREAM_ALARM]); + int32_t ret = audioAdapterManager->GetMinVolumeLevel(STREAM_MUSIC, DEVICE_TYPE_NONE); + EXPECT_EQ(ret, audioAdapterManager->minVolumeIndexMap_[STREAM_MUSIC]); } /** * @tc.name: Test GetMinVolumeLevel * @tc.number: GetMinVolumeLevel_004 * @tc.type: FUNC - * @tc.desc: the volume Type is not valid, return minVolumeIndexMap_[STREAM_MUSIC]. + * @tc.desc: the volume Type is not valid, return ERR_INVALID_PARAM. */ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_004, TestSize.Level1) { auto audioAdapterManager = std::make_shared(); int32_t ret = audioAdapterManager->GetMinVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, audioAdapterManager->minVolumeIndexMap_[STREAM_MUSIC]); + EXPECT_EQ(ret, ERR_INVALID_PARAM]); } /** diff --git a/services/audio_policy/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_thirdext_unit_test.cpp b/services/audio_policy/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_thirdext_unit_test.cpp index adb0bf4a43..142cb961dc 100644 --- a/services/audio_policy/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_thirdext_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_thirdext_unit_test.cpp @@ -1634,7 +1634,7 @@ HWTEST_F(AudioPolicyServiceFourthUnitTest, GetMaxVolumeLevel_001, TestSize.Level /** * @tc.name : Test GetMaxVolumeLevel. * @tc.number: GetMaxVolumeLevel_002 -* @tc.desc : no valid parameters, return SUCCESS and volumeLevel is default value. +* @tc.desc : no valid parameters, return SUCCESS and volumeLevel is no valid value. */ HWTEST_F(AudioPolicyServiceFourthUnitTest, GetMaxVolumeLevel_002, TestSize.Level1) { @@ -1647,7 +1647,7 @@ HWTEST_F(AudioPolicyServiceFourthUnitTest, GetMaxVolumeLevel_002, TestSize.Level int ret = server->GetMaxVolumeLevel(volumeType, volumeLevel, deviceType); EXPECT_EQ(ret, SUCCESS); - EXPECT_EQ(volumeLevel, MAX_VOLUME_LEVEL); + EXPECT_EQ(volumeLevel, ERR_INVALID_PARAM); } /** @@ -1672,7 +1672,7 @@ HWTEST_F(AudioPolicyServiceFourthUnitTest, GetMinVolumeLevel_001, TestSize.Level /** * @tc.name : Test GetMinVolumeLevel. * @tc.number: GetMinVolumeLevel_002 -* @tc.desc : no valid parameters, return SUCCESS and volumeLevel is default value. +* @tc.desc : no valid parameters, return SUCCESS and volumeLevel is no valid value. */ HWTEST_F(AudioPolicyServiceFourthUnitTest, GetMinVolumeLevel_002, TestSize.Level1) { @@ -1685,7 +1685,7 @@ HWTEST_F(AudioPolicyServiceFourthUnitTest, GetMinVolumeLevel_002, TestSize.Level int ret = server->GetMinVolumeLevel(volumeType, volumeLevel, deviceType); EXPECT_EQ(ret, SUCCESS); - EXPECT_EQ(volumeLevel, MIN_VOLUME_LEVEL); + EXPECT_EQ(volumeLevel, ERR_INVALID_PARAM); } } // namespace AudioStandard } // namespace OHOS -- Gitee From cee36e1a1aafb7fa4d7fad01ec6613a3d93aef59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AF=8C=E5=86=9B?= Date: Thu, 28 Aug 2025 19:14:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9audioAdapterManager=20DT?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BE=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 朱富军 --- .../src/audio_adapter_manager_unit_test.cpp | 60 ++++++++----------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp index df43f57051..7d3f0239c4 100644 --- a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp @@ -600,9 +600,8 @@ HWTEST_F(AudioAdapterManagerUnitTest, SetSleVoliceStatusFlag_004, TestSize.Level */ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_001, TestSize.Level1) { - auto audioAdapterManager = std::make_shared(); - int32_t ret = audioAdapterManager->GetMaxVolumeLevel(STREAM_APP, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, audioAdapterManager->appConfigVolume_.maxVolume); + int32_t ret = audioAdapterManager_->GetMaxVolumeLevel(STREAM_APP, DEVICE_TYPE_NONE); + EXPECT_EQ(ret, audioAdapterManager_->appConfigVolume_.maxVolume); } /** @@ -613,20 +612,19 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_001, TestSize.Level1) */ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_002, TestSize.Level1) { - auto audioAdapterManager = std::make_shared(); AudioVolumeType volumeType = STREAM_VOICE_CALL; DeviceVolumeType deviceType = SPEAKER_VOLUME_TYPE; - if (audioAdapterManager->streamVolumeInfos_.end() != audioAdapterManager->streamVolumeInfos_.find(volumeType)) { - if ((audioAdapterManager->streamVolumeInfos_[volumeType] != nullptr) && - (audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos.end() != - audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos.find(deviceType)) && - (audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType] != nullptr)) { - audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType]->maxLevel = 15; + if (audioAdapterManager_->streamVolumeInfos_.end() != audioAdapterManager_->streamVolumeInfos_.find(volumeType)) { + if ((audioAdapterManager_->streamVolumeInfos_[volumeType] != nullptr) && + (audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos.end() != + audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos.find(deviceType)) && + (audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType] != nullptr)) { + audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType]->maxLevel = 10; } } - int32_t ret = audioAdapterManager->GetMaxVolumeLevel(volumeType, DEVICE_TYPE_SPEAKER); - EXPECT_EQ(ret, 15); + int32_t ret = audioAdapterManager_->GetMaxVolumeLevel(volumeType, DEVICE_TYPE_SPEAKER); + EXPECT_EQ(ret, 10); } /** @@ -637,9 +635,8 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_002, TestSize.Level1) */ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_003, TestSize.Level1) { - auto audioAdapterManager = std::make_shared(); - int32_t ret = audioAdapterManager->GetMaxVolumeLevel(STREAM_MUSIC, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, audioAdapterManager->maxVolumeIndexMap_[STREAM_MUSIC]); + int32_t ret = audioAdapterManager_->GetMaxVolumeLevel(STREAM_MUSIC, DEVICE_TYPE_NONE); + EXPECT_EQ(ret, audioAdapterManager_->maxVolumeIndexMap_[STREAM_MUSIC]); } /** @@ -650,8 +647,7 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_003, TestSize.Level1) */ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_004, TestSize.Level1) { - auto audioAdapterManager = std::make_shared(); - int32_t ret = audioAdapterManager->GetMaxVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); + int32_t ret = audioAdapterManager_->GetMaxVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); EXPECT_EQ(ret, ERR_INVALID_PARAM); } @@ -663,9 +659,8 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_004, TestSize.Level1) */ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_001, TestSize.Level1) { - auto audioAdapterManager = std::make_shared(); - int32_t ret = audioAdapterManager->GetMinVolumeLevel(STREAM_APP, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, audioAdapterManager->appConfigVolume_.minVolume); + int32_t ret = audioAdapterManager_->GetMinVolumeLevel(STREAM_APP, DEVICE_TYPE_NONE); + EXPECT_EQ(ret, audioAdapterManager_->appConfigVolume_.minVolume); } /** @@ -676,20 +671,19 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_001, TestSize.Level1) */ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_002, TestSize.Level1) { - auto audioAdapterManager = std::make_shared(); AudioVolumeType volumeType = STREAM_VOICE_CALL; DeviceVolumeType deviceType = SPEAKER_VOLUME_TYPE; - if (audioAdapterManager->streamVolumeInfos_.end() != audioAdapterManager->streamVolumeInfos_.find(volumeType)) { - if ((audioAdapterManager->streamVolumeInfos_[volumeType] != nullptr) && - (audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos.end() != - audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos.find(deviceType)) && - (audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType] != nullptr)) { - audioAdapterManager->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType]->minLevel = 0; + if (audioAdapterManager_->streamVolumeInfos_.end() != audioAdapterManager_->streamVolumeInfos_.find(volumeType)) { + if ((audioAdapterManager_->streamVolumeInfos_[volumeType] != nullptr) && + (audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos.end() != + audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos.find(deviceType)) && + (audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType] != nullptr)) { + audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos[deviceType]->minLevel = 2; } } - int32_t ret = audioAdapterManager->GetMinVolumeLevel(volumeType, DEVICE_TYPE_SPEAKER); - EXPECT_EQ(ret, 0); + int32_t ret = audioAdapterManager_->GetMinVolumeLevel(volumeType, DEVICE_TYPE_SPEAKER); + EXPECT_EQ(ret, 2); } /** @@ -700,9 +694,8 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_002, TestSize.Level1) */ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_003, TestSize.Level1) { - auto audioAdapterManager = std::make_shared(); - int32_t ret = audioAdapterManager->GetMinVolumeLevel(STREAM_MUSIC, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, audioAdapterManager->minVolumeIndexMap_[STREAM_MUSIC]); + int32_t ret = audioAdapterManager_->GetMinVolumeLevel(STREAM_MUSIC, DEVICE_TYPE_NONE); + EXPECT_EQ(ret, audioAdapterManager_->minVolumeIndexMap_[STREAM_MUSIC]); } /** @@ -713,8 +706,7 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_003, TestSize.Level1) */ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_004, TestSize.Level1) { - auto audioAdapterManager = std::make_shared(); - int32_t ret = audioAdapterManager->GetMinVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); + int32_t ret = audioAdapterManager_->GetMinVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); EXPECT_EQ(ret, ERR_INVALID_PARAM]); } -- Gitee From 8e68a8aaec7347b5359d8ee8489fb93dd47b67af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AF=8C=E5=86=9B?= Date: Thu, 28 Aug 2025 19:23:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 朱富军 --- .../src/audio_adapter_manager_unit_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp index 7d3f0239c4..d9631e7146 100644 --- a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp @@ -707,7 +707,7 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_003, TestSize.Level1) HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_004, TestSize.Level1) { int32_t ret = audioAdapterManager_->GetMinVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); - EXPECT_EQ(ret, ERR_INVALID_PARAM]); + EXPECT_EQ(ret, ERR_INVALID_PARAM); } /** -- Gitee From daec64ae53a518c4ca5fe20cda04b16c53d55134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AF=8C=E5=86=9B?= Date: Fri, 29 Aug 2025 17:19:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3DT=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 朱富军 --- .../src/audio_adapter_manager_unit_test.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp index d9631e7146..a1d774eb04 100644 --- a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp @@ -614,6 +614,7 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMaxVolumeLevel_002, TestSize.Level1) { AudioVolumeType volumeType = STREAM_VOICE_CALL; DeviceVolumeType deviceType = SPEAKER_VOLUME_TYPE; + audioAdapterManager_->Init(); if (audioAdapterManager_->streamVolumeInfos_.end() != audioAdapterManager_->streamVolumeInfos_.find(volumeType)) { if ((audioAdapterManager_->streamVolumeInfos_[volumeType] != nullptr) && (audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos.end() != @@ -673,6 +674,7 @@ HWTEST_F(AudioAdapterManagerUnitTest, GetMinVolumeLevel_002, TestSize.Level1) { AudioVolumeType volumeType = STREAM_VOICE_CALL; DeviceVolumeType deviceType = SPEAKER_VOLUME_TYPE; + audioAdapterManager_->Init(); if (audioAdapterManager_->streamVolumeInfos_.end() != audioAdapterManager_->streamVolumeInfos_.find(volumeType)) { if ((audioAdapterManager_->streamVolumeInfos_[volumeType] != nullptr) && (audioAdapterManager_->streamVolumeInfos_[volumeType]->deviceVolumeInfos.end() != -- Gitee