openharmony/telephony_core_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_core_service synced 2025-02-17 07:47:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2272 修改用例断言问题

Browse Source 
Merge pull request !2272 from rsin/master
This commit is contained in:
openharmony_ci 2024-09-12 07:37:24 +00:00 committed by Gitee
commit f113080b38
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/unittest/core_service_gtest/vcard_test.cpp
View File

@ -228,7 +228,7 @@ HWTEST_F(VcardTest, Telephony_VCardTest_000, Function | MediumTest | Level2)
EXPECT_GE(errorCode, TELEPHONY_SUCCESS);
} else {
TELEPHONY_LOGE("VCardTest CreateDataShareHelper == null");
EXPECT_TRUE(true);
EXPECT_NE(dataShareHelper, nullptr);
}
}
@ -261,7 +261,7 @@ HWTEST_F(VcardTest, Telephony_VCardTest_101, Function | MediumTest | Level2)
}
} else {
TELEPHONY_LOGE("VCardTest CreateDataShareHelper == null");
EXPECT_TRUE(true);
EXPECT_NE(dataShareHelper, nullptr);
}
}
@ -298,7 +298,7 @@ HWTEST_F(VcardTest, Telephony_VCardTest_102, Function | MediumTest | Level2)
}
} else {
TELEPHONY_LOGE("VCardTest CreateDataShareHelper == null");
EXPECT_TRUE(true);
EXPECT_NE(dataShareHelper, nullptr);
}
}
@ -1177,7 +1177,7 @@ END:VCARD
VCardManager::GetInstance().SetDataHelper(dataShareHelper);
VCardManager::GetInstance().Import(TEL_FILE_NAME, 0);
} else {
EXPECT_TRUE(true);
EXPECT_NE(dataShareHelper, nullptr);
}
}
@ -1198,7 +1198,7 @@ HWTEST_F(VcardTest, Telephony_VCardTest_021, Function | MediumTest | Level1)
int32_t errorCode = VCardManager::GetInstance().Import(TEL_FILE_NAME, 0);
EXPECT_EQ(errorCode, TELEPHONY_ERR_VCARD_FILE_INVALID);
} else {
EXPECT_TRUE(true);
EXPECT_NE(dataShareHelper, nullptr);
}
}
@ -1222,7 +1222,7 @@ HWTEST_F(VcardTest, Telephony_VCardTest_022, Function | MediumTest | Level1)
EXPECT_EQ(errorCode, TELEPHONY_ERROR);
} else {
TELEPHONY_LOGE("VCardTest CreateDataShareHelper == null");
EXPECT_TRUE(true);
EXPECT_NE(dataShareHelper, nullptr);
}
}
@ -1327,7 +1327,7 @@ HWTEST_F(VcardTest, Telephony_VCardTest_BigData_Import, Function | MediumTest |
EXPECT_GE(errorCode, TELEPHONY_ERROR);
} else {
TELEPHONY_LOGE("VCardTest CreateDataShareHelper == null");
EXPECT_TRUE(true);
EXPECT_NE(dataShareHelper, nullptr);
}
}

4
test/unittest/core_service_gtest/vsim_test.cpp
View File

@ -788,10 +788,12 @@ HWTEST_F(SimTest, SavePrimarySlotId_0350, Function | MediumTest | Level1)
*/
HWTEST_F(SimTest, Telephony_Sim_MockTest_0100, Function | MediumTest | Level3)
{
bool isSupported = true;
if (!(SimTest::HasSimCard(SimTest::slotId_))) {
isSupported = fasle;
TELEPHONY_LOGI("TelephonyTestService has no sim card");
}
EXPECT_TRUE(true);
EXPECT_TRUE(isSupported);
}
#endif // TEL_TEST_UNSUPPORT
} // namespace Telephony

30
test/unittest/core_service_gtest/zero_branch_test.cpp
View File

