From 136734b69a5567a5198b90bd1f22781c2fb3608b Mon Sep 17 00:00:00 2001 From: lishuo Date: Tue, 27 May 2025 20:37:14 +0800 Subject: [PATCH] fix:dt Signed-off-by: lishuo --- .../src/call_manager1_gtest.cpp | 33 ------------------- .../src/call_manager2_gtest.cpp | 7 ---- .../src/call_manager4_gtest.cpp | 5 --- .../src/call_manager5_gtest.cpp | 1 - .../src/call_manager8_gtest.cpp | 8 ----- 5 files changed, 54 deletions(-) diff --git a/test/unittest/call_manager_gtest/src/call_manager1_gtest.cpp b/test/unittest/call_manager_gtest/src/call_manager1_gtest.cpp index 0e7db8fb..28416fc4 100644 --- a/test/unittest/call_manager_gtest/src/call_manager1_gtest.cpp +++ b/test/unittest/call_manager_gtest/src/call_manager1_gtest.cpp @@ -201,7 +201,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_RejectCall_0100, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; std::u16string textMessage = Str8ToStr16("this is a test message"); EXPECT_NE(CallManagerGtest::clientPtr_->RejectCall(callId, true, textMessage), RETURN_VALUE_IS_ZERO); @@ -217,7 +216,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_RejectCall_0200, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; std::u16string textMessage = Str8ToStr16("this is a test message"); EXPECT_NE(CallManagerGtest::clientPtr_->RejectCall(callId, true, textMessage), RETURN_VALUE_IS_ZERO); @@ -234,7 +232,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_RejectCall_0300, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_NE(bluetoothCallClient.RejectCall(), RETURN_VALUE_IS_ZERO); } @@ -250,7 +247,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HangUpCall_0100, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; EXPECT_NE(CallManagerGtest::clientPtr_->HangUpCall(callId), RETURN_VALUE_IS_ZERO); } @@ -267,7 +263,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HangUpCall_0200, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); int32_t callId = INVALID_NEGATIVE_ID; @@ -284,7 +279,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HangUpCall_0300, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); int32_t callId = INVALID_NEGATIVE_ID; @@ -302,7 +296,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HangUpCall_0400, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_NE(bluetoothCallClient.HangUpCall(), RETURN_VALUE_IS_ZERO); } @@ -318,7 +311,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_GetCallState_0100, Function | M if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_GE(CallManagerGtest::clientPtr_->GetCallState(), (int32_t)CallStateToApp::CALL_STATE_IDLE); } @@ -334,7 +326,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_GetCallState_0200, Function | M if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); EXPECT_GE(CallManagerGtest::clientPtr_->GetCallState(), (int32_t)CallStateToApp::CALL_STATE_IDLE); @@ -351,7 +342,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_GetCallState_0300, Function | M if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_EQ(bluetoothCallClient.GetCallState(), TELEPHONY_SUCCESS); } @@ -371,7 +361,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_ReportAudioDeviceInfo_0100, Tes if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_GE(CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_), RETURN_VALUE_IS_ZERO); CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_OFFHOOK, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_GE(CallManagerGtest::clientPtr_->ReportAudioDeviceInfo(), RETURN_VALUE_IS_ZERO); @@ -423,7 +412,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HoldCall_0100, Function | Mediu if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; EXPECT_NE(CallManagerGtest::clientPtr_->HoldCall(callId), RETURN_VALUE_IS_ZERO); } @@ -440,7 +428,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HoldCall_0200, Function | Mediu if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); int32_t callId = INVALID_NEGATIVE_ID; @@ -457,7 +444,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HoldCall_0300, Function | Mediu if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); int32_t callId = INVALID_NEGATIVE_ID; @@ -475,7 +461,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HoldCall_0400, Function | Mediu if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_NE(bluetoothCallClient.HoldCall(), RETURN_VALUE_IS_ZERO); } @@ -491,7 +476,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_UnHoldCall_0100, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; EXPECT_NE(CallManagerGtest::clientPtr_->UnHoldCall(callId), RETURN_VALUE_IS_ZERO); } @@ -508,7 +492,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_UnHoldCall_0200, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); int32_t callId = INVALID_NEGATIVE_ID; @@ -525,7 +508,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_UnHoldCall_0300, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; EXPECT_NE(CallManagerGtest::clientPtr_->UnHoldCall(callId), RETURN_VALUE_IS_ZERO); } @@ -541,7 +523,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_UnHoldCall_0400, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_NE(bluetoothCallClient.UnHoldCall(), RETURN_VALUE_IS_ZERO); } @@ -557,7 +538,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SwitchCall_0100, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; EXPECT_NE(CallManagerGtest::clientPtr_->SwitchCall(callId), RETURN_VALUE_IS_ZERO); } @@ -572,7 +552,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SwitchCall_0200, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; EXPECT_NE(CallManagerGtest::clientPtr_->SwitchCall(callId), RETURN_VALUE_IS_ZERO); } @@ -588,7 +567,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SwitchCall_0300, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_NE(bluetoothCallClient.SwitchCall(), RETURN_VALUE_IS_ZERO); } @@ -608,7 +586,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SwitchCall_0400, Function | Med if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); std::string phoneNumber = "44444444444"; int32_t callId = INVALID_NEGATIVE_ID; InitDialInfo( @@ -638,7 +615,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HasCall_0100, Function | Medium if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callState = CallManagerGtest::clientPtr_->GetCallState(); int32_t idleState = (int32_t)CallStateToApp::CALL_STATE_IDLE; ASSERT_GE(callState, idleState); @@ -657,7 +633,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HasCall_0200, Function | Medium return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); std::string phoneNumber = ""; InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); @@ -678,7 +653,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HasCall_0300, Function | Medium if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); bool isRet = CallManagerGtest::clientPtr_->HasCall(); EXPECT_EQ(isRet, true); } @@ -694,7 +668,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_HasCall_0400, Function | Medium if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); ASSERT_GE(CallManagerGtest::clientPtr_->GetCallState(), (int32_t)CallStateToApp::CALL_STATE_IDLE); EXPECT_NE(bluetoothCallClient.HasCall(), false); } @@ -714,7 +687,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_IsNewCallAllowed_0100, Function if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); std::string phoneNumber = "55555555555"; InitDialInfo(SIM1_SLOTID, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); @@ -744,7 +716,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_IsNewCallAllowed_0200, Function if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); bool enabled = false; EXPECT_EQ(bluetoothCallClient.IsNewCallAllowed(enabled), TELEPHONY_SUCCESS); EXPECT_EQ(enabled, true); @@ -762,7 +733,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_IsRinging_0100, Function | Medi if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callState = CallManagerGtest::clientPtr_->GetCallState(); int32_t idleState = (int32_t)CallStateToApp::CALL_STATE_IDLE; ASSERT_GE(callState, idleState); @@ -782,7 +752,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_IsRinging_0200, Function | Medi if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callState = CallManagerGtest::clientPtr_->GetCallState(); int32_t idleState = (int32_t)CallStateToApp::CALL_STATE_IDLE; ASSERT_GE(callState, idleState); @@ -848,7 +817,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_CombineConference_0400, Functio return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); std::string phoneNumber = "10086"; InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); @@ -919,7 +887,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SeparateConference_0400, Functi return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); EXPECT_GE(CallManagerGtest::clientPtr_->DialCall(Str8ToStr16("10086"), dialInfo_), RETURN_VALUE_IS_ZERO); diff --git a/test/unittest/call_manager_gtest/src/call_manager2_gtest.cpp b/test/unittest/call_manager_gtest/src/call_manager2_gtest.cpp index 5d1d0e39..99dca275 100644 --- a/test/unittest/call_manager_gtest/src/call_manager2_gtest.cpp +++ b/test/unittest/call_manager_gtest/src/call_manager2_gtest.cpp @@ -852,7 +852,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_DialCall_2000, Function | Mediu HangUpCall(); } std::string phoneNumber = "10086"; - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); if (HasSimCard(SIM1_SLOTID)) { InitDialInfo( SIM1_SLOTID, (int32_t)VideoStateType::TYPE_VOICE, DIAL_SCENE_TEST, (int32_t)DialType::DIAL_CARRIER_TYPE); @@ -906,7 +905,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_DialCall_2100, Function | Mediu } std::string phoneNumber = "10086,123"; if (HasSimCard(SIM1_SLOTID)) { - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( SIM1_SLOTID, (int32_t)VideoStateType::TYPE_VOICE, DIAL_SCENE_TEST, (int32_t)DialType::DIAL_CARRIER_TYPE); EXPECT_EQ(CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_), RETURN_VALUE_IS_ZERO); @@ -917,7 +915,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_DialCall_2100, Function | Mediu } if (HasSimCard(SIM2_SLOTID)) { - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo( SIM2_SLOTID, (int32_t)VideoStateType::TYPE_VOICE, DIAL_SCENE_TEST, (int32_t)DialType::DIAL_CARRIER_TYPE); EXPECT_EQ(CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_), RETURN_VALUE_IS_ZERO); @@ -944,7 +941,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_AnswerCall_0100, Function | Med if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_NEGATIVE_ID; int32_t videoState = (int32_t)VideoStateType::TYPE_VOICE; EXPECT_NE(CallManagerGtest::clientPtr_->AnswerCall(callId, videoState), RETURN_VALUE_IS_ZERO); @@ -962,7 +958,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_AnswerCall_0200, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_POSITIVE_ID; int32_t videoState = INVALID_NEGATIVE_ID; EXPECT_NE(CallManagerGtest::clientPtr_->AnswerCall(callId, videoState), RETURN_VALUE_IS_ZERO); @@ -978,7 +973,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_AnswerCall_0300, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t callId = INVALID_POSITIVE_ID; int32_t videoState = INVALID_NEGATIVE_ID; EXPECT_NE(CallManagerGtest::clientPtr_->AnswerCall(callId, videoState), RETURN_VALUE_IS_ZERO); @@ -995,7 +989,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_AnswerCall_0400, Function | Med if (!HasSimCard(SIM1_SLOTID) && !HasSimCard(SIM2_SLOTID)) { return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); EXPECT_NE(bluetoothCallClient.AnswerCall(), RETURN_VALUE_IS_ZERO); } } // namespace Telephony diff --git a/test/unittest/call_manager_gtest/src/call_manager4_gtest.cpp b/test/unittest/call_manager_gtest/src/call_manager4_gtest.cpp index 6c1e7ad5..826c074b 100644 --- a/test/unittest/call_manager_gtest/src/call_manager4_gtest.cpp +++ b/test/unittest/call_manager_gtest/src/call_manager4_gtest.cpp @@ -201,7 +201,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_KickOutFromConference_0400, Fun return; } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); std::string number = "10086"; InitDialInfo( 0, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); @@ -631,7 +630,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_StartDtmf_0400, Function | Medi if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); std::string phoneNumber = "10086"; InitDialInfo(SIM1_SLOTID, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); @@ -710,7 +708,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_StopDtmf_0400, Function | Mediu if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo(SIM1_SLOTID, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); @@ -775,7 +772,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_PostDialProceed_0300, TestSize. HangUpCall(); } if (HasSimCard(SIM1_SLOTID)) { - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo(SIM1_SLOTID, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16("10086;123"), dialInfo_); @@ -792,7 +788,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_PostDialProceed_0300, TestSize. } } if (HasSimCard(SIM2_SLOTID)) { - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); InitDialInfo(SIM2_SLOTID, (int32_t)VideoStateType::TYPE_VOICE, (int32_t)DialScene::CALL_NORMAL, (int32_t)DialType::DIAL_CARRIER_TYPE); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16("10086;456"), dialInfo_); diff --git a/test/unittest/call_manager_gtest/src/call_manager5_gtest.cpp b/test/unittest/call_manager_gtest/src/call_manager5_gtest.cpp index 40f3bb58..71891765 100644 --- a/test/unittest/call_manager_gtest/src/call_manager5_gtest.cpp +++ b/test/unittest/call_manager_gtest/src/call_manager5_gtest.cpp @@ -969,7 +969,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetAudioDevice_0100, Function | if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); diff --git a/test/unittest/call_manager_gtest/src/call_manager8_gtest.cpp b/test/unittest/call_manager_gtest/src/call_manager8_gtest.cpp index e0d89834..d22d377e 100644 --- a/test/unittest/call_manager_gtest/src/call_manager8_gtest.cpp +++ b/test/unittest/call_manager_gtest/src/call_manager8_gtest.cpp @@ -212,7 +212,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetAudioDevice_0200, Function | if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); AudioDevice audioDevice = { @@ -245,7 +244,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetAudioDevice_0300, Function | if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); AudioDevice audioDevice = { @@ -278,7 +276,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetAudioDevice_0400, Function | HangUpCall(); } std::string phoneNumber = "99999999999"; - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); AudioDevice audioDevice = { @@ -311,7 +308,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetAudioDevice_0500, Function | if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); AudioDevice audioDevice = { @@ -344,7 +340,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetAudioDevice_0600, Function | if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); AudioDevice audioDevice = { @@ -377,7 +372,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetAudioDevice_0700, Function | if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); AudioDevice audioDevice = { @@ -411,7 +405,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetMuted_0100, Function | Mediu if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); bool muted = true; @@ -463,7 +456,6 @@ HWTEST_F(CallManagerGtest, Telephony_CallManager_SetMuted_0300, Function | Mediu if (clientPtr_->GetCallState() == static_cast(CallStateToApp::CALL_STATE_OFFHOOK)) { HangUpCall(); } - CallInfoManager::LockCallState(false, (int32_t)CallStateToApp::CALL_STATE_IDLE, SLEEP_200_MS, SLEEP_30000_MS); int32_t ret = CallManagerGtest::clientPtr_->DialCall(Str8ToStr16(phoneNumber), dialInfo_); EXPECT_GE(ret, RETURN_VALUE_IS_ZERO); bool muted = false; -- Gitee