From 6d85f4e119c42a9f43f47bcedcc632fa58112b40 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Tue, 6 Jun 2023 20:28:47 +0800 Subject: [PATCH 1/6] modify UT Signed-off-by: w30042960 --- .../src/daudio_source_dev_test.cpp | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp index 895d3307..52f1d03e 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp @@ -169,7 +169,8 @@ HWTEST_F(DAudioSourceDevTest, HandlePlayStatusChange_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandlePlayStatusChange(event)); sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->HandlePlayStatusChange(event)); + sourceDev_->taskQueue_ = std::make_shared(20); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandlePlayStatusChange(event)); } /** @@ -307,7 +308,7 @@ HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStart_001, TestSize.Level1) { AudioEvent event; sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleSpkMmapStart(event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleSpkMmapStart(event)); } /** @@ -320,7 +321,7 @@ HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStop_001, TestSize.Level1) { AudioEvent event; sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleSpkMmapStop(event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleSpkMmapStop(event)); } /** @@ -333,7 +334,7 @@ HWTEST_F(DAudioSourceDevTest, HandleMicMmapStart_001, TestSize.Level1) { AudioEvent event; sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleMicMmapStart(event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleMicMmapStart(event)); } /** @@ -346,7 +347,7 @@ HWTEST_F(DAudioSourceDevTest, HandleMicMmapStop_001, TestSize.Level1) { AudioEvent event; sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleMicMmapStop(event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleMicMmapStop(event)); } /** @@ -702,6 +703,7 @@ HWTEST_F(DAudioSourceDevTest, TaskChangeRenderState_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, TaskPlayStatusChange_001, TestSize.Level1) { sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); + sourceDev_->speaker_ = std::make_shared(DEV_ID, nullptr); EXPECT_NE(DH_SUCCESS, sourceDev_->TaskPlayStatusChange(AUDIO_EVENT_PAUSE)); EXPECT_NE(DH_SUCCESS, sourceDev_->TaskPlayStatusChange(AUDIO_EVENT_RESTART)); } @@ -714,7 +716,7 @@ HWTEST_F(DAudioSourceDevTest, TaskPlayStatusChange_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStart_001, TestSize.Level1) { - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSpkMmapStart(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSpkMmapStart(ARGS)); } /** @@ -725,7 +727,7 @@ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStart_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStop_001, TestSize.Level1) { - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSpkMmapStop(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSpkMmapStop(ARGS)); } /** @@ -736,7 +738,7 @@ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStop_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskMicMmapStart_001, TestSize.Level1) { - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskMicMmapStart(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskMicMmapStart(ARGS)); } /** @@ -747,7 +749,7 @@ HWTEST_F(DAudioSourceDevTest, TaskMicMmapStart_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskMicMmapStop_001, TestSize.Level1) { - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskMicMmapStop(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskMicMmapStop(ARGS)); } -- Gitee From e939dca73558c4d1e7b1122d11997d0d52a3e1c6 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Wed, 7 Jun 2023 11:52:44 +0800 Subject: [PATCH 2/6] modify UT Signed-off-by: w30042960 --- .../managersource/src/daudio_source_dev.cpp | 4 +-- .../src/daudio_source_dev_test.cpp | 33 ++++++++++++++----- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index 585ec219..ba7933b3 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -905,7 +905,7 @@ int32_t DAudioSourceDev::TaskMicMmapStart(const std::string &args) { DHLOGI("Task mic mmap start, content: %s.", args.c_str()); if (mic_ == nullptr) { - DHLOGE("Task mic mmap start, speaker is nullptr."); + DHLOGE("Task mic mmap start, mic is nullptr."); return ERR_DH_AUDIO_NULLPTR; } int32_t ret = mic_->MmapStart(); @@ -919,7 +919,7 @@ int32_t DAudioSourceDev::TaskMicMmapStop(const std::string &args) { DHLOGI("Task mic mmap stop, content: %s.", args.c_str()); if (mic_ == nullptr) { - DHLOGE("Task mic mmap stop, speaker is nullptr."); + DHLOGE("Task mic mmap stop, mic is nullptr."); return ERR_DH_AUDIO_NULLPTR; } int32_t ret = mic_->MmapStop(); diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp index 52f1d03e..a80fe913 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp @@ -307,8 +307,9 @@ HWTEST_F(DAudioSourceDevTest, HandleNotifyRPC_003, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStart_001, TestSize.Level1) { AudioEvent event; + sourceDev_->taskQueue_ = std::make_shared(20); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleSpkMmapStart(event)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleSpkMmapStart(event)); } /** @@ -320,8 +321,9 @@ HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStart_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStop_001, TestSize.Level1) { AudioEvent event; + sourceDev_->taskQueue_ = std::make_shared(20); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleSpkMmapStop(event)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleSpkMmapStop(event)); } /** @@ -333,8 +335,9 @@ HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStop_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleMicMmapStart_001, TestSize.Level1) { AudioEvent event; + sourceDev_->taskQueue_ = std::make_shared(20); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleMicMmapStart(event)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleMicMmapStart(event)); } /** @@ -346,8 +349,9 @@ HWTEST_F(DAudioSourceDevTest, HandleMicMmapStart_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleMicMmapStop_001, TestSize.Level1) { AudioEvent event; + sourceDev_->taskQueue_ = std::make_shared(20); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleMicMmapStop(event)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleMicMmapStop(event)); } /** @@ -716,7 +720,10 @@ HWTEST_F(DAudioSourceDevTest, TaskPlayStatusChange_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStart_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSpkMmapStart(ARGS)); + sourceDev_->speaker_ = std::make_shared(DEV_ID, nullptr); + sourceDev_->speaker_->ashmem_ = new Ashmem(1, 20); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSpkMmapStart(ARGS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->speaker_->MmapStop()); } /** @@ -727,7 +734,8 @@ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStart_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStop_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSpkMmapStop(ARGS)); + sourceDev_->mic_ = std::make_shared(DEV_ID, nullptr); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSpkMmapStop(ARGS)); } /** @@ -738,7 +746,15 @@ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStop_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskMicMmapStart_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskMicMmapStart(ARGS)); + sourceDev_->mic_ = std::make_shared(DEV_ID, nullptr); + sourceDev_->mic_->ashmem_ = new Ashmem(1, 20); + const size_t capacity = 1; + std::shared_ptr data = std::make_shared(capacity); + for (size_t i = 0; i < 20; i++) { + sourceDev_->mic_->dataQueue_.push(data); + } + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskMicMmapStart(ARGS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->mic_->MmapStop()); } /** @@ -749,7 +765,8 @@ HWTEST_F(DAudioSourceDevTest, TaskMicMmapStart_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskMicMmapStop_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskMicMmapStop(ARGS)); + sourceDev_->mic_ = std::make_shared(DEV_ID, nullptr); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskMicMmapStop(ARGS)); } -- Gitee From 39639625fcb029b619194eddf27e7f0f4e3db303 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Wed, 7 Jun 2023 14:08:15 +0800 Subject: [PATCH 3/6] modify UT Signed-off-by: w30042960 --- .../test/unittest/sourcedevice/src/daudio_source_dev_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp index a80fe913..76b5d829 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp @@ -734,7 +734,7 @@ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStart_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStop_001, TestSize.Level1) { - sourceDev_->mic_ = std::make_shared(DEV_ID, nullptr); + sourceDev_->speaker_ = std::make_shared(DEV_ID, nullptr); EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSpkMmapStop(ARGS)); } -- Gitee From c8538670e4f99df07f74dbec3bedbbe7d584a68c Mon Sep 17 00:00:00 2001 From: w30042960 Date: Wed, 7 Jun 2023 14:58:37 +0800 Subject: [PATCH 4/6] modify UT Signed-off-by: w30042960 --- services/audiomanager/test/unittest/sourcedevice/BUILD.gn | 1 + .../test/unittest/sourcedevice/include/daudio_source_dev_test.h | 1 + 2 files changed, 2 insertions(+) diff --git a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn index 7f49c0f4..87165b53 100644 --- a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn @@ -70,6 +70,7 @@ ohos_unittest("DaudioSourceDevTest") { deps = [ "${hdf_interfaces_path}/audioext/v1_0:libdaudioext_proxy_1.0", "${services_path}/audiomanager/servicesource:distributed_audio_source", + "${services_path}/common:distributed_audio_utils", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] diff --git a/services/audiomanager/test/unittest/sourcedevice/include/daudio_source_dev_test.h b/services/audiomanager/test/unittest/sourcedevice/include/daudio_source_dev_test.h index ac8e38ea..d82d6933 100644 --- a/services/audiomanager/test/unittest/sourcedevice/include/daudio_source_dev_test.h +++ b/services/audiomanager/test/unittest/sourcedevice/include/daudio_source_dev_test.h @@ -18,6 +18,7 @@ #include +#include "audio_data.h" #include "daudio_constants.h" #include "daudio_errorcode.h" #define private public -- Gitee From f81dc02863e1f6f834301c10b3d405bff33a5ae4 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Thu, 8 Jun 2023 09:52:56 +0800 Subject: [PATCH 5/6] modify UT Signed-off-by: w30042960 --- .../src/daudio_source_dev_test.cpp | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp index 76b5d829..585ce347 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp @@ -26,6 +26,10 @@ const std::string ARGS = "args"; const std::string DH_ID_MIC = "134217728"; const std::string DH_ID_SPK = "1"; const std::string DH_ID_UNKNOWN = "0"; +const int32_t taskQueueLength = 20; +const int32_t ashmemLength = 20 +const size_t capacity = 1; +const int32_t fd = 1; void DAudioSourceDevTest::SetUpTestCase(void) {} @@ -169,7 +173,7 @@ HWTEST_F(DAudioSourceDevTest, HandlePlayStatusChange_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandlePlayStatusChange(event)); sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); - sourceDev_->taskQueue_ = std::make_shared(20); + sourceDev_->taskQueue_ = std::make_shared(taskQueueLength); EXPECT_EQ(DH_SUCCESS, sourceDev_->HandlePlayStatusChange(event)); } @@ -307,7 +311,7 @@ HWTEST_F(DAudioSourceDevTest, HandleNotifyRPC_003, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStart_001, TestSize.Level1) { AudioEvent event; - sourceDev_->taskQueue_ = std::make_shared(20); + sourceDev_->taskQueue_ = std::make_shared(taskQueueLength); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleSpkMmapStart(event)); } @@ -321,7 +325,7 @@ HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStart_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStop_001, TestSize.Level1) { AudioEvent event; - sourceDev_->taskQueue_ = std::make_shared(20); + sourceDev_->taskQueue_ = std::make_shared(taskQueueLength); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleSpkMmapStop(event)); } @@ -335,7 +339,7 @@ HWTEST_F(DAudioSourceDevTest, HandleSpkMmapStop_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleMicMmapStart_001, TestSize.Level1) { AudioEvent event; - sourceDev_->taskQueue_ = std::make_shared(20); + sourceDev_->taskQueue_ = std::make_shared(taskQueueLength); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleMicMmapStart(event)); } @@ -349,7 +353,7 @@ HWTEST_F(DAudioSourceDevTest, HandleMicMmapStart_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleMicMmapStop_001, TestSize.Level1) { AudioEvent event; - sourceDev_->taskQueue_ = std::make_shared(20); + sourceDev_->taskQueue_ = std::make_shared(taskQueueLength); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleMicMmapStop(event)); } @@ -721,7 +725,7 @@ HWTEST_F(DAudioSourceDevTest, TaskPlayStatusChange_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStart_001, TestSize.Level1) { sourceDev_->speaker_ = std::make_shared(DEV_ID, nullptr); - sourceDev_->speaker_->ashmem_ = new Ashmem(1, 20); + sourceDev_->speaker_->ashmem_ = new Ashmem(fd, ashmemLength); EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSpkMmapStart(ARGS)); EXPECT_EQ(DH_SUCCESS, sourceDev_->speaker_->MmapStop()); } @@ -747,10 +751,9 @@ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStop_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, TaskMicMmapStart_001, TestSize.Level1) { sourceDev_->mic_ = std::make_shared(DEV_ID, nullptr); - sourceDev_->mic_->ashmem_ = new Ashmem(1, 20); - const size_t capacity = 1; + sourceDev_->mic_->ashmem_ = new Ashmem(fd, ashmemLength); std::shared_ptr data = std::make_shared(capacity); - for (size_t i = 0; i < 20; i++) { + for (size_t i = 0; i < taskQueueLength; i++) { sourceDev_->mic_->dataQueue_.push(data); } EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskMicMmapStart(ARGS)); -- Gitee From c1cb25c438eb09d2a9498987a5d269877f146496 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Thu, 8 Jun 2023 10:39:37 +0800 Subject: [PATCH 6/6] modify UT Signed-off-by: w30042960 --- .../test/unittest/sourcedevice/src/daudio_source_dev_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp index 585ce347..f4f800d4 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp @@ -27,7 +27,7 @@ const std::string DH_ID_MIC = "134217728"; const std::string DH_ID_SPK = "1"; const std::string DH_ID_UNKNOWN = "0"; const int32_t taskQueueLength = 20; -const int32_t ashmemLength = 20 +const int32_t ashmemLength = 20; const size_t capacity = 1; const int32_t fd = 1; -- Gitee