From 8020fdbdea2b1a896b555810a7ad681d19f1586f Mon Sep 17 00:00:00 2001 From: fanrui0 Date: Thu, 8 May 2025 19:55:24 +0800 Subject: [PATCH 1/2] modify dt crash Signed-off-by: fanrui0 --- .../imstest/ims_callback_proxy_test.cpp | 108 ++++++++---------- test/unittest/imstest/zero_branch1_test.cpp | 6 +- 2 files changed, 50 insertions(+), 64 deletions(-) diff --git a/test/unittest/imstest/ims_callback_proxy_test.cpp b/test/unittest/imstest/ims_callback_proxy_test.cpp index 8bc33964..8eb9a903 100644 --- a/test/unittest/imstest/ims_callback_proxy_test.cpp +++ b/test/unittest/imstest/ims_callback_proxy_test.cpp @@ -73,48 +73,42 @@ HWTEST_F(ImsCallbackProxyTest, cellular_call_ImsCallCallbackProxy_0001, Function const sptr imsCallCallback_ = (std::make_unique()).release(); auto callCallbackProxy = (std::make_unique(imsCallCallback_->AsObject().GetRefPtr())).release(); - ASSERT_TRUE(callCallbackProxy != nullptr); + EXPECT_TRUE(callCallbackProxy != nullptr); for (int32_t slotId = 0; slotId < SIM_SLOT_COUNT; slotId++) { if (!HasSimCard(slotId)) { continue; } - EventFwk::MatchingSkills matchingSkills; - matchingSkills.AddEvent(EventFwk::CommonEventSupport::COMMON_EVENT_OPERATOR_CONFIG_CHANGED); - EventFwk::CommonEventSubscribeInfo subscriberInfo(matchingSkills); - auto handler = std::make_shared(subscriberInfo); - handler->SetSlotId(slotId); - handler->RegisterImsCallCallbackHandler(); RadioResponseInfo rilRadioResponse; rilRadioResponse.error = ErrType::ERR_GENERIC_FAILURE; - ASSERT_EQ(callCallbackProxy->DialResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->HangUpResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->RejectWithReasonResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->AnswerResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->HoldCallResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->UnHoldCallResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->SwitchCallResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->StartDtmfResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_GE(callCallbackProxy->SendDtmfResponse(slotId, rilRadioResponse, DEFAULT_INDEX), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->StopDtmfResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->SetImsSwitchResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->GetImsSwitchResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->GetImsCallsDataResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->CallStateChangeReport(slotId), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->DialResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->HangUpResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->RejectWithReasonResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->AnswerResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->HoldCallResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->UnHoldCallResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SwitchCallResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->StartDtmfResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_GE(callCallbackProxy->SendDtmfResponse(slotId, rilRadioResponse, DEFAULT_INDEX), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->StopDtmfResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetImsSwitchResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetImsSwitchResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetImsCallsDataResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->CallStateChangeReport(slotId), TELEPHONY_SUCCESS); ImsCurrentCallList imsCallList; imsCallList.callSize = 0; - ASSERT_EQ(callCallbackProxy->GetImsCallsDataResponse(slotId, imsCallList), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetImsCallsDataResponse(slotId, imsCallList), TELEPHONY_SUCCESS); DisconnectedDetails details; - ASSERT_EQ(callCallbackProxy->LastCallFailReasonResponse(slotId, details), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->LastCallFailReasonResponse(slotId, details), TELEPHONY_SUCCESS); RingbackVoice ringback; - ASSERT_EQ(callCallbackProxy->CallRingBackReport(slotId, ringback), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->CallRingBackReport(slotId, ringback), TELEPHONY_SUCCESS); int32_t active = 0; - ASSERT_EQ(callCallbackProxy->GetImsSwitchResponse(slotId, active), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetImsSwitchResponse(slotId, active), TELEPHONY_SUCCESS); ImsCapFromChip imsCap = {0}; - ASSERT_EQ(callCallbackProxy->GetImsCapResponse(slotId, imsCap), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetImsCapResponse(slotId, imsCap), TELEPHONY_SUCCESS); MuteControlResponse muteResponse; - ASSERT_EQ(callCallbackProxy->SetMuteResponse(slotId, muteResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->CombineConferenceResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->InviteToConferenceResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetMuteResponse(slotId, muteResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->CombineConferenceResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->InviteToConferenceResponse(slotId, rilRadioResponse), TELEPHONY_SUCCESS); } } @@ -128,47 +122,41 @@ HWTEST_F(ImsCallbackProxyTest, cellular_call_ImsCallCallbackProxy_0002, Function const sptr imsCallCallback_ = (std::make_unique()).release(); auto callCallbackProxy = (std::make_unique(imsCallCallback_->AsObject().GetRefPtr())).release(); - ASSERT_TRUE(callCallbackProxy != nullptr); + EXPECT_TRUE(callCallbackProxy != nullptr); for (int32_t slotId = 0; slotId < SIM_SLOT_COUNT; slotId++) { if (!HasSimCard(slotId)) { continue; } - EventFwk::MatchingSkills matchingSkills; - matchingSkills.AddEvent(EventFwk::CommonEventSupport::COMMON_EVENT_OPERATOR_CONFIG_CHANGED); - EventFwk::CommonEventSubscribeInfo subscriberInfo(matchingSkills); - auto handler = std::make_shared(subscriberInfo); - handler->SetSlotId(slotId); - handler->RegisterImsCallCallbackHandler(); GetClipResult clipResult; clipResult.result.index = INVALID_INDEX; - ASSERT_EQ(callCallbackProxy->GetClipResponse(slotId, clipResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetClipResponse(slotId, clipResult), TELEPHONY_SUCCESS); GetClirResult clirResult; clirResult.result.index = INVALID_INDEX; - ASSERT_EQ(callCallbackProxy->GetClirResponse(slotId, clirResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetClirResponse(slotId, clirResult), TELEPHONY_SUCCESS); SsBaseResult normalResult; normalResult.index = DEFAULT_INDEX; - ASSERT_EQ(callCallbackProxy->SetClipResponse(slotId, normalResult), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->SetClirResponse(slotId, normalResult), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->SetCallTransferResponse(slotId, normalResult), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->SetCallRestrictionResponse(slotId, normalResult), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->SetCallWaitingResponse(slotId, normalResult), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->SetColrResponse(slotId, normalResult), TELEPHONY_SUCCESS); - ASSERT_EQ(callCallbackProxy->SetColpResponse(slotId, normalResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetClipResponse(slotId, normalResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetClirResponse(slotId, normalResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetCallTransferResponse(slotId, normalResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetCallRestrictionResponse(slotId, normalResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetCallWaitingResponse(slotId, normalResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetColrResponse(slotId, normalResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->SetColpResponse(slotId, normalResult), TELEPHONY_SUCCESS); CallForwardQueryInfoList callList; callList.result.index = INVALID_INDEX; - ASSERT_EQ(callCallbackProxy->GetCallTransferResponse(slotId, callList), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetCallTransferResponse(slotId, callList), TELEPHONY_SUCCESS); CallRestrictionResult crResult; crResult.result.index = INVALID_INDEX; - ASSERT_EQ(callCallbackProxy->GetCallRestrictionResponse(slotId, crResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetCallRestrictionResponse(slotId, crResult), TELEPHONY_SUCCESS); CallWaitResult cwResult; cwResult.result.index = INVALID_INDEX; - ASSERT_EQ(callCallbackProxy->GetCallWaitingResponse(slotId, cwResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetCallWaitingResponse(slotId, cwResult), TELEPHONY_SUCCESS); GetColrResult colrResult; colrResult.result.index = INVALID_INDEX; - ASSERT_EQ(callCallbackProxy->GetColrResponse(slotId, colrResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetColrResponse(slotId, colrResult), TELEPHONY_SUCCESS); GetColpResult colpResult; colpResult.result.index = INVALID_INDEX; - ASSERT_EQ(callCallbackProxy->GetColpResponse(slotId, colpResult), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->GetColpResponse(slotId, colpResult), TELEPHONY_SUCCESS); } } @@ -182,35 +170,29 @@ HWTEST_F(ImsCallbackProxyTest, cellular_call_ImsCallCallbackProxy_0003, Function const sptr imsCallCallback_ = (std::make_unique()).release(); auto callCallbackProxy = (std::make_unique(imsCallCallback_->AsObject().GetRefPtr())).release(); - ASSERT_TRUE(callCallbackProxy != nullptr); + EXPECT_TRUE(callCallbackProxy != nullptr); for (int32_t slotId = 0; slotId < SIM_SLOT_COUNT; slotId++) { if (!HasSimCard(slotId)) { continue; } - EventFwk::MatchingSkills matchingSkills; - matchingSkills.AddEvent(EventFwk::CommonEventSupport::COMMON_EVENT_OPERATOR_CONFIG_CHANGED); - EventFwk::CommonEventSubscribeInfo subscriberInfo(matchingSkills); - auto handler = std::make_shared(subscriberInfo); - handler->SetSlotId(slotId); - handler->RegisterImsCallCallbackHandler(); ImsCallModeReceiveInfo callModeReceiveInfo; callModeReceiveInfo.callIndex = DEFAULT_INDEX; - ASSERT_EQ( + EXPECT_EQ( callCallbackProxy->ReceiveUpdateCallMediaModeResponse(slotId, callModeReceiveInfo), TELEPHONY_SUCCESS); - ASSERT_EQ( + EXPECT_EQ( callCallbackProxy->ReceiveUpdateCallMediaModeRequest(slotId, callModeReceiveInfo), TELEPHONY_SUCCESS); ImsCallSessionEventInfo callSessionEventInfo; callSessionEventInfo.callIndex = DEFAULT_INDEX; - ASSERT_EQ(callCallbackProxy->CallSessionEventChanged(slotId, callSessionEventInfo), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->CallSessionEventChanged(slotId, callSessionEventInfo), TELEPHONY_SUCCESS); ImsCallPeerDimensionsInfo callPeerDimensionsInfo; callPeerDimensionsInfo.callIndex = DEFAULT_INDEX; - ASSERT_EQ(callCallbackProxy->PeerDimensionsChanged(slotId, callPeerDimensionsInfo), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->PeerDimensionsChanged(slotId, callPeerDimensionsInfo), TELEPHONY_SUCCESS); ImsCallDataUsageInfo callDataUsageInfo; callDataUsageInfo.callIndex = DEFAULT_INDEX; - ASSERT_EQ(callCallbackProxy->CallDataUsageChanged(slotId, callDataUsageInfo), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->CallDataUsageChanged(slotId, callDataUsageInfo), TELEPHONY_SUCCESS); CameraCapabilitiesInfo cameraCapabilitiesInfo; cameraCapabilitiesInfo.callIndex = DEFAULT_INDEX; - ASSERT_EQ(callCallbackProxy->CameraCapabilitiesChanged(slotId, cameraCapabilitiesInfo), TELEPHONY_SUCCESS); + EXPECT_EQ(callCallbackProxy->CameraCapabilitiesChanged(slotId, cameraCapabilitiesInfo), TELEPHONY_SUCCESS); } } } // namespace Telephony diff --git a/test/unittest/imstest/zero_branch1_test.cpp b/test/unittest/imstest/zero_branch1_test.cpp index 35667577..b918484b 100644 --- a/test/unittest/imstest/zero_branch1_test.cpp +++ b/test/unittest/imstest/zero_branch1_test.cpp @@ -56,6 +56,7 @@ const int32_t SIM2_SLOTID = 1; const int32_t ACTIVATE_ACTION = 1; const std::string PHONE_NUMBER = "00000000"; const int32_t DEFAULT_INDEX = 1; +const int32_t FIVE_MINUTES = 5; } // namespace class DemoHandler : public AppExecFwk::EventHandler { @@ -88,7 +89,10 @@ void ZeroBranch1Test::TearDownTestCase() {} void ZeroBranch1Test::SetUp() {} -void ZeroBranch1Test::TearDown() {} +void ZeroBranch1Test::TearDown() +{ + std::this_thread::sleep_for(std::chrono::seconds(FIVE_MINUTES)); +} int32_t ZeroBranch1Test::InitCellularCallInfo(int32_t accountId, std::string phonenumber, CellularCallInfo &callInfo) { -- Gitee From c1ddd5d823c5c1becd281b7989e86997990fe2cf Mon Sep 17 00:00:00 2001 From: fanrui0 Date: Thu, 8 May 2025 19:59:15 +0800 Subject: [PATCH 2/2] modify dt crash Signed-off-by: fanrui0 --- .vscode/settings.json | 70 +++++++++++++++++++ .../imstest/ims_callback_proxy_test.cpp | 6 +- 2 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..b5b407cc --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,70 @@ +{ + "files.associations": { + "algorithm": "cpp", + "atomic": "cpp", + "bit": "cpp", + "cctype": "cpp", + "charconv": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "compare": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "exception": "cpp", + "format": "cpp", + "fstream": "cpp", + "initializer_list": "cpp", + "ios": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "iterator": "cpp", + "limits": "cpp", + "list": "cpp", + "locale": "cpp", + "map": "cpp", + "memory": "cpp", + "mutex": "cpp", + "new": "cpp", + "optional": "cpp", + "ostream": "cpp", + "random": "cpp", + "ratio": "cpp", + "regex": "cpp", + "shared_mutex": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "streambuf": "cpp", + "string": "cpp", + "system_error": "cpp", + "thread": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "typeinfo": "cpp", + "unordered_map": "cpp", + "utility": "cpp", + "vector": "cpp", + "xfacet": "cpp", + "xhash": "cpp", + "xiosbase": "cpp", + "xlocale": "cpp", + "xlocbuf": "cpp", + "xlocinfo": "cpp", + "xlocmes": "cpp", + "xlocmon": "cpp", + "xlocnum": "cpp", + "xloctime": "cpp", + "xmemory": "cpp", + "xstring": "cpp", + "xtr1common": "cpp", + "xtree": "cpp", + "xutility": "cpp" + } +} \ No newline at end of file diff --git a/test/unittest/imstest/ims_callback_proxy_test.cpp b/test/unittest/imstest/ims_callback_proxy_test.cpp index 8eb9a903..7326fb79 100644 --- a/test/unittest/imstest/ims_callback_proxy_test.cpp +++ b/test/unittest/imstest/ims_callback_proxy_test.cpp @@ -73,7 +73,7 @@ HWTEST_F(ImsCallbackProxyTest, cellular_call_ImsCallCallbackProxy_0001, Function const sptr imsCallCallback_ = (std::make_unique()).release(); auto callCallbackProxy = (std::make_unique(imsCallCallback_->AsObject().GetRefPtr())).release(); - EXPECT_TRUE(callCallbackProxy != nullptr); + ASSERT_TRUE(callCallbackProxy != nullptr); for (int32_t slotId = 0; slotId < SIM_SLOT_COUNT; slotId++) { if (!HasSimCard(slotId)) { continue; @@ -122,7 +122,7 @@ HWTEST_F(ImsCallbackProxyTest, cellular_call_ImsCallCallbackProxy_0002, Function const sptr imsCallCallback_ = (std::make_unique()).release(); auto callCallbackProxy = (std::make_unique(imsCallCallback_->AsObject().GetRefPtr())).release(); - EXPECT_TRUE(callCallbackProxy != nullptr); + ASSERT_TRUE(callCallbackProxy != nullptr); for (int32_t slotId = 0; slotId < SIM_SLOT_COUNT; slotId++) { if (!HasSimCard(slotId)) { continue; @@ -170,7 +170,7 @@ HWTEST_F(ImsCallbackProxyTest, cellular_call_ImsCallCallbackProxy_0003, Function const sptr imsCallCallback_ = (std::make_unique()).release(); auto callCallbackProxy = (std::make_unique(imsCallCallback_->AsObject().GetRefPtr())).release(); - EXPECT_TRUE(callCallbackProxy != nullptr); + ASSERT_TRUE(callCallbackProxy != nullptr); for (int32_t slotId = 0; slotId < SIM_SLOT_COUNT; slotId++) { if (!HasSimCard(slotId)) { continue; -- Gitee