diff --git a/jstest/Calllog_test.js b/jstest/Calllog_test.js index 05e30124b13a9ca8e160de40583b16ef993b6349..e6a43349c4c432c991141e7fcc0bbce9fc210de2 100644 --- a/jstest/Calllog_test.js +++ b/jstest/Calllog_test.js @@ -425,7 +425,7 @@ describe('CalllogTest', function() { var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {"phone_number" : "196320147"}; + var insertValues = {"phone_number" : "12345678901"}; try { var calllogId = await DAHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_fuzzyquery_test_100: calllogId = " + calllogId); @@ -453,7 +453,7 @@ describe('CalllogTest', function() { expect(resultSet.getString(0) == calllogId.toString()).assertTrue(); console.info( 'logMessage calllog_fuzzyquery_test_100: phone_number = ' + resultSet.getString(1)); - expect(resultSet.getString(1) == "196320147").assertTrue(); + expect(resultSet.getString(1) == "12345678901").assertTrue(); } while (resultSet.goToNextRow()); } resultSet.close(); @@ -1067,7 +1067,7 @@ describe('CalllogTest', function() { console.info("--------logMessage abnormal_calllog_update_test_2300 is starting!------------"); var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {phone_number : "15748646546", display_name : "name2300"} + var insertValues = {phone_number : "12345678901", display_name : "name2300"} try { var calllogId = await DAHelper.insert(calllogUri, insertValues); var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); @@ -1082,7 +1082,7 @@ describe('CalllogTest', function() { async function UpdateOneCalllog() { try { - var insertValues = {phone_number : "15748646546", display_names : "nameUpdateError2300"}; + var insertValues = {phone_number : "12345678901", display_names : "nameUpdateError2300"}; var condition = new ohos_data_ability.DataAbilityPredicates(); var updateCode = await DAHelper.update(calllogUri, insertValues, condition); @@ -1112,7 +1112,7 @@ describe('CalllogTest', function() { console.info("--------logMessage abnormal_calllog_query_test_2400 is starting!------------"); var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {phone_number : "15748646546", display_name : "name2300"} + var insertValues = {phone_number : "12345678901", display_name : "name2300"} try { var calllogId = await DAHelper.insert(calllogUri, insertValues); var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); @@ -1143,7 +1143,7 @@ describe('CalllogTest', function() { console.info("--------logMessage abnormal_calllog_query_test_2500 is starting!------------"); var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {phone_number : "15748646546", display_name : "name2300"} + var insertValues = {phone_number : "12345678901", display_name : "name2300"} try { var calllogId = await DAHelper.insert(calllogUri, insertValues); console.info('abnormal_calllog_query_test_2500 calllogId = ' + calllogId); @@ -1175,7 +1175,7 @@ describe('CalllogTest', function() { console.info("--------logMessage abnormal_calllog_delete_test_2600 is starting!------------"); var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {phone_number : "15748646546", display_name : "name2300"} + var insertValues = {phone_number : "12345678901", display_name : "name2300"} try { var calllogId = await DAHelper.insert(calllogUri, insertValues); var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); @@ -1210,7 +1210,7 @@ describe('CalllogTest', function() { it("abnormal_calllog_delete_test_2700", 0, async function(done) { var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {phone_number : "270015748646546", display_name : "name2700"} + var insertValues = {phone_number : "270012345678901", display_name : "name2700"} try { var calllogId = await DAHelper.insert(calllogUri, insertValues); var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); @@ -1225,7 +1225,7 @@ describe('CalllogTest', function() { async function UpdateOneCalllog() { try { - var insertValues = {phone_number : "270015748646546", display_names : "nameUpdateError2700"}; + var insertValues = {phone_number : "270012345678901", display_names : "nameUpdateError2700"}; var condition = new ohos_data_ability.DataAbilityPredicates(); condition.equalTo("ids", calllogIdTwo.toString()); condition.or(); @@ -1256,7 +1256,7 @@ describe('CalllogTest', function() { console.info("------------abnormal_calllog_query_test_2800 is starting!-----------"); var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {"phone_number" : "196320147"}; + var insertValues = {"phone_number" : "12345678901"}; try { var calllogId = await DAHelper.insert(calllogUri, insertValues); console.info("logMessage abnormal_calllog_query_test_2800: calllogId = " + calllogId); diff --git a/jstest/Voicemail_test.js b/jstest/Voicemail_test.js index 6d87b62d642ed90ae15f6bbeae6f08910f5ca134..a0c927db8f0a86961a3ffcdaea21d6dd604c1a09 100644 --- a/jstest/Voicemail_test.js +++ b/jstest/Voicemail_test.js @@ -552,7 +552,7 @@ describe('VoicemailTest', function() { var DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {"phone_numbers" : "18942010321", "display_name" : "xiaoming"}; + var insertValues = {"phone_numbers" : "12345678901", "display_name" : "xiaoming"}; try { var voicemailId = await DAHelper.insert(voicemailUri, insertValues); console.info("logMessage abnormal_voicemail_insert_test_300: voicemialId = " + voicemailId); @@ -575,13 +575,13 @@ describe('VoicemailTest', function() { console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); var errorUri = "dataability:///com.ohos.calllogability/calls/voicemails"; - var insertValues = {"phone_number" : "18942010321", "display_name" : "xiaoming"}; + var insertValues = {"phone_number" : "12345678901", "display_name" : "xiaoming"}; try { var voicemialId = await DAHelper.insert(errorUri, insertValues) console.info("logMessage abnormal_voicemail_insert_test_400: voicemialId = " + voicemialId); expect(voicemialId == -1).assertTrue(); var map = new Map(); - map.set("phone_number", "18942010321"); + map.set("phone_number", "12345678901"); await voicemailQueryError(map, "abnormal_voicemail_insert_test_400"); done(); } catch (error) { @@ -600,7 +600,7 @@ describe('VoicemailTest', function() { var DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var insertValues = {"phone_number" : "18942010321"}; + var insertValues = {"phone_number" : "12345678901"}; try { var voicemailId = await DAHelper.insert(voicemailUri, insertValues); console.info("logMessage abnormal_voicemail_update_test_1100: voicemailId = " + voicemailId); @@ -925,14 +925,14 @@ describe('VoicemailTest', function() { console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) - var stringValue = {"phone_number" : "1557544452542200", "voice_status" : 0}; + var stringValue = {"phone_number" : "123456789012200", "voice_status" : 0}; try { var voicemailId = await DAHelper.insert(voicemailUri, stringValue) console.info("logMessage voicemail_insert_test_2200: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); var map = new Map(); map.set("id", voicemailId.toString()); - map.set("phone_number", "1557544452542200"); + map.set("phone_number", "123456789012200"); map.set("voice_status", "0"); await voicemailQuery(map, "voicemail_insert_test_2200"); await voiceMailDelete("voicemail_insert_test_2200"); @@ -955,7 +955,7 @@ describe('VoicemailTest', function() { console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) - var stringValue = {"phone_number" : "155754445254", "voice_status" : 0}; + var stringValue = {"phone_number" : "12345678901", "voice_status" : 0}; try { var voicemailId = await DAHelper.insert(voicemailUri, stringValue) var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue) @@ -990,7 +990,7 @@ describe('VoicemailTest', function() { console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) - var stringValue = {"phone_number" : "155754445254", "voice_status" : 0}; + var stringValue = {"phone_number" : "12345678901", "voice_status" : 0}; try { var voicemailId = await DAHelper.insert(voicemailUri, stringValue) var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue) diff --git a/test/unittest/src/calllogability_test.cpp b/test/unittest/src/calllogability_test.cpp index 89a49c2319a8ea5a8b46f53dd012027b76634149..8677703660a4b918563289d306462b58a9eac358 100644 --- a/test/unittest/src/calllogability_test.cpp +++ b/test/unittest/src/calllogability_test.cpp @@ -244,12 +244,13 @@ HWTEST_F(CalllogAbilityTest, calllog_Update_test_300, testing::ext::TestSize.Lev std::vector columns; columns.push_back("phone_number"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "123456789055"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number", "0987654321"); + updateValues.PutString("phone_number", phoneNumber); OHOS::NativeRdb::DataAbilityPredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); int updateCode = CalllogUpdate(updateValues, predicates); @@ -312,7 +313,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Update_test_500, testing::ext::TestSize.Lev { HILOG_INFO("--- calllog_Update_test_500 is starting! ---"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); valuesBucket.PutString("display_name", "testName"); CalllogInsertValues(valuesBucket); CalllogInsertValues(valuesBucket); @@ -361,7 +363,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_600, testing::ext::TestSize.Leve columns.push_back("display_name"); columns.push_back("id"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); valuesBucket.PutString("display_name", "testName"); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); @@ -391,7 +394,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_800, testing::ext::TestSize.Leve HILOG_INFO("-----calllog_Query_test_800 is starting!-----"); int ringDuration = 9121215; OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); valuesBucket.PutString("display_name", "testName"); valuesBucket.PutInt("ring_duration", ringDuration); int rawId = CalllogInsertValues(valuesBucket); @@ -429,7 +433,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_900, testing::ext::TestSize.Leve { HILOG_INFO("-----calllog_Query_test_900 is starting!-----"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "12345678901254"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); valuesBucket.PutString("display_name", "testName"); CalllogInsertValues(valuesBucket); CalllogInsertValues(valuesBucket); @@ -462,7 +467,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1000, testing::ext::TestSize.Le { HILOG_INFO("--- calllog_Delete_test_1000 is starting! ---"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); std::vector columns; int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); @@ -491,12 +497,13 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1100, testing::ext::TestSize.Le { HILOG_INFO("--- calllog_Delete_test_1100 is starting! ---"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", "18552504057"); + valuesBucketTwo.PutString("phone_number", phoneNumber); int rawIdTwo = CalllogInsertValues(valuesBucketTwo); EXPECT_GT(rawIdTwo, 0); OHOS::NativeRdb::DataAbilityPredicates predicates; @@ -760,7 +767,8 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1700, testing::ext::Te HILOG_INFO("--- abnormal_calllog_Update_test_1700 is starting! ---"); std::vector columns; OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); valuesBucket.PutString("display_name", "abnormal_sigle"); columns.push_back("phone_number"); columns.push_back("display_name"); @@ -768,7 +776,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1700, testing::ext::Te EXPECT_GT(rawId, 0); OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number_sha", "0987654321"); + updateValues.PutString("phone_number_sha", phoneNumber); OHOS::NativeRdb::DataAbilityPredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); int updateCode = CalllogUpdate(updateValues, predicates); @@ -797,13 +805,14 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1800, testing::ext::Te HILOG_INFO("--- abnormal_calllog_Update_test_1800 is starting! ---"); std::vector columns; OHOS::NativeRdb::ValuesBucket valuesBucketOne; - valuesBucketOne.PutString("phone_number", "1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucketOne.PutString("phone_number", phoneNumber); valuesBucketOne.PutInt("ring_duration", 998); int rawIdOne = CalllogInsertValues(valuesBucketOne); EXPECT_GT(rawIdOne, 0); OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", "638292093737"); + valuesBucketTwo.PutString("phone_number", phoneNumber); valuesBucketTwo.PutInt("ring_duration", 999); int rawIdTwo = CalllogInsertValues(valuesBucketTwo); EXPECT_GT(rawIdTwo, 0); @@ -812,7 +821,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1800, testing::ext::Te columns.push_back("ring_duration"); OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number", "0987654321"); + updateValues.PutString("phone_number", phoneNumber); updateValues.PutInt("ring_duration", 888); OHOS::NativeRdb::DataAbilityPredicates predicates; predicates.GreaterThan("id", "0"); @@ -1080,11 +1089,12 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_delete_test_2600, testing::ext::Te OHOS::Uri errorUriCalllogs(CallLogUri::ERROR_URI); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); int calllogIdOne = CalllogInsertValues(valuesBucket); EXPECT_GT(calllogIdOne, 0); OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", "1234567890"); + valuesBucketTwo.PutString("phone_number", phoneNumber); int calllogIdTwo = CalllogInsertValues(valuesBucketTwo); EXPECT_GT(calllogIdTwo, 0); @@ -1125,13 +1135,14 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te HILOG_INFO("--- abnormal_calllog_Update_test_2700 is starting! ---"); OHOS::Uri errorUri(CallLogUri::ERROR_URI); - int64_t calllogIdOne = CalllogInsert("1234567890"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + int64_t calllogIdOne = CalllogInsert(phoneNumber); EXPECT_GT(calllogIdOne, 0); - int64_t calllogIdTwo = CalllogInsert("0987654321"); + int64_t calllogIdTwo = CalllogInsert(phoneNumber); EXPECT_GT(calllogIdTwo, 0); OHOS::NativeRdb::ValuesBucket updateCalllogValues; - updateCalllogValues.PutString("phone_number", "998877"); + updateCalllogValues.PutString("phone_number", phoneNumber); OHOS::NativeRdb::DataAbilityPredicates predicates; predicates.EqualTo("ids", std::to_string(calllogIdOne)); int updateCode = CalllogUpdate(updateCalllogValues, predicates); @@ -1139,7 +1150,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te std::vector columns; columns.push_back("phone_number"); predicates.Clear(); - predicates.EqualTo("phone_number", "998877"); + predicates.EqualTo("phone_number", phoneNumber); std::shared_ptr resultSetOne = CalllogQuery(columns, predicates); int rowCountOne = 0; resultSetOne->GetRowCount(rowCountOne); @@ -1147,7 +1158,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te resultSetOne->Close(); updateCalllogValues.Clear(); - updateCalllogValues.PutString("phone_number", "987654"); + updateCalllogValues.PutString("phone_number", phoneNumber); predicates.Clear(); predicates.EqualTo("id", std::to_string(calllogIdTwo)); updateCode = calllogAbility.Update(errorUri, updateCalllogValues, predicates); @@ -1158,7 +1169,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te resultSetTwo->GetRowCount(rowCountOne); EXPECT_EQ(0, rowCountTwo); OHOS::NativeRdb::ValuesBucket oldValue; - oldValue.PutString("phone_number", "0987654321"); + oldValue.PutString("phone_number", phoneNumber); CheckResultSet(oldValue, resultSetTwo, "abnormal_calllog_Update_test_2700"); ClearCallLog(); } diff --git a/test/unittest/src/calllogfuzzyquery_test.cpp b/test/unittest/src/calllogfuzzyquery_test.cpp index 7c8904dbfa390048b67913371f0cf34a735c709a..b8cc28cef69aa4d275658918ae0074497ac78184 100644 --- a/test/unittest/src/calllogfuzzyquery_test.cpp +++ b/test/unittest/src/calllogfuzzyquery_test.cpp @@ -71,13 +71,14 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_100, testing::ext::TestSize.L { HILOG_INFO("----calllog_Query_test_100 is starting!----"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "123456789"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); valuesBucket.PutInt("id", rawId); OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", "1842794123"); + valuesBucketTwo.PutString("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); valuesBucketTwo.PutInt("id", rawId); EXPECT_GT(rawId, 0); @@ -114,12 +115,13 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_200, testing::ext::TestSize.L { HILOG_INFO("----calllog_Query_test_200 is starting!----"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "1854250750"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); valuesBucket.PutInt("id", rawId); OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", "17542368015"); + valuesBucketTwo.PutString("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); valuesBucketTwo.PutInt("id", rawId); EXPECT_GT(rawId, 0); @@ -152,12 +154,13 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_300, testing::ext::TestSize.L { HILOG_INFO("----calllog_Query_test_300 is starting!----"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "12378418910"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); valuesBucket.PutInt("id", rawId); OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", "12374589961"); + valuesBucketTwo.PutString("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); valuesBucketTwo.PutInt("id", rawId); EXPECT_GT(rawId, 0); @@ -165,7 +168,7 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_300, testing::ext::TestSize.L columns.push_back("id"); columns.push_back("phone_number"); OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.Like("phone_number", "1238910516156465%"); + predicates.Like("phone_number", phoneNumber); predicates.OrderByAsc("id"); std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count 0 @@ -188,12 +191,13 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_400, testing::ext::TestSize.L { HILOG_INFO("----calllog_Query_test_400 is starting!----"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "17778418910"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); valuesBucket.PutInt("id", rawId); OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", "12378451245"); + valuesBucketTwo.PutString("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); valuesBucketTwo.PutInt("id", rawId); EXPECT_GT(rawId, 0); @@ -225,13 +229,14 @@ HWTEST_F(CalllogFuzzyQueryTest, abnormal_calllog_Query_test_500, testing::ext::T { HILOG_INFO("----abnormal_calllog_Query_test_500 is starting!----"); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "12378418910"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); valuesBucket.PutInt("id", rawId); OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", "12374589961"); + valuesBucketTwo.PutString("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); valuesBucketTwo.PutInt("id", rawId); EXPECT_GT(rawId, 0); @@ -240,7 +245,7 @@ HWTEST_F(CalllogFuzzyQueryTest, abnormal_calllog_Query_test_500, testing::ext::T columns.push_back("id"); columns.push_back("phone_number"); OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.Like("phone_numbers", "1238910516156465%"); + predicates.Like("phone_numbers", phoneNumber); predicates.OrderByAsc("id"); std::shared_ptr resultSet = CalllogQuery(columns, predicates); int rowCount = 0; diff --git a/test/unittest/src/contactability_test.cpp b/test/unittest/src/contactability_test.cpp index 1188c6a646cdb6c479c2156c3e5645de3177853d..c9f596ee79e8f3c8a11637dc7c904d1f7fd12aab 100644 --- a/test/unittest/src/contactability_test.cpp +++ b/test/unittest/src/contactability_test.cpp @@ -85,9 +85,9 @@ int64_t ContactAbilityTest::GroupsInsert(std::string groupName, OHOS::NativeRdb: int64_t ContactAbilityTest::ContactBlocklistInsert( std::string phoneNumber, OHOS::NativeRdb::ValuesBucket &contactBlocklistValues) { - OHOS::Uri uriBlacklist(ContactsUri::BLOCKLIST); + OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST); contactBlocklistValues.PutString("phone_number", phoneNumber); - int64_t code = contactsDataAbility.Insert(uriBlacklist, contactBlocklistValues); + int64_t code = contactsDataAbility.Insert(uriBlocklist, contactBlocklistValues); return code; } @@ -2945,25 +2945,26 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_5800, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_BatchInsertAndDelete_test_5900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_BatchInsertAndDelete_test_5900 is starting! ---"); - OHOS::Uri uriContactBlacklist(ContactsUri::BLOCKLIST); - OHOS::NativeRdb::ValuesBucket contactBlacklistValuesOne; - contactBlacklistValuesOne.PutString("phone_number", "147258369"); - OHOS::NativeRdb::ValuesBucket contactBlacklistValuesTwo; - contactBlacklistValuesTwo.PutString("phone_number", "963852741"); - OHOS::NativeRdb::ValuesBucket contactBlacklistValuesThree; - contactBlacklistValuesThree.PutString("phone_number", "1234789602"); + OHOS::Uri uriContactBlocklist(ContactsUri::BLOCKLIST); + OHOS::NativeRdb::ValuesBucket contactBlocklistValuesOne; + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + contactBlocklistValuesOne.PutString("phone_number", phoneNumber); + OHOS::NativeRdb::ValuesBucket contactBlocklistValuesTwo; + contactBlocklistValuesTwo.PutString("phone_number", phoneNumber); + OHOS::NativeRdb::ValuesBucket contactBlocklistValuesThree; + contactBlocklistValuesThree.PutString("phone_number", phoneNumber); std::vector listAddBluk; - listAddBluk.push_back(contactBlacklistValuesOne); - listAddBluk.push_back(contactBlacklistValuesTwo); - listAddBluk.push_back(contactBlacklistValuesThree); - int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlacklist, listAddBluk); + listAddBluk.push_back(contactBlocklistValuesOne); + listAddBluk.push_back(contactBlocklistValuesTwo); + listAddBluk.push_back(contactBlocklistValuesThree); + int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlocklist, listAddBluk); EXPECT_EQ(batchInsertCode, 0); OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.EqualTo("phone_number", std::string("147258369")); + predicates.EqualTo("phone_number", std::string(phoneNumber)); predicates.Or(); - predicates.EqualTo("phone_number", std::string("963852741")); + predicates.EqualTo("phone_number", std::string(phoneNumber)); std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST; int deleteCode = ContactDelete(contactBlocklist, predicates); EXPECT_EQ(deleteCode, 0); diff --git a/test/unittest/src/contactprofile_test.cpp b/test/unittest/src/contactprofile_test.cpp index b3a8cd9ed703e3b3c8a9ecda426f00a3ad8b93fb..e208e5dcedf4b7050c3ef664250047cdf9f344af 100644 --- a/test/unittest/src/contactprofile_test.cpp +++ b/test/unittest/src/contactprofile_test.cpp @@ -87,9 +87,9 @@ int64_t ContactProfileTest::GroupsInsert(std::string groupName, OHOS::NativeRdb: int64_t ContactProfileTest::ContactBlocklistInsert( std::string phoneNumber, OHOS::NativeRdb::ValuesBucket &contactBlocklistValues) { - OHOS::Uri uriBlacklist(ProfileUri::BLOCKLIST); + OHOS::Uri uriBlocklist(ProfileUri::BLOCKLIST); contactBlocklistValues.PutString("phone_number", phoneNumber); - int64_t code = contactsDataAbility.Insert(uriBlacklist, contactBlocklistValues); + int64_t code = contactsDataAbility.Insert(uriBlocklist, contactBlocklistValues); return code; } @@ -2943,25 +2943,26 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_5800, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_BatchInsertAndDelete_test_5900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_BatchInsertAndDelete_test_5900 is starting! ---"); - OHOS::Uri uriContactBlacklist(ProfileUri::BLOCKLIST); - OHOS::NativeRdb::ValuesBucket contactBlacklistValuesOne; - contactBlacklistValuesOne.PutString("phone_number", "147258369"); - OHOS::NativeRdb::ValuesBucket contactBlacklistValuesTwo; - contactBlacklistValuesTwo.PutString("phone_number", "963852741"); - OHOS::NativeRdb::ValuesBucket contactBlacklistValuesThree; - contactBlacklistValuesThree.PutString("phone_number", "1234789602"); + OHOS::Uri uriContactBlocklist(ProfileUri::BLOCKLIST); + OHOS::NativeRdb::ValuesBucket contactBlocklistValuesOne; + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + contactBlocklistValuesOne.PutString("phone_number", phoneNumber); + OHOS::NativeRdb::ValuesBucket contactBlocklistValuesTwo; + contactBlocklistValuesTwo.PutString("phone_number", phoneNumber); + OHOS::NativeRdb::ValuesBucket contactBlocklistValuesThree; + contactBlocklistValuesThree.PutString("phone_number", phoneNumber); std::vector listAddBluk; - listAddBluk.push_back(contactBlacklistValuesOne); - listAddBluk.push_back(contactBlacklistValuesTwo); - listAddBluk.push_back(contactBlacklistValuesThree); - int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlacklist, listAddBluk); + listAddBluk.push_back(contactBlocklistValuesOne); + listAddBluk.push_back(contactBlocklistValuesTwo); + listAddBluk.push_back(contactBlocklistValuesThree); + int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlocklist, listAddBluk); EXPECT_EQ(batchInsertCode, 0); OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.EqualTo("phone_number", std::string("147258369")); + predicates.EqualTo("phone_number", std::string(phoneNumber)); predicates.Or(); - predicates.EqualTo("phone_number", std::string("963852741")); + predicates.EqualTo("phone_number", std::string(phoneNumber)); std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST; int deleteCode = ContactDelete(contactBlocklist, predicates); EXPECT_EQ(deleteCode, 0); diff --git a/test/unittest/src/voicemailability_test.cpp b/test/unittest/src/voicemailability_test.cpp index 42304a580e63fbb50b01b4a33a465af366e5b9c6..3a01d1ea8cb269eda9f6d8f99881732c13d14a75 100644 --- a/test/unittest/src/voicemailability_test.cpp +++ b/test/unittest/src/voicemailability_test.cpp @@ -92,7 +92,8 @@ OHOS::NativeRdb::ValuesBucket VoicemailAbilityTest::GetVoiceMailValues( { std::string voiceMailTestStringValue = std::to_string(ContactsRand()); OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", "15412121" + voiceMailTestStringValue); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesBucket.PutString("phone_number", phoneNumber + voiceMailTestStringValue); valuesBucket.PutString("quicksearch_key", "dfquicksearch_key" + voiceMailTestStringValue); valuesBucket.PutString("display_name", "dfName" + voiceMailTestStringValue); valuesBucket.PutString("voicemail_uri", "dfUri::voicemail_uri" + voiceMailTestStringValue); @@ -149,7 +150,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_100, testing::ext::TestSize { HILOG_INFO("--- voicemail_Insert_test_100 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "166320"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); values.PutInt("voice_status", 1); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Insert_test_100 : voicemailId = %{public}d", voicemailId); @@ -180,7 +182,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_200, testing::ext::TestSize { HILOG_INFO("--- voicemail_Insert_test_200 is staring! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "154236"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Insert_test_200 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); @@ -244,7 +247,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_400, testing::ext::TestSize { HILOG_INFO("--- voicemail_Update_test_400 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "4396"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); values.PutInt("voice_status", 1); int voicemailId = VoicemailInsertValues(values); EXPECT_GT(voicemailId, 0); @@ -282,7 +286,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_500, testing::ext::TestSize { HILOG_INFO("--- voicemail_Delete_test_500 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "154236"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Delete_test_500 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); @@ -319,19 +324,20 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_600, testing::ext::TestSize { HILOG_INFO("--- voicemail_Delete_test_600 is staring! ---"); OHOS::NativeRdb::ValuesBucket valuesOne; - valuesOne.PutString("phone_number", "1000111"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesOne.PutString("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(valuesOne); HILOG_INFO("voicemail_Delete_test_600 : voicemailIdOne = %{public}d", voicemailIdOne); EXPECT_GT(voicemailIdOne, 0); OHOS::NativeRdb::ValuesBucket valuesTwo; - valuesTwo.PutString("phone_number", "1000111"); + valuesTwo.PutString("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(valuesTwo); HILOG_INFO("voicemail_Delete_test_600 : voicemailIdTwo = %{public}d", voicemailIdTwo); EXPECT_GT(voicemailIdTwo, 0); OHOS::NativeRdb::ValuesBucket valuesThree; - valuesThree.PutString("phone_number", "1000111"); + valuesThree.PutString("phone_number", phoneNumber); int voicemailIdThree = VoicemailInsertValues(valuesThree); HILOG_INFO("voicemail_Delete_test_600 : voicemailIdThree = %{public}d", voicemailIdThree); EXPECT_GT(voicemailIdThree, 0); @@ -410,10 +416,11 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_800, testing::ext::TestSize { HILOG_INFO("--- voicemail_Delete_test_800 is starting!---"); OHOS::NativeRdb::ValuesBucket voicemailValues; - voicemailValues.PutString("phone_number", "154236"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + voicemailValues.PutString("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(voicemailValues); EXPECT_GT(voicemailIdOne, 0); - voicemailValues.PutString("phone_number", "154236"); + voicemailValues.PutString("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(voicemailValues); EXPECT_GT(voicemailIdTwo, 0); @@ -455,7 +462,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_900, testing::ext::TestSize { HILOG_INFO("--- voicemail_Update_test_900 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "166323340"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); values.PutInt("voice_status", 0); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Update_test_900 : voicemailId = %{public}d", voicemailId); @@ -468,7 +476,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_900, testing::ext::TestSize int updateCode = VoicemailUpdate(updateValues, predicates); EXPECT_EQ(updateCode, 0); - updateValues.PutString("phone_number", "166323340"); + updateValues.PutString("phone_number", phoneNumber); predicates.Clear(); predicates.EqualTo("id", std::to_string(voicemailId)); std::vector columns; @@ -500,7 +508,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1000, testing::ext::TestSiz EXPECT_GT(voicemailId, 0); OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number", std::string("18522547896")); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + updateValues.PutString("phone_number", std::string(phoneNumber)); OHOS::NativeRdb::DataAbilityPredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); @@ -531,29 +540,30 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1100, testing::ext::TestSiz { HILOG_INFO("--- voicemail_Update_test_1100 is staring! ---"); OHOS::NativeRdb::ValuesBucket valuesOne; - valuesOne.PutString("phone_number", "177888855"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesOne.PutString("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(valuesOne); EXPECT_GT(voicemailIdOne, 0); OHOS::NativeRdb::ValuesBucket valuesTwo; - valuesTwo.PutString("phone_number", "177888856"); + valuesTwo.PutString("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(valuesTwo); EXPECT_GT(voicemailIdTwo, 0); OHOS::NativeRdb::ValuesBucket valuesThree; - valuesThree.PutString("phone_number", "177888856"); + valuesThree.PutString("phone_number", phoneNumber); int voicemailIdThree = VoicemailInsertValues(valuesThree); EXPECT_GT(voicemailIdThree, 0); OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number", std::string("20014455")); + updateValues.PutString("phone_number", std::string(phoneNumber)); OHOS::NativeRdb::DataAbilityPredicates predicates; predicates.EqualTo("id", std::to_string(voicemailIdOne)); int updateCode = VoicemailUpdate(updateValues, predicates); EXPECT_EQ(updateCode, 0); OHOS::NativeRdb::ValuesBucket updateValuesTwo; - updateValuesTwo.PutString("phone_number", std::string("1993025")); + updateValuesTwo.PutString("phone_number", std::string(phoneNumber)); predicates.Clear(); predicates.EqualTo("id", std::to_string(voicemailIdTwo)); updateCode = VoicemailUpdate(updateValuesTwo, predicates); @@ -627,10 +637,11 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1300, testing::ext::TestSiz { HILOG_INFO("--- voicemail_Update_test_1300 is starting!---"); OHOS::NativeRdb::ValuesBucket voicemailValues; - voicemailValues.PutString("phone_number", "154236"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + voicemailValues.PutString("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(voicemailValues); EXPECT_GT(voicemailIdOne, 0); - voicemailValues.PutString("phone_number", "154236"); + voicemailValues.PutString("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(voicemailValues); EXPECT_GT(voicemailIdTwo, 0); OHOS::NativeRdb::DataAbilityPredicates predicates; @@ -680,7 +691,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1400, testing::ext::TestSize { HILOG_INFO("--- voicemail_Query_test_1400 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "882203110"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); values.PutInt("voice_status", 1); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Query_test_1400 : voicemailId = %{public}d", voicemailId); @@ -750,7 +762,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1600, testing::ext::TestSize EXPECT_GT(voicemailIdOne, 0); OHOS::NativeRdb::ValuesBucket valuesTwo; - valuesTwo.PutString("phone_number", "891320"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + valuesTwo.PutString("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(valuesTwo); HILOG_INFO("voicemail_Query_test_1600 : voicemailIdTwo = %{public}d", voicemailIdTwo); EXPECT_GT(voicemailIdTwo, 0); @@ -812,13 +825,14 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1800, testing::ext::Te OHOS::Uri uriData(VoicemailUri::VOICEMAIL); OHOS::NativeRdb::ValuesBucket voicemailValuesOne; - voicemailValuesOne.PutString("phone_number", std::string("1470023")); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + voicemailValuesOne.PutString("phone_number", std::string(phoneNumber)); voicemailValuesOne.PutInt("voice_status", 1); OHOS::NativeRdb::ValuesBucket voicemailValuesTwo; - voicemailValuesTwo.PutString("phone_number", std::string("1470056")); + voicemailValuesTwo.PutString("phone_number", std::string(phoneNumber)); voicemailValuesTwo.PutInt("voice_status", 0); OHOS::NativeRdb::ValuesBucket voicemailValuesThree; - voicemailValuesThree.PutString("phone_number", std::string("1470089")); + voicemailValuesThree.PutString("phone_number", std::string(phoneNumber)); voicemailValuesThree.PutInt("voice_status", 0); std::vector listAddBluk; @@ -829,9 +843,9 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1800, testing::ext::Te EXPECT_EQ(batchInsertCode, 0); OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.EqualTo("phone_number", "1470023"); + predicates.EqualTo("phone_number", phoneNumber); predicates.Or(); - predicates.EqualTo("phone_number", "1470089"); + predicates.EqualTo("phone_number", phoneNumber); predicates.OrderByAsc("id"); std::vector columns; columns.push_back("phone_number"); @@ -860,19 +874,20 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1900, testing::ext::Te HILOG_INFO("--- voicemail_BatchInsert_test_1900 is staring! ---"); OHOS::Uri uriData(VoicemailUri::VOICEMAIL); OHOS::NativeRdb::ValuesBucket voicemailValuesOne; - voicemailValuesOne.PutString("phone_number", std::string("123478")); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + voicemailValuesOne.PutString("phone_number", std::string(phoneNumber)); voicemailValuesOne.PutString("display_name", std::string("xiaoming")); OHOS::NativeRdb::ValuesBucket voicemailValuesTwo; - voicemailValuesTwo.PutString("phone_number", std::string("10002")); + voicemailValuesTwo.PutString("phone_number", std::string(phoneNumber)); voicemailValuesTwo.PutString("display_name", std::string("xiaozi")); OHOS::NativeRdb::ValuesBucket voicemailValuesThree; - voicemailValuesThree.PutString("phone_number", std::string("10003")); + voicemailValuesThree.PutString("phone_number", std::string(phoneNumber)); voicemailValuesThree.PutString("display_name", std::string("xiaozhi")); OHOS::NativeRdb::ValuesBucket voicemailValuesFour; - voicemailValuesFour.PutString("phone_number", std::string("10004")); + voicemailValuesFour.PutString("phone_number", std::string(phoneNumber)); voicemailValuesFour.PutString("display_name", std::string("xiaohei")); OHOS::NativeRdb::ValuesBucket voicemailValuesFive; - voicemailValuesFive.PutString("phone_number", std::string("10005")); + voicemailValuesFive.PutString("phone_number", std::string(phoneNumber)); voicemailValuesFive.PutString("display_name", std::string("xiaohong")); std::vector listAddBluk; listAddBluk.push_back(voicemailValuesOne); @@ -1017,7 +1032,8 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Delete_test_2300, testing::ext { HILOG_INFO("--- abnormal_voicemail_Delete_test_2300 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "10086123"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("abnormal_voicemail_Delete_test_2300 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); @@ -1051,7 +1067,8 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Delete_test_2400, testing::ext { HILOG_INFO("--- abnormal_voicemail_Delete_test_2400 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "166320"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("abnormal_voicemail_Delete_test_2400 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); @@ -1123,13 +1140,14 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2600, testing::ext { HILOG_INFO("--- abnormal_voicemail_Update_test_2600 is staring! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "11100886622"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("abnormal_voicemail_Update_test_2600 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number", std::string("18522547896")); + updateValues.PutString("phone_number", std::string(phoneNumber)); OHOS::NativeRdb::DataAbilityPredicates predicates; predicates.EqualTo("ids", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); @@ -1150,14 +1168,15 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2700, testing::ext { HILOG_INFO("--- abnormal_voicemail_Update_test_2700 is staring! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "188520"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("abnormal_voicemail_Update_test_2700 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); OHOS::Uri uriVoicemails(VoicemailUri::ERROR_URI); OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number", std::string("18522547896")); + updateValues.PutString("phone_number", std::string(phoneNumber)); OHOS::NativeRdb::DataAbilityPredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); int updateCode = voicemailAbility.Update(uriVoicemails, updateValues, predicates); @@ -1282,13 +1301,14 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3200, testing HILOG_INFO("--- abnormal_voicemail_BatchInsert_test_3200 is starting! ---"); OHOS::Uri uriData(VoicemailUri::VOICEMAIL); OHOS::NativeRdb::ValuesBucket voicemailValuesOne; - voicemailValuesOne.PutString("phone_number", std::string("147002366666666")); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + voicemailValuesOne.PutString("phone_number", std::string(phoneNumber)); voicemailValuesOne.PutInt("voice_status", 1); OHOS::NativeRdb::ValuesBucket voicemailValuesTwo; - voicemailValuesTwo.PutString("phone_numbers", std::string("1470056")); + voicemailValuesTwo.PutString("phone_numbers", std::string(phoneNumber)); voicemailValuesTwo.PutInt("voice_statuss", 0); OHOS::NativeRdb::ValuesBucket voicemailValuesThree; - voicemailValuesThree.PutString("phone_number", std::string("1470089")); + voicemailValuesThree.PutString("phone_number", std::string(phoneNumber)); voicemailValuesThree.PutInt("voice_status", 0); std::vector listAddBluk; @@ -1299,11 +1319,12 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3200, testing EXPECT_EQ(batchInsertCode, -1); OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.EqualTo("phone_number", "147002366666666"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + predicates.EqualTo("phone_number", phoneNumber); predicates.Or(); - predicates.EqualTo("phone_numbers", "1470056"); + predicates.EqualTo("phone_numbers", phoneNumber); predicates.Or(); - predicates.EqualTo("phone_number", "1470089"); + predicates.EqualTo("phone_number", phoneNumber); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); @@ -1406,7 +1427,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_3500, testing::ext::TestSiz { HILOG_INFO("--- voicemail_Update_test_3500 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "166323340"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); values.PutInt("voice_status", 1); int voicemailId = VoicemailInsertValues(values); EXPECT_GT(voicemailId, 0); @@ -1418,7 +1440,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_3500, testing::ext::TestSiz int updateCode = VoicemailUpdate(updateValues, predicates); EXPECT_EQ(updateCode, 0); - updateValues.PutString("phone_number", "166323340"); + updateValues.PutString("phone_number", phoneNumber); predicates.Clear(); predicates.EqualTo("id", std::to_string(voicemailId)); std::vector columns; @@ -1444,7 +1466,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_3600, testing::ext::TestSize { HILOG_INFO("--- voicemail_Query_test_3600 is starting! ---"); OHOS::NativeRdb::ValuesBucket values; - values.PutString("phone_number", "882203110"); + std::string phoneNumber = to_string((rand() % (900000000000))+10000000000); + values.PutString("phone_number", phoneNumber); values.PutInt("voice_status", 0); int voicemailId = VoicemailInsertValues(values); EXPECT_GT(voicemailId, 0);