openharmony/applications_contactsdata
1
0
Fork 0
mirror of https://github.com/openharmony/applications_contactsdata.git synced 2026-07-01 20:24:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

!31 规范问题处理

Browse Source 
Merge pull request !31 from 徐黔南/master
This commit is contained in:
openharmony_ci
2022-04-11 02:36:43 +00:00
committed by Gitee
parent 19ced5798f 794ee8dec0
commit f33b81d40e
41 changed files with 377 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README_zh.md
+9 -9
View File
@@ -106,7 +106,7 @@ var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
// 调用update方法
DAHelper.update(calllogUri, value, condition).then((data) => {
@@ -138,7 +138,7 @@ var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
// 调用delete方法
DAHelper.delete(calllogUri, condition).then((data) => {
@@ -171,7 +171,7 @@ var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
var resultColumns = [ "id", "display_name", "phone_number"];
// 调用query方法
@@ -245,7 +245,7 @@ var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
// 调用update方法
DAHelper.update(voicemaiUri, value, condition).then((data) => {
@@ -277,7 +277,7 @@ var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
// 调用delete方法
DAHelper.delete(voicemaiUri, condition).then((data) => {
@@ -310,7 +310,7 @@ var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
var resultColumns = [ "id", "display_name", "phone_number"];
// 调用query方法
@@ -394,7 +394,7 @@ var value = {"display_name" : "xxx"};
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
// 调用update方法
DAHelper.update(rawContactUri, value, condition).then((data) => {
@@ -427,7 +427,7 @@ var contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/cont
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
// 调用delete方法
DAHelper.delete(contactDataUri, condition).then((data) => {
@@ -459,7 +459,7 @@ var rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_c
// 获取DAHelper
let DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
// 条件参数
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", "xxx");
var resultColumns = [ "id", "display_name"];
// 调用query方法
ability/account/include/account_sync.h
+1 -1
View File
@@ -48,4 +48,4 @@ private:
} // namespace Contacts
} // namespace OHOS
#endif // ACCOUNT_SYNC_H
#endif // ACCOUNT_SYNC_H
ability/common/include/common.h
+1 -1
View File
@@ -889,4 +889,4 @@ constexpr const char *MERGE_INFO_INDEX =
"CREATE INDEX IF NOT EXISTS [merge_info_index] ON [merge_info] ([raw_contact_id])";
} // namespace Contacts
} // namespace OHOS
#endif // COMMON_H
#endif // COMMON_H
ability/common/include/hilog_wrapper.h
+1 -1
View File
@@ -58,4 +58,4 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = {LOG_CORE, 0, "Contacts
#endif // CONFIG_HILOG
#endif // HILOG_WRAPPER_H
#endif // HILOG_WRAPPER_H
ability/common/utils/include/contacts_common_event.h
+1 -1
View File
@@ -52,4 +52,4 @@ public:
};
} // namespace Contacts
} // namespace OHOS
#endif // CONTACT_COMMON_EVENT_H
#endif // CONTACT_COMMON_EVENT_H
ability/common/utils/include/contacts_string_utils.h
+1 -1
View File
@@ -31,4 +31,4 @@ public:
} // namespace Contacts
} // namespace OHOS
#endif // STRING_UTILS_H
#endif // STRING_UTILS_H
ability/common/utils/include/file_utils.h
+1 -1
View File
@@ -37,4 +37,4 @@ public:
};
} // namespace Contacts
} // namespace OHOS
#endif // FILE_UTILS_H
#endif // FILE_UTILS_H
ability/common/utils/include/predicates_convert.h
+1 -1
View File
@@ -33,4 +33,4 @@ public:
};
} // namespace Contacts
} // namespace OHOS
#endif // PREDICATES_CONVERT_H
#endif // PREDICATES_CONVERT_H
ability/merge/include/merger_contacts.h
+1 -1
View File
@@ -51,4 +51,4 @@ private:
} // namespace Contacts
} // namespace OHOS
#endif // MERGERCONTACT_H
#endif // MERGERCONTACT_H
ability/sinicization/include/character_transliterate.h
+1 -1
View File
@@ -52,4 +52,4 @@ public:
};
} // namespace Contacts
} // namespace OHOS
#endif // CHARACTER_TRANSLITERATE_H
#endif // CHARACTER_TRANSLITERATE_H
ability/sinicization/src/character_transliterate.cpp
+1 -1
View File
@@ -1965,7 +1965,7 @@ CharacterTransliterate::~CharacterTransliterate()
bool CharacterTransliterate::IsChineseCharacter(wchar_t chineseCharacter)
{
return (unsigned short)chineseCharacter >= 0x4E00 && (unsigned short)chineseCharacter <= 0x9FCF;
return (uint16_t)chineseCharacter >= 0x4E00 && (uint16_t)chineseCharacter <= 0x9FCF;
}
Container CharacterTransliterate::GetContainer(std::wstring wChinese)
contacts/include/contacts_control.h
+1 -1
View File
@@ -66,4 +66,4 @@ public:
};
} // namespace ContactsApi
} // namespace OHOS
#endif // CONTACT_CONTROL_H
#endif // CONTACT_CONTROL_H
contacts/include/contacts_napi_object.h
+1 -1
View File
@@ -851,4 +851,4 @@ public:
};
} // namespace ContactsApi
} // namespace OHOS
#endif // CONTACT_NAPI_OBJECT_H
#endif // CONTACT_NAPI_OBJECT_H
contacts/include/hilog_wrapper_api.h
+1 -1
View File
@@ -58,4 +58,4 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = {LOG_CORE, 0, "Contacts
#endif // CONFIG_HILOG
#endif // HILOG_WRAPPER_API_H
#endif // HILOG_WRAPPER_API_H
dataBusiness/contacts/include/contacts_account.h
+1 -1
View File
@@ -48,4 +48,4 @@ private:
} // namespace Contacts
} // namespace OHOS
#endif // CONTACT_ACCOUNT_H
#endif // CONTACT_ACCOUNT_H
dataBusiness/contacts/include/contacts_data_ability.h
+1 -1
View File
@@ -69,4 +69,4 @@ private:
} // namespace AppExecFwk
} // namespace OHOS
#endif // CONTACTSDATAABILITY_CONTACT_DATA_ABILITY_TEST_H
#endif // CONTACTSDATAABILITY_CONTACT_DATA_ABILITY_TEST_H
dataBusiness/contacts/include/contacts_database.h
+1 -1
View File
@@ -104,4 +104,4 @@ public:
};
} // namespace Contacts
} // namespace OHOS
#endif // CONTACT_DATABASE_H
#endif // CONTACT_DATABASE_H
dataBusiness/voicemail/include/voicemail_ability.h
+1 -1
View File
@@ -48,4 +48,4 @@ private:
};
} // namespace AppExecFwk
} // namespace OHOS
#endif // VOICEMAIL_ABILITY_H
#endif // VOICEMAIL_ABILITY_H
jstest/Calllog_test.js
+49 -49
View File
@@ -28,16 +28,16 @@ describe('CalllogTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
console.info(tag + ': calllogQueryByInsert start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
if (resultSet.rowCount > 0) {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of map) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ' : logMessage calllogQueryByInsert key = ' + key +
' dbResult :' + dbresult + ' value : ' + value);
console.info(tag + ' : logMessage calllogQueryByInsert value ' + (value == dbresult));
@@ -57,11 +57,11 @@ describe('CalllogTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
console.info(tag + ': calllogQueryForDelete start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
expect(resultSet.goToFirstRow() == false).assertTrue();
console.info(tag + " :logMessage calllogQueryForDelete: goToFirstRow " + resultSet.goToFirstRow());
resultSet.close();
@@ -74,11 +74,11 @@ describe('CalllogTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
console.info(tag + ': calllogQueryForBatchInsert start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("phone_number", array[0].get("phone_number"));
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
var size = array.size();
console.info(tag + ' : logMessage calllogQueryForBatchInsert: size' + size);
expect(resultSet.rowCount == size).assertEqual(true);
@@ -87,7 +87,7 @@ describe('CalllogTest', function() {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of array[i]) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ' : logMessage calllogQueryForBatchInsert dbresult :' + dbresult +
' value : ' + value);
console.info(tag + ' : logMessage calllogQueryForBatchInsert value ' + (value == dbresult));
@@ -106,7 +106,7 @@ describe('CalllogTest', function() {
async function calllogDelete(tag)
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(calllogUri, condition);
console.info(tag + ': calllogDelete deleteCode = ' + deleteCode);
@@ -161,7 +161,7 @@ describe('CalllogTest', function() {
async function UpdateOneCalllog()
{
try {
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString());
var updateCode = await DAHelper.update(calllogUri, common.getCallLogUpdate(), condition);
console.info("logMessage calllog_update_test_400: updateCode = " + updateCode);
@@ -201,7 +201,7 @@ describe('CalllogTest', function() {
async function UpdateAllCalllog()
{
var updateValues = {"answer_state" : "1"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var updateCode = await DAHelper.update(calllogUri, updateValues, condition)
@@ -244,7 +244,7 @@ describe('CalllogTest', function() {
async function DeleteOneCalllog()
{
try {
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString());
var deleteCode = await DAHelper.delete(calllogUri, condition);
console.info("logMessage calllog_delete_test_1300: deleteCode = " + deleteCode);
@@ -344,12 +344,12 @@ describe('CalllogTest', function() {
async function QueryCalllog()
{
var resultColumns = [ "id", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.lessThan("ring_duration", "200").orderByAsc("id");
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
if (resultSet.goToFirstRow()) {
do {
console.info("logMessage calllog_query_test_1100: columnNames:" + resultSet.columnNames);
@@ -394,10 +394,10 @@ describe('CalllogTest', function() {
async function QueryOneCalllog()
{
var resultColumns = [ "id", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString());
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
if (resultSet.goToFirstRow()) {
do {
console.info("logMessage calllog_query_test_800: columnNames:" + resultSet.columnNames);
@@ -443,10 +443,10 @@ describe('CalllogTest', function() {
async function QueryByStartsWithPhoneNumber()
{
var resultColumns = [ "id", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("phone_number", phoneNumber_Test + "%");
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
if (resultSet.goToFirstRow()) {
do {
console.info("logMessage calllog_fuzzyquery_test_100: columnNames:" + resultSet.columnNames);
@@ -493,10 +493,10 @@ describe('CalllogTest', function() {
async function QueryByEndWithPhoneNumber()
{
var resultColumns = [ "id", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("phone_number", "%" + phoneNumber_Test);
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
if (resultSet.goToFirstRow()) {
do {
console.info("logMessage calllog_fuzzyquery_test_200: columnNames:" + resultSet.columnNames);
@@ -542,11 +542,11 @@ describe('CalllogTest', function() {
async function QueryByPhoneNumberContainsField()
{
var resultColumns = [ "id", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var phoneNumber_Test = phoneNumber.substring(7,10);
condition.like("phone_number", "%" + phoneNumber_Test + "%");
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
if (resultSet.goToFirstRow()) {
do {
console.info("logMessage calllog_fuzzyquery_test_300: columnNames:" + resultSet.columnNames);
@@ -638,7 +638,7 @@ describe('CalllogTest', function() {
{
var phoneNumber_Test = randomNum(7);
var updateValues = {"phone_numbers" : phoneNumber_Test};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", calllogId.toString());
try {
var updataCode = await DAHelper.update(calllogUri, updateValues, condition);
@@ -683,7 +683,7 @@ describe('CalllogTest', function() {
{
var phoneNumber_Test = randomNum(7);
var updateValues = {"phone_numbers" : phoneNumber_Test};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString());
try {
var updataCode = await DAHelper.update(errorUri, updateValues, condition);
@@ -726,7 +726,7 @@ describe('CalllogTest', function() {
async function abnormalDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", calllogId.toString());
try {
var deleteCode = await DAHelper.delete(calllogUri, condition);
@@ -769,7 +769,7 @@ describe('CalllogTest', function() {
async function abnormalDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString());
try {
var deleteCode = await DAHelper.delete(errorUri, condition);
@@ -813,10 +813,10 @@ describe('CalllogTest', function() {
async function abnormalQuery()
{
var resultColumns = [ "id", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", calllogId.toString());
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
console.info('logMessage abnormal_calllog_query_test_900: goToFirstRow' + resultSet.goToFirstRow());
expect(resultSet.goToFirstRow()).assertEqual(false);
resultSet.close();
@@ -885,7 +885,7 @@ describe('CalllogTest', function() {
async function executeBatch()
{
console.info("logMessage calllog_delete_test_1800: executeBatch start ");
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString());
DAHelper.executeBatch(URI_CALLLOG, [ {
uri : calllogUri,
@@ -931,7 +931,7 @@ describe('CalllogTest', function() {
{
var phoneNumber = randomNum(8);
var updateValues = {"phone_number" : phoneNumber};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString());
DAHelper.executeBatch(URI_CALLLOG, [ {
uri : calllogUri,
@@ -980,7 +980,7 @@ describe('CalllogTest', function() {
async function DeleteCalllog()
{
try {
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString());
condition.or();
condition.equalTo("id", calllogIdTwo.toString());
@@ -990,7 +990,7 @@ describe('CalllogTest', function() {
console.info("logMessage calllog_Delete_test_2000: deleteCode = " + deleteCode);
expect(deleteCode == 0).assertTrue();
var resultColumns = [];
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
expect(resultSet.rowCount == 0).assertTrue();
resultSet.close();
} catch (error) {
@@ -1017,10 +1017,10 @@ describe('CalllogTest', function() {
map.set("id", calllogId.toString());
await calllogQueryForALL(map, "calllog_Delete_test_2100");
await calllogDelete("calllog_Delete_test_2100");
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId);
var resultColumns = [];
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
expect(resultSet.rowCount == 0).assertTrue();
resultSet.close();
done();
@@ -1048,9 +1048,9 @@ describe('CalllogTest', function() {
expect(calllogId > 0).assertTrue();
var resultColumns = [ "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.contains("phone_number", phoneNumber_Test);
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
if (resultSet.rowCount > 0) {
if (resultSet.goToFirstRow()) {
do {
@@ -1131,10 +1131,10 @@ describe('CalllogTest', function() {
var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues);
expect(calllogId > 0).assertTrue();
expect(calllogIdTwo > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", calllogId.toString() + "ksks");
var resultColumns = [ "display_names" ];
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
console.info("abnormal_calllog_query_test_2400: resultSet.rowCount = " + resultSet.rowCount);
expect(resultSet.rowCount == -1).assertTrue();
resultSet.close();
@@ -1165,9 +1165,9 @@ describe('CalllogTest', function() {
console.info('abnormal_calllog_query_test_2500 calllogIdTwo = ' + calllogIdTwo);
expect(calllogId > 0).assertTrue();
expect(calllogIdTwo > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var resultColumns = [ "display_names" ];
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
console.info('abnormal_calllog_query_test_2500 resultSet.goToFirstRow() = ' + resultSet.goToFirstRow());
console.info('abnormal_calllog_query_test_2500 resultSet.rowCount = ' + resultSet.rowCount);
expect(resultSet.goToFirstRow() == false).assertTrue();
@@ -1200,7 +1200,7 @@ describe('CalllogTest', function() {
console.info("logMessage abnormal_calllog_delete_test_2600: calllog insert error = " + error);
done();
}
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", calllogIdTwo.toString());
condition.or();
condition.equalTo("id", calllogId.toString());
@@ -1209,7 +1209,7 @@ describe('CalllogTest', function() {
expect(code == -1).assertTrue();
condition.clear();
var resultColumns = [];
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
var count = 2;
expect(resultSet.rowCount == count).assertTrue();
resultSet.close();
@@ -1242,7 +1242,7 @@ describe('CalllogTest', function() {
{
try {
var insertValues = {phone_number : phoneNumber, display_names : "nameUpdateError2700"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", calllogIdTwo.toString());
condition.or();
condition.equalTo("id", calllogId.toString());
@@ -1290,10 +1290,10 @@ describe('CalllogTest', function() {
async function QueryByStartsWithPhoneNumberError()
{
var resultColumns = [ "id", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("phone_numbers", phoneNumber_Test + "%");
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
console.info("logMessage abnormal_calllog_query_test_2800: resultSet.rowCount = " + resultSet.rowCount);
expect(resultSet.rowCount == -1).assertTrue();
resultSet.close();
@@ -1307,7 +1307,7 @@ describe('CalllogTest', function() {
afterAll(async function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
console.info('callllog afterAll logMessage get DAHelper success! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(calllogUri, condition);
console.info('callllog afterAll end logMessage deleteCode = ' + deleteCode);
jstest/ContactCard_test.js
+78 -78
View File
@@ -56,7 +56,7 @@ describe('ContactCardTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(uri, resultColumns, condition);
@@ -65,7 +65,7 @@ describe('ContactCardTest', function() {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of map) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ':logMessage contactsQuery key = ' + key + ' dbresult :' + dbresult +
' value : ' + value);
expect(value == dbresult).assertEqual(true);
@@ -84,7 +84,7 @@ describe('ContactCardTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryBatch start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", map.get("raw_contact_id"));
try {
var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition);
@@ -101,8 +101,8 @@ describe('ContactCardTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryIdForDelete start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(uri, resultColumns, condition);
@@ -119,7 +119,7 @@ describe('ContactCardTest', function() {
{
try {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(uri, condition);
console.info(tag + ': deleteAll deleteCode = ' + deleteCode);
@@ -133,7 +133,7 @@ describe('ContactCardTest', function() {
{
try {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -646,7 +646,7 @@ describe('ContactCardTest', function() {
"favorite" : 0,
"phonetic_name" : "dacheng||dc"
};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileRawContactUri, updateValues, condition);
@@ -707,7 +707,7 @@ describe('ContactCardTest', function() {
async function dataNameUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "dayuan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -769,7 +769,7 @@ describe('ContactCardTest', function() {
async function dataCompanyUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "OOOO", "position" : "developer"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -827,7 +827,7 @@ describe('ContactCardTest', function() {
async function dataPhoneUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "99663355"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -889,7 +889,7 @@ describe('ContactCardTest', function() {
async function dataNickNameUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "fengyuan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -951,7 +951,7 @@ describe('ContactCardTest', function() {
async function dataEmailUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "199@163.com"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition)
@@ -1013,7 +1013,7 @@ describe('ContactCardTest', function() {
async function dataPostalUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "BeiJing"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -1071,7 +1071,7 @@ describe('ContactCardTest', function() {
async function dataNoteUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "God"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -1129,7 +1129,7 @@ describe('ContactCardTest', function() {
async function dataAimUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "bbbbb"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -1191,7 +1191,7 @@ describe('ContactCardTest', function() {
async function dataEventUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "19971021"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -1253,7 +1253,7 @@ describe('ContactCardTest', function() {
async function dataWebsiteUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "www.123.com"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -1314,7 +1314,7 @@ describe('ContactCardTest', function() {
async function dataRelationUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "spouse"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -1376,7 +1376,7 @@ describe('ContactCardTest', function() {
async function dataGroupUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "7"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -1439,7 +1439,7 @@ describe('ContactCardTest', function() {
async function dataMiscUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "999"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
@@ -1482,7 +1482,7 @@ describe('ContactCardTest', function() {
async function updateFavorite(DAHelper, rawContactId)
{
var updateValues = {"favorite" : 1};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileRawContactUri, updateValues, condition);
@@ -1527,7 +1527,7 @@ describe('ContactCardTest', function() {
async function updateUnFavorite(DAHelper, rawContactId)
{
var updateValues = {"favorite" : 0};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(profileRawContactUri, updateValues, condition);
@@ -1594,7 +1594,7 @@ describe('ContactCardTest', function() {
async function BlocklistDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", blocklistId.toString());
try {
var deleteCode = await DAHelper.delete(profileBlocklistUri, condition);
@@ -1734,7 +1734,7 @@ describe('ContactCardTest', function() {
async function deleteGroup(DAHelper, contactDataId)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", contactDataId.toString());
try {
var deleteCode = await DAHelper.delete(profileContactDataUri, condition);
@@ -1777,7 +1777,7 @@ describe('ContactCardTest', function() {
async function RawContactQuery(DAHelper, rawContactId)
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition);
@@ -1835,7 +1835,7 @@ describe('ContactCardTest', function() {
async function queryTwoRaw(DAHelper, rawContactId1, rawContactId2)
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId1.toString());
condition.or();
condition.equalTo("id", rawContactId2.toString());
@@ -1879,7 +1879,7 @@ describe('ContactCardTest', function() {
done();
}
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition);
@@ -1935,7 +1935,7 @@ describe('ContactCardTest', function() {
async function queryAllInformation(DAHelper, rawContactId)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition);
@@ -2022,7 +2022,7 @@ describe('ContactCardTest', function() {
async function groupBossBoardQuery(DAHelper, rawContactId, groupId)
{
var resultColumns = [ "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 9 data is group
condition.equalTo("type_id", "9");
condition.and();
@@ -2070,7 +2070,7 @@ describe('ContactCardTest', function() {
async function queryFavorite()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("favorite", "1");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -2120,7 +2120,7 @@ describe('ContactCardTest', function() {
async function queryContacted()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.lessThan("lastest_contacted_time", "100");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -2254,7 +2254,7 @@ describe('ContactCardTest', function() {
async function phoneQuery(DAHelper, rawContactId)
{
var resultColumns = [ "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 5 data is phone
condition.equalTo("content_type", "phone");
try {
@@ -2322,7 +2322,7 @@ describe('ContactCardTest', function() {
async function emailQuery(DAHelper, contactDataId, rawContactId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 1 data content_type is email
condition.equalTo("type_id", "1").limitAs(array_three).orderByDesc("id");
try {
@@ -2406,7 +2406,7 @@ describe('ContactCardTest', function() {
async function queryTwo(DAHelper, rawContactId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info", "position" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition);
@@ -2654,7 +2654,7 @@ describe('ContactCardTest', function() {
console.info("logMessage contactCard_batchinsert_test_4900: batchInsertCode = " + batchInsertCode);
expect(batchInsertCode == 0).assertTrue();
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("company", "TT4900");
var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition);
console.info(
@@ -2735,7 +2735,7 @@ describe('ContactCardTest', function() {
async function BlocklistDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("phone_number", phoneNumber);
try {
var deleteCode = await DAHelper.delete(profileBlocklistUri, condition);
@@ -2752,7 +2752,7 @@ describe('ContactCardTest', function() {
async function query(size)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("phone_number", phoneNumber);
try {
var resultSet = await DAHelper.query(profileBlocklistUri, resultColumns, condition);
@@ -2802,7 +2802,7 @@ describe('ContactCardTest', function() {
async function RawContactUpdateUnFavorites(DAHelper)
{
var updateValues = {"favorite" : 0};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("display_name", "fengyuan");
condition.or();
condition.equalTo("display_name", "xiaoma");
@@ -2819,7 +2819,7 @@ describe('ContactCardTest', function() {
async function queryUnFavorites(DAHelper)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("display_name", "fengyuan");
condition.or();
condition.equalTo("display_name", "xiaoma");
@@ -2934,7 +2934,7 @@ describe('ContactCardTest', function() {
async function ContactDataDelete(DAHelper, rawContactId1, rawContactId3)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId1.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactId3.toString());
@@ -2952,7 +2952,7 @@ describe('ContactCardTest', function() {
async function queryTwoData(DAHelper, rawContactId1, rawContactId3)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId1.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactId3.toString());
@@ -3014,7 +3014,7 @@ describe('ContactCardTest', function() {
async function SearchQuery(DAHelper, rawContactId)
{
var resultColumns = [ "id", "search_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(profilesearchContactUri, resultColumns, condition);
@@ -3023,7 +3023,7 @@ describe('ContactCardTest', function() {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of map) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ':contactCard_pinyin_query_test_200 key = ' + key +
' dbresult :' + dbresult + ' value : ' + value);
expect(value == dbresult).assertEqual(true);
@@ -3080,7 +3080,7 @@ describe('ContactCardTest', function() {
async function SearchContactQueryChinese(DAHelper, rawContactId)
{
var resultColumns = [ "raw_contact_id", "search_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(profilesearchContactUri, resultColumns, condition);
@@ -3141,7 +3141,7 @@ describe('ContactCardTest', function() {
async function SearchContactQuery(DAHelper, rawContactId)
{
var resultColumns = [ "raw_contact_id", "search_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(profilesearchContactUri, resultColumns, condition);
@@ -3187,7 +3187,7 @@ describe('ContactCardTest', function() {
async function RawContactNameQuery()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("display_name", "%xiaoming40%");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -3235,7 +3235,7 @@ describe('ContactCardTest', function() {
async function RawContactPhoneticNameQuery()
{
var resultColumns = [ "id", "display_name", "phonetic_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("phonetic_name", "%xiaoming%");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -3293,7 +3293,7 @@ describe('ContactCardTest', function() {
async function RawContactCompanyQuery(DAHelper, rawContactId)
{
var resultColumns = [ "id", "display_name", "company", "position" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("company", "%TT6%");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -3370,7 +3370,7 @@ describe('ContactCardTest', function() {
async function fuzzyQueryPhone(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 5 data is phone
condition.like("detail_info", "%52896%");
condition.and();
@@ -3442,7 +3442,7 @@ describe('ContactCardTest', function() {
async function fuzzyQueryPhoneNickName(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 3 data is nickname
condition.like("detail_info", "%daming%");
condition.and();
@@ -3513,7 +3513,7 @@ describe('ContactCardTest', function() {
async function fuzzyQueryEmail(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 1 data is email
condition.like("detail_info", "%1564%");
condition.and();
@@ -3586,7 +3586,7 @@ describe('ContactCardTest', function() {
async function fuzzyQueryAddress(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 1 data is postal_address
condition.like("detail_info", "%nanjing10%");
condition.and();
@@ -3660,7 +3660,7 @@ describe('ContactCardTest', function() {
async function fuzzyQueryNote(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 10 data is note
condition.like("detail_info", "%java11%");
condition.and();
@@ -3731,7 +3731,7 @@ describe('ContactCardTest', function() {
async function fuzzyQueryIM(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 10 data is im account number
condition.like("detail_info", "%aa12%");
condition.and();
@@ -3827,7 +3827,7 @@ describe('ContactCardTest', function() {
async function AbnormalUpdate()
{
var updateValues = {"display_names" : "xiaosan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
try {
var updataCode = await DAHelper.update(profileRawContactUri, updateValues, condition)
@@ -3871,7 +3871,7 @@ describe('ContactCardTest', function() {
async function AbnormalUpdate()
{
var updateValues = {"display_name" : "xiaosan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var updataCode = await DAHelper.update(errorUri, updateValues, condition);
@@ -3913,7 +3913,7 @@ describe('ContactCardTest', function() {
async function AbnormalDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
try {
var deleteCode = await DAHelper.delete(profileRawContactUri, condition);
@@ -3957,7 +3957,7 @@ describe('ContactCardTest', function() {
async function AbnormalDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var deleteCode = await DAHelper.delete(errorUri, condition);
@@ -4001,7 +4001,7 @@ describe('ContactCardTest', function() {
async function AbnormalQuery()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
try {
var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition);
@@ -4146,7 +4146,7 @@ describe('ContactCardTest', function() {
}
async function executeBatch()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
DAHelper.executeBatch(URI_CONTACTS, [ {
uri : profileRawContactUri,
@@ -4192,7 +4192,7 @@ describe('ContactCardTest', function() {
async function executeBatch()
{
var updateValues = {"display_name" : "xiaoxiaoxiao"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
DAHelper.executeBatch(URI_CONTACTS, [ {
uri : profileRawContactUri,
@@ -4446,7 +4446,7 @@ describe('ContactCardTest', function() {
console.info("logMessage contactCard_update_test_6200: rawContactIdTwo = " + rawContactIdTwo);
var updateValues = {"display_name" : "xiaosan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4472,7 +4472,7 @@ describe('ContactCardTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [ "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4510,7 +4510,7 @@ describe('ContactCardTest', function() {
expect(rawContactId > 0).assertTrue();
sleep(sleep_two);
var updateValues = common.getProfileRawContactUpdate();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
var updataCode = await DAHelper.update(profileRawContactUri, updateValues, condition);
console.info('logMessage contactCard_UpdateRawContcat_test_6300: updataCode = ' + updataCode);
@@ -4554,7 +4554,7 @@ describe('ContactCardTest', function() {
expect(contactDataId > 0).assertTrue();
var updateValues = common.getProfileContactDataUpdate();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", contactDataId.toString());
var updataCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
console.info('logMessage contactCard_insertDataUpdate_test_6400: updataCode = ' + updataCode);
@@ -4603,7 +4603,7 @@ describe('ContactCardTest', function() {
await insertData(rawContactId, "group_membership", 1, "");
await insertData(rawContactId, "contact_misc", "5678", "");
var updateValues = {"detail_info" : "xiaocai"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
var updataCode = await DAHelper.update(profileContactDataUri, updateValues, condition);
console.info('logMessage contactCard_insertDataUpdateAll_test_6500: updataCode = ' + updataCode);
@@ -4624,7 +4624,7 @@ describe('ContactCardTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("row_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition);
@@ -4682,7 +4682,7 @@ describe('ContactCardTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryThreeFavorite start ! DAHelper = ' + DAHelper);
var resultColumns = [ "favorite" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4728,7 +4728,7 @@ describe('ContactCardTest', function() {
console.info("logMessage contactCard_unFavorite_test_6700: rawContactId = " + rawContactIdTwo);
var updateValues = {"favorite" : 0};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4776,7 +4776,7 @@ describe('ContactCardTest', function() {
async function query(size)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var phoneNumber = randomNum(8);
condition.equalTo("phone_number", phoneNumber);
try {
@@ -4823,7 +4823,7 @@ describe('ContactCardTest', function() {
async function query(size)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var phoneNumber = randomNum(8);
condition.equalTo("phone_number", phoneNumber);
try {
@@ -4883,7 +4883,7 @@ describe('ContactCardTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryThreeGroup start ! DAHelper = ' + DAHelper);
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4978,7 +4978,7 @@ describe('ContactCardTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryZeroGroup start ! DAHelper = ' + DAHelper);
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactIdOne.toString());
@@ -5134,7 +5134,7 @@ describe('ContactCardTest', function() {
async function queryAlldata(tag, DAHelper, rawContactId, contactdata, values)
{
var resultColumns = [ "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", contactdata.toString());
try {
var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition);
@@ -5235,7 +5235,7 @@ describe('ContactCardTest', function() {
await insertData(rawContactId, "name", "xiaotian", "");
var updateValues = {"detail_info" : "xiaocai7800"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactId1.toString())
@@ -5256,7 +5256,7 @@ describe('ContactCardTest', function() {
async function insertDataUpdateMoreQuery(tag, DAHelper, rawContactId, rawContactId1)
{
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactId1.toString())
@@ -5323,7 +5323,7 @@ describe('ContactCardTest', function() {
afterAll(async function() {
var tag = "Contacts_test_start_deleted";
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
let DAHelperContact = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': start ! DAHelperContact = ' + DAHelperContact);
jstest/ContactMerge_test.js
+13 -13
View File
@@ -75,7 +75,7 @@ describe('ContactMergeTest', function() {
async function AutoMerge(DAHelper, rawContactId1)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
try {
var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition);
@@ -115,7 +115,7 @@ describe('ContactMergeTest', function() {
async function deleteAll(uri, tag)
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(uri, condition);
console.info(tag + ': deleteAll deleteCode = ' + deleteCode);
@@ -127,7 +127,7 @@ describe('ContactMergeTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ' : ContactMergeQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [ "contact_id" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
console.info(tag + ' : map_id = ' + map.get("id"));
condition.equalTo("id", map.get("id"));
try {
@@ -158,7 +158,7 @@ describe('ContactMergeTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var updateValues = {"detail_info" : updateDataValue};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", contactDataId.toString());
var code = await DAHelper.update(contactDataUri, updateValues, condition);
console.info(testName + " updateContactData: code = " + code);
@@ -424,7 +424,7 @@ describe('ContactMergeTest', function() {
async function AutoMerger(DAHelper, rawContactId1, testName)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
try {
var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition);
@@ -443,7 +443,7 @@ describe('ContactMergeTest', function() {
async function AutoNotMerger(DAHelper, rawContactId1, testName)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
try {
sleep(sleep_two);
@@ -747,7 +747,7 @@ describe('ContactMergeTest', function() {
async function threeAutoMerger(DAHelper, rawContactId1)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
try {
var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition);
@@ -1005,7 +1005,7 @@ describe('ContactMergeTest', function() {
console.info('logMessage contact_query_merge_list_test_1000: raw_contact_2 insert error = ' + error);
done();
}
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
try {
sleep(sleep_three);
@@ -1370,7 +1370,7 @@ describe('ContactMergeTest', function() {
console.info('logMessage contact_query_merge_list_test_1800: raw_contact_2 insert error = ' + error);
done();
}
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
try {
var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition);
@@ -1504,7 +1504,7 @@ describe('ContactMergeTest', function() {
console.info('logMessage abnormal_merge_Update_test_2100: raw_contact_2 insert error = ' + error);
done();
}
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition);
console.info("logMessage abnormal_merge_Update_test_2100 autoMergeCode = " + autoMergeCode);
@@ -1686,7 +1686,7 @@ describe('ContactMergeTest', function() {
console.info('logMessage abnormal_merge_Update_test_2500: raw_contact_2 insert error = ' + error);
done();
}
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition);
sleep(sleep_one);
@@ -1736,7 +1736,7 @@ describe('ContactMergeTest', function() {
console.info('logMessage abnormal_merge_Update_test_2600: raw_contact_2 insert error = ' + error);
done();
}
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {};
var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition);
sleep(sleep_one);
@@ -1770,7 +1770,7 @@ describe('ContactMergeTest', function() {
afterAll(async function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('merge afterAll delete_All: start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var deletedAll = await DAHelper.delete(deletedUri, condition);
sleep(4000);
console.info('merge afterAll delete_All : deletedAll ! DAHelper = ' + deletedAll);
jstest/Contacts_test.js
+95 -95
View File
@@ -55,7 +55,7 @@ describe('ContactsTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(uri, resultColumns, condition);
@@ -64,7 +64,7 @@ describe('ContactsTest', function() {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of map) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ' :logMessage contactsQuery key = ' + key + ' dbresult :' + dbresult +
' value : ' + value);
expect(value == dbresult).assertEqual(true);
@@ -83,7 +83,7 @@ describe('ContactsTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryBatch start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", map.get("raw_contact_id"));
try {
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
@@ -100,8 +100,8 @@ describe('ContactsTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryIdForDelete start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(uri, resultColumns, condition);
@@ -118,7 +118,7 @@ describe('ContactsTest', function() {
{
try {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(uri, condition);
console.info(tag + ': deleteAll deleteCode = ' + deleteCode);
@@ -132,7 +132,7 @@ describe('ContactsTest', function() {
{
try {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -645,7 +645,7 @@ describe('ContactsTest', function() {
"favorite" : 0,
"phonetic_name" : "dacheng||dc"
};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(rawContactUri, updateValues, condition);
@@ -706,7 +706,7 @@ describe('ContactsTest', function() {
async function dataNameUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "dayuan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -768,7 +768,7 @@ describe('ContactsTest', function() {
async function dataCompanyUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "OOOO", "position" : "developer"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -826,7 +826,7 @@ describe('ContactsTest', function() {
async function dataPhoneUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "99663355"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -888,7 +888,7 @@ describe('ContactsTest', function() {
async function dataNickNameUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "fengyuan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -950,7 +950,7 @@ describe('ContactsTest', function() {
async function dataEmailUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "199@163.com"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition)
@@ -1012,7 +1012,7 @@ describe('ContactsTest', function() {
async function dataPostalUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "BeiJing"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -1070,7 +1070,7 @@ describe('ContactsTest', function() {
async function dataNoteUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "God"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -1128,7 +1128,7 @@ describe('ContactsTest', function() {
async function dataAimUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "bbbbb"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -1190,7 +1190,7 @@ describe('ContactsTest', function() {
async function dataEventUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "19971021"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -1252,7 +1252,7 @@ describe('ContactsTest', function() {
async function dataWebsiteUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "www.123.com"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -1313,7 +1313,7 @@ describe('ContactsTest', function() {
async function dataRelationUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "spouse"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -1375,7 +1375,7 @@ describe('ContactsTest', function() {
async function dataGroupUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "7"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -1438,7 +1438,7 @@ describe('ContactsTest', function() {
async function dataMiscUpdate(DAHelper, rawContactId)
{
var updateValues = {"detail_info" : "999"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -1481,7 +1481,7 @@ describe('ContactsTest', function() {
async function updateFavorite(DAHelper, rawContactId)
{
var updateValues = {"favorite" : 1};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(rawContactUri, updateValues, condition);
@@ -1526,7 +1526,7 @@ describe('ContactsTest', function() {
async function updateUnFavorite(DAHelper, rawContactId)
{
var updateValues = {"favorite" : 0};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var updateCode = await DAHelper.update(rawContactUri, updateValues, condition);
@@ -1593,7 +1593,7 @@ describe('ContactsTest', function() {
async function BlocklistDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", blocklistId.toString());
try {
var deleteCode = await DAHelper.delete(contactBlocklistUri, condition);
@@ -1733,7 +1733,7 @@ describe('ContactsTest', function() {
async function deleteGroup(DAHelper, contactDataId)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", contactDataId.toString());
try {
var deleteCode = await DAHelper.delete(contactDataUri, condition);
@@ -1776,7 +1776,7 @@ describe('ContactsTest', function() {
async function RawContactQuery(DAHelper, rawContactId)
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
@@ -1834,7 +1834,7 @@ describe('ContactsTest', function() {
async function queryTwoRaw(DAHelper, rawContactIdOne, rawContactIdTwo)
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactIdOne.toString());
condition.or();
condition.equalTo("id", rawContactIdTwo.toString());
@@ -1878,7 +1878,7 @@ describe('ContactsTest', function() {
done();
}
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition);
@@ -1934,7 +1934,7 @@ describe('ContactsTest', function() {
async function queryAllInformation(DAHelper, rawContactId)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
@@ -2021,7 +2021,7 @@ describe('ContactsTest', function() {
async function groupBossBoardQuery(DAHelper, rawContactId, groupId)
{
var resultColumns = [ "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 9 data is group
condition.equalTo("type_id", "9");
condition.and();
@@ -2069,7 +2069,7 @@ describe('ContactsTest', function() {
async function queryFavorite()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("favorite", "1");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -2118,7 +2118,7 @@ describe('ContactsTest', function() {
async function queryContacted()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.lessThan("lastest_contacted_time", "100");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -2251,7 +2251,7 @@ describe('ContactsTest', function() {
async function phoneQuery(DAHelper, rawContactId)
{
var resultColumns = [ "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 5 data is phone
condition.equalTo("content_type", "phone");
try {
@@ -2319,7 +2319,7 @@ describe('ContactsTest', function() {
async function emailQuery(DAHelper, contactDataId, rawContactId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 1 data content_type is email
condition.equalTo("type_id", "1").limitAs(array_three).orderByDesc("id");
try {
@@ -2403,7 +2403,7 @@ describe('ContactsTest', function() {
async function queryTwo(DAHelper, rawContactId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info", "position" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition);
@@ -2651,7 +2651,7 @@ describe('ContactsTest', function() {
console.info("logMessage contact_batchinsert_test_4900: batchInsertCode = " + batchInsertCode);
expect(batchInsertCode == 0).assertTrue();
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("company", "TT4900");
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
console.info(
@@ -2731,7 +2731,7 @@ describe('ContactsTest', function() {
async function BlocklistDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("phone_number", phoneNumber);
try {
var deleteCode = await DAHelper.delete(contactBlocklistUri, condition);
@@ -2748,7 +2748,7 @@ describe('ContactsTest', function() {
async function query(size)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("phone_number", phoneNumber);
try {
var resultSet = await DAHelper.query(contactBlocklistUri, resultColumns, condition);
@@ -2798,7 +2798,7 @@ describe('ContactsTest', function() {
async function RawContactUpdateUnFavorites(DAHelper)
{
var updateValues = {"favorite" : 0};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("display_name", "fengyuan");
condition.or();
condition.equalTo("display_name", "xiaoma");
@@ -2815,7 +2815,7 @@ describe('ContactsTest', function() {
async function queryUnFavorites(DAHelper)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("display_name", "fengyuan");
condition.or();
condition.equalTo("display_name", "xiaoma");
@@ -2929,7 +2929,7 @@ describe('ContactsTest', function() {
async function ContactDataDelete(DAHelper, rawContactIdOne, rawContactId3)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactIdOne.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactId3.toString());
@@ -2947,7 +2947,7 @@ describe('ContactsTest', function() {
async function queryTwoData(DAHelper, rawContactIdOne, rawContactId3)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactIdOne.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactId3.toString());
@@ -3009,7 +3009,7 @@ describe('ContactsTest', function() {
async function SearchQuery(DAHelper, rawContactId)
{
var resultColumns = [ "id", "search_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition);
@@ -3018,7 +3018,7 @@ describe('ContactsTest', function() {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of map) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ':contact_pinyin_query_test_200 key = ' + key + ' dbresult :' + dbresult +
' value : ' + value);
expect(value == dbresult).assertEqual(true);
@@ -3075,7 +3075,7 @@ describe('ContactsTest', function() {
async function SearchContactQueryChinese(DAHelper, rawContactId)
{
var resultColumns = [ "raw_contact_id", "search_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition);
@@ -3135,7 +3135,7 @@ describe('ContactsTest', function() {
async function SearchContactQuery(DAHelper, rawContactId)
{
var resultColumns = [ "raw_contact_id", "search_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition);
@@ -3180,7 +3180,7 @@ describe('ContactsTest', function() {
async function RawContactNameQuery()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("display_name", "%xiaoming40%");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -3228,7 +3228,7 @@ describe('ContactsTest', function() {
async function RawContactPhoneticNameQuery()
{
var resultColumns = [ "id", "display_name", "phonetic_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("phonetic_name", "%xiaoming%");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -3286,7 +3286,7 @@ describe('ContactsTest', function() {
async function RawContactCompanyQuery(DAHelper, rawContactId)
{
var resultColumns = [ "id", "display_name", "company", "position" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("company", "%TT6%");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -3362,7 +3362,7 @@ describe('ContactsTest', function() {
async function fuzzyQueryPhone(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 5 data is phone
condition.like("detail_info", "%52896%");
condition.and();
@@ -3433,7 +3433,7 @@ describe('ContactsTest', function() {
async function fuzzyQueryPhoneNickName(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 3 data is nickname
condition.like("detail_info", "%daming%");
condition.and();
@@ -3503,7 +3503,7 @@ describe('ContactsTest', function() {
async function fuzzyQueryEmail(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 1 data is email
condition.like("detail_info", "%1564%");
condition.and();
@@ -3575,7 +3575,7 @@ describe('ContactsTest', function() {
async function fuzzyQueryAddress(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 1 data is postal_address
condition.like("detail_info", "%nanjing10%");
condition.and();
@@ -3647,7 +3647,7 @@ describe('ContactsTest', function() {
async function fuzzyQueryNote(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 10 data is note
condition.like("detail_info", "%java11%");
condition.and();
@@ -3716,7 +3716,7 @@ describe('ContactsTest', function() {
async function fuzzyQueryIM(DAHelper, rawContactId, contactDataId)
{
var resultColumns = [ "id", "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
// type_id = 10 data is im account number
condition.like("detail_info", "%aa12%");
condition.and();
@@ -3810,7 +3810,7 @@ describe('ContactsTest', function() {
async function AbnormalUpdate()
{
var updateValues = {"display_names" : "xiaosan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
try {
var updataCode = await DAHelper.update(rawContactUri, updateValues, condition)
@@ -3854,7 +3854,7 @@ describe('ContactsTest', function() {
async function AbnormalUpdate()
{
var updateValues = {"display_name" : "xiaosan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var updataCode = await DAHelper.update(errorUri, updateValues, condition);
@@ -3896,7 +3896,7 @@ describe('ContactsTest', function() {
async function AbnormalDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
try {
var deleteCode = await DAHelper.delete(rawContactUri, condition);
@@ -3940,7 +3940,7 @@ describe('ContactsTest', function() {
async function AbnormalDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var deleteCode = await DAHelper.delete(errorUri, condition);
@@ -3984,7 +3984,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
try {
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
@@ -4128,7 +4128,7 @@ describe('ContactsTest', function() {
}
async function executeBatch()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
DAHelper.executeBatch(URI_CONTACTS, [ {
uri : rawContactUri,
@@ -4173,7 +4173,7 @@ describe('ContactsTest', function() {
async function executeBatch()
{
var updateValues = {"display_name" : "xiaoxiaoxiao"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
DAHelper.executeBatch(URI_CONTACTS, [ {
uri : rawContactUri,
@@ -4426,7 +4426,7 @@ describe('ContactsTest', function() {
console.info("logMessage contact_update_test_6200: rawContactIdTwo = " + rawContactIdTwo);
var updateValues = {"display_name" : "xiaosan"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4452,7 +4452,7 @@ describe('ContactsTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [ "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4490,7 +4490,7 @@ describe('ContactsTest', function() {
expect(rawContactId > 0).assertTrue();
sleep(sleep_two);
var updateValues = common.getProfileRawContactUpdate();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
var updataCode = await DAHelper.update(rawContactUri, updateValues, condition);
console.info('logMessage contact_UpdateRawContcat_test_6300: updataCode = ' + updataCode);
@@ -4534,7 +4534,7 @@ describe('ContactsTest', function() {
expect(contactDataId > 0).assertTrue();
var updateValues = common.getProfileContactDataUpdate();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", contactDataId.toString());
var updataCode = await DAHelper.update(contactDataUri, updateValues, condition);
console.info('logMessage contact_insertDataUpdate_test_6400: updataCode = ' + updataCode);
@@ -4583,7 +4583,7 @@ describe('ContactsTest', function() {
await insertData(rawContactId, "group_membership", 1, "");
await insertData(rawContactId, "contact_misc", "5678", "");
var updateValues = {"detail_info" : "xiaocai"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
var updataCode = await DAHelper.update(contactDataUri, updateValues, condition);
console.info('logMessage contact_insertDataUpdateAll_test_6500: updataCode = ' + updataCode);
@@ -4604,7 +4604,7 @@ describe('ContactsTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("row_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition);
@@ -4662,7 +4662,7 @@ describe('ContactsTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryThreeFavorite start ! DAHelper = ' + DAHelper);
var resultColumns = [ "favorite" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4708,7 +4708,7 @@ describe('ContactsTest', function() {
console.info("logMessage contact_unFavorite_test_6700: rawContactId = " + rawContactIdTwo);
var updateValues = {"favorite" : 0};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4756,7 +4756,7 @@ describe('ContactsTest', function() {
async function query(size)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var phoneNumber = randomNum(8);
condition.equalTo("phone_number", phoneNumber);
try {
@@ -4802,7 +4802,7 @@ describe('ContactsTest', function() {
async function query(size)
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var phoneNumber = randomNum(8);
condition.equalTo("phone_number", phoneNumber);
try {
@@ -4862,7 +4862,7 @@ describe('ContactsTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryThreeGroup start ! DAHelper = ' + DAHelper);
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
condition.or();
condition.equalTo("id", rawContactIdOne.toString());
@@ -4956,7 +4956,7 @@ describe('ContactsTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryZeroGroup start ! DAHelper = ' + DAHelper);
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactIdOne.toString());
@@ -5110,7 +5110,7 @@ describe('ContactsTest', function() {
async function queryAlldata(tag, DAHelper, rawContactId, contactdata, values)
{
var resultColumns = [ "raw_contact_id", "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", contactdata.toString());
try {
var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition);
@@ -5210,7 +5210,7 @@ describe('ContactsTest', function() {
await insertData(rawContactId, "name", "xiaotian", "");
var updateValues = {"detail_info" : "xiaocai7800"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactId1.toString())
@@ -5231,7 +5231,7 @@ describe('ContactsTest', function() {
async function insertDataUpdateMoreQuery(tag, DAHelper, rawContactId, rawContactId1)
{
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
condition.or();
condition.equalTo("raw_contact_id", rawContactId1.toString())
@@ -5317,7 +5317,7 @@ describe('ContactsTest', function() {
console.info("logMessage abnormal_contact_updateData_test_8000: contactDataId = " + contactDataId);
expect(contactDataId > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {"display_namess" : "xaioli80000000"};
condition.equalTo("id", contactDataId.toString());
var code = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -5441,7 +5441,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
condition.or();
condition.equalTo("ids", rawContactId1.toString());
@@ -5486,7 +5486,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [ "id", "display_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("ids", "0");
try {
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
@@ -5525,7 +5525,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [ "id", "display_names" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
@@ -5567,7 +5567,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [ "raw_contact_id" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("content_typess", "group_membership");
try {
var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition);
@@ -5606,7 +5606,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
try {
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
@@ -5645,7 +5645,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("lastest_contacted_timess", "50");
try {
var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition);
@@ -5673,7 +5673,7 @@ describe('ContactsTest', function() {
var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues);
console.info("logMessage abnormal_contact_query_test_9000: rawContactId = " + rawContactId);
expect(rawContactId > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
var deleteCode = await DAHelper.delete(rawContactUri, condition);
console.info('abnormal_contact_query_test_9000 : deleteRawContact deleteCode = ' + deleteCode);
@@ -5693,7 +5693,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.orderByDesc("delete_timess");
try {
var resultSet = await DAHelper.query(deletedRawContactUri, resultColumns, condition);
@@ -5737,7 +5737,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("content_typess", "phone");
try {
var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition);
@@ -5781,7 +5781,7 @@ describe('ContactsTest', function() {
async function AbnormalQuery()
{
var resultColumns = [ "detail_info" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("content_typess", "email");
try {
var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition);
@@ -5815,7 +5815,7 @@ describe('ContactsTest', function() {
console.info("logMessage abnormal_contact_delete_test_10000: dataId1 = " + dataId1);
var errorUri = "dataability:///com.ohos.contactsdataability/contacts/contact_datasss";
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", dataId.toString());
var deleteCode = await DAHelper.delete(errorUri, condition);
console.info(' abnormal_contact_delete_test_10000 : deleteAll deleteCode = ' + deleteCode);
@@ -5853,7 +5853,7 @@ describe('ContactsTest', function() {
console.info("logMessage abnormal_contact_delete_test_9300: dataId1 = " + dataId1);
var errorUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contactsss";
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
var deleteCode = await DAHelper.delete(errorUri, condition);
console.info(' abnormal_contact_delete_test_9300 : deleteAll deleteCode = ' + deleteCode);
@@ -5890,7 +5890,7 @@ describe('ContactsTest', function() {
console.info("logMessage abnormal_contact_delete_test_9400: rawContactId1 = " + rawContactId1);
expect(rawContactId1 > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", rawContactId.toString());
condition.or();
condition.equalTo("ids", rawContactId1.toString())
@@ -5924,7 +5924,7 @@ describe('ContactsTest', function() {
console.info("logMessage abnormal_contact_favorite_test_9500: rawContactId1 = " + rawContactId1);
expect(rawContactId1 > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var updateValues = {"favorites" : 1};
condition.equalTo("id", rawContactId.toString());
condition.or();
@@ -6053,7 +6053,7 @@ describe('ContactsTest', function() {
async function query()
{
var resultColumns = [ "search_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("raw_contact_id", rawContactId.toString());
try {
var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition);
@@ -6106,7 +6106,7 @@ describe('ContactsTest', function() {
async function query()
{
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.like("search_namesss", "%jp%");
try {
var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition);
@@ -6123,7 +6123,7 @@ describe('ContactsTest', function() {
afterAll(async function() {
var tag = "Contacts_test_start_deleted";
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
let DAHelperContact = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': start ! DAHelperContact = ' + DAHelperContact);
jstest/Groups_test.js
+16 -16
View File
@@ -31,7 +31,7 @@ describe('GroupsTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': groupsQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(groupUri, resultColumns, condition);
@@ -39,7 +39,7 @@ describe('GroupsTest', function() {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of map) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ': logMessage groupsQuery key =' + key + 'dbresult :' + dbresult +
' value : ' + value);
expect(value == dbresult).assertTrue();
@@ -57,8 +57,8 @@ describe('GroupsTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': queryIdForDelete start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(groupUri, resultColumns, condition);
@@ -73,7 +73,7 @@ describe('GroupsTest', function() {
async function deleteAll(uri, tag)
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(uri, condition);
console.info(tag + ': deleteAll deleteCode = ' + deleteCode);
@@ -127,7 +127,7 @@ describe('GroupsTest', function() {
async function GroupUpdate()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", groupId.toString());
try {
var updateCode = await DAHelper.update(groupUri, common.getProfileUpdateGroup(), condition);
@@ -164,7 +164,7 @@ describe('GroupsTest', function() {
}
async function GroupDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", groupId.toString());
try {
var deleteCode = await DAHelper.delete(groupUri, condition);
@@ -233,7 +233,7 @@ describe('GroupsTest', function() {
async function GroupQuery()
{
var resultColumns = [ "id", "group_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var resultSet = await DAHelper.query(groupUri, resultColumns, condition);
@@ -291,7 +291,7 @@ describe('GroupsTest', function() {
async function GroupUpdate()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", groupId.toString());
var updateValue = { "group_notesss" : "6666" }
try {
@@ -330,7 +330,7 @@ describe('GroupsTest', function() {
}
async function GroupDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("idss", groupId.toString());
try {
var deleteCode = await DAHelper.delete(groupUri, condition);
@@ -372,7 +372,7 @@ describe('GroupsTest', function() {
async function GroupQuery(DAHelper)
{
var resultColumns = [ "id", "group_namesss" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", groupId.toString());
try {
var resultSet = await DAHelper.query(groupUri, resultColumns, condition);
@@ -419,7 +419,7 @@ describe('GroupsTest', function() {
{
var groupSize = 3;
var resultColumns = [ "id", "group_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("group_name", "test1000");
try {
var resultSet = await DAHelper.query(groupUri, resultColumns, condition);
@@ -466,7 +466,7 @@ describe('GroupsTest', function() {
{
var groupSize = 0;
var resultColumns = [ "id", "group_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("group_name", "test1100");
try {
var resultSet = await DAHelper.query(groupUri, resultColumns, condition);
@@ -514,7 +514,7 @@ describe('GroupsTest', function() {
{
var groupSize = 3;
var resultColumns = [ "id", "group_name" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("group_name", "test120000");
try {
var resultSet = await DAHelper.query(groupUri, resultColumns, condition);
@@ -530,7 +530,7 @@ describe('GroupsTest', function() {
async function GroupUpdateThree(DAHelper)
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("group_name", "test1200");
var updateValue = { "group_name" : "test120000" }
try {
@@ -544,7 +544,7 @@ describe('GroupsTest', function() {
afterAll(async function(done) {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.notEqualTo("id", "0");
try {
var deleteCode = await DAHelper.delete(groupUri, condition);
jstest/Performance_test.js
+15 -15
View File
@@ -91,7 +91,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
var updateValues = {"favorite" : 1};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -123,7 +123,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -154,7 +154,7 @@ describe('PerformanceTest', function() {
it("raw_contact_delete_performance_test_1200", 0, async function(done) {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('raw_contact_delete_performance_test_1200 : start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -196,7 +196,7 @@ describe('PerformanceTest', function() {
console.info("logMessage contact_data_insert_performance_test_1300: raw_contact insert error = " + error);
}
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
var deleteCode = await DAHelper.delete(rawContactUri, condition);
sleep(1000);
@@ -243,7 +243,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('logMessage contact_data_update_performance_test_1400 DAHelper success! DAHelper = ' + DAHelper);
var updateValues = {"syn_1" : "test"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
let old = new Date();
@@ -272,7 +272,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('contact_data_query_performance_test_1500 start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
let old = new Date();
@@ -301,7 +301,7 @@ describe('PerformanceTest', function() {
it("contact_data_delete_performance_test_1600", 0, async function(done) {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('contact_data_delete_performance_test_1600 : start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
let old = new Date();
@@ -373,7 +373,7 @@ describe('PerformanceTest', function() {
console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
var updateValues = {"answer_state" : "1"};
try {
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.notEqualTo("id", 0);
let old = new Date();
var updateCode = await DAHelper.update(calllogUri, updateValues, condition);
@@ -401,12 +401,12 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.notEqualTo("id", 0);
try {
let old = new Date();
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let now = new Date();
let usedTime = now - old;
console.info('calllog_query_performance_test_300 usedTime = ' + usedTime);
@@ -432,7 +432,7 @@ describe('PerformanceTest', function() {
var tag = "calllog_delete_performance_test_400";
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
let old = new Date();
var deleteCode = await DAHelper.delete(calllogUri, condition);
@@ -500,7 +500,7 @@ describe('PerformanceTest', function() {
console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
var updateValues = {"origin_type" : "test"};
try {
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.notEqualTo("id", 0);
let old = new Date();
var updateCode = await DAHelper.update(voicemailUri, updateValues, condition);
@@ -529,7 +529,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
let old = new Date();
@@ -559,7 +559,7 @@ describe('PerformanceTest', function() {
var tag = "voicemail_delete_performance_test_800";
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
let old = new Date();
@@ -581,7 +581,7 @@ describe('PerformanceTest', function() {
afterAll(async function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('DeleteContact : start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.notEqualTo("id", "0");
try {
var resultColumns = [ "id" ];
jstest/Stability_test.js
+15 -15
View File
@@ -85,7 +85,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
var updateValues = {"favorite" : 1};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -111,7 +111,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var resultColumns = ["id"];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -136,7 +136,7 @@ describe('PerformanceTest', function() {
it("raw_contact_delete_stability_test_1200", 0, async function(done) {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('raw_contact_delete_stability_test_1200 : start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -172,7 +172,7 @@ describe('PerformanceTest', function() {
console.info("logMessage contact_data_insert_stability_test_1300: raw_contact insert error = " + error);
}
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", rawContactId.toString());
var deleteCode = await DAHelper.delete(rawContactUri, condition);
sleep(1000);
@@ -214,7 +214,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('logMessage contact_data_update_stability_test_1400 DAHelper success! DAHelper = ' + DAHelper);
var updateValues = {"syn_1" : "test"};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var updateCode = await DAHelper.update(contactDataUri, updateValues, condition);
@@ -237,7 +237,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('contact_data_query_stability_test_1500 start ! DAHelper = ' + DAHelper);
var resultColumns = ["id"];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition);
@@ -260,7 +260,7 @@ describe('PerformanceTest', function() {
it("contact_data_delete_stability_test_1600", 0, async function(done) {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('contact_data_delete_stability_test_1600 : start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var deleteCode = await DAHelper.delete(contactDataUri, condition);
@@ -321,7 +321,7 @@ describe('PerformanceTest', function() {
console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
var updateValues = {"answer_state" : "1"};
try {
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var updateCode = await DAHelper.update(calllogUri, updateValues, condition);
sleep(1000);
@@ -344,11 +344,11 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var resultColumns = ["id"];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.notEqualTo("id", 0);
try {
var resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
let resultSet = await DAHelper.query(calllogUri, resultColumns, condition);
sleep(5000);
console.info(tag + ' : logMessage : rowCount' + resultSet.rowCount);
expect(resultSet.rowCount == 10000).assertTrue();
@@ -369,7 +369,7 @@ describe('PerformanceTest', function() {
var tag = "calllog_delete_stability_test_400";
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(calllogUri, condition);
sleep(5000);
@@ -426,7 +426,7 @@ describe('PerformanceTest', function() {
console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
var updateValues = {"origin_type" : "test"};
try {
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.notEqualTo("id", 0);
var updateCode = await DAHelper.update(voicemailUri, updateValues, condition);
sleep(1000);
@@ -449,7 +449,7 @@ describe('PerformanceTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var resultColumns = ["id"];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
@@ -473,7 +473,7 @@ describe('PerformanceTest', function() {
var tag = "voicemail_delete_stability_test_800";
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info(tag + ': start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var deleteCode = await DAHelper.delete(voicemailUri, condition);
@@ -490,7 +490,7 @@ describe('PerformanceTest', function() {
afterAll(async function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info('Stability : start ! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.notEqualTo("id", "0");
try {
var resultColumns = [ "id" ];
jstest/Voicemail_test.js
+33 -33
View File
@@ -29,7 +29,7 @@ describe('VoicemailTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info(tag + ':calllogInsertQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
@@ -37,7 +37,7 @@ describe('VoicemailTest', function() {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of map) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ' :logMessage voicemailQuery key = ' + key + ' dbresult :' + dbresult +
' value : ' + value);
expect(value == dbresult).assertTrue();
@@ -55,8 +55,8 @@ describe('VoicemailTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info(tag + ': voicemailQueryForDelete start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", map.get("id"));
try {
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
@@ -72,8 +72,8 @@ describe('VoicemailTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info(tag + ': voicemailQueryError start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("phone_number", map.get("phone_number"));
try {
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
@@ -89,8 +89,8 @@ describe('VoicemailTest', function() {
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info(tag + ': voicemailQueryForBatchInsert start ! DAHelper = ' + DAHelper);
var resultColumns = common.getCallLogResultColumns();
var condition = new ohos_data_ability.DataAbilityPredicates();
let resultColumns = common.getCallLogResultColumns();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("phone_number", array[0].get("phone_number"));
try {
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
@@ -102,7 +102,7 @@ describe('VoicemailTest', function() {
if (resultSet.goToFirstRow()) {
do {
for (var [key, value] of array[i]) {
var dbresult = resultSet.getString(resultSet.getColumnIndex(key));
let dbresult = resultSet.getString(resultSet.getColumnIndex(key));
console.info(tag + ' : logMessage voicemailQueryForBatchInsert dbresult :' + dbresult +
' value : ' + value);
console.info(
@@ -122,7 +122,7 @@ describe('VoicemailTest', function() {
async function voiceMailDelete(tag)
{
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(voicemailUri, condition);
console.info(tag + ': voiceMailDelete deleteCode = ' + deleteCode);
@@ -236,7 +236,7 @@ describe('VoicemailTest', function() {
async function VoicemailUpdate()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
try {
var updateCode = await DAHelper.update(voicemailUri, common.getVoiceMailUpdate(), condition);
@@ -278,7 +278,7 @@ describe('VoicemailTest', function() {
async function VoicemailUpdate()
{
var updateValues = {"voice_status" : 1};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
try {
var updateCode = await DAHelper.update(voicemailUri, updateValues, condition);
@@ -320,7 +320,7 @@ describe('VoicemailTest', function() {
async function VoicemailDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
try {
var deleteCode = await DAHelper.delete(voicemailUri, condition);
@@ -362,7 +362,7 @@ describe('VoicemailTest', function() {
async function VoicemailUpdate()
{
var updateValues = {"voice_status" : 0};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
try {
var updateCode = await DAHelper.update(voicemailUri, updateValues, condition);
@@ -472,7 +472,7 @@ describe('VoicemailTest', function() {
async function VoicemailQuery()
{
var resultColumns = [ "id", "display_name", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
try {
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
@@ -519,7 +519,7 @@ describe('VoicemailTest', function() {
async function VoicemailQuery()
{
var resultColumns = [ "id", "display_name", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("voice_status", "1");
condition.and();
condition.equalTo("phone_number", phoneNumber);
@@ -618,7 +618,7 @@ describe('VoicemailTest', function() {
{
var phoneNumber_Test = randomNum(15);
var updateValues = {"phone_numbers" : phoneNumber_Test};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", voicemailId.toString());
try {
var updataCode = await DAHelper.update(voicemailUri, updateValues, condition);
@@ -662,7 +662,7 @@ describe('VoicemailTest', function() {
{
var phoneNumber_Test = randomNum(6);
var updateValues = {"phone_number" : phoneNumber_Test};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
try {
var updataCode = await DAHelper.update(errorUri, updateValues, condition)
@@ -703,7 +703,7 @@ describe('VoicemailTest', function() {
async function AbnormalDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", voicemailId.toString());
try {
var deleteCode = await DAHelper.delete(voicemailUri, condition);
@@ -742,7 +742,7 @@ describe('VoicemailTest', function() {
async function AbnormalDelete()
{
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
try {
var deleteCode = await DAHelper.delete(errorUri, condition);
@@ -782,7 +782,7 @@ describe('VoicemailTest', function() {
{
var resultColumns = [ "id", "phone_number" ];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", voicemailId.toString());
try {
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition)
@@ -853,7 +853,7 @@ describe('VoicemailTest', function() {
async function executeBatch()
{
console.info("logMessage voiceMail_delete_test_2000: executeBatch start ");
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voiceMailId.toString());
DAHelper.executeBatch(URI_VOICEMAIL, [ {
uri : voicemailUri,
@@ -899,7 +899,7 @@ describe('VoicemailTest', function() {
var phoneNumber = randomNum(8);
var updateValues = {"phone_number" : phoneNumber};
console.info("logMessage voiceMail_update_test_2100: executeBatch start ");
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voiceMailId.toString());
DAHelper.executeBatch(URI_VOICEMAIL, [ {
uri : voicemailUri,
@@ -966,7 +966,7 @@ describe('VoicemailTest', function() {
var voicemailId = await DAHelper.insert(voicemailUri, stringValue)
var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue)
var voicemailIdTwo = await DAHelper.insert(voicemailUri, stringValue)
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
condition.or();
condition.equalTo("id", voicemailIdOne.toString());
@@ -1001,7 +1001,7 @@ describe('VoicemailTest', function() {
var voicemailId = await DAHelper.insert(voicemailUri, stringValue)
var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue)
var voicemailIdTwo = await DAHelper.insert(voicemailUri, stringValue)
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
condition.or();
condition.equalTo("id", voicemailIdOne.toString());
@@ -1044,7 +1044,7 @@ describe('VoicemailTest', function() {
try {
var voicemailId = await DAHelper.insert(voicemailUri, stringValue)
var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue)
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.beginWrap();
condition.equalTo("id", voicemailId.toString());
condition.or();
@@ -1081,7 +1081,7 @@ describe('VoicemailTest', function() {
console.info('voicemail_query_test_2600 voicemailId = ' + voicemailId);
var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue);
console.info('voicemail_query_test_2600 voicemailIdOne = ' + voicemailIdOne);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var resultColumns = [];
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
expect(resultSet.rowCount == 2).assertTrue();
@@ -1108,7 +1108,7 @@ describe('VoicemailTest', function() {
var insertValues = {display_name : "2700name", voice_statuss : "1"};
var voicemailId = await DAHelper.insert(voicemailUri, insertValues);
expect(voicemailId == -1).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var resultColumns = [];
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
expect(resultSet.rowCount == 0).assertTrue();
@@ -1133,7 +1133,7 @@ describe('VoicemailTest', function() {
var insertValues = {display_name : "2800name", voice_status : "1"};
var voicemailId = await DAHelper.insert(voicemailUri, insertValues);
expect(voicemailId > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
var updateValues = {display_name : "2800name", voice_statuss : "0"};
var updateCode = await DAHelper.update(voicemailUri, updateValues, condition);
@@ -1164,7 +1164,7 @@ describe('VoicemailTest', function() {
var insertValues = {display_name : "2900name", voice_status : "1"};
var voicemailId = await DAHelper.insert(voicemailUri, insertValues);
expect(voicemailId > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("id", voicemailId.toString());
var updateValues = {display_name : "2900name", voice_statuss : "0"};
var updateCode = await DAHelper.update(voicemailUri, updateValues, condition);
@@ -1195,7 +1195,7 @@ describe('VoicemailTest', function() {
var insertValues = {display_name : "2900name", voice_status : "1"};
var voicemailId = await DAHelper.insert(voicemailUri, insertValues);
expect(voicemailId > 0).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.equalTo("ids", voicemailId.toString());
var resultColumns = [];
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
@@ -1233,7 +1233,7 @@ describe('VoicemailTest', function() {
var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk);
console.info("logMessage abnormal_voicemail_batchInsert_test_3100: batchInsertCode = " + batchInsertCode);
expect(batchInsertCode == -1).assertTrue();
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
var resultColumns = [];
var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition);
expect(resultSet.rowCount == 0).assertTrue();
@@ -1248,7 +1248,7 @@ describe('VoicemailTest', function() {
afterAll(async function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
console.info('voicemai afterAll logMessage get DAHelper success! DAHelper = ' + DAHelper);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
var deleteCode = await DAHelper.delete(voicemailUri, condition);
console.info('voicemai afterAll logMessage deleteCode = ' + deleteCode);
jstest/recovery_test.js
+4 -4
View File
@@ -40,7 +40,7 @@ describe('RecoveryTest', function() {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
console.info(tag + ': ContactsQuery start ! DAHelper = ' + DAHelper);
var resultColumns = [];
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
try {
var resultSet = await DAHelper.query(uri, resultColumns, condition);
@@ -85,7 +85,7 @@ describe('RecoveryTest', function() {
{
try {
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
condition.greaterThan("id", "0");
condition.and();
condition.equalTo("is_deleted", "0");
@@ -108,7 +108,7 @@ describe('RecoveryTest', function() {
await deleteRawContact("recovery_test_100");
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var updateValues = {};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
try {
var updateCode = await DAHelper.update(backup, updateValues, condition);
sleep(2000);
@@ -132,7 +132,7 @@ describe('RecoveryTest', function() {
await deleteRawContact("recovery_test_200");
let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS);
var updateValues = {};
var condition = new ohos_data_ability.DataAbilityPredicates();
let condition = new ohos_data_ability.DataAbilityPredicates();
rawContactInsert("liming");
rawContactInsert("xiaolilili");
sleep(2000);
test/unittest/include/calllogability_test.h
+1 -1
View File
@@ -134,4 +134,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // CALLLOGABILITY_TEST_H
#endif // CALLLOGABILITY_TEST_H
test/unittest/include/calllogfuzzyquery_test.h
+1 -1
View File
@@ -32,4 +32,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // CALLLOGFUZZYQUERY_TEST_H
#endif // CALLLOGFUZZYQUERY_TEST_H
test/unittest/include/contactability_test.h
+1 -1
View File
@@ -157,4 +157,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // CONTACTABILITY_TEST_H
#endif // CONTACTABILITY_TEST_H
test/unittest/include/contactgroup_test.h
+1 -1
View File
@@ -42,4 +42,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // CONTACTGROUP_TEST_H
#endif // CONTACTGROUP_TEST_H
test/unittest/include/contactpinyin_test.h
+1 -1
View File
@@ -35,4 +35,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // CONTACTPINYIN_TEST_H
#endif // CONTACTPINYIN_TEST_H
test/unittest/include/contactprofile_test.h
+1 -1
View File
@@ -60,4 +60,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // CONTACTPROFILE_TEST_H
#endif // CONTACTPROFILE_TEST_H
test/unittest/include/contactquery_test.h
+1 -1
View File
@@ -33,4 +33,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // CONTACTQUERY_TEST_H
#endif // CONTACTQUERY_TEST_H
test/unittest/include/mergecontact_test.h
+1 -1
View File
@@ -35,4 +35,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // MERGECONTACT_TEST_H
#endif // MERGECONTACT_TEST_H
test/unittest/include/performance_test.h
+3 -3
View File
@@ -44,10 +44,10 @@ public:
PerformanceTest();
~PerformanceTest();
long long GetCurrentTime();
int CalcTime(long long startTime, long long endTime);
int64_t GetCurrentTime();
int CalcTime(int64_t startTime, int64_t endTime);
void DeleteContact();
};
} // namespace Test
} // namespace Contacts
#endif // PERFORMANCE_TEST_H
#endif // PERFORMANCE_TEST_H
test/unittest/include/random_number_utils.h
+1 -1
View File
@@ -30,4 +30,4 @@ public:
} // namespace Contacts
} // namespace OHOS
#endif // RANDOM_NUMBER_UTILS_H
#endif // RANDOM_NUMBER_UTILS_H
test/unittest/include/recovery_test.h
+1 -1
View File
@@ -27,4 +27,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // RECOVERY_TEST_H
#endif // RECOVERY_TEST_H
test/unittest/include/stability_test.h
+1 -1
View File
@@ -28,4 +28,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // STABILITY_TEST_H
#endif // STABILITY_TEST_H
test/unittest/include/voicemailability_test.h
+1 -1
View File
@@ -136,4 +136,4 @@ public:
};
} // namespace Test
} // namespace Contacts
#endif // VOICEMAILABILITY_TEST_H
#endif // VOICEMAILABILITY_TEST_H
test/unittest/src/performance_test.cpp
+18 -18
View File
@@ -29,7 +29,7 @@ PerformanceTest::~PerformanceTest()
{
}
long long PerformanceTest::GetCurrentTime()
int64_t PerformanceTest::GetCurrentTime()
{
int subtle = 1000000;
struct timeval time;
@@ -37,7 +37,7 @@ long long PerformanceTest::GetCurrentTime()
return (time.tv_sec * subtle + time.tv_usec);
}
int PerformanceTest::CalcTime(long long startTime, long long endTime)
int PerformanceTest::CalcTime(int64_t startTime, int64_t endTime)
{
return (int)(endTime - startTime);
}
@@ -95,7 +95,7 @@ HWTEST_F(PerformanceTest, raw_contact_insert_performance_test_900, testing::ext:
values.push_back(rawContactValues);
}
HILOG_INFO("raw_contact_insert_performance_test_900 start! ");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int batchInsertCode = contactsDataAbility.BatchInsert(uriRawContact, values);
@@ -127,7 +127,7 @@ HWTEST_F(PerformanceTest, raw_contact_update_performance_test_1000, testing::ext
predicates.And();
predicates.EqualTo("is_deleted", "0");
HILOG_INFO("raw_contact_update_performance_test_1000 start! ");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int updateCode = contactsDataAbility.Update(uriRawContact, updateValues, predicates);
@@ -160,7 +160,7 @@ HWTEST_F(PerformanceTest, raw_contact_query_performance_test_1100, testing::ext:
predicates.And();
predicates.EqualTo("is_deleted", "0");
HILOG_INFO("raw_contact_query_performance_test_1100 start! ");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
@@ -192,7 +192,7 @@ HWTEST_F(PerformanceTest, raw_contact_delete_performance_test_1200, testing::ext
predicates.And();
predicates.EqualTo("is_deleted", "0");
HILOG_INFO("raw_contact_delete_performance_test_1200 start! ");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int deleteCode = contactsDataAbility.Delete(uriRawContact, predicates);
@@ -239,7 +239,7 @@ HWTEST_F(PerformanceTest, contact_data_insert_performance_test_1300, testing::ex
values.push_back(contactDataValues);
}
HILOG_INFO("contact_data_insert_performance_test_1300 start! ");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int batchInsertCode = contactsDataAbility.BatchInsert(uriContactData, values);
@@ -266,7 +266,7 @@ HWTEST_F(PerformanceTest, contact_data_update_performance_test_1400, testing::ex
updateValues.PutString("syn_1", "test");
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int updateCode = contactsDataAbility.Update(uriContactData, updateValues, predicates);
@@ -294,7 +294,7 @@ HWTEST_F(PerformanceTest, contact_data_query_performance_test_1500, testing::ext
columns.push_back("detail_info");
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
@@ -323,7 +323,7 @@ HWTEST_F(PerformanceTest, contact_data_delete_performance_test_1600, testing::ex
OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA);
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int deleteCode = contactsDataAbility.Delete(uriContactData, predicates);
@@ -356,7 +356,7 @@ HWTEST_F(PerformanceTest, calllog_insert_performance_test_100, testing::ext::Tes
calllogValues.PutString("phone_number", std::to_string(i + 1));
values.push_back(calllogValues);
}
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int batchInsertCode = calllogAbility.BatchInsert(uriCalllog, values);
@@ -383,7 +383,7 @@ HWTEST_F(PerformanceTest, calllog_update_performance_test_200, testing::ext::Tes
updateValues.PutInt("answer_state", 1);
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int updateCode = calllogAbility.Update(uriCalllog, updateValues, predicates);
@@ -411,7 +411,7 @@ HWTEST_F(PerformanceTest, calllog_query_performance_test_300, testing::ext::Test
columns.push_back("phone_number");
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
@@ -440,7 +440,7 @@ HWTEST_F(PerformanceTest, calllog_delete_performance_test_400, testing::ext::Tes
OHOS::Uri uriCalllog(CallLogUri::CALL_LOG);
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int deleteCode = calllogAbility.Delete(uriCalllog, predicates);
@@ -474,7 +474,7 @@ HWTEST_F(PerformanceTest, voicemail_insert_performance_test_500, testing::ext::T
values.push_back(voicemailValues);
}
HILOG_INFO("voicemail_insert_performance_test_500 start! ");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int batchInsertCode = voicemailAbility.BatchInsert(uriVoiceMail, values);
@@ -501,7 +501,7 @@ HWTEST_F(PerformanceTest, voicemail_update_performance_test_600, testing::ext::T
updateValues.PutString("origin_type", "origin");
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int updateCode = voicemailAbility.Update(uriVoiceMail, updateValues, predicates);
@@ -531,7 +531,7 @@ HWTEST_F(PerformanceTest, voicemail_query_performance_test_700, testing::ext::Te
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
HILOG_INFO("voicemail_query_performance_test_700 start! ");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
@@ -561,7 +561,7 @@ HWTEST_F(PerformanceTest, voicemail_delete_performance_test_800, testing::ext::T
OHOS::NativeRdb::DataAbilityPredicates predicates;
predicates.GreaterThan("id", "0");
HILOG_INFO("voicemail_delete_performance_test_800 start! ");
long long startTime, endTime;
int64_t startTime, endTime;
int elaps;
startTime = GetCurrentTime();
int deleteCode = voicemailAbility.Delete(uriVoiceMail, predicates);