diff --git a/common/dfx_utils/test/unittest/src/daudio_hidumper_test.cpp b/common/dfx_utils/test/unittest/src/daudio_hidumper_test.cpp index a1411e608aad25bdbc94e13e1b0d6dd83235ced6..a750a6f95da65e739c28280cb70f65af26057c8c 100644 --- a/common/dfx_utils/test/unittest/src/daudio_hidumper_test.cpp +++ b/common/dfx_utils/test/unittest/src/daudio_hidumper_test.cpp @@ -43,9 +43,7 @@ void DAudioHidumperTest::TearDown() */ HWTEST_F(DAudioHidumperTest, Dump_001, TestSize.Level1) { - if (hidumper_ == nullptr) { - return; - } + ASSERT_TRUE(hidumper_ != nullptr); std::string result; std::vector args; EXPECT_EQ(true, hidumper_->Dump(args, result)); @@ -69,9 +67,7 @@ HWTEST_F(DAudioHidumperTest, Dump_001, TestSize.Level1) */ HWTEST_F(DAudioHidumperTest, GetSourceDevId_001, TestSize.Level1) { - if (hidumper_ == nullptr) { - return; - } + ASSERT_TRUE(hidumper_ != nullptr); std::string result = "123"; EXPECT_NE(HDF_SUCCESS, hidumper_->GetSourceDevId(result)); } @@ -84,9 +80,7 @@ HWTEST_F(DAudioHidumperTest, GetSourceDevId_001, TestSize.Level1) */ HWTEST_F(DAudioHidumperTest, GetSinkInfo_001, TestSize.Level1) { - if (hidumper_ == nullptr) { - return; - } + ASSERT_TRUE(hidumper_ != nullptr); std::string result = "123"; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, hidumper_->GetSinkInfo(result)); } @@ -99,9 +93,7 @@ HWTEST_F(DAudioHidumperTest, GetSinkInfo_001, TestSize.Level1) */ HWTEST_F(DAudioHidumperTest, StartDumpData_001, TestSize.Level1) { - if (hidumper_ == nullptr) { - return; - } + ASSERT_TRUE(hidumper_ != nullptr); std::string result = ""; EXPECT_EQ(HDF_SUCCESS, hidumper_->StartDumpData(result)); EXPECT_EQ(true, hidumper_->QueryDumpDataFlag()); diff --git a/common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp b/common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp index b8856bd445570c3d229723205b985558ce3cac3c..8575905679575b2394aadcb6f4b40685ec1b8fdc 100644 --- a/common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp +++ b/common/dfx_utils/test/unittest/src/daudio_hitrace_test.cpp @@ -42,9 +42,7 @@ void DAudioHitraceTest::TearDown() */ HWTEST_F(DAudioHitraceTest, End_001, TestSize.Level1) { - if (hitrace_ == nullptr) { - return; - } + ASSERT_TRUE(hitrace_ != nullptr); std::string result = "123"; hitrace_->isFinished_ = false; hitrace_->End(); diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/src/daudio_sink_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/src/daudio_sink_handler_test.cpp index f63ba62dbc5ecba2633fbb166e1592e822a3e0e4..4079371d2855fe9b8978230e8ddc4cd04c21e341 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/src/daudio_sink_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/src/daudio_sink_handler_test.cpp @@ -90,18 +90,14 @@ HWTEST_F(DAudioSinkHandlerTest, LocalHardware_003, TestSize.Level1) wptr remote = nullptr; DAudioSinkHandler::GetInstance().OnRemoteSinkSvrDied(remote); sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - return; - } + ASSERT_TRUE(samgr != nullptr); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); sptr proxy(new DAudioSinkProxy(remoteObject)); wptr remoteobject (remoteObject); DAudioSinkHandler::GetInstance().OnRemoteSinkSvrDied(remoteobject); DAudioSinkHandler::GetInstance().sinkSvrRecipient_ = sptr( new DAudioSinkHandler::DAudioSinkSvrRecipient()); - if (DAudioSinkHandler::GetInstance().sinkSvrRecipient_ == nullptr) { - return; - } + ASSERT_TRUE(DAudioSinkHandler::GetInstance().sinkSvrRecipient_ != nullptr); DAudioSinkHandler::GetInstance().sinkSvrRecipient_->OnRemoteDied(remoteobject); DAudioSinkHandler::GetInstance().sinkSvrRecipient_ = nullptr; DAudioSinkHandler::GetInstance().dAudioSinkProxy_ = proxy; @@ -138,9 +134,7 @@ HWTEST_F(DAudioSinkHandlerTest, LocalHardware_005, TestSize.Level1) int32_t ret = DAudioSinkHandler::GetInstance().PauseDistributedHardware(networkId); EXPECT_EQ(ERR_DH_AUDIO_SA_PROXY_NOT_INIT, ret); sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - return; - } + ASSERT_TRUE(samgr != nullptr); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); sptr proxy(new DAudioSinkProxy(remoteObject)); DAudioSinkHandler::GetInstance().dAudioSinkProxy_ = proxy; @@ -162,9 +156,7 @@ HWTEST_F(DAudioSinkHandlerTest, LocalHardware_006, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_PROXY_NOT_INIT, ret); EXPECT_EQ(ERR_DH_AUDIO_SA_PROXY_NOT_INIT, DAudioSinkHandler::GetInstance().StopDistributedHardware(networkId)); sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - return; - } + ASSERT_TRUE(samgr != nullptr); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); sptr proxy(new DAudioSinkProxy(remoteObject)); DAudioSinkHandler::GetInstance().dAudioSinkProxy_ = proxy; diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/src/daudio_sink_proxy_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/src/daudio_sink_proxy_test.cpp index b4b7ae662d251644722035a6a85b3252f42b93cb..393ed6c766927ba9dc398c682d5f56a3df6676f3 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/src/daudio_sink_proxy_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosinktest/src/daudio_sink_proxy_test.cpp @@ -54,9 +54,7 @@ void DAudioSinkProxyTest::TearDown(void) {} */ HWTEST_F(DAudioSinkProxyTest, SubscribeLocalHardware_001, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); const std::string dhId = "dhId"; const std::string param = "param"; int32_t ret = dAudioProxy->SubscribeLocalHardware(dhId, param); @@ -73,9 +71,7 @@ HWTEST_F(DAudioSinkProxyTest, SubscribeLocalHardware_001, TestSize.Level1) */ HWTEST_F(DAudioSinkProxyTest, SubscribeLocalHardware_002, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; size_t DAUDIO_LEGAL_DEVICE_ID_LEN = 10; std::string dhId; @@ -106,9 +102,7 @@ HWTEST_F(DAudioSinkProxyTest, SubscribeLocalHardware_002, TestSize.Level1) */ HWTEST_F(DAudioSinkProxyTest, InitSink_001, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); const std::string params = "params"; auto dAudioSinkIpcCallback = new DAudioSinkIpcCallback(); int32_t ret = dAudioProxy->InitSink(params, dAudioSinkIpcCallback); @@ -125,9 +119,7 @@ HWTEST_F(DAudioSinkProxyTest, InitSink_001, TestSize.Level1) */ HWTEST_F(DAudioSinkProxyTest, PauseDistributedHardware_001, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); std::string networkId = "123"; EXPECT_EQ(DH_SUCCESS, dAudioProxy->PauseDistributedHardware(networkId)); EXPECT_EQ(DH_SUCCESS, dAudioProxy->ResumeDistributedHardware(networkId)); 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 4d59ec80b2383d14966417fe9eb39dfc8ac45dc6..378c9907f9cde1ae1a33271bb5bf38f29d012948 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 @@ -44,9 +44,7 @@ void DAudioIpcCallbackTest::TearDown(void) */ HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_001, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string devId = "devId"; const std::string dhId = "dhId"; const std::string reqId = "reqIdReg"; @@ -67,9 +65,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_001, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_002, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string devId = "devId"; const std::string dhId = "dhId"; const std::string reqId = "reqId"; @@ -87,9 +83,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_002, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_003, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; size_t DAUDIO_LEGAL_DEVICE_ID_LEN = 10; std::string devId ; @@ -118,9 +112,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_003, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnNotifyUnregResult_001, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string devId = "devId"; const std::string dhId = "dhId"; const std::string reqId = "reqIdUnreg"; @@ -141,9 +133,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyUnregResult_001, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnNotifyUnregResult_002, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string devId = "devId"; const std::string dhId = "dhId"; const std::string reqId = "reqId"; @@ -161,9 +151,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyUnregResult_002, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnNotifyUnregResult_003, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; size_t DAUDIO_LEGAL_DEVICE_ID_LEN = 10; std::string devId ; @@ -192,9 +180,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyUnregResult_003, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, PushRegRegisterCallback_001, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string reqId = "reqIdReg"; std::shared_ptr callback = std::make_shared(); int32_t sizeFront = dAudioIpcCallback_->registerCallbackMap_.size(); @@ -212,9 +198,7 @@ HWTEST_F(DAudioIpcCallbackTest, PushRegRegisterCallback_001, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, PopRegRegisterCallback_001, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string reqId = "reqId"; std::shared_ptr callback = std::make_shared(); dAudioIpcCallback_->PushRegisterCallback(reqId, callback); @@ -232,9 +216,7 @@ HWTEST_F(DAudioIpcCallbackTest, PopRegRegisterCallback_001, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, PushUnregRegisterCallback_001, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string reqId = "reqIdUnreg"; std::shared_ptr callback = std::make_shared(); int32_t sizeFront = dAudioIpcCallback_->unregisterCallbackMap_.size(); @@ -252,9 +234,7 @@ HWTEST_F(DAudioIpcCallbackTest, PushUnregRegisterCallback_001, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, PopUnregRegisterCallback_001, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string reqId = "reqId"; std::shared_ptr callback = std::make_shared(); dAudioIpcCallback_->PushUnregisterCallback(reqId, callback); @@ -272,9 +252,7 @@ HWTEST_F(DAudioIpcCallbackTest, PopUnregRegisterCallback_001, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnHardwareStateChanged_001, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string devId = "123"; const std::string dhId = "1"; int32_t status = 0; @@ -294,9 +272,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnHardwareStateChanged_001, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnHardwareStateChanged_002, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); std::string devId = "123"; std::string dhId = "1"; size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; @@ -321,9 +297,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnHardwareStateChanged_002, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnDataSyncTrigger_001, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); const std::string devId = "123"; std::shared_ptr callback = std::make_shared(); dAudioIpcCallback_->RegisterTriggerListener(callback); @@ -340,9 +314,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnDataSyncTrigger_001, TestSize.Level1) */ HWTEST_F(DAudioIpcCallbackTest, OnDataSyncTrigger_002, TestSize.Level1) { - if (dAudioIpcCallback_ == nullptr) { - return; - } + ASSERT_TRUE(dAudioIpcCallback_ != nullptr); size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; size_t DAUDIO_LEGAL_DEVICE_ID_LEN = 10; std::string devId ; diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_proxy_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_proxy_test.cpp index 321ef11cdcb13edcb3f66557ed48211adeddb420..a013559555c2a234f44d20b5a76d2d52d7e87fcd 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_proxy_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_proxy_test.cpp @@ -53,9 +53,7 @@ void DAudioSourceProxyTest::TearDown(void) {} */ HWTEST_F(DAudioSourceProxyTest, RegisterDistributedHardware_001, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); const std::string devId = "devId"; const std::string dhId = "dhId"; const std::string reqId = "reqId"; @@ -79,9 +77,7 @@ HWTEST_F(DAudioSourceProxyTest, RegisterDistributedHardware_001, TestSize.Level1 */ HWTEST_F(DAudioSourceProxyTest, RegisterDistributedHardware_002, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; std::string devId; devId.resize(DAUDIO_MAX_DEVICE_ID_LEN); @@ -105,9 +101,7 @@ HWTEST_F(DAudioSourceProxyTest, RegisterDistributedHardware_002, TestSize.Level1 */ HWTEST_F(DAudioSourceProxyTest, RegisterDistributedHardware_003, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; size_t DAUDIO_LEGAL_DEVICE_ID_LEN = 10; std::string devId; @@ -138,9 +132,7 @@ HWTEST_F(DAudioSourceProxyTest, RegisterDistributedHardware_003, TestSize.Level1 */ HWTEST_F(DAudioSourceProxyTest, ConfigDistributedHardware_001, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); const std::string devId = "devId"; const std::string dhId = "dhId"; const std::string key = "value"; @@ -158,9 +150,7 @@ HWTEST_F(DAudioSourceProxyTest, ConfigDistributedHardware_001, TestSize.Level1) */ HWTEST_F(DAudioSourceProxyTest, ConfigDistributedHardware_002, TestSize.Level1) { - if (dAudioProxy == nullptr) { - return; - } + ASSERT_TRUE(dAudioProxy != nullptr); size_t DAUDIO_MAX_DEVICE_ID_LEN = 101; size_t DAUDIO_LEGAL_DEVICE_ID_LEN = 10; const int32_t eventType = 1; diff --git a/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp b/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp index d331540ebc5641aef4e406bbd892ddb93a34b07b..9f2b2d7c1e43fccbba667e7883af0c1c93ce3b5a 100644 --- a/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp +++ b/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp @@ -54,9 +54,7 @@ void DMicClientTest::TearDown() */ HWTEST_F(DMicClientTest, InitSenderEngine_001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); IAVEngineProvider *providerPtr = nullptr; auto message = std::make_shared(); micClient_->OnEngineTransMessage(message); @@ -71,9 +69,7 @@ HWTEST_F(DMicClientTest, InitSenderEngine_001, TestSize.Level1) */ HWTEST_F(DMicClientTest, OnStateChange_001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); EXPECT_NE(DH_SUCCESS, micClient_->OnStateChange(AudioEventType::NOTIFY_OPEN_SPEAKER_RESULT)); } @@ -85,9 +81,7 @@ HWTEST_F(DMicClientTest, OnStateChange_001, TestSize.Level1) */ HWTEST_F(DMicClientTest, OnStateChange_002, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); EXPECT_EQ(DH_SUCCESS, micClient_->OnStateChange(AudioEventType::DATA_CLOSED)); } @@ -99,9 +93,7 @@ HWTEST_F(DMicClientTest, OnStateChange_002, TestSize.Level1) */ HWTEST_F(DMicClientTest, SetUp_001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); std::string devId = "testID"; auto clientCallback = std::make_shared(); micClient_->SetAttrs(devId, clientCallback); @@ -118,9 +110,7 @@ HWTEST_F(DMicClientTest, SetUp_001, TestSize.Level1) */ HWTEST_F(DMicClientTest, StartCapture001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); micClient_->CaptureThreadRunning(); EXPECT_NE(DH_SUCCESS, micClient_->StartCapture()); EXPECT_NE(DH_SUCCESS, micClient_->StopCapture()); @@ -157,9 +147,7 @@ HWTEST_F(DMicClientTest, StartCapture001, TestSize.Level1) */ HWTEST_F(DMicClientTest, StopCapture001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); std::shared_ptr audioData = nullptr; EXPECT_NE(DH_SUCCESS, micClient_->StopCapture()); micClient_->clientStatus_ = STATUS_START; @@ -177,9 +165,7 @@ HWTEST_F(DMicClientTest, StopCapture001, TestSize.Level1) */ HWTEST_F(DMicClientTest, StopCapture002, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); micClient_->clientStatus_ = STATUS_START; EXPECT_EQ(ERR_DH_AUDIO_FAILED, micClient_->StopCapture()); micClient_->isCaptureReady_.store(true); @@ -196,9 +182,7 @@ HWTEST_F(DMicClientTest, StopCapture002, TestSize.Level1) */ HWTEST_F(DMicClientTest, Release001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); micClient_->clientStatus_ = AudioStatus::STATUS_START; EXPECT_EQ(ERR_DH_AUDIO_SA_STATUS_ERR, micClient_->Release()); micClient_->clientStatus_ = AudioStatus::STATUS_STOP; @@ -237,9 +221,7 @@ HWTEST_F(DMicClientTest, Release001, TestSize.Level1) */ HWTEST_F(DMicClientTest, SendMessage_001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); std::string content = "content"; std::string dstDevId = "dstDevId"; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, micClient_->SendMessage(EVENT_UNKNOWN, content, dstDevId)); @@ -256,9 +238,7 @@ HWTEST_F(DMicClientTest, SendMessage_001, TestSize.Level1) */ HWTEST_F(DMicClientTest, AudioFwkClientSetUp_001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); audioParam_.captureOpts.capturerFlags = MMAP_MODE; int32_t actual = micClient_->AudioFwkClientSetUp(); EXPECT_EQ(ERR_DH_AUDIO_CLIENT_CAPTURER_CREATE_FAILED, actual); @@ -275,9 +255,7 @@ HWTEST_F(DMicClientTest, AudioFwkClientSetUp_001, TestSize.Level1) */ HWTEST_F(DMicClientTest, TransSetUp_001, TestSize.Level1) { - if (micClient_ == nullptr) { - return; - } + ASSERT_TRUE(micClient_ != nullptr); int32_t actual = micClient_->TransSetUp(); EXPECT_EQ(DH_SUCCESS, actual); micClient_->micTrans_ = nullptr; diff --git a/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp b/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp index 61f18951f297c4dc98b47cc20a5680923844b1b2..c2737951c20740f911d59c2b8ff0922d537d20f7 100644 --- a/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp +++ b/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp @@ -58,9 +58,7 @@ void DSpeakerClientTest::TearDown() */ HWTEST_F(DSpeakerClientTest, InitReceiverEngine_001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); IAVEngineProvider *providerPtr = nullptr; AVTransEvent event1 = { EventType::EVENT_START_SUCCESS, "", ""}; @@ -82,9 +80,7 @@ HWTEST_F(DSpeakerClientTest, InitReceiverEngine_001, TestSize.Level1) */ HWTEST_F(DSpeakerClientTest, OnStateChange_001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); AudioStandard::VolumeEvent event; event.volume = 1; event.updateUi = 1; @@ -105,9 +101,7 @@ HWTEST_F(DSpeakerClientTest, OnStateChange_001, TestSize.Level1) */ HWTEST_F(DSpeakerClientTest, SetUp_001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); AudioParam audioParam; EXPECT_EQ(DH_SUCCESS, speakerClient_->SetUp(audioParam)); EXPECT_EQ(DH_SUCCESS, speakerClient_->SetUp(audioParam_)); @@ -126,9 +120,7 @@ HWTEST_F(DSpeakerClientTest, SetUp_001, TestSize.Level1) */ HWTEST_F(DSpeakerClientTest, StartRender001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); EXPECT_NE(DH_SUCCESS, speakerClient_->StartRender()); EXPECT_NE(DH_SUCCESS, speakerClient_->StopRender()); @@ -151,9 +143,7 @@ HWTEST_F(DSpeakerClientTest, StartRender001, TestSize.Level1) */ HWTEST_F(DSpeakerClientTest, StopRender001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); EXPECT_NE(DH_SUCCESS, speakerClient_->StopRender()); std::string args = "args"; AudioEvent event; @@ -186,9 +176,7 @@ HWTEST_F(DSpeakerClientTest, StopRender001, TestSize.Level1) */ HWTEST_F(DSpeakerClientTest, OnDecodeTransDataDone001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); std::shared_ptr audioData = nullptr; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, speakerClient_->OnDecodeTransDataDone(audioData)); for (size_t i = 0; i < 11; i++) { @@ -207,9 +195,7 @@ HWTEST_F(DSpeakerClientTest, OnDecodeTransDataDone001, TestSize.Level1) */ HWTEST_F(DSpeakerClientTest, Release001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); speakerClient_->speakerTrans_ = std::make_shared(); std::string args = "{\"ChangeType\":\"restart\"}"; speakerClient_->PlayStatusChange(args); @@ -227,9 +213,7 @@ HWTEST_F(DSpeakerClientTest, Release001, TestSize.Level1) */ HWTEST_F(DSpeakerClientTest, GetVolumeLevel_001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); AudioStandard::InterruptEvent eventType = {static_cast(1), static_cast(0), static_cast(0)}; speakerClient_->OnInterrupt(eventType); @@ -246,9 +230,7 @@ HWTEST_F(DSpeakerClientTest, GetVolumeLevel_001, TestSize.Level1) */ HWTEST_F(DSpeakerClientTest, SendMessage_001, TestSize.Level1) { - if (speakerClient_ == nullptr) { - return; - } + ASSERT_TRUE(speakerClient_ != nullptr); std::string content = "content"; std::string dstDevId = "dstDevId"; audioParam_.renderOpts.renderFlags = MMAP_MODE; diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp index 7c9461d43648b7a441629d677947010bdb38df1f..793084380030e899361fba7264a0a030573b962e 100644 --- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp +++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp @@ -41,9 +41,7 @@ void DAudioHdiHandlerTest::TearDown() */ HWTEST_F(DAudioHdiHandlerTest, InitHdiHandler_001, TestSize.Level1) { - if (hdiHandler_ == nullptr) { - return; - } + ASSERT_TRUE(hdiHandler_ != nullptr); EXPECT_EQ(HDF_SUCCESS, hdiHandler_->InitHdiHandler()); EXPECT_EQ(HDF_SUCCESS, hdiHandler_->InitHdiHandler()); // test repeated initialization } @@ -56,9 +54,7 @@ HWTEST_F(DAudioHdiHandlerTest, InitHdiHandler_001, TestSize.Level1) */ HWTEST_F(DAudioHdiHandlerTest, RegisterAudioDevice_001, TestSize.Level1) { - if (hdiHandler_ == nullptr) { - return; - } + ASSERT_TRUE(hdiHandler_ != nullptr); EXPECT_EQ(HDF_SUCCESS, hdiHandler_->InitHdiHandler()); hdiHandler_->audioSrvHdf_ = nullptr; std::shared_ptr callbackObjParam = std::make_shared(); @@ -80,9 +76,7 @@ HWTEST_F(DAudioHdiHandlerTest, RegisterAudioDevice_001, TestSize.Level1) */ HWTEST_F(DAudioHdiHandlerTest, RegisterAudioDevice_002, TestSize.Level1) { - if (hdiHandler_ == nullptr) { - return; - } + ASSERT_TRUE(hdiHandler_ != nullptr); EXPECT_EQ(HDF_SUCCESS, hdiHandler_->InitHdiHandler()); std::shared_ptr callbackObjParam = std::make_shared(); EXPECT_EQ(ERR_DH_AUDIO_HDI_CALL_FAILED, @@ -98,9 +92,7 @@ HWTEST_F(DAudioHdiHandlerTest, RegisterAudioDevice_002, TestSize.Level1) */ HWTEST_F(DAudioHdiHandlerTest, NotifyEvent_001, TestSize.Level1) { - if (hdiHandler_ == nullptr) { - return; - } + ASSERT_TRUE(hdiHandler_ != nullptr); EXPECT_EQ(HDF_SUCCESS, hdiHandler_->InitHdiHandler()); hdiHandler_->audioSrvHdf_ = nullptr; AudioEvent audioEvent; @@ -115,9 +107,7 @@ HWTEST_F(DAudioHdiHandlerTest, NotifyEvent_001, TestSize.Level1) */ HWTEST_F(DAudioHdiHandlerTest, NotifyEvent_002, TestSize.Level1) { - if (hdiHandler_ == nullptr) { - return; - } + ASSERT_TRUE(hdiHandler_ != nullptr); EXPECT_EQ(HDF_SUCCESS, hdiHandler_->InitHdiHandler()); hdiHandler_->audioSrvHdf_ = new MockIDAudioManager(); AudioEvent audioEvent1(AudioEventType::NOTIFY_OPEN_SPEAKER_RESULT, ""); @@ -150,9 +140,7 @@ HWTEST_F(DAudioHdiHandlerTest, NotifyEvent_002, TestSize.Level1) */ HWTEST_F(DAudioHdiHandlerTest, UnRegisterAudioDevice_001, TestSize.Level1) { - if (hdiHandler_ == nullptr) { - return; - } + ASSERT_TRUE(hdiHandler_ != nullptr); hdiHandler_->audioSrvHdf_ = nullptr; EXPECT_NE(HDF_SUCCESS, hdiHandler_->UnRegisterAudioDevice(devId_, dhId_)); } @@ -165,9 +153,7 @@ HWTEST_F(DAudioHdiHandlerTest, UnRegisterAudioDevice_001, TestSize.Level1) */ HWTEST_F(DAudioHdiHandlerTest, UnInitHdiHandler_001, TestSize.Level1) { - if (hdiHandler_ == nullptr) { - return; - } + ASSERT_TRUE(hdiHandler_ != nullptr); hdiHandler_->audioSrvHdf_ = nullptr; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, hdiHandler_->UninitHdiHandler()); } diff --git a/services/audiohdiproxy/test/unittest/daudio_manager_callback/src/daudio_manager_callback_test.cpp b/services/audiohdiproxy/test/unittest/daudio_manager_callback/src/daudio_manager_callback_test.cpp index 89971f905fc42933ef3351eb8c79263bfc8a05ee..7b3b84417ea67941b5fc2a365aee0184ee5a57ba 100644 --- a/services/audiohdiproxy/test/unittest/daudio_manager_callback/src/daudio_manager_callback_test.cpp +++ b/services/audiohdiproxy/test/unittest/daudio_manager_callback/src/daudio_manager_callback_test.cpp @@ -41,9 +41,7 @@ void DAudioManagerCallbackTest::TearDown() {} */ HWTEST_F(DAudioManagerCallbackTest, CreateStream_001, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = nullptr; EXPECT_EQ(HDF_FAILURE, manCallback_->CreateStream(streamId_)); } @@ -56,9 +54,7 @@ HWTEST_F(DAudioManagerCallbackTest, CreateStream_001, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, CreateStream_002, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); EXPECT_EQ(HDF_SUCCESS, manCallback_->DestroyStream(streamId_)); @@ -72,9 +68,7 @@ HWTEST_F(DAudioManagerCallbackTest, CreateStream_002, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, DestroyStream_001, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = nullptr; EXPECT_EQ(HDF_FAILURE, manCallback_->DestroyStream(streamId_)); } @@ -87,9 +81,7 @@ HWTEST_F(DAudioManagerCallbackTest, DestroyStream_001, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, DestroyStream_002, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); EXPECT_EQ(HDF_SUCCESS, manCallback_->DestroyStream(streamId_)); @@ -103,9 +95,7 @@ HWTEST_F(DAudioManagerCallbackTest, DestroyStream_002, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, SetParameters_001, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioParameter param; @@ -122,9 +112,7 @@ HWTEST_F(DAudioManagerCallbackTest, SetParameters_001, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, SetParameters_002, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioParameter param = { @@ -178,9 +166,7 @@ HWTEST_F(DAudioManagerCallbackTest, SetParameters_002, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, NotifyEvent_001, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); manCallback_->callback_ = nullptr; @@ -197,9 +183,7 @@ HWTEST_F(DAudioManagerCallbackTest, NotifyEvent_001, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, NotifyEvent_002, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); OHOS::HDI::DistributedAudio::Audioext::V2_0::DAudioEvent event; @@ -244,9 +228,7 @@ HWTEST_F(DAudioManagerCallbackTest, NotifyEvent_002, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, WriteStreamData_001, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); manCallback_->callback_ = nullptr; @@ -263,9 +245,7 @@ HWTEST_F(DAudioManagerCallbackTest, WriteStreamData_001, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, WriteStreamData_002, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData data; @@ -294,9 +274,7 @@ HWTEST_F(DAudioManagerCallbackTest, WriteStreamData_002, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, ReadStreamData_001, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); manCallback_->callback_ = nullptr; @@ -313,9 +291,7 @@ HWTEST_F(DAudioManagerCallbackTest, ReadStreamData_001, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, ReadStreamData_002, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData data; @@ -341,9 +317,7 @@ HWTEST_F(DAudioManagerCallbackTest, ReadStreamData_002, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, ReadMmapPosition_001, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); int32_t streamId = 0; uint64_t frames = 1; OHOS::HDI::DistributedAudio::Audioext::V2_0::CurrentTime time; @@ -360,9 +334,7 @@ HWTEST_F(DAudioManagerCallbackTest, ReadMmapPosition_001, TestSize.Level1) */ HWTEST_F(DAudioManagerCallbackTest, RefreshAshmemInfo_001, TestSize.Level1) { - if (manCallback_ == nullptr) { - return; - } + ASSERT_TRUE(manCallback_ != nullptr); int32_t streamId = 1; int fd = 1; int32_t ashmemLength = 240; diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp index a66d183a9610097099b9dfd88d8093aa3cf636b0..f7b71106ba9c2a2152bab612c88fa8c7b1747915 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp @@ -158,10 +158,7 @@ HWTEST_F(DAudioSinkDevTest, TaskOpenDSpeaker_003, TestSize.Level1) cJSON_AddNumberToObject(jobject, KEY_STREAM_USAGE, 0); cJSON_AddNumberToObject(jobject, KEY_SOURCE_TYPE, 0); char *jsonData = cJSON_PrintUnformatted(jobject); - if (jsonData == nullptr) { - cJSON_Delete(jobject); - return; - } + CHECK_NULL_AND_FREE_VOID(jsonData, jobject); std::string args(jsonData); cJSON_free(jsonData); cJSON_Delete(jobject); @@ -236,10 +233,7 @@ HWTEST_F(DAudioSinkDevTest, ParseResultFromEvent_001, TestSize.Level1) CHECK_NULL_VOID(jobject); cJSON_AddNumberToObject(jobject, KEY_RESULT, 0); char *jsonData = cJSON_PrintUnformatted(jobject); - if (jsonData == nullptr) { - cJSON_Delete(jobject); - return; - } + CHECK_NULL_AND_FREE_VOID(jsonData, jobject); std::string args1(jsonData); cJSON_free(jsonData); cJSON_Delete(jobject); @@ -302,10 +296,7 @@ HWTEST_F(DAudioSinkDevTest, TaskOpenDMic_002, TestSize.Level1) cJSON_AddNumberToObject(jobject, KEY_STREAM_USAGE, 0); cJSON_AddNumberToObject(jobject, KEY_SOURCE_TYPE, 0); char *jsonData = cJSON_PrintUnformatted(jobject); - if (jsonData == nullptr) { - cJSON_Delete(jobject); - return; - } + CHECK_NULL_AND_FREE_VOID(jsonData, jobject); std::string args(jsonData); cJSON_free(jsonData); cJSON_Delete(jobject); 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 56814fabd44af206dcd3520310a330dcc8fd916f..de66db64d5de85083fb0f5c8d5904affbf4679df 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 @@ -105,15 +105,11 @@ HWTEST_F(DAudioSinkManagerTest, CreateAudioDevice_001, TestSize.Level1) std::string devId = "devId"; std::string params = "params"; auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - return; - } + ASSERT_TRUE(samgr != nullptr); sptr loadCallback(new DAudioSinkLoadCallback(params)); samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); - if (remoteObject == nullptr) { - return; - } + ASSERT_TRUE(remoteObject != nullptr); sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject)); daudioSinkManager.ipcSinkCallback_ = dAudioSinkIpcCallbackProxy; EXPECT_EQ(ERR_DH_AUDIO_NOT_SUPPORT, daudioSinkManager.CreateAudioDevice(devId)); @@ -139,15 +135,11 @@ HWTEST_F(DAudioSinkManagerTest, InitAudioDevice_001, TestSize.Level1) std::shared_ptr dev = nullptr; EXPECT_NE(DH_SUCCESS, daudioSinkManager.InitAudioDevice(dev, devId, true)); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - return; - } + ASSERT_TRUE(samgr != nullptr); sptr loadCallback(new DAudioSinkLoadCallback(params)); samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); - if (remoteObject == nullptr) { - return; - } + ASSERT_TRUE(remoteObject != nullptr); sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject)); daudioSinkManager.ipcSinkCallback_ = dAudioSinkIpcCallbackProxy; dev = std::make_shared(devId, dAudioSinkIpcCallbackProxy); @@ -181,15 +173,11 @@ HWTEST_F(DAudioSinkManagerTest, PauseDistributedHardware_001, TestSize.Level1) std::string devId = "devId"; std::string params = "params"; auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - return; - } + ASSERT_TRUE(samgr != nullptr); sptr loadCallback(new DAudioSinkLoadCallback(params)); samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); - if (remoteObject == nullptr) { - return; - } + ASSERT_TRUE(remoteObject != nullptr); sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject)); auto dev = std::make_shared(networkId, dAudioSinkIpcCallbackProxy); EXPECT_EQ(DH_SUCCESS, daudioSinkManager.PauseDistributedHardware(networkId)); @@ -213,15 +201,11 @@ HWTEST_F(DAudioSinkManagerTest, VerifySecurityLevel_001, TestSize.Level1) std::string networkId = "networkId"; std::string params = "params"; auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - return; - } + ASSERT_TRUE(samgr != nullptr); sptr loadCallback(new DAudioSinkLoadCallback(params)); samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); - if (remoteObject == nullptr) { - return; - } + ASSERT_TRUE(remoteObject != nullptr); sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject)); daudioSinkManager.ipcSinkCallback_ = dAudioSinkIpcCallbackProxy; EXPECT_EQ(DH_SUCCESS, daudioSinkManager.VerifySecurityLevel(devId));