diff --git a/common/test/unittest/src/daudio_utils_test.cpp b/common/test/unittest/src/daudio_utils_test.cpp index 59257b8b67019cfba6c7eda2db234cb09dd624b3..0425ab18b7224c356bffea4e44d2db6791bd7569 100644 --- a/common/test/unittest/src/daudio_utils_test.cpp +++ b/common/test/unittest/src/daudio_utils_test.cpp @@ -155,13 +155,21 @@ HWTEST_F(DAudioUtilsTest, DAudioUtilTest_001, TestSize.Level1) */ HWTEST_F(DAudioUtilsTest, DAudioUtilTest_002, TestSize.Level1) { + int32_t eventType = 200; + GetEventNameByType(eventType); + cJSON * jsonObj = nullptr; + std::initializer_list keys = { "one", "two" }; + CJsonParamCheck(jsonObj, keys); + jsonObj = cJSON_CreateObject(); + cJSON_AddStringToObject(jsonObj, "one", "one"); + cJSON_AddNumberToObject(jsonObj, "two", 2); + CJsonParamCheck(jsonObj, keys); + int64_t tvSec; int64_t tvNSec; GetCurrentTime(tvSec, tvNSec); - int64_t curNano = GetCurNano(); EXPECT_NE(0, curNano); - int32_t ret = AbsoluteSleep(curNano); EXPECT_EQ(0, ret); } @@ -303,25 +311,6 @@ HWTEST_F(DAudioUtilsTest, DAudioUtilTest_007, TestSize.Level1) EXPECT_EQ(true, CheckDevIdIsLegal(tempDevIdStr)); } -/** - * @tc.name: DAudioLogTest_008 - * @tc.desc: Verify the GetEventNameByType function. - * @tc.type: FUNC - * @tc.require: AR000H0E5U - */ -HWTEST_F(DAudioUtilsTest, DAudioUtilTest_008, TestSize.Level1) -{ - int32_t eventType = 200; - GetEventNameByType(eventType); - cJSON * jsonObj = nullptr; - std::initializer_list keys = { "one", "two" }; - CJsonParamCheck(jsonObj, keys); - jsonObj = cJSON_CreateObject(); - cJSON_AddStringToObject(jsonObj, "one", "one"); - cJSON_AddNumberToObject(jsonObj, "two", 2); - CJsonParamCheck(jsonObj, keys); -} - /** * @tc.name: DAudioLogTest_009 * @tc.desc: Verify the AddDhIdPrefix and ReduceDhIdPrefix function. diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp index 58cb4821e4028a57857dd79d4ae79c9ba7cf65a7..880394f27aa9223d55e90277b55ce3bb57a0ad4d 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp @@ -57,19 +57,6 @@ HWTEST_F(DAudioSinkManagerTest, Init_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, daudioSinkManager.UnInit()); } -/** - * @tc.name: OnSinkDevReleased_001 - * @tc.desc: Verify the OnSinkDevReleased function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkManagerTest, OnSinkDevReleased_001, TestSize.Level1) -{ - std::string devId = "1"; - daudioSinkManager.devClearThread_ = std::thread(&DAudioSinkManager::ClearAudioDev, &daudioSinkManager, devId); - daudioSinkManager.OnSinkDevReleased(devId); -} - /** * @tc.name: HandleDAudioNotify_001 * @tc.desc: Verify the HandleDAudioNotify function. @@ -240,6 +227,9 @@ HWTEST_F(DAudioSinkManagerTest, GetDeviceSecurityLevel_001, TestSize.Level1) */ HWTEST_F(DAudioSinkManagerTest, CheckDeviceSecurityLevel_001, TestSize.Level1) { + std::string devId = "1"; + daudioSinkManager.devClearThread_ = std::thread(&DAudioSinkManager::ClearAudioDev, &daudioSinkManager, devId); + daudioSinkManager.OnSinkDevReleased(devId); std::string srcDeviceId = "srcDeviceId"; std::string dstDeviceId = "dstDeviceId"; EXPECT_EQ(false, daudioSinkManager.CheckDeviceSecurityLevel(srcDeviceId, dstDeviceId)); diff --git a/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_transport_test.cpp b/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_transport_test.cpp index 57b919a2f36f1f68fbfadc525515d9883f75b0c1..1dc8bb17fea80a722ab1c9e69d26e00b257d21d9 100644 --- a/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_transport_test.cpp +++ b/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_transport_test.cpp @@ -183,29 +183,12 @@ HWTEST_F(AVSenderEngineTransportTest, SetParameter_001, TestSize.Level1) std::shared_ptr message = nullptr; senderTrans_->OnEngineEvent(event); senderTrans_->OnEngineMessage(message); + message = std::make_shared(); + senderTrans_->OnEngineMessage(message); AudioParam audioParam; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderTrans_->SetParameter(audioParam)); senderTrans_->senderAdapter_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, senderTrans_->SetParameter(audioParam)); - message = std::make_shared(); - senderTrans_->OnEngineMessage(message); - senderTrans_->transCallback_ = nullptr; -} - -/** - * @tc.name: OnEngineMessage_001 - * @tc.desc: Verify the OnEngineMessage function. - * @tc.type: FUNC - * @tc.require: AR000HTAPM - */ -HWTEST_F(AVSenderEngineTransportTest, OnEngineMessage_001, TestSize.Level1) -{ - std::shared_ptr message = nullptr; - senderTrans_->OnEngineMessage(message); - message = std::make_shared(); - senderTrans_->OnEngineMessage(message); - senderTrans_->transCallback_ = nullptr; - senderTrans_->OnEngineMessage(message); } } // namespace DistributedHardware } // namespace OHOS