From fdd8325455e29cd97370591133728233c1484f45 Mon Sep 17 00:00:00 2001 From: jxw Date: Sat, 6 Sep 2025 07:29:51 +0000 Subject: [PATCH 1/3] update test/cellular_data_test.cpp. Signed-off-by: jxw --- test/cellular_data_test.cpp | 76 ------------------------------------- 1 file changed, 76 deletions(-) diff --git a/test/cellular_data_test.cpp b/test/cellular_data_test.cpp index 44202a79..691b232e 100644 --- a/test/cellular_data_test.cpp +++ b/test/cellular_data_test.cpp @@ -437,12 +437,10 @@ HWTEST_F(CellularDataTest, IsCellularDataEnabled_Test, TestSize.Level1) HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test, TestSize.Level2) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::GetDefaultCellularDataSlotIdTest(); if (result < DEFAULT_SIM_SLOT_ID_REMOVE) { - return; } result = CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); ASSERT_TRUE(result == TELEPHONY_ERR_SUCCESS); @@ -461,7 +459,6 @@ HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test, TestSize.Level2) HWTEST_F(CellularDataTest, DefaultCellularDataSimId_Test, TestSize.Level2) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } int32_t result = CellularDataTest::GetDefaultCellularDataSimIdTest(); ASSERT_TRUE(result == TELEPHONY_ERR_SUCCESS); @@ -475,12 +472,10 @@ HWTEST_F(CellularDataTest, DefaultCellularDataSimId_Test, TestSize.Level2) HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test_01, TestSize.Level2) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::GetDefaultCellularDataSlotIdTest(); if (result < DEFAULT_SIM_SLOT_ID_REMOVE) { - return; } result = CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); ASSERT_TRUE(result == TELEPHONY_ERR_SUCCESS); @@ -496,7 +491,6 @@ HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test_01, TestSize.Level2) HWTEST_F(CellularDataTest, EnableCellularData_Test_01, TestSize.Level2) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); @@ -526,7 +520,6 @@ HWTEST_F(CellularDataTest, EnableCellularData_Test_01, TestSize.Level2) HWTEST_F(CellularDataTest, EnableCellularData_Test_02, TestSize.Level2) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); @@ -556,7 +549,6 @@ HWTEST_F(CellularDataTest, EnableCellularData_Test_02, TestSize.Level2) HWTEST_F(CellularDataTest, DataRoamingState_ValidSlot_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); @@ -596,7 +588,6 @@ HWTEST_F(CellularDataTest, DataRoamingState_ValidSlot_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, DataRoamingState_ValidSlot_Test_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); @@ -636,7 +627,6 @@ HWTEST_F(CellularDataTest, DataRoamingState_ValidSlot_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, EnableCellularDataRoaming_ValidSlot_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); @@ -672,7 +662,6 @@ HWTEST_F(CellularDataTest, EnableCellularDataRoaming_ValidSlot_Test_01, TestSize HWTEST_F(CellularDataTest, EnableCellularDataRoaming_ValidSlot_Test_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); @@ -708,7 +697,6 @@ HWTEST_F(CellularDataTest, EnableCellularDataRoaming_ValidSlot_Test_02, TestSize HWTEST_F(CellularDataTest, GetCellularDataState_ValidityTest_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); @@ -743,7 +731,6 @@ HWTEST_F(CellularDataTest, GetCellularDataState_ValidityTest_01, TestSize.Level3 HWTEST_F(CellularDataTest, GetCellularDataState_ValidityTest_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); @@ -778,7 +765,6 @@ HWTEST_F(CellularDataTest, GetCellularDataState_ValidityTest_02, TestSize.Level3 HWTEST_F(CellularDataTest, DataRoamingState_InValidSlot_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; // invalid slot turn on data roaming @@ -810,7 +796,6 @@ HWTEST_F(CellularDataTest, DataRoamingState_InValidSlot_Test_01, TestSize.Level3 HWTEST_F(CellularDataTest, DataFlowType_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); @@ -845,7 +830,6 @@ HWTEST_F(CellularDataTest, DataFlowType_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, DataFlowType_Test_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); @@ -880,13 +864,11 @@ HWTEST_F(CellularDataTest, DataFlowType_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, MmsApn_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -898,14 +880,12 @@ HWTEST_F(CellularDataTest, MmsApn_Test_01, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto mmsCallback = static_cast(callback.GetRefPtr()); if (mmsCallback == nullptr) { std::cout << "mmsCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -928,13 +908,11 @@ HWTEST_F(CellularDataTest, MmsApn_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, MmsApn_Test_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -946,14 +924,12 @@ HWTEST_F(CellularDataTest, MmsApn_Test_02, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto mmsCallback = static_cast(callback.GetRefPtr()); if (mmsCallback == nullptr) { std::cout << "mmsCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -976,7 +952,6 @@ HWTEST_F(CellularDataTest, MmsApn_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, HasInternetCapability_Test_01, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } int32_t cid = 1; @@ -992,7 +967,6 @@ HWTEST_F(CellularDataTest, HasInternetCapability_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, HasInternetCapability_Test_02, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } int32_t cid = 1; @@ -1008,7 +982,6 @@ HWTEST_F(CellularDataTest, HasInternetCapability_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, ClearCellularDataConnections_Test_01, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::ClearCellularDataConnections(SIM_SLOT_ID_1); @@ -1023,7 +996,6 @@ HWTEST_F(CellularDataTest, ClearCellularDataConnections_Test_01, TestSize.Level3 HWTEST_F(CellularDataTest, ClearCellularDataConnections_Test_02, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::ClearCellularDataConnections(DEFAULT_SIM_SLOT_ID); @@ -1038,7 +1010,6 @@ HWTEST_F(CellularDataTest, ClearCellularDataConnections_Test_02, TestSize.Level3 HWTEST_F(CellularDataTest, ClearAllConnections_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::ClearAllConnections( @@ -1054,7 +1025,6 @@ HWTEST_F(CellularDataTest, ClearAllConnections_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, GetApnState_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::GetApnState(DEFAULT_SIM_SLOT_ID, "default"); @@ -1069,7 +1039,6 @@ HWTEST_F(CellularDataTest, GetApnState_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, GetDataRecoveryState_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::GetDataRecoveryState(); @@ -1206,7 +1175,6 @@ HWTEST_F(CellularDataTest, Telephony_Cellulardata_InitTelephonyExtService_0104, HWTEST_F(CellularDataTest, GetDataConnApnAttr_Test_01, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; ApnItem::Attribute apnAttr; @@ -1222,7 +1190,6 @@ HWTEST_F(CellularDataTest, GetDataConnApnAttr_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, GetDataConnApnAttr_Test_02, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; ApnItem::Attribute apnAttr; @@ -1238,7 +1205,6 @@ HWTEST_F(CellularDataTest, GetDataConnApnAttr_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, GetDataConnIpType_Test_01, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; std::string ipType; @@ -1254,7 +1220,6 @@ HWTEST_F(CellularDataTest, GetDataConnIpType_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, GetDataConnIpType_Test_02, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; std::string ipType; @@ -1270,7 +1235,6 @@ HWTEST_F(CellularDataTest, GetDataConnIpType_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, IsNeedDoRecovery_Test_01, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; bool needDoRecovery = true; @@ -1286,7 +1250,6 @@ HWTEST_F(CellularDataTest, IsNeedDoRecovery_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, IsNeedDoRecovery_Test_02, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; bool needDoRecovery = true; @@ -1302,7 +1265,6 @@ HWTEST_F(CellularDataTest, IsNeedDoRecovery_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, GetCellularDataSupplierId_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; uint32_t supplierId = 0; @@ -1323,7 +1285,6 @@ HWTEST_F(CellularDataTest, GetCellularDataSupplierId_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, CorrectNetSupplierNoAvailable_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::CorrectNetSupplierNoAvailable(DEFAULT_SIM_SLOT_ID); @@ -1349,7 +1310,6 @@ HWTEST_F(CellularDataTest, GetSupplierRegisterState_Test_01, TestSize.Level3) ASSERT_TRUE(result == TELEPHONY_ERR_FAIL); if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } int32_t getSupplierIdRet = CellularDataTest::GetCellularDataSupplierId(DEFAULT_SIM_SLOT_ID, NetCap::NET_CAPABILITY_INTERNET, supplierId); @@ -1367,7 +1327,6 @@ HWTEST_F(CellularDataTest, GetSupplierRegisterState_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, EnableIntelligenceSwitch_Test_01, TestSize.Level2) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); @@ -1389,7 +1348,6 @@ HWTEST_F(CellularDataTest, EnableIntelligenceSwitch_Test_01, TestSize.Level2) HWTEST_F(CellularDataTest, GetIntelligenceSwitchState_Test_01, TestSize.Level2) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); @@ -1415,7 +1373,6 @@ HWTEST_F(CellularDataTest, GetIntelligenceSwitchState_Test_01, TestSize.Level2) HWTEST_F(CellularDataTest, InitCellularDataController_Test_01, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::InitCellularDataController(SIM_SLOT_ID_1); @@ -1430,7 +1387,6 @@ HWTEST_F(CellularDataTest, InitCellularDataController_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, InitCellularDataController_Test_02, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; int32_t result = CellularDataTest::InitCellularDataController(DEFAULT_SIM_SLOT_ID); @@ -1457,13 +1413,11 @@ HWTEST_F(CellularDataTest, InitCellularDataController_Test_03, TestSize.Level3) HWTEST_F(CellularDataTest, SUPL_Apn_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -1475,14 +1429,12 @@ HWTEST_F(CellularDataTest, SUPL_Apn_Test_01, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto suplCallback = static_cast(callback.GetRefPtr()); if (suplCallback == nullptr) { std::cout << "suplCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -1505,13 +1457,11 @@ HWTEST_F(CellularDataTest, SUPL_Apn_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, SUPL_Apn_Test_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -1523,14 +1473,12 @@ HWTEST_F(CellularDataTest, SUPL_Apn_Test_02, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto suplCallback = static_cast(callback.GetRefPtr()); if (suplCallback == nullptr) { std::cout << "suplCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -1553,13 +1501,11 @@ HWTEST_F(CellularDataTest, SUPL_Apn_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, DUN_Apn_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -1571,14 +1517,12 @@ HWTEST_F(CellularDataTest, DUN_Apn_Test_01, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto dunCallback = static_cast(callback.GetRefPtr()); if (dunCallback == nullptr) { std::cout << "dunCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -1601,13 +1545,11 @@ HWTEST_F(CellularDataTest, DUN_Apn_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, DUN_Apn_Test_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -1619,14 +1561,12 @@ HWTEST_F(CellularDataTest, DUN_Apn_Test_02, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto dunCallback = static_cast(callback.GetRefPtr()); if (dunCallback == nullptr) { std::cout << "dunCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -1649,13 +1589,11 @@ HWTEST_F(CellularDataTest, DUN_Apn_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, IA_Apn_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -1667,14 +1605,12 @@ HWTEST_F(CellularDataTest, IA_Apn_Test_01, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto iaCallback = static_cast(callback.GetRefPtr()); if (iaCallback == nullptr) { std::cout << "iaCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -1697,13 +1633,11 @@ HWTEST_F(CellularDataTest, IA_Apn_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, IA_Apn_Test_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -1715,14 +1649,12 @@ HWTEST_F(CellularDataTest, IA_Apn_Test_02, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto iaCallback = static_cast(callback.GetRefPtr()); if (iaCallback == nullptr) { std::cout << "iaCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -1745,13 +1677,11 @@ HWTEST_F(CellularDataTest, IA_Apn_Test_02, TestSize.Level3) HWTEST_F(CellularDataTest, XCAP_Apn_Test_01, TestSize.Level3) { if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -1763,14 +1693,12 @@ HWTEST_F(CellularDataTest, XCAP_Apn_Test_01, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto xcapCallback = static_cast(callback.GetRefPtr()); if (xcapCallback == nullptr) { std::cout << "xcapCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { @@ -1793,13 +1721,11 @@ HWTEST_F(CellularDataTest, XCAP_Apn_Test_01, TestSize.Level3) HWTEST_F(CellularDataTest, XCAP_Apn_Test_02, TestSize.Level3) { if (!HasSimCard(SIM_SLOT_ID_1)) { - return; } DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); if (callback == nullptr) { std::cout << "callback is null" << std::endl; - return; } NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; @@ -1811,14 +1737,12 @@ HWTEST_F(CellularDataTest, XCAP_Apn_Test_02, TestSize.Level3) sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); if (specifier == nullptr) { std::cout << "specifier is null" << std::endl; - return; } int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto xcapCallback = static_cast(callback.GetRefPtr()); if (xcapCallback == nullptr) { std::cout << "xcapCallback is null" << std::endl; - return; } int32_t count = 0; while (count < MAX_TIMES) { -- Gitee From eb99f423616db01fe7ff06e7f1c1fe2ed7f3591e Mon Sep 17 00:00:00 2001 From: jxw Date: Tue, 9 Sep 2025 09:39:23 +0000 Subject: [PATCH 2/3] update test/cellular_data_test.cpp. Signed-off-by: jxw --- test/cellular_data_test.cpp | 258 +++++++++++------------------------- 1 file changed, 76 insertions(+), 182 deletions(-) diff --git a/test/cellular_data_test.cpp b/test/cellular_data_test.cpp index 691b232e..d08a8841 100644 --- a/test/cellular_data_test.cpp +++ b/test/cellular_data_test.cpp @@ -436,12 +436,10 @@ HWTEST_F(CellularDataTest, IsCellularDataEnabled_Test, TestSize.Level1) */ HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test, TestSize.Level2) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; int32_t result = CellularDataTest::GetDefaultCellularDataSlotIdTest(); - if (result < DEFAULT_SIM_SLOT_ID_REMOVE) { - } + EXPECT_FALSE(result < DEFAULT_SIM_SLOT_ID_REMOVE, 0); result = CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); ASSERT_TRUE(result == TELEPHONY_ERR_SUCCESS); // Multiple cards will need to be optimized again @@ -458,8 +456,7 @@ HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test, TestSize.Level2) */ HWTEST_F(CellularDataTest, DefaultCellularDataSimId_Test, TestSize.Level2) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); int32_t result = CellularDataTest::GetDefaultCellularDataSimIdTest(); ASSERT_TRUE(result == TELEPHONY_ERR_SUCCESS); } @@ -471,12 +468,10 @@ HWTEST_F(CellularDataTest, DefaultCellularDataSimId_Test, TestSize.Level2) */ HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test_01, TestSize.Level2) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; int32_t result = CellularDataTest::GetDefaultCellularDataSlotIdTest(); - if (result < DEFAULT_SIM_SLOT_ID_REMOVE) { - } + EXPECT_FALSE(result < DEFAULT_SIM_SLOT_ID_REMOVE, 0); result = CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); ASSERT_TRUE(result == TELEPHONY_ERR_SUCCESS); result = CellularDataTest::SetDefaultCellularDataSlotIdTest(DATA_SLOT_ID_INVALID); @@ -490,8 +485,7 @@ HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test_01, TestSize.Level2) */ HWTEST_F(CellularDataTest, EnableCellularData_Test_01, TestSize.Level2) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); CellularDataTest::EnableCellularDataTest(false); @@ -519,8 +513,7 @@ HWTEST_F(CellularDataTest, EnableCellularData_Test_01, TestSize.Level2) */ HWTEST_F(CellularDataTest, EnableCellularData_Test_02, TestSize.Level2) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); CellularDataTest::EnableCellularDataTest(false); @@ -548,8 +541,7 @@ HWTEST_F(CellularDataTest, EnableCellularData_Test_02, TestSize.Level2) */ HWTEST_F(CellularDataTest, DataRoamingState_ValidSlot_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); int32_t disabled = CellularDataTest::EnableCellularDataTest(false); @@ -587,8 +579,7 @@ HWTEST_F(CellularDataTest, DataRoamingState_ValidSlot_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, DataRoamingState_ValidSlot_Test_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); int32_t disabled = CellularDataTest::EnableCellularDataTest(false); @@ -626,8 +617,7 @@ HWTEST_F(CellularDataTest, DataRoamingState_ValidSlot_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, EnableCellularDataRoaming_ValidSlot_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); int32_t disabled = CellularDataTest::EnableCellularDataTest(false); @@ -661,8 +651,7 @@ HWTEST_F(CellularDataTest, EnableCellularDataRoaming_ValidSlot_Test_01, TestSize */ HWTEST_F(CellularDataTest, EnableCellularDataRoaming_ValidSlot_Test_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); int32_t disabled = CellularDataTest::EnableCellularDataTest(false); @@ -696,8 +685,7 @@ HWTEST_F(CellularDataTest, EnableCellularDataRoaming_ValidSlot_Test_02, TestSize */ HWTEST_F(CellularDataTest, GetCellularDataState_ValidityTest_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); bool dataEnabled = false; @@ -730,8 +718,7 @@ HWTEST_F(CellularDataTest, GetCellularDataState_ValidityTest_01, TestSize.Level3 */ HWTEST_F(CellularDataTest, GetCellularDataState_ValidityTest_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); bool dataEnabled = false; @@ -764,8 +751,7 @@ HWTEST_F(CellularDataTest, GetCellularDataState_ValidityTest_02, TestSize.Level3 */ HWTEST_F(CellularDataTest, DataRoamingState_InValidSlot_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; // invalid slot turn on data roaming int32_t enable = CellularDataTest::EnableCellularDataRoamingTest(DEFAULT_SIM_SLOT_ID - 1, true); @@ -795,8 +781,7 @@ HWTEST_F(CellularDataTest, DataRoamingState_InValidSlot_Test_01, TestSize.Level3 */ HWTEST_F(CellularDataTest, DataFlowType_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); CellularDataTest::EnableCellularDataTest(false); @@ -829,8 +814,7 @@ HWTEST_F(CellularDataTest, DataFlowType_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, DataFlowType_Test_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); CellularDataTest::EnableCellularDataTest(false); @@ -863,13 +847,10 @@ HWTEST_F(CellularDataTest, DataFlowType_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, MmsApn_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_MMS); @@ -878,15 +859,11 @@ HWTEST_F(CellularDataTest, MmsApn_Test_01, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto mmsCallback = static_cast(callback.GetRefPtr()); - if (mmsCallback == nullptr) { - std::cout << "mmsCallback is null" << std::endl; - } + EXPECT_NE(mmsCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -907,13 +884,10 @@ HWTEST_F(CellularDataTest, MmsApn_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, MmsApn_Test_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_MMS); @@ -922,15 +896,11 @@ HWTEST_F(CellularDataTest, MmsApn_Test_02, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto mmsCallback = static_cast(callback.GetRefPtr()); - if (mmsCallback == nullptr) { - std::cout << "mmsCallback is null" << std::endl; - } + EXPECT_NE(mmsCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -951,8 +921,7 @@ HWTEST_F(CellularDataTest, MmsApn_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, HasInternetCapability_Test_01, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); int32_t cid = 1; int32_t result = CellularDataTest::HasInternetCapability(SIM_SLOT_ID_1, cid); @@ -966,8 +935,7 @@ HWTEST_F(CellularDataTest, HasInternetCapability_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, HasInternetCapability_Test_02, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); int32_t cid = 1; int32_t result = CellularDataTest::HasInternetCapability(DEFAULT_SIM_SLOT_ID, cid); @@ -981,8 +949,7 @@ HWTEST_F(CellularDataTest, HasInternetCapability_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, ClearCellularDataConnections_Test_01, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; int32_t result = CellularDataTest::ClearCellularDataConnections(SIM_SLOT_ID_1); ASSERT_TRUE(result == static_cast(RequestNetCode::REQUEST_SUCCESS)); @@ -995,8 +962,7 @@ HWTEST_F(CellularDataTest, ClearCellularDataConnections_Test_01, TestSize.Level3 */ HWTEST_F(CellularDataTest, ClearCellularDataConnections_Test_02, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; int32_t result = CellularDataTest::ClearCellularDataConnections(DEFAULT_SIM_SLOT_ID); ASSERT_TRUE(result == static_cast(RequestNetCode::REQUEST_SUCCESS)); @@ -1009,8 +975,7 @@ HWTEST_F(CellularDataTest, ClearCellularDataConnections_Test_02, TestSize.Level3 */ HWTEST_F(CellularDataTest, ClearAllConnections_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; int32_t result = CellularDataTest::ClearAllConnections( DEFAULT_SIM_SLOT_ID, DisConnectionReason::REASON_RETRY_CONNECTION); @@ -1024,8 +989,7 @@ HWTEST_F(CellularDataTest, ClearAllConnections_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, GetApnState_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; int32_t result = CellularDataTest::GetApnState(DEFAULT_SIM_SLOT_ID, "default"); ASSERT_TRUE(result >= 0 && result <= 5); @@ -1038,8 +1002,7 @@ HWTEST_F(CellularDataTest, GetApnState_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, GetDataRecoveryState_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; int32_t result = CellularDataTest::GetDataRecoveryState(); ASSERT_TRUE(result >= 0 && result <= 3); @@ -1174,8 +1137,7 @@ HWTEST_F(CellularDataTest, Telephony_Cellulardata_InitTelephonyExtService_0104, */ HWTEST_F(CellularDataTest, GetDataConnApnAttr_Test_01, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; ApnItem::Attribute apnAttr; int32_t result = CellularDataTest::GetDataConnApnAttr(SIM_SLOT_ID_1, apnAttr); @@ -1189,8 +1151,7 @@ HWTEST_F(CellularDataTest, GetDataConnApnAttr_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, GetDataConnApnAttr_Test_02, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; ApnItem::Attribute apnAttr; int32_t result = CellularDataTest::GetDataConnApnAttr(DEFAULT_SIM_SLOT_ID, apnAttr); @@ -1204,8 +1165,7 @@ HWTEST_F(CellularDataTest, GetDataConnApnAttr_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, GetDataConnIpType_Test_01, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; std::string ipType; int32_t result = CellularDataTest::GetDataConnIpType(SIM_SLOT_ID_1, ipType); @@ -1219,8 +1179,7 @@ HWTEST_F(CellularDataTest, GetDataConnIpType_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, GetDataConnIpType_Test_02, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; std::string ipType; int32_t result = CellularDataTest::GetDataConnIpType(DEFAULT_SIM_SLOT_ID, ipType); @@ -1234,8 +1193,7 @@ HWTEST_F(CellularDataTest, GetDataConnIpType_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, IsNeedDoRecovery_Test_01, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; bool needDoRecovery = true; int32_t result = CellularDataTest::IsNeedDoRecovery(SIM_SLOT_ID_1, needDoRecovery); @@ -1249,8 +1207,7 @@ HWTEST_F(CellularDataTest, IsNeedDoRecovery_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, IsNeedDoRecovery_Test_02, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; bool needDoRecovery = true; int32_t result = CellularDataTest::IsNeedDoRecovery(DEFAULT_SIM_SLOT_ID, needDoRecovery); @@ -1264,8 +1221,7 @@ HWTEST_F(CellularDataTest, IsNeedDoRecovery_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, GetCellularDataSupplierId_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; uint32_t supplierId = 0; uint64_t capabilityInvalid = NetCap::NET_CAPABILITY_END; @@ -1284,8 +1240,7 @@ HWTEST_F(CellularDataTest, GetCellularDataSupplierId_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, CorrectNetSupplierNoAvailable_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; int32_t result = CellularDataTest::CorrectNetSupplierNoAvailable(DEFAULT_SIM_SLOT_ID); int32_t apnState = CellularDataTest::GetApnState(DEFAULT_SIM_SLOT_ID, "default"); @@ -1309,8 +1264,7 @@ HWTEST_F(CellularDataTest, GetSupplierRegisterState_Test_01, TestSize.Level3) int32_t result = CellularDataTest::GetSupplierRegisterState(supplierId, regState); ASSERT_TRUE(result == TELEPHONY_ERR_FAIL); - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); int32_t getSupplierIdRet = CellularDataTest::GetCellularDataSupplierId(DEFAULT_SIM_SLOT_ID, NetCap::NET_CAPABILITY_INTERNET, supplierId); if (getSupplierIdRet == TELEPHONY_ERR_SUCCESS) { @@ -1326,8 +1280,7 @@ HWTEST_F(CellularDataTest, GetSupplierRegisterState_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, EnableIntelligenceSwitch_Test_01, TestSize.Level2) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); int32_t result1 = CellularDataTest::EnableIntelligenceSwitchTest(true); @@ -1347,8 +1300,7 @@ HWTEST_F(CellularDataTest, EnableIntelligenceSwitch_Test_01, TestSize.Level2) */ HWTEST_F(CellularDataTest, GetIntelligenceSwitchState_Test_01, TestSize.Level2) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); int32_t result1 = CellularDataTest::EnableIntelligenceSwitchTest(true); @@ -1372,8 +1324,7 @@ HWTEST_F(CellularDataTest, GetIntelligenceSwitchState_Test_01, TestSize.Level2) */ HWTEST_F(CellularDataTest, InitCellularDataController_Test_01, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; int32_t result = CellularDataTest::InitCellularDataController(SIM_SLOT_ID_1); ASSERT_TRUE(result == CELLULAR_DATA_INVALID_PARAM); @@ -1386,8 +1337,7 @@ HWTEST_F(CellularDataTest, InitCellularDataController_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, InitCellularDataController_Test_02, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; int32_t result = CellularDataTest::InitCellularDataController(DEFAULT_SIM_SLOT_ID); ASSERT_TRUE(result == CELLULAR_DATA_INVALID_PARAM); @@ -1412,13 +1362,10 @@ HWTEST_F(CellularDataTest, InitCellularDataController_Test_03, TestSize.Level3) */ HWTEST_F(CellularDataTest, SUPL_Apn_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_SUPL); @@ -1427,15 +1374,11 @@ HWTEST_F(CellularDataTest, SUPL_Apn_Test_01, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto suplCallback = static_cast(callback.GetRefPtr()); - if (suplCallback == nullptr) { - std::cout << "suplCallback is null" << std::endl; - } + EXPECT_NE(suplCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -1456,13 +1399,10 @@ HWTEST_F(CellularDataTest, SUPL_Apn_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, SUPL_Apn_Test_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_SUPL); @@ -1471,15 +1411,11 @@ HWTEST_F(CellularDataTest, SUPL_Apn_Test_02, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto suplCallback = static_cast(callback.GetRefPtr()); - if (suplCallback == nullptr) { - std::cout << "suplCallback is null" << std::endl; - } + EXPECT_NE(suplCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -1500,13 +1436,10 @@ HWTEST_F(CellularDataTest, SUPL_Apn_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, DUN_Apn_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_DUN); @@ -1515,15 +1448,11 @@ HWTEST_F(CellularDataTest, DUN_Apn_Test_01, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto dunCallback = static_cast(callback.GetRefPtr()); - if (dunCallback == nullptr) { - std::cout << "dunCallback is null" << std::endl; - } + EXPECT_NE(dunCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -1544,13 +1473,10 @@ HWTEST_F(CellularDataTest, DUN_Apn_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, DUN_Apn_Test_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_DUN); @@ -1559,15 +1485,11 @@ HWTEST_F(CellularDataTest, DUN_Apn_Test_02, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto dunCallback = static_cast(callback.GetRefPtr()); - if (dunCallback == nullptr) { - std::cout << "dunCallback is null" << std::endl; - } + EXPECT_NE(dunCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -1588,13 +1510,10 @@ HWTEST_F(CellularDataTest, DUN_Apn_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, IA_Apn_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_IA); @@ -1603,15 +1522,11 @@ HWTEST_F(CellularDataTest, IA_Apn_Test_01, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto iaCallback = static_cast(callback.GetRefPtr()); - if (iaCallback == nullptr) { - std::cout << "iaCallback is null" << std::endl; - } + EXPECT_NE(iaCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -1632,13 +1547,10 @@ HWTEST_F(CellularDataTest, IA_Apn_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, IA_Apn_Test_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_IA); @@ -1647,15 +1559,11 @@ HWTEST_F(CellularDataTest, IA_Apn_Test_02, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto iaCallback = static_cast(callback.GetRefPtr()); - if (iaCallback == nullptr) { - std::cout << "iaCallback is null" << std::endl; - } + EXPECT_NE(iaCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -1676,13 +1584,10 @@ HWTEST_F(CellularDataTest, IA_Apn_Test_02, TestSize.Level3) */ HWTEST_F(CellularDataTest, XCAP_Apn_Test_01, TestSize.Level3) { - if (!HasSimCard(DEFAULT_SIM_SLOT_ID)) { - } + EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_XCAP); @@ -1691,15 +1596,11 @@ HWTEST_F(CellularDataTest, XCAP_Apn_Test_01, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto xcapCallback = static_cast(callback.GetRefPtr()); - if (xcapCallback == nullptr) { - std::cout << "xcapCallback is null" << std::endl; - } + EXPECT_NE(xcapCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); @@ -1720,13 +1621,10 @@ HWTEST_F(CellularDataTest, XCAP_Apn_Test_01, TestSize.Level3) */ HWTEST_F(CellularDataTest, XCAP_Apn_Test_02, TestSize.Level3) { - if (!HasSimCard(SIM_SLOT_ID_1)) { - } + EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; sptr callback = new (std::nothrow) TestCallback(); - if (callback == nullptr) { - std::cout << "callback is null" << std::endl; - } + EXPECT_NE(callback, nullptr); NetSpecifier netSpecifier; NetAllCapabilities netAllCapabilities; netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_XCAP); @@ -1735,15 +1633,11 @@ HWTEST_F(CellularDataTest, XCAP_Apn_Test_02, TestSize.Level3) netSpecifier.ident_ = "simId" + std::to_string(simId); netSpecifier.netCapabilities_ = netAllCapabilities; sptr specifier = new (std::nothrow) NetSpecifier(netSpecifier); - if (specifier == nullptr) { - std::cout << "specifier is null" << std::endl; - } + EXPECT_NE(specifier, nullptr); int32_t result = NetConnClient::GetInstance().RegisterNetConnCallback(specifier, callback, NET_REGISTER_TIMEOUT_MS); std::cout << "RegisterNetConnCallback result [" << result << "]" << std::endl; auto xcapCallback = static_cast(callback.GetRefPtr()); - if (xcapCallback == nullptr) { - std::cout << "xcapCallback is null" << std::endl; - } + EXPECT_NE(xcapCallback, nullptr); int32_t count = 0; while (count < MAX_TIMES) { sleep(SLEEP_TIME); -- Gitee From dee385b3e6be31674e6218acaa5eb69a7b0d6bae Mon Sep 17 00:00:00 2001 From: jxw Date: Thu, 11 Sep 2025 00:56:35 +0000 Subject: [PATCH 3/3] update test/cellular_data_test.cpp. Signed-off-by: jxw --- test/cellular_data_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cellular_data_test.cpp b/test/cellular_data_test.cpp index d08a8841..0b48cb66 100644 --- a/test/cellular_data_test.cpp +++ b/test/cellular_data_test.cpp @@ -439,7 +439,7 @@ HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test, TestSize.Level2) EXPECT_NE(HasSimCard(DEFAULT_SIM_SLOT_ID), 0); DataAccessToken token; int32_t result = CellularDataTest::GetDefaultCellularDataSlotIdTest(); - EXPECT_FALSE(result < DEFAULT_SIM_SLOT_ID_REMOVE, 0); + EXPECT_FALSE(result < DEFAULT_SIM_SLOT_ID_REMOVE); result = CellularDataTest::SetDefaultCellularDataSlotIdTest(DEFAULT_SIM_SLOT_ID); ASSERT_TRUE(result == TELEPHONY_ERR_SUCCESS); // Multiple cards will need to be optimized again @@ -471,7 +471,7 @@ HWTEST_F(CellularDataTest, DefaultCellularDataSlotId_Test_01, TestSize.Level2) EXPECT_NE(HasSimCard(SIM_SLOT_ID_1), 0); DataAccessToken token; int32_t result = CellularDataTest::GetDefaultCellularDataSlotIdTest(); - EXPECT_FALSE(result < DEFAULT_SIM_SLOT_ID_REMOVE, 0); + EXPECT_FALSE(result < DEFAULT_SIM_SLOT_ID_REMOVE); result = CellularDataTest::SetDefaultCellularDataSlotIdTest(SIM_SLOT_ID_1); ASSERT_TRUE(result == TELEPHONY_ERR_SUCCESS); result = CellularDataTest::SetDefaultCellularDataSlotIdTest(DATA_SLOT_ID_INVALID); -- Gitee