From b24077eb237a15cbf2b7da2560506f0aa8921a60 Mon Sep 17 00:00:00 2001 From: byndyx Date: Wed, 7 Feb 2024 09:33:53 +0800 Subject: [PATCH] sa serial Signed-off-by: byndyx --- .../src/daudio_sink_ipc_callback_stub.cpp | 2 +- .../audio_source/src/daudio_ipc_callback_stub.cpp | 2 +- .../src/daudio_ipc_callback_test.cpp | 13 +++++++++++-- .../servicesink/src/daudio_sink_stub.cpp | 2 +- .../servicesource/src/daudio_source_stub.cpp | 2 +- .../src/daudio_source_service_test.cpp | 3 +++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback_stub.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback_stub.cpp index a0f6258c..e794b043 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback_stub.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { -DAudioSinkIpcCallbackStub::DAudioSinkIpcCallbackStub() +DAudioSinkIpcCallbackStub::DAudioSinkIpcCallbackStub() : IRemoteStub(true) { memberFuncMap_[NOTIFY_RESOURCEINFO] = &DAudioSinkIpcCallbackStub::OnNotifyResourceInfoInner; } diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp index 68f950c2..35e183de 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { -DAudioIpcCallbackStub::DAudioIpcCallbackStub() +DAudioIpcCallbackStub::DAudioIpcCallbackStub() : IRemoteStub(true) { memberFuncMap_[NOTIFY_REGRESULT] = &DAudioIpcCallbackStub::OnNotifyRegResultInner; memberFuncMap_[NOTIFY_UNREGRESULT] = &DAudioIpcCallbackStub::OnNotifyUnregResultInner; diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_ipc_callback_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_ipc_callback_test.cpp index 27df7a7e..9d6d3dfe 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_ipc_callback_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_ipc_callback_test.cpp @@ -82,14 +82,23 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_002, TestSize.Level1) HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_003, TestSize.Level1) { size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; + size_t DAUDIO_LEGAL_DEVICE_ID_LEN = 10; std::string devId ; devId.resize(DAUDIO_MAX_DEVICE_ID_LEN); - const std::string dhId = "dhId"; - const std::string reqId = "reqId"; + std::string dhId = "dhId"; + std::string reqId = "reqId"; int32_t status = 0; const std::string data = "data"; int32_t ret = dAudioIpcCallback_->OnNotifyRegResult(devId, dhId, reqId, status, data); EXPECT_EQ(ERR_DH_AUDIO_SA_DEVID_ILLEGAL, ret); + devId.resize(DAUDIO_LEGAL_DEVICE_ID_LEN); + dhId.resize(DAUDIO_MAX_DEVICE_ID_LEN); + ret = dAudioIpcCallback_->OnNotifyRegResult(devId, dhId, reqId, status, data); + EXPECT_EQ(ERR_DH_AUDIO_SA_DEVID_ILLEGAL, ret); + dhId.resize(DAUDIO_LEGAL_DEVICE_ID_LEN); + reqId.resize(DAUDIO_MAX_DEVICE_ID_LEN); + ret = dAudioIpcCallback_->OnNotifyRegResult(devId, dhId, reqId, status, data); + EXPECT_EQ(ERR_DH_AUDIO_SA_DEVID_ILLEGAL, ret); } /** diff --git a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp index 6f4a4cb4..3b777504 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp @@ -30,7 +30,7 @@ namespace OHOS { namespace DistributedHardware { -DAudioSinkStub::DAudioSinkStub() +DAudioSinkStub::DAudioSinkStub() : IRemoteStub(true) { DHLOGD("Distributed audio sink stub constructed."); memberFuncMap_[static_cast(IDAudioSinkInterfaceCode::INIT_SINK)] = diff --git a/services/audiomanager/servicesource/src/daudio_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index 85b9083c..d00be43a 100644 --- a/services/audiomanager/servicesource/src/daudio_source_stub.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_stub.cpp @@ -30,7 +30,7 @@ namespace OHOS { namespace DistributedHardware { -DAudioSourceStub::DAudioSourceStub() +DAudioSourceStub::DAudioSourceStub() : IRemoteStub(true) { memberFuncMap_[static_cast(IDAudioSourceInterfaceCode::INIT_SOURCE)] = &DAudioSourceStub::InitSourceInner; diff --git a/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp b/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp index 21ff2f13..92947a23 100644 --- a/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp +++ b/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp @@ -104,6 +104,9 @@ HWTEST_F(DAudioSourceServiceTest, Dump_001, TestSize.Level1) int32_t fd = 1; std::vector args; EXPECT_EQ(DH_SUCCESS, sourceSrv_->Dump(fd, args)); + std::u16string order = u"--sourceDevId"; + args.push_back(order); + EXPECT_EQ(ERR_DH_AUDIO_BAD_VALUE, sourceSrv_->Dump(fd, args)); } } // DistributedHardware } // OHOS -- Gitee