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 35363a0baed0137fba85875e985a6bbd6fb683f1..a1d774eb04dfd5eb48407af0ddedc978b9ef19b9 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,19 +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 = 10; + audioAdapterManager_->Init(); + 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); + int32_t ret = audioAdapterManager_->GetMaxVolumeLevel(volumeType, DEVICE_TYPE_SPEAKER); EXPECT_EQ(ret, 10); } @@ -637,22 +636,20 @@ 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]); + int32_t ret = audioAdapterManager_->GetMaxVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); + EXPECT_EQ(ret, ERR_INVALID_PARAM); } /** @@ -663,9 +660,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,19 +672,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 = 2; + audioAdapterManager_->Init(); + 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); + int32_t ret = audioAdapterManager_->GetMinVolumeLevel(volumeType, DEVICE_TYPE_SPEAKER); EXPECT_EQ(ret, 2); } @@ -700,22 +696,20 @@ 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]); + int32_t ret = audioAdapterManager_->GetMinVolumeLevel(STREAM_DEFAULT, DEVICE_TYPE_NONE); + 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 adb0bf4a432d3dd607e400e1a9ad493eb3f66ce4..142cb961dce8839c070b05f87865ae4a86698da1 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