@ -301,15 +301,20 @@ HWTEST_F(BranchTest, Telephony_CellInfo_005, Function | MediumTest | Level1)
auto networkSearchManager = std::make_shared<NetworkSearchManager>(telRilManager, simManager);
auto cellInfo = std::make_shared<CellInfo>(networkSearchManager, INVALID_SLOTID);
auto event = AppExecFwk::InnerEvent::Get(0);
EXPECT_NE(event, nullptr);
cellInfo->ProcessNeighboringCellInfo(event);
cellInfo->ProcessCurrentCellInfo(event);
EXPECT_NE(event, nullptr);
event = nullptr;
cellInfo->ProcessNeighboringCellInfo(event);
cellInfo->ProcessCurrentCellInfo(event);
EXPECT_NE(event, nullptr);
auto cellListNearbyInfo = std::make_shared<CellListNearbyInfo>();
auto cellListCurrentInfo = std::make_shared<CellListCurrentInformation>();
auto eventNearby = AppExecFwk::InnerEvent::Get(0, cellListNearbyInfo);
auto eventCurrent = AppExecFwk::InnerEvent::Get(0, cellListCurrentInfo);
EXPECT_NE(eventNearby, nullptr);
EXPECT_NE(eventCurrent, nullptr);
cellInfo->ProcessNeighboringCellInfo(eventNearby);
cellInfo->ProcessCurrentCellInfo(eventCurrent);
CellNearbyInfo cellInfoNearby;
@ -364,9 +369,12 @@ HWTEST_F(BranchTest, Telephony_NetworkType_001, Function | MediumTest | Level1)
auto networkSearchManager = std::make_shared<NetworkSearchManager>(telRilManager, simManager);
auto networkType = std::make_unique<NetworkType>(networkSearchManager, INVALID_SLOTID);
AppExecFwk::InnerEvent::Pointer event = AppExecFwk::InnerEvent::Get(RadioEvent::RADIO_GET_PREFERRED_NETWORK_MODE);
EXPECT_NE(event, nullptr);
networkType->ProcessGetPreferredNetwork(event);
EXPECT_NE(event, nullptr);
event = nullptr;
networkType->ProcessGetPreferredNetwork(event);
EXPECT_EQ(event, nullptr);
}
/**
@ -1290,16 +1298,16 @@ HWTEST_F(BranchTest, Telephony_SimSmsController_001, Function | MediumTest | Lev
auto eventUpdate = simSmsController->BuildCallerInfo(SIM_SMS_UPDATE_COMPLETED);
auto eventWrite = simSmsController->BuildCallerInfo(SIM_SMS_WRITE_COMPLETED);
auto eventDelete = simSmsController->BuildCallerInfo(SIM_SMS_DELETE_COMPLETED);
simSmsController->ProcessLoadDone(event);
simSmsController->ProcessUpdateDone(event);
simSmsController->ProcessWriteDone(event);
simSmsController->ProcessDeleteDone(event);
simSmsController->ProcessDeleteDone(event);
simSmsController->ProcessEvent(event);
simSmsController->ProcessEvent(eventGet);
simSmsController->ProcessEvent(eventUpdate);
simSmsController->ProcessEvent(eventWrite);
simSmsController->ProcessEvent(eventDelete);
EXPECT_NO_THROW(simSmsController->ProcessLoadDone(event));
EXPECT_NO_THROW(simSmsController->ProcessUpdateDone(event));
EXPECT_NO_THROW(simSmsController->ProcessWriteDone(event));
EXPECT_NO_THROW(simSmsController->ProcessDeleteDone(event));
EXPECT_NO_THROW(simSmsController->ProcessDeleteDone(event));
EXPECT_NO_THROW(simSmsController->ProcessEvent(event));
EXPECT_NO_THROW(simSmsController->ProcessEvent(eventGet));
EXPECT_NO_THROW(simSmsController->ProcessEvent(eventUpdate));
EXPECT_NO_THROW(simSmsController->ProcessEvent(eventWrite));
EXPECT_NO_THROW(simSmsController->ProcessEvent(eventDelete));
EventFwk::MatchingSkills matchingSkills;
matchingSkills.AddEvent(CommonEventSupport::COMMON_EVENT_OPERATOR_CONFIG_CHANGED);
EventFwk::CommonEventSubscribeInfo subcribeInfo(matchingSkills);
@ -2008,6 +2016,8 @@ HWTEST_F(BranchTest, Telephony_OperatorName_002, Function | MediumTest | Level1)
operatorResult->flag = NetworkSearchManagerInner::SERIAL_NUMBER_EXEMPT;
operatorName->HandleOperatorInfo(operatorResult);
operatorName->TrySetLongOperatorNameWithTranslation();
EXPECT_EQ(operatorName->GetCustEons(plmn, 1, false, false), "ChinaMobile");
EXPECT_EQ(operatorName->GetCustEons(plmn, 1, true, false), "CMCC");
}
/**

30
test/unittest/core_service_gtest/zero_branch_test_core_service.cpp
View File

@ -145,14 +145,18 @@ HWTEST_F(CoreServiceBranchTest, Telephony_CoreService_NetWork_002, Function | Me
DelayedSingleton<CoreService>::GetInstance()->FactoryReset(SLOT_ID);
std::u16string u16Ret = u"";
DelayedSingleton<CoreService>::GetInstance()->GetIsoCountryCodeForNetwork(SLOT_ID, u16Ret);
DelayedSingleton<CoreService>::GetInstance()->GetImei(SLOT_ID, u16Ret);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
result = DelayedSingleton<CoreService>::GetInstance()->GetImei(SLOT_ID, u16Ret);
DelayedSingleton<CoreService>::GetInstance()->GetImeiSv(SLOT_ID, u16Ret);
DelayedSingleton<CoreService>::GetInstance()->GetMeid(SLOT_ID, u16Ret);
DelayedSingleton<CoreService>::GetInstance()->GetUniqueDeviceId(SLOT_ID, u16Ret);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
result = DelayedSingleton<CoreService>::GetInstance()->GetUniqueDeviceId(SLOT_ID, u16Ret);
DelayedSingleton<CoreService>::GetInstance()->IsNrSupported(SLOT_ID);
DelayedSingleton<CoreService>::GetInstance()->GetPreferredNetwork(SLOT_ID, nullptr);
DelayedSingleton<CoreService>::GetInstance()->SetNrOptionMode(SLOT_ID, NR_NSA_OPTION_ONLY, nullptr);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
result = DelayedSingleton<CoreService>::GetInstance()->SetNrOptionMode(SLOT_ID, NR_NSA_OPTION_ONLY, nullptr);
DelayedSingleton<CoreService>::GetInstance()->GetNetworkSearchInformation(SLOT_ID, nullptr);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
DelayedSingleton<CoreService>::GetInstance()->GetNrOptionMode(SLOT_ID, nullptr);
DelayedSingleton<CoreService>::GetInstance()->GetNetworkSelectionMode(SLOT_ID, nullptr);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
@ -174,33 +178,38 @@ HWTEST_F(CoreServiceBranchTest, Telephony_CoreService_Sim_001, Function | Medium
int32_t result = DelayedSingleton<CoreService>::GetInstance()->GetCardType(SLOT_ID, cardType);
std::u16string countryCode;
DelayedSingleton<CoreService>::GetInstance()->GetISOCountryCodeForSim(SLOT_ID, countryCode);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
std::u16string testU16Str = u"";
DelayedSingleton<CoreService>::GetInstance()->GetSimSpn(SLOT_ID, testU16Str);
result = DelayedSingleton<CoreService>::GetInstance()->GetSimSpn(SLOT_ID, testU16Str);
DelayedSingleton<CoreService>::GetInstance()->GetSimIccId(SLOT_ID, testU16Str);
DelayedSingleton<CoreService>::GetInstance()->GetSimOperatorNumeric(SLOT_ID, testU16Str);
DelayedSingleton<CoreService>::GetInstance()->GetIMSI(SLOT_ID, testU16Str);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
DelayedSingleton<CoreService>::GetInstance()->IsSimActive(SLOT_ID);
int32_t simId = 1;
DelayedSingleton<CoreService>::GetInstance()->GetSlotId(simId);
result = DelayedSingleton<CoreService>::GetInstance()->GetSlotId(simId);
DelayedSingleton<CoreService>::GetInstance()->GetLocaleFromDefaultSim();
DelayedSingleton<CoreService>::GetInstance()->GetSimGid1(SLOT_ID, testU16Str);
DelayedSingleton<CoreService>::GetInstance()->GetSimGid2(SLOT_ID);
EXPECT_NE(result, TELEPHONY_ERR_SUCCESS);
int32_t lac = 1;
bool longNameRequired = true;
std::string plmn = "46001";
DelayedSingleton<CoreService>::GetInstance()->GetSimEons(SLOT_ID, plmn, lac, longNameRequired);
IccAccountInfo info;
DelayedSingleton<CoreService>::GetInstance()->GetSimAccountInfo(SLOT_ID, info);
result = DelayedSingleton<CoreService>::GetInstance()->GetSimAccountInfo(SLOT_ID, info);
DelayedSingleton<CoreService>::GetInstance()->SetDefaultVoiceSlotId(SLOT_ID);
DelayedSingleton<CoreService>::GetInstance()->GetDefaultVoiceSlotId();
DelayedSingleton<CoreService>::GetInstance()->GetDefaultVoiceSimId(simId);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
int32_t dsdsMode = 0;
DelayedSingleton<CoreService>::GetInstance()->GetDsdsMode(dsdsMode);
DelayedSingleton<CoreService>::GetInstance()->GetPrimarySlotId(result);
const std::u16string cardNumber = Str8ToStr16("SimNumber12345678901");
DelayedSingleton<CoreService>::GetInstance()->SetShowNumber(SLOT_ID, cardNumber);
result = DelayedSingleton<CoreService>::GetInstance()->SetShowNumber(SLOT_ID, cardNumber);
DelayedSingleton<CoreService>::GetInstance()->GetShowNumber(SLOT_ID, testU16Str);
const std::u16string cardName = Str8ToStr16("SimNameZhang");
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
DelayedSingleton<CoreService>::GetInstance()->SetShowName(SLOT_ID, cardName);
DelayedSingleton<CoreService>::GetInstance()->GetShowName(SLOT_ID, testU16Str);
std::vector<IccAccountInfo> iccAccountInfoList = {};
@ -223,10 +232,13 @@ HWTEST_F(CoreServiceBranchTest, Telephony_CoreService_Sim_002, Function | Medium
std::string number = "01234567890123456789";
DelayedSingleton<CoreService>::GetInstance()->SetVoiceCallForwarding(SLOT_ID, true, number);
DelayedSingleton<CoreService>::GetInstance()->GetOpKey(SLOT_ID, testU16Str);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
result = DelayedSingleton<CoreService>::GetInstance()->GetOpKeyExt(SLOT_ID, testU16Str);
DelayedSingleton<CoreService>::GetInstance()->GetOpKeyExt(SLOT_ID, testU16Str);
DelayedSingleton<CoreService>::GetInstance()->GetOpName(SLOT_ID, testU16Str);
ImsRegInfo mImsRegInfo;
DelayedSingleton<CoreService>::GetInstance()->GetImsRegStatus(SLOT_ID, ImsServiceType::TYPE_VOICE, mImsRegInfo);
EXPECT_GE(result, TELEPHONY_ERR_SUCCESS);
SimAuthenticationResponse response = { 0 };
AuthType authType = AuthType::SIM_AUTH_EAP_SIM_TYPE;
std::string authData = "1234";
@ -244,6 +256,7 @@ HWTEST_F(CoreServiceBranchTest, Telephony_CoreService_Sim_002, Function | Medium
HWTEST_F(CoreServiceBranchTest, Telephony_CoreService_Stub_001, Function | MediumTest | Level1)
{
uint32_t maxCode = static_cast<uint32_t>(CoreServiceInterfaceCode::GET_SIM_IO_DONE);
int32_t result = 0;
for (uint32_t code = 0; code <= maxCode; code++) {
if (code == static_cast<uint32_t>(CoreServiceInterfaceCode::HAS_OPERATOR_PRIVILEGES)) {
continue;
@ -252,7 +265,8 @@ HWTEST_F(CoreServiceBranchTest, Telephony_CoreService_Stub_001, Function | Mediu
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(CoreServiceStub::GetDescriptor());
DelayedSingleton<CoreService>::GetInstance()->OnRemoteRequest(code, data, reply, option);
result = DelayedSingleton<CoreService>::GetInstance()->OnRemoteRequest(code, data, reply, option);
EXPECT_GE(result, NO_ERROR);
}
std::string version;
EXPECT_GE(

8
test/unittest/tel_ril_gtest/zero_branch_test_tel_ril.cpp
View File

@ -359,23 +359,25 @@ HWTEST_F(TelRilBranchTest, Telephony_tel_ril_Call_001, Function | MediumTest | L
telRilCall->CallRingbackVoiceNotice(ringbackVoice);
telRilCall->CallSrvccStatusNotice(srvccStatus);
responseInfo.error = HDI::Ril::V1_1::RilErrType::NONE;
ASSERT_TRUE(telRilCall->ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo));
telRilCall->ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo);
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_GENERIC_FAILURE;
ASSERT_FALSE(telRilCall->ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo));
telRilCall->ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo);
telRilCall->GetClirResponse(responseInfo, getClirResult);
AppExecFwk::InnerEvent::Pointer event = AppExecFwk::InnerEvent::Get(1, 1);
responseInfo.serial = -1;
telRilCall->SendDtmfResponse(responseInfo);
ASSERT_TRUE(telRilCall->SendDtmfResponse(responseInfo));
responseInfo.serial = 1;
telRilCall->CreateTelRilRequest(event);
telRilCall->SendDtmfResponse(responseInfo);
ASSERT_TRUE(telRilCall->SendDtmfResponse(responseInfo));
event = nullptr;
responseInfo.serial = 2;
telRilCall->CreateTelRilRequest(event);
telRilCall->SendDtmfResponse(responseInfo);
ASSERT_TRUE(telRilCall->SendDtmfResponse(responseInfo));
}
} // namespace Telephony
} // namespace OHOS