openharmony/telephony_core_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_core_service synced 2024-11-23 16:09:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1173 智能指针delete问题

Browse Source 
Merge pull request !1173 from wangziming/master
This commit is contained in:
openharmony_ci 2023-04-04 13:34:30 +00:00 committed by Gitee
commit 84f1c0adf5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/unittest/core_service_gtest/network_search_test.cpp
View File

@ -1846,7 +1846,6 @@ HWTEST_F(NetworkSearchTest, Telephony_NetworkSearch_RegImsRegInfoCallback_0100,
NetworkSearchTest::imsRegStateCallbackList_.push_back(imsRegStateCallback);
} else {
if (imsRegStateCallback.imsCallback != nullptr) {
delete imsRegStateCallback.imsCallback;
imsRegStateCallback.imsCallback = nullptr;
}
}
@ -1870,7 +1869,6 @@ HWTEST_F(NetworkSearchTest, Telephony_NetworkSearch_RegImsRegInfoCallback_0200,
sptr<ImsRegInfoCallback> imsRegInfoCallback = new ImsRegInfoCallbackGtest();
ret = NetworkSearchTest::telephonyService_->RegisterImsRegInfoCallback(
INVALID_SLOT_ID, DEFAULT_TYPE, imsRegInfoCallback);
delete imsRegInfoCallback;
imsRegInfoCallback = nullptr;
EXPECT_EQ(TELEPHONY_ERR_SLOTID_INVALID, ret);
}
@ -1890,7 +1888,6 @@ HWTEST_F(NetworkSearchTest, Telephony_NetworkSearch_RegImsRegInfoCallback_0300,
sptr<ImsRegInfoCallback> imsRegInfoCallback = new ImsRegInfoCallbackGtest();
int ret = NetworkSearchTest::telephonyService_->RegisterImsRegInfoCallback(
SLOT_ID, static_cast<ImsServiceType>(INVALID_TYPE), imsRegInfoCallback);
delete imsRegInfoCallback;
imsRegInfoCallback = nullptr;
EXPECT_EQ(TELEPHONY_ERR_ARGUMENT_INVALID, ret);
}
@ -1933,7 +1930,6 @@ HWTEST_F(NetworkSearchTest, Telephony_NetworkSearch_RegImsRegInfoCallback_0500,
NetworkSearchTest::imsRegStateCallbackList_.push_back(imsRegStateCallback);
} else {
if (imsRegStateCallback.imsCallback != nullptr) {
delete imsRegStateCallback.imsCallback;
imsRegStateCallback.imsCallback = nullptr;
}
}
@ -1955,7 +1951,6 @@ HWTEST_F(NetworkSearchTest, Telephony_NetworkSearch_RegImsRegInfoCallback_0600,
sptr<ImsRegInfoCallback> imsRegInfoCallback = new ImsRegInfoCallbackGtest();
int ret = NetworkSearchTest::telephonyService_->RegisterImsRegInfoCallback(
SLOT_ID1, static_cast<ImsServiceType>(INVALID_TYPE), imsRegInfoCallback);
delete imsRegInfoCallback;
imsRegInfoCallback = nullptr;
EXPECT_EQ(TELEPHONY_ERR_ARGUMENT_INVALID, ret);
}
@ -2038,7 +2033,6 @@ HWTEST_F(NetworkSearchTest, Telephony_NetworkSearch_UnRegImsRegInfoCallback_0100
for (; itor != NetworkSearchTest::imsRegStateCallbackList_.end(); ++itor) {
if (itor->slotId == SLOT_ID && itor->imsSrvType == DEFAULT_TYPE) {
if (itor->imsCallback != nullptr) {
delete itor->imsCallback;
itor->imsCallback = nullptr;
}
NetworkSearchTest::imsRegStateCallbackList_.erase(itor);
@ -2118,7 +2112,6 @@ HWTEST_F(NetworkSearchTest, Telephony_NetworkSearch_UnRegImsRegInfoCallback_0500
for (; itor != NetworkSearchTest::imsRegStateCallbackList_.end(); ++itor) {
if (itor->slotId == SLOT_ID1 && itor->imsSrvType == DEFAULT_TYPE) {
if (itor->imsCallback != nullptr) {
delete itor->imsCallback;
itor->imsCallback = nullptr;
}
NetworkSearchTest::imsRegStateCallbackList_.erase(itor);