diff --git a/cfi_blocklist.txt b/cfi_blocklist.txt index 9e57ac2745e8bb36354e8ca99a7b96f3cde84c43..892f73016cf48cf5e95e246a9d8583c59a932e55 100644 --- a/cfi_blocklist.txt +++ b/cfi_blocklist.txt @@ -1,3 +1,4 @@ src:*third_party/googletest/*:* src:*foundation/multimedia/audio_framework/services/audio_policy/test/unittest/*:* -src:*foundation/multimedia/audio_framework/services/audio_policy/server/infra/config/parser/test/unittest/*:* \ No newline at end of file +src:*foundation/multimedia/audio_framework/services/audio_policy/server/infra/config/parser/test/unittest/*:* +src:*foundation/multimedia/audio_framework/services/audio_service/test/unittest/audio_endpoint_unit_test/*:* \ No newline at end of file diff --git a/frameworks/native/opensles/test/unittest/opensles_player_test/src/audio_opensles_player_unit_test.cpp b/frameworks/native/opensles/test/unittest/opensles_player_test/src/audio_opensles_player_unit_test.cpp index 76c4f84005215cb90750865b160e4b94f78c3860..bbfa09ee25ad9f7a2aceda25018e893e379c1d1c 100644 --- a/frameworks/native/opensles/test/unittest/opensles_player_test/src/audio_opensles_player_unit_test.cpp +++ b/frameworks/native/opensles/test/unittest/opensles_player_test/src/audio_opensles_player_unit_test.cpp @@ -1500,7 +1500,7 @@ HWTEST(AudioOpenslesPlayerUnitTest, GetBufferAdapter_001, TestSize.Level4) HWTEST(AudioOpenslesPlayerUnitTest, RegisterCallbackAdapter_001, TestSize.Level3) { - SLresult result = AudioPlayerAdapter::GetInstance()->RegisterCallbackAdapter(nullptr, 0, nullptr); + SLresult result = AudioPlayerAdapter::GetInstance()->RegisterCallbackAdapter(bufferQueueItf_, 0, nullptr); EXPECT_TRUE(result == SL_RESULT_RESOURCE_ERROR); } diff --git a/services/audio_policy/test/BUILD.gn b/services/audio_policy/test/BUILD.gn index b2693434ceaa8974878c7ff7892d266c7930aa10..f71d94ca6e832402c4c2c34907d04efdac5fd77f 100644 --- a/services/audio_policy/test/BUILD.gn +++ b/services/audio_policy/test/BUILD.gn @@ -278,6 +278,16 @@ ohos_unittest("audio_zone_unit_test") { use_exceptions = true + sanitize = { + cfi = true + cfi_cross_dso = false + boundary_sanitize = true + debug = false + integer_overflow = true + ubsan = false + blocklist = "${audio_framework_root}/cfi_blocklist.txt" + } + cflags = [ "-Wall", "-Werror", @@ -3154,11 +3164,12 @@ ohos_unittest("audio_stream_collector_pro_unit_test") { sanitize = { cfi = true - cfi_cross_dso = true + cfi_cross_dso = false boundary_sanitize = true debug = false integer_overflow = true - ubsan = true + ubsan = false + blocklist = "${audio_framework_root}/cfi_blocklist.txt" } external_deps = [ @@ -5568,6 +5579,16 @@ ohos_unittest("audio_client_tracker_callback_service_unit_test") { use_exceptions = true + sanitize = { + cfi = true + cfi_cross_dso = false + boundary_sanitize = true + debug = false + integer_overflow = true + ubsan = false + blocklist = "${audio_framework_root}/cfi_blocklist.txt" + } + cflags = [ "-Wall", "-Werror", diff --git a/services/audio_service/test/unittest/audio_endpoint_unit_test/BUILD.gn b/services/audio_service/test/unittest/audio_endpoint_unit_test/BUILD.gn index 34d25bd4bb36f18dd64296131e707fa791d3b7ba..796aab00e1c2f61b6112b8a2c8c957a115cc23f5 100644 --- a/services/audio_service/test/unittest/audio_endpoint_unit_test/BUILD.gn +++ b/services/audio_service/test/unittest/audio_endpoint_unit_test/BUILD.gn @@ -87,6 +87,16 @@ ohos_unittest("audio_endpoint_plus_unit_test") { cflags = [ "-fno-access-control" ] + sanitize = { + cfi = true + cfi_cross_dso = false + boundary_sanitize = true + debug = false + integer_overflow = true + ubsan = false + blocklist = "${audio_framework_root}/cfi_blocklist.txt" + } + sources = [ "./src/audio_endpoint_plus_unit_test.cpp" ] include_dirs = [ diff --git a/services/audio_service/test/unittest/audio_service_unit_test.cpp b/services/audio_service/test/unittest/audio_service_unit_test.cpp index add2a5fc9557ead134e4c9d0be92267920777139..d8aff873d3744a6f91ee544dc893f98c94eb282a 100644 --- a/services/audio_service/test/unittest/audio_service_unit_test.cpp +++ b/services/audio_service/test/unittest/audio_service_unit_test.cpp @@ -592,6 +592,7 @@ HWTEST(AudioServiceUnitTest, AudioServiceOnInitInnerCapList_001, TestSize.Level1 EXPECT_EQ(0, floatRet); AudioProcessConfig config = {}; + config.streamInfo.channels = AudioChannel::MONO; config.privacyType = AudioPrivacyType::PRIVACY_TYPE_PUBLIC; AudioService::GetInstance()->GetAudioProcess(config); AudioService::GetInstance()->OnInitInnerCapList(1); @@ -700,6 +701,7 @@ HWTEST(AudioServiceUnitTest, AudioServiceFilterAllFastProcess_001, TestSize.Leve AudioProcessConfig config = {}; config.privacyType = AudioPrivacyType::PRIVACY_TYPE_PUBLIC; + config.streamInfo.channels = AudioChannel::MONO; AudioService::GetInstance()->GetAudioProcess(config); AudioService::GetInstance()->OnInitInnerCapList(1); AudioService::GetInstance()->workingConfig_.filterOptions.usages.emplace_back(STREAM_USAGE_MEDIA); @@ -750,6 +752,7 @@ HWTEST(AudioServiceUnitTest, AudioServiceDump_001, TestSize.Level1) AudioProcessConfig config = {}; config.privacyType = AudioPrivacyType::PRIVACY_TYPE_PUBLIC; + config.streamInfo.channels = AudioChannel::MONO; AudioService::GetInstance()->GetAudioProcess(config); AudioService::GetInstance()->OnInitInnerCapList(1); AudioService::GetInstance()->workingConfig_.filterOptions.usages.emplace_back(STREAM_USAGE_MEDIA); @@ -786,6 +789,7 @@ HWTEST(AudioServiceUnitTest, AudioServiceSetNonInterruptMute_001, TestSize.Level AudioProcessConfig config = {}; config.privacyType = AudioPrivacyType::PRIVACY_TYPE_PUBLIC; + config.streamInfo.channels = AudioChannel::MONO; AudioService::GetInstance()->GetAudioProcess(config); AudioService::GetInstance()->OnInitInnerCapList(1); AudioService::GetInstance()->workingConfig_.filterOptions.usages.emplace_back(STREAM_USAGE_MEDIA); @@ -820,6 +824,7 @@ HWTEST(AudioServiceUnitTest, AudioServiceOnProcessRelease_001, TestSize.Level1) AudioProcessConfig config = {}; config.privacyType = AudioPrivacyType::PRIVACY_TYPE_PUBLIC; + config.streamInfo.channels = AudioChannel::MONO; AudioDeviceDescriptor deviceInfo(AudioDeviceDescriptor::DEVICE_INFO); sptr audioprocess = AudioProcessInServer::Create(config, AudioService::GetInstance()); EXPECT_NE(audioprocess, nullptr); @@ -861,6 +866,7 @@ HWTEST(AudioServiceUnitTest, AudioServiceOnProcessRelease_002, TestSize.Level1) AudioProcessConfig config = {}; config.privacyType = AudioPrivacyType::PRIVACY_TYPE_PUBLIC; config.rendererInfo.isLoopback = true; + config.streamInfo.channels = AudioChannel::MONO; AudioDeviceDescriptor deviceInfo(AudioDeviceDescriptor::DEVICE_INFO); sptr audioprocess = AudioProcessInServer::Create(config, AudioService::GetInstance()); EXPECT_NE(audioprocess, nullptr); @@ -904,6 +910,7 @@ HWTEST(AudioServiceUnitTest, AudioServiceOnProcessRelease_003, TestSize.Level1) config.privacyType = AudioPrivacyType::PRIVACY_TYPE_PUBLIC; config.audioMode = AUDIO_MODE_RECORD; config.capturerInfo.isLoopback = true; + config.streamInfo.channels = AudioChannel::MONO; AudioDeviceDescriptor deviceInfo(AudioDeviceDescriptor::DEVICE_INFO); sptr audioprocess = AudioProcessInServer::Create(config, AudioService::GetInstance()); EXPECT_NE(audioprocess, nullptr); @@ -922,21 +929,6 @@ HWTEST(AudioServiceUnitTest, AudioServiceOnProcessRelease_003, TestSize.Level1) EXPECT_EQ(ret, 0); } -/** - * @tc.name : Test GetAudioEndpointForDevice API - * @tc.type : FUNC - * @tc.number: GetAudioEndpointForDevice_001 - * @tc.desc : Test GetAudioEndpointForDevice interface. - */ -HWTEST(AudioServiceUnitTest, GetAudioEndpointForDevice_001, TestSize.Level1) -{ - AudioService *audioService = AudioService::GetInstance(); - AudioProcessConfig clientConfig; - clientConfig.rendererInfo.streamUsage = STREAM_USAGE_VOICE_COMMUNICATION; - clientConfig.rendererInfo.originalFlag = AUDIO_FLAG_VOIP_FAST; - audioService->GetAudioProcess(clientConfig); -} - /** * @tc.name : Test Dump API * @tc.type : FUNC