From 8cce2ee604031885a970a9e388e014574e338627 Mon Sep 17 00:00:00 2001 From: ohos-lsw Date: Mon, 9 Jan 2023 15:07:59 +0800 Subject: [PATCH] switch to stage mode Signed-off-by: ohos-lsw --- AppScope/app.json | 13 + AppScope/resources/base/element/string.json | 8 + BUILD.gn | 39 +- README_zh.md | 317 ++- ability/common/include/common.h | 6 +- .../utils/include/contacts_json_utils.h | 2 +- ability/common/utils/include/contacts_path.h | 1 - .../common/utils/include/predicates_convert.h | 4 +- ability/common/utils/include/sql_analyzer.h | 2 +- ability/common/utils/src/contacts_path.cpp | 1 - .../common/utils/src/predicates_convert.cpp | 9 +- ability/common/utils/src/sql_analyzer.cpp | 2 +- ability/merge/include/merger_contacts.h | 4 +- ability/merge/src/merger_contacts.cpp | 2 +- config.json | 66 - contacts/BUILD.gn | 4 +- contacts/include/contacts_api.h | 39 +- contacts/include/contacts_build.h | 44 +- contacts/include/contacts_control.h | 58 +- contacts/include/contacts_napi_common.h | 23 +- contacts/include/result_convert.h | 42 +- contacts/src/contacts_api.cpp | 205 +- contacts/src/contacts_build.cpp | 206 +- contacts/src/contacts_control.cpp | 108 +- contacts/src/result_convert.cpp | 56 +- .../calllog/include/calllog_ability.h | 32 +- .../calllog/include/calllog_database.h | 5 +- dataBusiness/calllog/src/calllog_ability.cpp | 103 +- dataBusiness/contacts/include/contacts.h | 2 +- .../contacts/include/contacts_data_ability.h | 50 +- .../contacts/include/contacts_database.h | 7 +- .../include/contacts_datashare_stub_impl.h | 61 + dataBusiness/contacts/include/contacts_type.h | 2 +- .../contacts/include/contacts_update_helper.h | 2 +- dataBusiness/contacts/include/raw_contacts.h | 2 +- .../contacts/src/contacts_data_ability.cpp | 184 +- .../contacts/src/contacts_database.cpp | 4 +- .../src/contacts_datashare_stub_impl.cpp | 240 +++ dataBusiness/contacts/src/contacts_type.cpp | 1 - .../voicemail/include/voicemail_ability.h | 32 +- .../voicemail/include/voicemail_database.h | 2 +- .../voicemail/src/voicemail_ability.cpp | 106 +- .../Application/ContactsDataAbilityStage.ts | 30 + .../DataShareExtAbility.ts | 60 + entry/src/main/ets/common/utils/LogUtils.ts | 40 + entry/src/main/module.json | 61 + .../main/resources/base/element/string.json | 8 + jstest/Calllog_test.js | 345 ++-- jstest/ContactCard_test.js | 1531 +++++++------- jstest/ContactMerge_test.js | 583 +++--- jstest/Contacts_test.js | 1755 ++++++++--------- jstest/Groups_test.js | 171 +- jstest/ObjectCallback.js | 10 +- jstest/ObjectInterface_test.js | 8 +- jstest/Performance_test.js | 229 ++- jstest/Stability_test.js | 229 ++- jstest/Voicemail_test.js | 347 ++-- jstest/common.js | 30 +- jstest/recovery_test.js | 51 +- test/BUILD.gn | 9 + test/unittest/include/base_test.h | 21 +- test/unittest/include/calllogability_test.h | 60 +- .../unittest/include/calllogfuzzyquery_test.h | 8 +- test/unittest/include/contactability_test.h | 84 +- test/unittest/include/contactgroup_test.h | 20 +- test/unittest/include/contactpinyin_test.h | 12 +- test/unittest/include/contactprofile_test.h | 38 +- test/unittest/include/contactquery_test.h | 8 +- test/unittest/include/mergecontact_test.h | 10 +- test/unittest/include/random_number_utils.h | 2 +- test/unittest/include/test_common.h | 65 +- test/unittest/include/voicemailability_test.h | 65 +- test/unittest/src/base_test.cpp | 42 +- test/unittest/src/calllogability_test.cpp | 590 +++--- test/unittest/src/calllogfuzzyquery_test.cpp | 118 +- test/unittest/src/contactability_test.cpp | 1400 +++++++------ test/unittest/src/contactgroup_test.cpp | 252 +-- test/unittest/src/contactpinyin_test.cpp | 80 +- test/unittest/src/contactprofile_test.cpp | 1344 +++++++------ test/unittest/src/contactquery_test.cpp | 156 +- test/unittest/src/mergecontact_test.cpp | 384 ++-- test/unittest/src/performance_test.cpp | 124 +- test/unittest/src/random_number_utils.cpp | 9 +- test/unittest/src/recovery_test.cpp | 30 +- test/unittest/src/stability_test.cpp | 124 +- test/unittest/src/voicemailability_test.cpp | 786 ++++---- 86 files changed, 7019 insertions(+), 6406 deletions(-) create mode 100644 AppScope/app.json create mode 100644 AppScope/resources/base/element/string.json delete mode 100644 config.json create mode 100644 dataBusiness/contacts/include/contacts_datashare_stub_impl.h create mode 100644 dataBusiness/contacts/src/contacts_datashare_stub_impl.cpp create mode 100644 entry/src/main/ets/Application/ContactsDataAbilityStage.ts create mode 100644 entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts create mode 100644 entry/src/main/ets/common/utils/LogUtils.ts create mode 100644 entry/src/main/module.json create mode 100644 entry/src/main/resources/base/element/string.json diff --git a/AppScope/app.json b/AppScope/app.json new file mode 100644 index 0000000..16355d6 --- /dev/null +++ b/AppScope/app.json @@ -0,0 +1,13 @@ +{ + "app": { + "bundleName": "com.ohos.contactsdataability", + "vendor": "ohos", + "versionCode": 1000000, + "versionName": "1.0.0", + "icon": "", + "label": "$string:app_name", + "distributedNotificationEnabled": true, + "minAPIVersion": 9, + "targetAPIVersion": 9 + } +} \ No newline at end of file diff --git a/AppScope/resources/base/element/string.json b/AppScope/resources/base/element/string.json new file mode 100644 index 0000000..eff784e --- /dev/null +++ b/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name": "app_name", + "value": "ContactsData" + } + ] +} \ No newline at end of file diff --git a/BUILD.gn b/BUILD.gn index 89ea052..8c8db8f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,7 +16,11 @@ import("//build/ohos.gni") ## Build Contacts_DataAbility.hap ohos_hap("Contacts_DataAbility") { - hap_profile = "./config.json" + hap_profile = "entry/src/main/module.json" + deps = [ + ":Contacts_DataAbility_js_assets", + ":Contacts_DataAbility_resources" + ] shared_libraries = [ ":contactsdataability" ] certificate_profile = "./signature/contactsdata.p7b" hap_name = "Contacts_DataAbility" @@ -25,6 +29,26 @@ ohos_hap("Contacts_DataAbility") { module_install_dir = "app/com.ohos.contactsdataability" } +ohos_app_scope("Contacts_DataAbility_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("Contacts_DataAbility_js_assets") { + ets2abc = true + source_dir = "entry/src/main/ets" +} + +ohos_resources("Contacts_DataAbility_resources") { + sources = [ + "entry/src/main/resources", + ] + deps = [ + ":Contacts_DataAbility_app_profile", + ] + hap_profile = "entry/src/main/module.json" +} + ## Build contactsdataability.so {{{ config("contactsdataability_public_config") { visibility = [ ":*" ] @@ -72,6 +96,7 @@ ohos_shared_library("contactsdataability") { "dataBusiness/contacts/src/contacts_account.cpp", "dataBusiness/contacts/src/contacts_data_ability.cpp", "dataBusiness/contacts/src/contacts_database.cpp", + "dataBusiness/contacts/src/contacts_datashare_stub_impl.cpp", "dataBusiness/contacts/src/contacts_type.cpp", "dataBusiness/contacts/src/contacts_update_helper.cpp", "dataBusiness/contacts/src/profile_database.cpp", @@ -89,22 +114,30 @@ ohos_shared_library("contactsdataability") { "//base/account/os_account/interfaces/kits/napi/distributedaccount/include/", "//base/account/os_account/interfaces/innerkits/include", "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager/include", - "//foundation/ability/ability_runtime/services/abilitymgr/include", + "//foundation/ability/ability_runtime/interfaces/inner_api/dataobs_manager/include", "//foundation/ability/ability_runtime/interfaces/kits/native/ability/native", + "//foundation/ability/ability_runtime/services/abilitymgr/include", ] - deps = [ "//third_party/jsoncpp:jsoncpp" ] + deps = [ + "//foundation/ability/ability_runtime/interfaces/inner_api/dataobs_manager:dataobs_manager", + "//third_party/jsoncpp:jsoncpp" + ] public_configs = [ ":contactsdataability_public_config" ] external_deps = [ "ability_base:want", "ability_base:zuri", "ability_runtime:abilitykit_native", + "ability_runtime:app_context", "c_utils:utilsbase", "common_event_service:cesfwk_innerkits", + "data_share:datashare_common", + "data_share:datashare_provider", "napi:ace_napi", "relational_store:native_dataability", "relational_store:native_rdb", + "relational_store:rdb_data_share_adapter", ] defines = [ diff --git a/README_zh.md b/README_zh.md index 6bcac86..9579127 100644 --- a/README_zh.md +++ b/README_zh.md @@ -9,8 +9,8 @@ ## 简介 联系人数据库应用是每一个用户管理联系人数据库的不可缺少的一个信息管理应用， -它的内容对于用户管理者来说是至关重要的，所以联系人数据库应该能够为每一个 -用户的管理提供充足的信息和快捷查询手段，大大方便用户合理的管理联系人数据库信息。 +它的内容对于用户管理者来说是至关重要的，所以联系人数据库应该能够为每一个 +用户的管理提供充足的信息和快捷查询手段，大大方便用户合理的管理联系人数据库信息。 ## 架构图 @@ -41,17 +41,16 @@ ### 概述 提供联系人数据和通话记录以及语音信箱增、删、改、查、等接口。 -接口参数主要有string类型的uri和对象类型的value、DataAbilityPredicates +接口参数主要有string类型的uri和对象类型的value、DataSharePredicates 使用功能接口前，需要导入相关模块。 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; ``` ### 通话记录 -#### DAHelper.insert(uri: string, value: ValuesBucket) +#### dataShareHelper.insert(uri: string, value: ValuesBucket) - 接口说明 @@ -68,19 +67,18 @@ import ohos_data_ability from '@ohos.data.dataability'; 更新示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var calllogDAhelperUri= "dataability:///com.ohos.calllogability"; -var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog"; +import dataShare from '@ohos.data.dataShare'; +var calllogData = "datashare:///com.ohos.calllogability"; +var calllogUri = "datashare:///com.ohos.calllogability/calls/calllog"; var value = {"phone_number" : "xxxxx","display_name" : "xxx"}; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri); +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(calllogData); // 调用insert方法 -DAHelper.insert(calllogUri, value).then((data) => { +dataShareHelper.insert(calllogUri, value).then((data) => { console.info("calllogId = " + data); }); ``` -#### DAHelper.update(uri: string, value: ValuesBucket, condition: DataAbilityPredicates) +#### dataShareHelper.update(uri: string, condition: DataSharePredicates, value: ValuesBucket) - 接口说明 @@ -91,30 +89,29 @@ DAHelper.insert(calllogUri, value).then((data) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | + | condition | 只读 | DataSharePredicates | 是 | 更新条件 | | value | 只读 | ValuesBucket | 是 | 数据库字段key-value对象 | - | condition | 只读 | DataAbilityPredicates | 是 | 更新条件 | 返回值为 成功为0否则为-1 修改示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var calllogDAhelperUri= "dataability:///com.ohos.calllogability"; -var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog"; +import dataShare from '@ohos.data.dataShare'; +var calllogData = "datashare:///com.ohos.calllogability"; +var calllogUri = "datashare:///com.ohos.calllogability/calls/calllog"; var value = {"phone_number" : "xxxxx","display_name" : "xxx"}; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri); +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(calllogData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); // 调用update方法 -DAHelper.update(calllogUri, value, condition).then((data) => { +dataShareHelper.update(calllogUri, value, condition).then((data) => { console.info("resultCode = " + data); }); ``` -#### DAHelper.delete(uri: string, condition: DataAbilityPredicates) +#### dataShareHelper.delete(uri: string, condition: DataSharePredicates) - 接口说明 @@ -125,28 +122,27 @@ DAHelper.update(calllogUri, value, condition).then((data) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | - | condition | 只读 | DataAbilityPredicates | 是 | 删除条件 | + | condition | 只读 | DataSharePredicates | 是 | 删除条件 | 返回值为 成功为0否则为-1 删除示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var calllogDAhelperUri= "dataability:///com.ohos.calllogability"; -var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog"; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri); +import dataShare from '@ohos.data.dataShare'; +var calllogData = "datashare:///com.ohos.calllogability"; +var calllogUri = "datashare:///com.ohos.calllogability/calls/calllog"; +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(calllogData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); // 调用delete方法 -DAHelper.delete(calllogUri, condition).then((data) => { +dataShareHelper.delete(calllogUri, condition).then((data) => { console.info("deleteCode = " + data); }); ``` -#### DAHelper.query(uri: string, resultColumns: array, condition: DataAbilityPredicates) +#### dataShareHelper.query(uri: string, condition: DataSharePredicates, resultColumns: array) - 接口说明 @@ -157,25 +153,24 @@ DAHelper.delete(calllogUri, condition).then((data) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | - | resultColumns | 只读 | array | 是 | 需要查询的列字段名称 | - | condition | 只读 | DataAbilityPredicates | 是 | 查询条件 | + | condition | 只读 | DataSharePredicates | 是 | 查询条件 | + | resultColumns | 只读 | array | 是 | 需要查询的列字段名称 | 返回值为 ResultSet 查询结果集 查询示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var calllogDAhelperUri= "dataability:///com.ohos.calllogability"; -var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog"; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri); +import dataShare from '@ohos.data.dataShare'; +var calllogData = "datashare:///com.ohos.calllogability"; +var calllogUri = "datashare:///com.ohos.calllogability/calls/calllog"; +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(calllogData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); var resultColumns = [ "id", "display_name", "phone_number"]; // 调用query方法 -DAHelper.query(calllogUri, resultColumns, condition).then((resultSet) => { +dataShareHelper.query(calllogUri, resultColumns, condition).then((resultSet) => { if (resultSet.goToFirstRow()) { do { var displayName = resultSet.getString(resultSet.getColumnIndex("display_name")); @@ -190,7 +185,7 @@ DAHelper.query(calllogUri, resultColumns, condition).then((resultSet) => { ### 语音信箱 -#### DAHelper.insert(uri: string, value: ValuesBucket) +#### dataShareHelper.insert(uri: string, value: ValuesBucket) - 接口说明 @@ -207,19 +202,18 @@ DAHelper.query(calllogUri, resultColumns, condition).then((resultSet) => { 更新示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var voicemailDAhelperUri= "dataability:///com.ohos.voicemailability"; -var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail"; +import dataShare from '@ohos.data.dataShare'; +var voicemailData = "datashare:///com.ohos.voicemailability"; +var voicemailUri = "datashare:///com.ohos.voicemailability/calls/voicemail"; var value = {"phone_number" : "xxxxx","display_name" : "xxx"}; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri); +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(voicemailData); // 调用insert方法 -DAHelper.insert(voicemaiUri, value).then((data) => { +dataShareHelper.insert(voicemailUri, value).then((data) => { console.info("calllogId = " + data); }); ``` -#### DAHelper.update(uri: string, value: ValuesBucket, condition:DataAbilityPredicates) +#### dataShareHelper.update(uri: string, condition:DataSharePredicates, value: ValuesBucket) - 接口说明 @@ -230,30 +224,29 @@ DAHelper.insert(voicemaiUri, value).then((data) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | + | condition | 只读 | DataSharePredicates | 是 | 更新条件 | | value | 只读 | ValuesBucket | 是 | 数据库字段key-value对象 | - | condition | 只读 | DataAbilityPredicates | 是 | 更新条件 | 返回值为 成功为0否则为-1 修改示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var voicemailDAhelperUri= "dataability:///com.ohos.voicemailability"; -var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail"; +import dataShare from '@ohos.data.dataShare'; +var voicemailData = "datashare:///com.ohos.voicemailability"; +var voicemailUri = "datashare:///com.ohos.voicemailability/calls/voicemail"; var value = {"phone_number" : "xxxxx","display_name" : "xxx"}; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri); +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(voicemailData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); // 调用update方法 -DAHelper.update(voicemaiUri, value, condition).then((data) => { +dataShareHelper.update(voicemailUri, value, condition).then((data) => { console.info("resultCode = " + data); }); ``` -#### DAHelper.delete(uri: string, condition: DataAbilityPredicates) +#### dataShareHelper.delete(uri: string, condition: DataSharePredicates) - 接口说明 @@ -264,28 +257,27 @@ DAHelper.update(voicemaiUri, value, condition).then((data) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | - | condition | 只读 | DataAbilityPredicates | 是 | 删除条件 | + | condition | 只读 | DataSharePredicates | 是 | 删除条件 | 返回值为 成功为0否则为-1 删除示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var voicemailDAhelperUri= "dataability:///com.ohos.voicemailability"; -var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail"; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri); +import dataShare from '@ohos.data.dataShare'; +var voicemailData = "datashare:///com.ohos.voicemailability"; +var voicemailUri = "datashare:///com.ohos.voicemailability/calls/voicemail"; +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(voicemailData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); // 调用delete方法 -DAHelper.delete(voicemaiUri, condition).then((data) => { +dataShareHelper.delete(voicemailUri, condition).then((data) => { console.info("deleteCode = " + data); }); ``` -#### DAHelper.query(uri: string, resultColumns:array, condition: DataAbilityPredicates) +#### dataShareHelper.query(uri: string, condition: DataSharePredicates, resultColumns:array) - 接口说明 @@ -296,25 +288,24 @@ DAHelper.delete(voicemaiUri, condition).then((data) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | - | resultColumns | 只读 | array | 是 | 需要查询的列字段名称 | - | condition | 只读 | DataAbilityPredicates | 是 | 查询条件 | + | condition | 只读 | DataSharePredicates | 是 | 查询条件 | + | resultColumns | 只读 | array | 是 | 需要查询的列字段名称 | 返回值为 ResultSet 查询结果集 查询示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var voicemailDAhelperUri= "dataability:///com.ohos.voicemailability"; -var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail"; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri); +import dataShare from '@ohos.data.dataShare'; +var voicemailData = "datashare:///com.ohos.voicemailability"; +var voicemailUri = "datashare:///com.ohos.voicemailability/calls/voicemail"; +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(voicemailData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); var resultColumns = [ "id", "display_name", "phone_number"]; // 调用query方法 -DAHelper.query(voicemaiUri, resultColumns, condition).then((resultSet) => { +dataShareHelper.query(voicemailUri, resultColumns, condition).then((resultSet) => { if (resultSet.goToFirstRow()) { do { var displayName = resultSet.getString(resultSet.getColumnIndex("display_name")); @@ -328,7 +319,7 @@ DAHelper.query(voicemaiUri, resultColumns, condition).then((resultSet) => { ### 联系人 -#### DAHelper.insert(uri: string, value: ValuesBucket) +#### dataShareHelper.insert(uri: string, value: ValuesBucket) - 接口说明 @@ -345,16 +336,15 @@ DAHelper.query(voicemaiUri, resultColumns, condition).then((resultSet) => { 更新示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var contactsUri= "dataability:///com.ohos.contactsdataability"; -var rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -var contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; +import dataShare from '@ohos.data.dataShare'; +var contactsData = "datashare:///com.ohos.contactsdataability"; +var rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +var contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; var value = {"display_name" : "xxx"}; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri); +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(contactsData); // 调用insert方法 -DAHelper.insert(rawContactUri, value).then((rawContactId) => { +dataShareHelper.insert(rawContactUri, value).then((rawContactId) => { console.info("rawContactId = " + rawContactId); // 联系人详细信息插入 var contactDataValues = { @@ -362,12 +352,12 @@ DAHelper.insert(rawContactUri, value).then((rawContactId) => { "content_type" : "name", "detail_info" : "xxxxxxx" }; - DAHelper.insert(contactDataUri, contactDataValues).then((contactDataId) => { + dataShareHelper.insert(contactDataUri, contactDataValues).then((contactDataId) => { console.info("rawContactId = " + contactDataId); }; }); ``` -#### DAHelper.update(uri: string, value: ValuesBucket, condition: DataAbilityPredicates) +#### dataShareHelper.update(uri: string, condition: DataSharePredicates, value: ValuesBucket) - 接口说明 @@ -378,31 +368,30 @@ DAHelper.insert(rawContactUri, value).then((rawContactId) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | + | condition | 只读 | DataSharePredicates | 是 | 更新条件 | | value | 只读 | ValuesBucket | 是 | 数据库字段key-value对象 | - | condition | 只读 | DataAbilityPredicates | 是 | 更新条件 | 返回值为 成功为0否则为-1 修改示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var contactsUri= "dataability:///com.ohos.contactsdataability"; -var rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -var contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; +import dataShare from '@ohos.data.dataShare'; +var contactsData = "datashare:///com.ohos.contactsdataability"; +var rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +var contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; var value = {"display_name" : "xxx"}; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri); +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(contactsData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); // 调用update方法 -DAHelper.update(rawContactUri, value, condition).then((data) => { +dataShareHelper.update(rawContactUri, value, condition).then((data) => { console.info("resultCode = " + data); }); ``` -#### DAHelper.delete(uri: string, condition: DataAbilityPredicates) +#### dataShareHelper.delete(uri: string, condition: DataSharePredicates) - 接口说明 @@ -413,28 +402,27 @@ DAHelper.update(rawContactUri, value, condition).then((data) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | - | condition | 只读 | DataAbilityPredicates | 是 | 删除条件 | + | condition | 只读 | DataSharePredicates | 是 | 删除条件 | 返回值为 成功为0否则为-1 删除示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var contactsUri= "dataability:///com.ohos.contactsdataability"; -var rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -var contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri); +import dataShare from '@ohos.data.dataShare'; +var contactsData = "datashare:///com.ohos.contactsdataability"; +var rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +var contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(contactsData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); // 调用delete方法 -DAHelper.delete(contactDataUri, condition).then((data) => { +dataShareHelper.delete(contactDataUri, condition).then((data) => { console.info("deleteCode = " + data); }); ``` -#### DAHelper.query(uri: string, resultColumns: array, condition: DataAbilityPredicates) +#### dataShareHelper.query(uri: string, condition: DataSharePredicates, resultColumns: array) - 接口说明 @@ -445,25 +433,24 @@ DAHelper.delete(contactDataUri, condition).then((data) => { | 名称 | 读写属性 | 类型 | 必填 | 描述 | | -------- | -------- | ---------------------- | ---- | ------------------------------ | | uri | 只读 | string | 是 | 具体操作的uri | - | resultColumns | 只读 | array | 是 | 需要查询的列字段名称 | - | condition | 只读 | DataAbilityPredicates | 是 | 查询条件 | + | condition | 只读 | DataSharePredicates | 是 | 查询条件 | + | resultColumns | 只读 | array | 是 | 需要查询的列字段名称 | 返回值为 ResultSet 查询结果集 查询示例 ```js -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; -var contactsUri= "dataability:///com.ohos.contactsdataability"; -var rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -// 获取DAHelper -let DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri); +import dataShare from '@ohos.data.dataShare'; +var contactsData = "datashare:///com.ohos.contactsdataability"; +var rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +// 获取dataShareHelper +let dataShareHelper = dataShare.createDataShareHelper(contactsData); // 条件参数 -let condition = new ohos_data_ability.DataAbilityPredicates(); +let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", "xxx"); var resultColumns = [ "id", "display_name"]; // 调用query方法 -DAHelper.query(rawContactUri, resultColumns, condition).then((resultSet) => { +dataShareHelper.query(rawContactUri, resultColumns, condition).then((resultSet) => { if (resultSet.goToFirstRow()) { do { var displayName = resultSet.getString(resultSet.getColumnIndex("display_name")); @@ -474,45 +461,45 @@ DAHelper.query(rawContactUri, resultColumns, condition).then((resultSet) => { ``` | 系统公共uri | | --------------------------------------------------------- | -| dataability:///com.ohos.contactsdataability | -| dataability:///com.ohos.contactsdataability/contacts/contact | -| dataability:///com.ohos.contactsdataability/contacts/raw_contact | -| dataability:///com.ohos.contactsdataability/contacts/contact_data | -| dataability:///com.ohos.contactsdataability/contacts/raw_contact/query_merge_list| -| dataability:///com.ohos.contactsdataability/contacts/raw_contact/split_contact | -| dataability:///com.ohos.contactsdataability/contacts/raw_contact/manual_merge | -| dataability:///com.ohos.contactsdataability/contacts/raw_contact/auto_merge | -| dataability:///com.ohos.contactsdataability/contacts/contact_type | -| dataability:///com.ohos.contactsdataability/contacts/groups | -| dataability:///com.ohos.contactsdataability/contacts/photo_files | -| dataability:///com.ohos.contactsdataability/contacts/contact_blocklist | -| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact | -| dataability:///com.ohos.contactsdataability/contacts/search_contact | -| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact | -| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact_record | -| dataability:///com.ohos.contactsdataability/contacts/backup | -| dataability:///com.ohos.contactsdataability/contacts/recover | -| dataability:///com.ohos.contactsdataability/profile/contact | -| dataability:///com.ohos.contactsdataability/profile/raw_contact | -| dataability:///com.ohos.contactsdataability/profile/contact_data | -| dataability:///com.ohos.contactsdataability/profile/raw_contact/query_merge_list | -| dataability:///com.ohos.contactsdataability/profile/raw_contact/split_contact | -| dataability:///com.ohos.contactsdataability/profile/raw_contact/manual_merge | -| dataability:///com.ohos.contactsdataability/profile/raw_contact/auto_merge | -| dataability:///com.ohos.contactsdataability/profile/contact_type | -| dataability:///com.ohos.contactsdataability/profile/groups | -| dataability:///com.ohos.contactsdataability/profile/photo_files | -| dataability:///com.ohos.contactsdataability/profile/contact_blocklist | -| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact | -| dataability:///com.ohos.contactsdataability/profile/search_contact | -| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact | -| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact_record | -| dataability:///com.ohos.contactsdataability/profile/backup | -| dataability:///com.ohos.contactsdataability/profile/recover | -| dataability:///com.ohos.calllogability | -| dataability:///com.ohos.calllogability/calls/calllog | -| dataability:///com.ohos.voicemailability | -| dataability:///com.ohos.voicemailability/calls/voicemail | +| datashare:///com.ohos.contactsdataability | +| datashare:///com.ohos.contactsdataability/contacts/contact | +| datashare:///com.ohos.contactsdataability/contacts/raw_contact | +| datashare:///com.ohos.contactsdataability/contacts/contact_data | +| datashare:///com.ohos.contactsdataability/contacts/raw_contact/query_merge_list| +| datashare:///com.ohos.contactsdataability/contacts/raw_contact/split_contact | +| datashare:///com.ohos.contactsdataability/contacts/raw_contact/manual_merge | +| datashare:///com.ohos.contactsdataability/contacts/raw_contact/auto_merge | +| datashare:///com.ohos.contactsdataability/contacts/contact_type | +| datashare:///com.ohos.contactsdataability/contacts/groups | +| datashare:///com.ohos.contactsdataability/contacts/photo_files | +| datashare:///com.ohos.contactsdataability/contacts/contact_blocklist | +| datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact | +| datashare:///com.ohos.contactsdataability/contacts/search_contact | +| datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact | +| datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact_record | +| datashare:///com.ohos.contactsdataability/contacts/backup | +| datashare:///com.ohos.contactsdataability/contacts/recover | +| datashare:///com.ohos.contactsdataability/profile/contact | +| datashare:///com.ohos.contactsdataability/profile/raw_contact | +| datashare:///com.ohos.contactsdataability/profile/contact_data | +| datashare:///com.ohos.contactsdataability/profile/raw_contact/query_merge_list | +| datashare:///com.ohos.contactsdataability/profile/raw_contact/split_contact | +| datashare:///com.ohos.contactsdataability/profile/raw_contact/manual_merge | +| datashare:///com.ohos.contactsdataability/profile/raw_contact/auto_merge | +| datashare:///com.ohos.contactsdataability/profile/contact_type | +| datashare:///com.ohos.contactsdataability/profile/groups | +| datashare:///com.ohos.contactsdataability/profile/photo_files | +| datashare:///com.ohos.contactsdataability/profile/contact_blocklist | +| datashare:///com.ohos.contactsdataability/profile/deleted_raw_contact | +| datashare:///com.ohos.contactsdataability/profile/search_contact | +| datashare:///com.ohos.contactsdataability/profile/deleted_raw_contact | +| datashare:///com.ohos.contactsdataability/profile/deleted_raw_contact_record | +| datashare:///com.ohos.contactsdataability/profile/backup | +| datashare:///com.ohos.contactsdataability/profile/recover | +| datashare:///com.ohos.calllogability | +| datashare:///com.ohos.calllogability/calls/calllog | +| datashare:///com.ohos.voicemailability | +| datashare:///com.ohos.voicemailability/calls/voicemail | ## 相关仓 系统应用 diff --git a/ability/common/include/common.h b/ability/common/include/common.h index bfc63c5..ccdbf28 100644 --- a/ability/common/include/common.h +++ b/ability/common/include/common.h @@ -115,9 +115,9 @@ constexpr int MERGE_MODE_MANUAL = 1; constexpr int MERGE_MODE_AUTO = 2; // Uri -constexpr const char *CONTACT_URI = "dataability:///com.ohos.contactsdataability"; -constexpr const char *VOICEMAIL_URI = "dataability:///com.ohos.voicemailability"; -constexpr const char *CALL_LOG_URI = "dataability:///com.ohos.calllogability"; +constexpr const char *CONTACT_URI = "datashare:///com.ohos.contactsdataability"; +constexpr const char *VOICEMAIL_URI = "datashare:///com.ohos.voicemailability"; +constexpr const char *CALL_LOG_URI = "datashare:///com.ohos.calllogability"; constexpr const char *CREATE_CALLLOG = "CREATE TABLE IF NOT EXISTS [calllog](" diff --git a/ability/common/utils/include/contacts_json_utils.h b/ability/common/utils/include/contacts_json_utils.h index 59d83c4..1083268 100644 --- a/ability/common/utils/include/contacts_json_utils.h +++ b/ability/common/utils/include/contacts_json_utils.h @@ -18,11 +18,11 @@ #include +#include "datashare_result_set.h" #include "json.h" #include "json_utils.h" #include "rdb_errno.h" #include "rdb_open_callback.h" -#include "result_set.h" namespace OHOS { namespace Contacts { diff --git a/ability/common/utils/include/contacts_path.h b/ability/common/utils/include/contacts_path.h index abfcd2a..78b30b1 100644 --- a/ability/common/utils/include/contacts_path.h +++ b/ability/common/utils/include/contacts_path.h @@ -26,7 +26,6 @@ public: ~ContactsPath(); static std::string RDB_PATH; static std::string RDB_BACKUP_PATH; - static std::string DUMP_PATH; }; } // namespace Contacts } // namespace OHOS diff --git a/ability/common/utils/include/predicates_convert.h b/ability/common/utils/include/predicates_convert.h index cfe9880..38b2341 100644 --- a/ability/common/utils/include/predicates_convert.h +++ b/ability/common/utils/include/predicates_convert.h @@ -16,7 +16,7 @@ #ifndef PREDICATES_CONVERT_H #define PREDICATES_CONVERT_H -#include "data_ability_predicates.h" +#include "datashare_predicates.h" #include "predicates_utils.h" #include "rdb_predicates.h" @@ -27,7 +27,7 @@ public: PredicatesConvert(); ~PredicatesConvert(); OHOS::NativeRdb::RdbPredicates ConvertPredicates( - std::string tableName, OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates); + std::string tableName, DataShare::DataSharePredicates &dataSharePredicates); OHOS::NativeRdb::RdbPredicates CopyPredicates( std::string tableName, OHOS::NativeRdb::RdbPredicates &oldRdbPredicates); }; diff --git a/ability/common/utils/include/sql_analyzer.h b/ability/common/utils/include/sql_analyzer.h index 3d7bdff..8a21774 100644 --- a/ability/common/utils/include/sql_analyzer.h +++ b/ability/common/utils/include/sql_analyzer.h @@ -29,7 +29,7 @@ public: SqlAnalyzer(); ~SqlAnalyzer(); - bool CheckValuesBucket(const NativeRdb::ValuesBucket &value); + bool CheckValuesBucket(const OHOS::NativeRdb::ValuesBucket &value); bool FindIllegalWords(std::string sql); bool StrCheck(char &ch, std::size_t strlen, std::string sql, std::size_t &pos); bool CharCheck(char &ch, std::string sql, std::size_t &pos); diff --git a/ability/common/utils/src/contacts_path.cpp b/ability/common/utils/src/contacts_path.cpp index c751f8e..9f84cac 100644 --- a/ability/common/utils/src/contacts_path.cpp +++ b/ability/common/utils/src/contacts_path.cpp @@ -18,7 +18,6 @@ namespace OHOS { namespace Contacts { std::string ContactsPath::RDB_PATH = ""; -std::string ContactsPath::DUMP_PATH = ""; std::string ContactsPath::RDB_BACKUP_PATH = ""; ContactsPath::ContactsPath(void) diff --git a/ability/common/utils/src/predicates_convert.cpp b/ability/common/utils/src/predicates_convert.cpp index 661c4fb..bfab18e 100644 --- a/ability/common/utils/src/predicates_convert.cpp +++ b/ability/common/utils/src/predicates_convert.cpp @@ -14,6 +14,7 @@ */ #include "predicates_convert.h" +#include "rdb_utils.h" namespace OHOS { namespace Contacts { @@ -26,13 +27,9 @@ PredicatesConvert::~PredicatesConvert() } OHOS::NativeRdb::RdbPredicates PredicatesConvert::ConvertPredicates( - std::string tableName, OHOS::NativeRdb::DataAbilityPredicates &dataPredicates) + std::string tableName, DataShare::DataSharePredicates &dataPredicates) { - OHOS::NativeRdb::RdbPredicates predicates(tableName); - OHOS::NativeRdb::PredicatesUtils::SetWhereClauseAndArgs( - &predicates, dataPredicates.GetWhereClause(), dataPredicates.GetWhereArgs()); - OHOS::NativeRdb::PredicatesUtils::SetAttributes(&predicates, dataPredicates.IsDistinct(), dataPredicates.GetIndex(), - dataPredicates.GetGroup(), dataPredicates.GetOrder(), dataPredicates.GetLimit(), dataPredicates.GetOffset()); + OHOS::NativeRdb::RdbPredicates predicates = RdbDataShareAdapter::RdbUtils::ToPredicates(dataPredicates, tableName); return predicates; } diff --git a/ability/common/utils/src/sql_analyzer.cpp b/ability/common/utils/src/sql_analyzer.cpp index 087259f..bcbabb4 100644 --- a/ability/common/utils/src/sql_analyzer.cpp +++ b/ability/common/utils/src/sql_analyzer.cpp @@ -28,7 +28,7 @@ SqlAnalyzer::~SqlAnalyzer() { } -bool SqlAnalyzer::CheckValuesBucket(const NativeRdb::ValuesBucket &value) +bool SqlAnalyzer::CheckValuesBucket(const OHOS::NativeRdb::ValuesBucket &value) { std::map valuesMap; value.GetAll(valuesMap); diff --git a/ability/merge/include/merger_contacts.h b/ability/merge/include/merger_contacts.h index f882b4c..24ebf9b 100644 --- a/ability/merge/include/merger_contacts.h +++ b/ability/merge/include/merger_contacts.h @@ -16,7 +16,7 @@ #ifndef MERGERCONTACT_H #define MERGERCONTACT_H -#include "data_ability_predicates.h" +#include "datashare_predicates.h" #include "rdb_store.h" #include "result_set.h" @@ -28,7 +28,7 @@ public: ~MergerContacts(); int ForceContactMerge(std::shared_ptr, std::set); int ContactMerge(std::shared_ptr); - int ReContactMerge(std::shared_ptr, const OHOS::NativeRdb::DataAbilityPredicates &); + int ReContactMerge(std::shared_ptr, const DataShare::DataSharePredicates &); std::shared_ptr SelectCandidate(std::shared_ptr); private: diff --git a/ability/merge/src/merger_contacts.cpp b/ability/merge/src/merger_contacts.cpp index c4effe1..7871f66 100644 --- a/ability/merge/src/merger_contacts.cpp +++ b/ability/merge/src/merger_contacts.cpp @@ -430,7 +430,7 @@ std::shared_ptr MergerContacts::SelectCandi * @return The result returned by the ManualMerge operation */ int MergerContacts::ReContactMerge( - std::shared_ptr store, const OHOS::NativeRdb::DataAbilityPredicates &predicates) + std::shared_ptr store, const DataShare::DataSharePredicates &predicates) { HILOG_INFO("MergerContacts::ReContactMerge is starting"); std::vector whereArgs = predicates.GetWhereArgs(); diff --git a/config.json b/config.json deleted file mode 100644 index 7de7170..0000000 --- a/config.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.contactsdataability", - "vendor": "ohos", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 3, - "target": 3 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.contactsdataability", - "name": ".ContactsDataAbility", - - "deviceType": [ - "default", - "smartVision", - "tablet" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "name": "ContactsDataAbility", - "readPermission": "ohos.permission.READ_CONTACTS", - "writePermission": "ohos.permission.WRITE_CONTACTS", - "icon": "$media:icon", - "description": "dataability_description", - "type": "data", - "uri": "dataability://com.ohos.contactsdataability", - "visible":true, - "srcLanguage":"c++" - }, - { - "name": "VoiceMailAbility", - "permissions": [ - "ohos.permission.MANAGE_VOICEMAIL" - ], - "icon": "$media:icon", - "description": "dataability_description", - "type": "data", - "uri": "dataability://com.ohos.voicemailability", - "visible":true, - "srcLanguage":"c++" - }, - { - "name": "CallLogAbility", - "readPermission": "ohos.permission.READ_CALL_LOG", - "writePermission": "ohos.permission.WRITE_CALL_LOG", - "icon": "$media:icon", - "description": "dataability_description", - "type": "data", - "uri": "dataability://com.ohos.calllogability", - "visible":true, - "srcLanguage":"c++" - } - ] - } -} \ No newline at end of file diff --git a/contacts/BUILD.gn b/contacts/BUILD.gn index 94698ed..68c6234 100644 --- a/contacts/BUILD.gn +++ b/contacts/BUILD.gn @@ -44,8 +44,10 @@ ohos_shared_library("contact") { external_deps = [ "ability_base:zuri", "ability_runtime:abilitykit_native", - "ability_runtime:data_ability_helper", + "ability_runtime:app_context", + "ability_runtime:napi_base_context", "c_utils:utils", + "data_share:datashare_consumer", "napi:ace_napi", "relational_store:native_dataability", "relational_store:native_rdb", diff --git a/contacts/include/contacts_api.h b/contacts/include/contacts_api.h index 15ffd71..676ae8b 100644 --- a/contacts/include/contacts_api.h +++ b/contacts/include/contacts_api.h @@ -18,6 +18,7 @@ #include "contacts_build.h" #include "contacts_napi_object.h" +#include "napi_base_context.h" namespace OHOS { namespace ContactsApi { @@ -50,7 +51,7 @@ void ExecuteAsync(napi_env env, void *data); void ExecuteDone(napi_env env, napi_status status, void *data); void ExecuteSyncDone(napi_env env, napi_status status, void *data); void HandleExecuteResult(napi_env env, ExecuteHelper *executeHelper, napi_value &result); -int GetRawIdByResultSet(const std::shared_ptr &resultSet); +int GetRawIdByResultSet(const std::shared_ptr &resultSet); napi_value CreateAsyncWork(napi_env env, ExecuteHelper *executeHelper); void LocalExecute(napi_env env, ExecuteHelper *executeHelper); void LocalExecuteAddContact(napi_env env, ExecuteHelper *executeHelper); @@ -66,33 +67,33 @@ void LocalExecuteIsLocalContact(napi_env env, ExecuteHelper *executeHelper); void LocalExecuteIsMyCard(napi_env env, ExecuteHelper *executeHelper); napi_value Scheduling(napi_env env, napi_callback_info info, ExecuteHelper *executeHelper, int actionCode); void SetChildActionCodeAndConvertParams(napi_env env, ExecuteHelper *executeHelper); -NativeRdb::DataAbilityPredicates ConvertParamsSwitchSplit( +DataShare::DataSharePredicates ConvertParamsSwitchSplit( int code, napi_env env, const napi_value &key, const napi_value &hold, const napi_value &attr); -std::shared_ptr GetDataAbilityHelper(napi_env env); -void HolderPredicates(const Holder &holder, NativeRdb::DataAbilityPredicates &predicates); +std::shared_ptr GetDataShareHelper(napi_env env, napi_callback_info info); +void HolderPredicates(const Holder &holder, DataShare::DataSharePredicates &predicates); void HoldersStructure(std::map &holders, Holder &holder); -void AttributesPredicates(ContactAttributes &attrs, NativeRdb::DataAbilityPredicates &predicates); +void AttributesPredicates(ContactAttributes &attrs, DataShare::DataSharePredicates &predicates); void CheckAttributes(ContactAttributes &attrs); -NativeRdb::DataAbilityPredicates BuildQueryContactPredicates( +DataShare::DataSharePredicates BuildQueryContactPredicates( napi_env env, std::string key, napi_value hold, napi_value attr); -NativeRdb::DataAbilityPredicates BuildUpdateContactPredicates(napi_env env, napi_value contacts, napi_value attr); -NativeRdb::DataAbilityPredicates BuildQueryContactData(napi_env env, napi_value &contactsObject, - napi_value &attrObject, std::vector &valueContactData); +DataShare::DataSharePredicates BuildUpdateContactPredicates(napi_env env, napi_value contacts, napi_value attr); +DataShare::DataSharePredicates BuildQueryContactData(napi_env env, napi_value &contactsObject, + napi_value &attrObject, std::vector &valueContactData); std::vector BuildUpdateContactColumns(); void BuildUpdateContactConvertParams( napi_env env, napi_value &contacts, napi_value &attr, ExecuteHelper &executeHelper); -NativeRdb::DataAbilityPredicates BuildQueryContactsPredicates(napi_env env, napi_value hold, napi_value attr); -NativeRdb::DataAbilityPredicates BuildQueryContactsByEmailPredicates( +DataShare::DataSharePredicates BuildQueryContactsPredicates(napi_env env, napi_value hold, napi_value attr); +DataShare::DataSharePredicates BuildQueryContactsByEmailPredicates( napi_env env, std::string email, napi_value hold, napi_value attr); -NativeRdb::DataAbilityPredicates BuildQueryContactsByPhoneNumberPredicates( +DataShare::DataSharePredicates BuildQueryContactsByPhoneNumberPredicates( napi_env env, std::string phoneNumber, napi_value hold, napi_value attr); -NativeRdb::DataAbilityPredicates BuildQueryGroupsPredicates(napi_env env, napi_value hold); -NativeRdb::DataAbilityPredicates BuildQueryKeyPredicates(napi_env env, int id, napi_value hold); -NativeRdb::DataAbilityPredicates BuildQueryMyCardPredicates(napi_env env, napi_value attr); -NativeRdb::DataAbilityPredicates BuildIsLocalContactPredicates(napi_env env, napi_value id); -NativeRdb::DataAbilityPredicates BuildIsMyCardPredicates(napi_env env, napi_value id); -NativeRdb::DataAbilityPredicates BuildDeleteContactDataPredicates(napi_env env, napi_value attr); -NativeRdb::DataAbilityPredicates BuildDeleteContactPredicates(napi_env env, ExecuteHelper &executeHelper); +DataShare::DataSharePredicates BuildQueryGroupsPredicates(napi_env env, napi_value hold); +DataShare::DataSharePredicates BuildQueryKeyPredicates(napi_env env, int id, napi_value hold); +DataShare::DataSharePredicates BuildQueryMyCardPredicates(napi_env env, napi_value attr); +DataShare::DataSharePredicates BuildIsLocalContactPredicates(napi_env env, napi_value id); +DataShare::DataSharePredicates BuildIsMyCardPredicates(napi_env env, napi_value id); +DataShare::DataSharePredicates BuildDeleteContactDataPredicates(napi_env env, napi_value attr); +DataShare::DataSharePredicates BuildDeleteContactPredicates(napi_env env, ExecuteHelper &executeHelper); void ObjectInit(napi_env env, napi_value object, napi_value &hold, napi_value &attr, napi_value &contacts); void ObjectInitId(napi_env env, napi_value object, napi_value &id); void ObjectInitString(napi_env env, napi_value object, napi_value &key); diff --git a/contacts/include/contacts_build.h b/contacts/include/contacts_build.h index 627a725..1183771 100644 --- a/contacts/include/contacts_build.h +++ b/contacts/include/contacts_build.h @@ -19,8 +19,8 @@ #include "ability.h" #include "ability_context.h" #include "context.h" -#include "data_ability_helper.h" -#include "data_ability_predicates.h" +#include "datashare_helper.h" +#include "datashare_predicates.h" #include "napi/native_common.h" #include "napi/native_node_api.h" #include "rdb_errno.h" @@ -42,16 +42,16 @@ public: ~ContactsBuild(); void GetContactDataByObject(napi_env env, napi_value object, Contacts &contacts); int GetInt(napi_env env, napi_value id); - void GetContactData(napi_env env, napi_value object, std::vector &valueContact, - std::vector &valueContactData); + void GetContactData(napi_env env, napi_value object, std::vector &valueContact, + std::vector &valueContactData); std::string NapiGetValueString(napi_env env, napi_value value); ContactAttributes GetContactAttributes(napi_env env, napi_value object); Holder GetHolder(napi_env env, napi_value object); void BuildValueContactDataByType( - Contacts &contacts, int typeId, std::vector &valueContactData); + Contacts &contacts, int typeId, std::vector &valueContactData); private: - void TypeSwitchSplit(int typeId, Contacts &contacts, std::vector &valueContactData); + void TypeSwitchSplit(int typeId, Contacts &contacts, std::vector &valueContactData); napi_value GetArrayByKey(napi_env env, napi_value valueObject, std::string key); napi_value GetObjectByKey(napi_env env, napi_value object, std::string key); std::string GetStringValueByKey(napi_env env, napi_value valueObject, std::string key); @@ -71,22 +71,22 @@ private: Note GetNote(napi_env env, napi_value object); Organization GetOrganization(napi_env env, napi_value object); // structure parameter and ValuesBucket - void BuildValueContact(Contacts &contacts, std::vector &valueContact); - void BuildValueContactData(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketEmail(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketEvent(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketGroup(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketImAddress(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketPortrait(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketPhoneNumber(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketPostalAddress(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketRelation(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketSipAddress(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketWebsite(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketName(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketNickName(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketNote(Contacts &contacts, std::vector &valueContactData); - void GetValuesBucketOrganization(Contacts &contacts, std::vector &valueContactData); + void BuildValueContact(Contacts &contacts, std::vector &valueContact); + void BuildValueContactData(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketEmail(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketEvent(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketGroup(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketImAddress(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketPortrait(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketPhoneNumber(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketPostalAddress(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketRelation(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketSipAddress(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketWebsite(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketName(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketNickName(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketNote(Contacts &contacts, std::vector &valueContactData); + void GetValuesBucketOrganization(Contacts &contacts, std::vector &valueContactData); }; } // namespace ContactsApi } // namespace OHOS diff --git a/contacts/include/contacts_control.h b/contacts/include/contacts_control.h index 986f00c..6ea3752 100644 --- a/contacts/include/contacts_control.h +++ b/contacts/include/contacts_control.h @@ -19,8 +19,8 @@ #include "ability.h" #include "ability_context.h" #include "context.h" -#include "data_ability_helper.h" -#include "data_ability_predicates.h" +#include "datashare_helper.h" +#include "datashare_predicates.h" #include "rdb_errno.h" #include "rdb_helper.h" #include "rdb_open_callback.h" @@ -36,33 +36,33 @@ class ContactsControl { public: ContactsControl(); ~ContactsControl(); - int64_t RawContactInsert(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::ValuesBucket rawContactValues); - int ContactDataInsert(std::shared_ptr dataAbilityHelper, - std::vector contactsDataValues); - int RawContactUpdate(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates); - int ContactDataUpdate(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates); - int ContactDelete(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::DataAbilityPredicates predicates); - int ContactDataDelete(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr ContactQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr ContactDataQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr GroupsQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr MyCardQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr HolderQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates); + int64_t RawContactInsert(std::shared_ptr dataShareHelper, + DataShare::DataShareValuesBucket rawContactValues); + int ContactDataInsert(std::shared_ptr dataShareHelper, + std::vector contactsDataValues); + int RawContactUpdate(std::shared_ptr dataShareHelper, + DataShare::DataShareValuesBucket updateValues, DataShare::DataSharePredicates predicates); + int ContactDataUpdate(std::shared_ptr dataShareHelper, + DataShare::DataShareValuesBucket updateValues, DataShare::DataSharePredicates predicates); + int ContactDelete(std::shared_ptr dataShareHelper, + DataShare::DataSharePredicates predicates); + int ContactDataDelete(std::shared_ptr dataShareHelper, + DataShare::DataSharePredicates predicates); + std::shared_ptr ContactQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates); + std::shared_ptr ContactDataQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates); + std::shared_ptr GroupsQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates); + std::shared_ptr MyCardQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates); + std::shared_ptr HolderQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates); }; } // namespace ContactsApi } // namespace OHOS diff --git a/contacts/include/contacts_napi_common.h b/contacts/include/contacts_napi_common.h index a269b9d..48aabbb 100644 --- a/contacts/include/contacts_napi_common.h +++ b/contacts/include/contacts_napi_common.h @@ -16,8 +16,8 @@ #ifndef CONTACT_NAPI_COMMON_H #define CONTACT_NAPI_COMMON_H -#include "data_ability_predicates.h" -#include "data_ability_helper.h" +#include "datashare_predicates.h" +#include "datashare_helper.h" #include "napi/native_api.h" #include "napi/native_common.h" #include "napi/native_node_api.h" @@ -86,6 +86,9 @@ constexpr int HICALL_DEVICE = 15; constexpr int CAMCARD = 16; constexpr int SIP_ADDRESS = 17; +constexpr int ARGS_ONE = 1; +const std::string CONTACTS_DATA_URI = "datashare:///com.ohos.contactsdataability"; + struct ExecuteHelper { ExecuteHelper() : work(nullptr), deferred(nullptr), sync(NAPI_CALL_TYPE_PROMISE), argc(0), actionCode(-1), callBack(nullptr), @@ -102,21 +105,21 @@ struct ExecuteHelper { // query std::vector columns; // condition - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; // delete contact predicates for update contact - NativeRdb::DataAbilityPredicates deletePredicates; + DataShare::DataSharePredicates deletePredicates; // update - std::vector valueUpdateContact; + std::vector valueUpdateContact; // insert - std::vector valueContact; + std::vector valueContact; // insertContactData - std::vector valueContactData; - // dataAbilityHelper - std::shared_ptr dataAbilityHelper; + std::vector valueContactData; + // dataShareHelper + std::shared_ptr dataShareHelper; // operation result int resultData; - std::shared_ptr resultSet; + std::shared_ptr resultSet; }; } // namespace ContactsApi } // namespace OHOS diff --git a/contacts/include/result_convert.h b/contacts/include/result_convert.h index 60f2386..e632247 100644 --- a/contacts/include/result_convert.h +++ b/contacts/include/result_convert.h @@ -34,47 +34,47 @@ public: napi_value GetNapiElementArray(napi_env env, napi_value object, const std::string keyChar); napi_value GetNapiElementObject(napi_env env, napi_value object, const std::string keyChar); napi_value GetResultValue( - napi_env env, std::string &contentKey, std::shared_ptr &resultSet); - napi_value ResultSetToHolder(napi_env env, std::shared_ptr &resultSet); - napi_value ResultSetToGroup(napi_env env, std::shared_ptr &resultSet); - napi_value ResultSetToObject(napi_env env, std::shared_ptr &resultSet); + napi_env env, std::string &contentKey, std::shared_ptr &resultSet); + napi_value ResultSetToHolder(napi_env env, std::shared_ptr &resultSet); + napi_value ResultSetToGroup(napi_env env, std::shared_ptr &resultSet); + napi_value ResultSetToObject(napi_env env, std::shared_ptr &resultSet); napi_value ConvertContactArray( napi_env env, std::map &resultSetMap, std::map &quickSearchMap); - void PutQuickSearchKey(napi_env env, std::shared_ptr &resultSet, + void PutQuickSearchKey(napi_env env, std::shared_ptr &resultSet, std::map &quickSearchMap, int contactsIdValue); void ConvertContactObject( - napi_env env, napi_value napiObject, std::shared_ptr &resultSet); + napi_env env, napi_value napiObject, std::shared_ptr &resultSet); napi_value GetResultMapValue(napi_env env, std::map &resultSetMap, int &contactsId); void ConvertEmail(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertName(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertUri(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertEvent(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertGroup(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertImAddress(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertPhoneNumber(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertPostalAddress(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertRelation(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertSipAddress(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertWebsite(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertNickName(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertNote(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); void ConvertOrganization(napi_env env, napi_value napiObject, int &typeId, - std::shared_ptr &resultSet); + std::shared_ptr &resultSet); napi_value CreateNapiStringValue(napi_env env, const std::string key); - bool IsEmpty(std::shared_ptr &resultSet); + bool IsEmpty(std::shared_ptr &resultSet); }; } // namespace ContactsApi } // namespace OHOS diff --git a/contacts/src/contacts_api.cpp b/contacts/src/contacts_api.cpp index 7fa30f6..44251df 100644 --- a/contacts/src/contacts_api.cpp +++ b/contacts/src/contacts_api.cpp @@ -17,11 +17,7 @@ #include -#include "ability.h" -#include "ability_context.h" -#include "context.h" -#include "data_ability_helper.h" -#include "data_ability_predicates.h" +#include "datashare_predicates.h" #include "rdb_errno.h" #include "rdb_helper.h" #include "rdb_open_callback.h" @@ -147,29 +143,56 @@ int GetType(napi_env env, napi_value value) } /** - * @brief Get dataAbilityHelper + * @brief Get dataShareHelper * - * @param env Conditions for get dataAbilityHelper operation + * @param env Conditions for get dataShareHelper operation * - * @return The result returned by get dataAbilityHelper + * @return The result returned by get dataShareHelper */ -std::shared_ptr GetDataAbilityHelper(napi_env env) +std::shared_ptr GetDataShareHelper(napi_env env, napi_callback_info info) { - napi_value global = nullptr; - NAPI_CALL(env, napi_get_global(env, &global)); - napi_value abilityObj = nullptr; - NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); - if (abilityObj == nullptr) { - HILOG_ERROR("abilityObj is nullptr!"); + napi_value global; + napi_status status = napi_get_global(env, &global); + if (status != napi_ok) { + HILOG_ERROR("GetDataShareHelper napi_get_global != napi_ok"); } - OHOS::AppExecFwk::Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); - if (ability == nullptr) { - HILOG_ERROR("ability is nullptr!"); - return nullptr; + napi_value globalThis; + status = napi_get_named_property(env, global, "globalThis", &globalThis); + if (status != napi_ok) { + HILOG_ERROR("GetDataShareHelper napi_get_globalThis != napi_ok"); } - std::shared_ptr uriPtr = std::make_shared("dataability:///com.ohos.contactsdataability"); - return OHOS::AppExecFwk::DataAbilityHelper::Creator(ability->GetContext(), uriPtr); + napi_value abilityContext = nullptr; + status = napi_get_named_property(env, globalThis, "abilityContext", &abilityContext); + if (status != napi_ok) { + HILOG_ERROR("GetDataShareHelper napi_get_abilityContext != napi_ok"); + } + + std::shared_ptr dataShareHelper = nullptr; + bool isStageMode = false; + status = OHOS::AbilityRuntime::IsStageContext(env, abilityContext, isStageMode); + if (status != napi_ok || !isStageMode) { + HILOG_INFO("GetFAModeContext"); + auto ability = OHOS::AbilityRuntime::GetCurrentAbility(env); + if (ability == nullptr) { + HILOG_ERROR("Failed to get native ability instance"); + return nullptr; + } + auto context = ability->GetContext(); + if (context == nullptr) { + HILOG_ERROR("Failed to get native context instance"); + return nullptr; + } + dataShareHelper = DataShare::DataShareHelper::Creator(context, CONTACTS_DATA_URI); + } else { + HILOG_INFO("GetStageModeContext"); + auto context = OHOS::AbilityRuntime::GetStageModeContext(env, abilityContext); + if (context == nullptr) { + HILOG_ERROR("Failed to get native stage context instance"); + return nullptr; + } + dataShareHelper = DataShare::DataShareHelper::Creator(context->GetToken(), CONTACTS_DATA_URI); + } + return dataShareHelper; } /** @@ -178,7 +201,7 @@ std::shared_ptr GetDataAbilityHelper(napi_e * @param holder Conditions for establish predicates operation * @param predicates Conditions for establish predicates operation */ -void HolderPredicates(Holder &holder, NativeRdb::DataAbilityPredicates &predicates) +void HolderPredicates(Holder &holder, DataShare::DataSharePredicates &predicates) { if (!holder.bundleName.empty()) { predicates.And(); @@ -200,7 +223,7 @@ void HolderPredicates(Holder &holder, NativeRdb::DataAbilityPredicates &predicat * @param attrs Conditions for establish predicates operation * @param predicates Conditions for establish predicates operation */ -void AttributesPredicates(ContactAttributes &attrs, NativeRdb::DataAbilityPredicates &predicates) +void AttributesPredicates(ContactAttributes &attrs, DataShare::DataSharePredicates &predicates) { unsigned int size = attrs.attributes.size(); if (size > 0) { @@ -246,9 +269,9 @@ void CheckAttributes(ContactAttributes &attrs) * @param env Conditions for resolve object interface operation * @param info Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildDeleteContactPredicates(napi_env env, ExecuteHelper *executeHelper) +DataShare::DataSharePredicates BuildDeleteContactPredicates(napi_env env, ExecuteHelper *executeHelper) { - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; ContactsBuild contactsBuild; std::string keyValue = contactsBuild.NapiGetValueString(env, executeHelper->argv[0]); if (!keyValue.empty()) { @@ -267,14 +290,14 @@ NativeRdb::DataAbilityPredicates BuildDeleteContactPredicates(napi_env env, Exec * @param hold Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQueryContactPredicates( +DataShare::DataSharePredicates BuildQueryContactPredicates( napi_env env, napi_value key, napi_value hold, napi_value attr) { ContactsBuild contactsBuild; std::string keyValue = contactsBuild.NapiGetValueString(env, key); Holder holder = contactsBuild.GetHolder(env, hold); ContactAttributes attrs = contactsBuild.GetContactAttributes(env, attr); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; if (!keyValue.empty()) { predicates.EqualTo("is_deleted", "0"); predicates.And(); @@ -305,12 +328,12 @@ void HoldersStructure(std::map &holders, Holder &holde * @param hold Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQueryContactsPredicates(napi_env env, napi_value hold, napi_value attr) +DataShare::DataSharePredicates BuildQueryContactsPredicates(napi_env env, napi_value hold, napi_value attr) { ContactsBuild contactsBuild; Holder holder = contactsBuild.GetHolder(env, hold); ContactAttributes attrs = contactsBuild.GetContactAttributes(env, attr); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; std::map holders; HoldersStructure(holders, holder); unsigned int size = attrs.attributes.size(); @@ -352,14 +375,14 @@ NativeRdb::DataAbilityPredicates BuildQueryContactsPredicates(napi_env env, napi * @param hold Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQueryContactsByEmailPredicates( +DataShare::DataSharePredicates BuildQueryContactsByEmailPredicates( napi_env env, napi_value emailobject, napi_value hold, napi_value attr) { ContactsBuild contactsBuild; std::string email = contactsBuild.NapiGetValueString(env, emailobject); Holder holder = contactsBuild.GetHolder(env, hold); ContactAttributes attrs = contactsBuild.GetContactAttributes(env, attr); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; if (!email.empty() || email != "") { predicates.EqualTo("is_deleted", "0"); predicates.And(); @@ -380,14 +403,14 @@ NativeRdb::DataAbilityPredicates BuildQueryContactsByEmailPredicates( * @param hold Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQueryContactsByPhoneNumberPredicates( +DataShare::DataSharePredicates BuildQueryContactsByPhoneNumberPredicates( napi_env env, napi_value number, napi_value hold, napi_value attr) { ContactsBuild contactsBuild; std::string phoneNumber = contactsBuild.NapiGetValueString(env, number); Holder holder = contactsBuild.GetHolder(env, hold); ContactAttributes attrs = contactsBuild.GetContactAttributes(env, attr); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; if (!phoneNumber.empty() || phoneNumber != "") { predicates.EqualTo("is_deleted", "0"); predicates.And(); @@ -406,11 +429,11 @@ NativeRdb::DataAbilityPredicates BuildQueryContactsByPhoneNumberPredicates( * @param env Conditions for resolve object interface operation * @param hold Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQueryGroupsPredicates(napi_env env, napi_value hold) +DataShare::DataSharePredicates BuildQueryGroupsPredicates(napi_env env, napi_value hold) { ContactsBuild contactsBuild; Holder holder = contactsBuild.GetHolder(env, hold); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; std::map holders; HoldersStructure(holders, holder); predicates.EqualTo("is_deleted", "0"); @@ -435,12 +458,12 @@ NativeRdb::DataAbilityPredicates BuildQueryGroupsPredicates(napi_env env, napi_v * @param id Conditions for resolve object interface operation * @param hold Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQueryKeyPredicates(napi_env env, napi_value id, napi_value hold) +DataShare::DataSharePredicates BuildQueryKeyPredicates(napi_env env, napi_value id, napi_value hold) { ContactsBuild contactsBuild; int value = contactsBuild.GetInt(env, id); Holder holder = contactsBuild.GetHolder(env, hold); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; if (value != 0) { predicates.EqualTo("is_deleted", "0"); predicates.And(); @@ -456,11 +479,11 @@ NativeRdb::DataAbilityPredicates BuildQueryKeyPredicates(napi_env env, napi_valu * @param env Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQueryMyCardPredicates(napi_env env, napi_value attr) +DataShare::DataSharePredicates BuildQueryMyCardPredicates(napi_env env, napi_value attr) { ContactsBuild contactsBuild; ContactAttributes attrs = contactsBuild.GetContactAttributes(env, attr); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; unsigned int size = attrs.attributes.size(); predicates.EqualTo("is_deleted", "0"); if (size > 0) { @@ -475,15 +498,15 @@ NativeRdb::DataAbilityPredicates BuildQueryMyCardPredicates(napi_env env, napi_v return predicates; } -NativeRdb::DataAbilityPredicates BuildQueryContactData(napi_env env, napi_value &contactObject, napi_value &attrObject, - std::vector &valueContactData) +DataShare::DataSharePredicates BuildQueryContactData(napi_env env, napi_value &contactObject, napi_value &attrObject, + std::vector &valueContactData) { ContactsBuild contactsBuild; Contacts contact; contactsBuild.GetContactDataByObject(env, contactObject, contact); ContactAttributes attrs = contactsBuild.GetContactAttributes(env, attrObject); CheckAttributes(attrs); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; std::vector fields; fields.push_back("raw_contact_id"); if (contact.id != 0) { @@ -506,7 +529,7 @@ std::vector BuildUpdateContactColumns() return columns; } -int GetRawIdByResultSet(const std::shared_ptr &resultSet) +int GetRawIdByResultSet(const std::shared_ptr &resultSet) { if (resultSet == nullptr) { return -1; @@ -524,18 +547,18 @@ int GetRawIdByResultSet(const std::shared_ptrvalueContactData.clear(); - NativeRdb::DataAbilityPredicates predicates = + DataShare::DataSharePredicates predicates = BuildQueryContactData(env, contact, attr, executeHelper->valueContactData); executeHelper->columns = BuildUpdateContactColumns(); executeHelper->deletePredicates = BuildDeleteContactDataPredicates(env, attr); } -NativeRdb::DataAbilityPredicates BuildDeleteContactDataPredicates(napi_env env, napi_value attr) +DataShare::DataSharePredicates BuildDeleteContactDataPredicates(napi_env env, napi_value attr) { ContactsBuild contactsBuild; ContactAttributes attrs = contactsBuild.GetContactAttributes(env, attr); CheckAttributes(attrs); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; AttributesPredicates(attrs, predicates); return predicates; } @@ -546,11 +569,11 @@ NativeRdb::DataAbilityPredicates BuildDeleteContactDataPredicates(napi_env env, * @param env Conditions for resolve object interface operation * @param id Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildIsLocalContactPredicates(napi_env env, napi_value id) +DataShare::DataSharePredicates BuildIsLocalContactPredicates(napi_env env, napi_value id) { ContactsBuild contactsBuild; int value = contactsBuild.GetInt(env, id); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; if (value != 0) { predicates.EqualTo("is_deleted", "0"); predicates.And(); @@ -569,11 +592,11 @@ NativeRdb::DataAbilityPredicates BuildIsLocalContactPredicates(napi_env env, nap * @param env Conditions for resolve object interface operation * @param id Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildIsMyCardPredicates(napi_env env, napi_value id) +DataShare::DataSharePredicates BuildIsMyCardPredicates(napi_env env, napi_value id) { ContactsBuild contactsBuild; int value = contactsBuild.GetInt(env, id); - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; if (value != 0) { predicates.EqualTo("is_deleted", "0"); predicates.And(); @@ -592,9 +615,9 @@ void ExecuteDone(napi_env env, napi_status status, void *data) executeHelper->deferred = nullptr; NAPI_CALL_RETURN_VOID(env, napi_resolve_deferred(env, deferred, result)); NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, executeHelper->work)); - if (executeHelper->dataAbilityHelper != nullptr) { - executeHelper->dataAbilityHelper->Release(); - executeHelper->dataAbilityHelper = nullptr; + if (executeHelper->dataShareHelper != nullptr) { + executeHelper->dataShareHelper->Release(); + executeHelper->dataShareHelper = nullptr; } delete executeHelper; executeHelper = nullptr; @@ -634,9 +657,9 @@ void ExecuteSyncDone(napi_env env, napi_status status, void *data) } executeHelper->work = nullptr; executeHelper->deferred = nullptr; - if (executeHelper->dataAbilityHelper != nullptr) { - executeHelper->dataAbilityHelper->Release(); - executeHelper->dataAbilityHelper = nullptr; + if (executeHelper->dataShareHelper != nullptr) { + executeHelper->dataShareHelper->Release(); + executeHelper->dataShareHelper = nullptr; } delete executeHelper; } @@ -651,22 +674,30 @@ void HandleExecuteResult(napi_env env, ExecuteHelper *executeHelper, napi_value case ADD_CONTACT: case DELETE_CONTACT: case UPDATE_CONTACT: - case IS_LOCAL_CONTACT: - case IS_MY_CARD: case SELECT_CONTACT: napi_create_int64(env, executeHelper->resultData, &result); break; + case IS_LOCAL_CONTACT: + case IS_MY_CARD: + napi_get_boolean(env, executeHelper->resultData != 0, &result); + break; case QUERY_CONTACT: + case QUERY_MY_CARD: results = resultConvert.ResultSetToObject(env, executeHelper->resultSet); if (results != nullptr) { napi_get_element(env, results, 0, &result); } break; - case QUERY_CONTACTS: case QUERY_KEY: + results = resultConvert.ResultSetToObject(env, executeHelper->resultSet); + if (results != nullptr) { + napi_get_element(env, results, 0, &result); + } + napi_get_named_property(env, result, "key", &result); + break; + case QUERY_CONTACTS: case QUERY_CONTACTS_BY_EMAIL: case QUERY_CONTACTS_BY_PHONE_NUMBER: - case QUERY_MY_CARD: result = resultConvert.ResultSetToObject(env, executeHelper->resultSet); break; case QUERY_GROUPS: @@ -684,13 +715,13 @@ void LocalExecuteAddContact(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; int64_t rawId = contactsControl.RawContactInsert( - executeHelper->dataAbilityHelper, (executeHelper->valueContact)[0]); - std::vector value = executeHelper->valueContactData; + executeHelper->dataShareHelper, (executeHelper->valueContact)[0]); + std::vector value = executeHelper->valueContactData; unsigned int size = value.size(); for (unsigned int i = 0; i < size; ++i) { - (executeHelper->valueContactData)[i].PutInt("raw_contact_id", rawId); + (executeHelper->valueContactData)[i].Put("raw_contact_id", rawId); } - int code = contactsControl.ContactDataInsert(executeHelper->dataAbilityHelper, executeHelper->valueContactData); + int code = contactsControl.ContactDataInsert(executeHelper->dataShareHelper, executeHelper->valueContactData); if (code == 0) { executeHelper->resultData = rawId; } else { @@ -701,7 +732,7 @@ void LocalExecuteAddContact(napi_env env, ExecuteHelper *executeHelper) void LocalExecuteDeleteContact(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; - int ret = contactsControl.ContactDelete(executeHelper->dataAbilityHelper, executeHelper->predicates); + int ret = contactsControl.ContactDelete(executeHelper->dataShareHelper, executeHelper->predicates); HILOG_INFO("LocalExecuteDeleteContact contact ret = %{public}d", ret); executeHelper->resultData = ret; } @@ -710,7 +741,7 @@ void LocalExecuteQueryContact(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; executeHelper->resultSet = contactsControl.ContactQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); executeHelper->resultData = SUCCESS; } @@ -718,7 +749,7 @@ void LocalExecuteQueryContactsOrKey(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; executeHelper->resultSet = contactsControl.ContactQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); executeHelper->resultData = SUCCESS; } @@ -726,7 +757,7 @@ void LocalExecuteQueryContactsByData(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; executeHelper->resultSet = contactsControl.ContactDataQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); executeHelper->resultData = SUCCESS; } @@ -734,7 +765,7 @@ void LocalExecuteQueryGroup(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; executeHelper->resultSet = contactsControl.GroupsQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); executeHelper->resultData = SUCCESS; } @@ -742,7 +773,7 @@ void LocalExecuteQueryHolders(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; executeHelper->resultSet = contactsControl.HolderQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); executeHelper->resultData = SUCCESS; } @@ -750,7 +781,7 @@ void LocalExecuteQueryMyCard(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; executeHelper->resultSet = contactsControl.MyCardQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); executeHelper->resultData = SUCCESS; } @@ -758,22 +789,22 @@ void LocalExecuteUpdateContact(napi_env env, ExecuteHelper *executeHelper) { ContactsControl contactsControl; // query raw_contact_id - std::shared_ptr resultSet = contactsControl.ContactDataQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + std::shared_ptr resultSet = contactsControl.ContactDataQuery( + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); int rawId = GetRawIdByResultSet(resultSet); - std::vector value = executeHelper->valueContactData; + std::vector value = executeHelper->valueContactData; unsigned int size = value.size(); for (unsigned int i = 0; i < size; ++i) { - (executeHelper->valueContactData)[i].PutInt("raw_contact_id", rawId); + (executeHelper->valueContactData)[i].Put("raw_contact_id", rawId); } if (rawId != 0) { executeHelper->deletePredicates.EqualTo("raw_contact_id", std::to_string(rawId)); } int resultCode = contactsControl.ContactDataDelete( - executeHelper->dataAbilityHelper, executeHelper->deletePredicates); + executeHelper->dataShareHelper, executeHelper->deletePredicates); if (resultCode == 0) { resultCode = contactsControl.ContactDataInsert( - executeHelper->dataAbilityHelper, executeHelper->valueContactData); + executeHelper->dataShareHelper, executeHelper->valueContactData); } executeHelper->resultData = resultCode; } @@ -782,8 +813,8 @@ void LocalExecuteIsLocalContact(napi_env env, ExecuteHelper *executeHelper) { int64_t isLocal = 0; ContactsControl contactsControl; - std::shared_ptr resultSet = contactsControl.ContactQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + std::shared_ptr resultSet = contactsControl.ContactQuery( + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); if (resultSet == nullptr) { executeHelper->resultData = isLocal; return; @@ -800,8 +831,8 @@ void LocalExecuteIsMyCard(napi_env env, ExecuteHelper *executeHelper) { int64_t isMyCard = 0; ContactsControl contactsControl; - std::shared_ptr resultSet = contactsControl.MyCardQuery( - executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates); + std::shared_ptr resultSet = contactsControl.MyCardQuery( + executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates); if (resultSet == nullptr) { executeHelper->resultData = isMyCard; return; @@ -818,8 +849,8 @@ void LocalExecuteIsMyCard(napi_env env, ExecuteHelper *executeHelper) void LocalExecute(napi_env env, ExecuteHelper *executeHelper) { - if (executeHelper->dataAbilityHelper == nullptr) { - HILOG_ERROR("create dataAbilityHelper is null, please check your permission"); + if (executeHelper->dataShareHelper == nullptr) { + HILOG_ERROR("create dataShareHelper is null, please check your permission"); executeHelper->resultData = ERROR; return; } @@ -895,10 +926,10 @@ napi_value CreateAsyncWork(napi_env env, ExecuteHelper *executeHelper) return result; } -NativeRdb::DataAbilityPredicates ConvertParamsSwitchSplit( +DataShare::DataSharePredicates ConvertParamsSwitchSplit( int code, napi_env env, const napi_value &key, const napi_value &hold, const napi_value &attr) { - NativeRdb::DataAbilityPredicates predicates; + DataShare::DataSharePredicates predicates; switch (code) { case QUERY_CONTACT: predicates = BuildQueryContactPredicates(env, key, hold, attr); @@ -985,7 +1016,7 @@ napi_value Scheduling(napi_env env, napi_callback_info info, ExecuteHelper *exec } } SetChildActionCodeAndConvertParams(env, executeHelper); - executeHelper->dataAbilityHelper = GetDataAbilityHelper(env); + executeHelper->dataShareHelper = GetDataShareHelper(env, info); napi_value result = CreateAsyncWork(env, executeHelper); return result; diff --git a/contacts/src/contacts_build.cpp b/contacts/src/contacts_build.cpp index 64a3b47..d9a8aab 100644 --- a/contacts/src/contacts_build.cpp +++ b/contacts/src/contacts_build.cpp @@ -48,7 +48,7 @@ void ContactsBuild::GetContactDataByObject(napi_env env, napi_value object, Cont } void ContactsBuild::GetContactData(napi_env env, napi_value object, - std::vector &valueContact, std::vector &valueContactData) + std::vector &valueContact, std::vector &valueContactData) { Contacts contact; GetContactDataByObject(env, object, contact); @@ -56,22 +56,22 @@ void ContactsBuild::GetContactData(napi_env env, napi_value object, BuildValueContactData(contact, valueContactData); } -void ContactsBuild::BuildValueContact(Contacts &contact, std::vector &valueContact) +void ContactsBuild::BuildValueContact(Contacts &contact, std::vector &valueContact) { - NativeRdb::ValuesBucket valuesBucketContact; + DataShare::DataShareValuesBucket valuesBucketContact; if (!contact.name.fullName.empty() || contact.name.fullName != "") { - valuesBucketContact.PutString("display_name", contact.name.fullName); + valuesBucketContact.Put("display_name", contact.name.fullName); } if (!contact.organization.name.empty() || contact.organization.name != "") { - valuesBucketContact.PutString("company", contact.organization.name); + valuesBucketContact.Put("company", contact.organization.name); } if (!contact.organization.title.empty() || contact.organization.title != "") { - valuesBucketContact.PutString("position", contact.organization.title); + valuesBucketContact.Put("position", contact.organization.title); } valueContact.push_back(valuesBucketContact); } -void ContactsBuild::BuildValueContactData(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::BuildValueContactData(Contacts &contact, std::vector &valueContactData) { GetValuesBucketEmail(contact, valueContactData); GetValuesBucketEvent(contact, valueContactData); @@ -90,7 +90,7 @@ void ContactsBuild::BuildValueContactData(Contacts &contact, std::vector &valueContactData) + Contacts &contact, int typeId, std::vector &valueContactData) { switch (typeId) { case EMAIL: @@ -121,7 +121,7 @@ void ContactsBuild::BuildValueContactDataByType( } void ContactsBuild::TypeSwitchSplit( - int typeId, Contacts &contact, std::vector &valueContactData) + int typeId, Contacts &contact, std::vector &valueContactData) { switch (typeId) { case PHOTO: @@ -164,23 +164,23 @@ void ContactsBuild::TypeSwitchSplit( * @param contact Conditions for establish ValuesBucket operation * @param valueContactData Conditions for establish ValuesBucket operation */ -void ContactsBuild::GetValuesBucketEmail(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketEmail(Contacts &contact, std::vector &valueContactData) { unsigned int emailsSize = contact.emails.size(); for (unsigned int i = 0; i < emailsSize; i++) { - NativeRdb::ValuesBucket valuesBucketEmail; - valuesBucketEmail.PutString("detail_info", contact.emails[i].email); + DataShare::DataShareValuesBucket valuesBucketEmail; + valuesBucketEmail.Put("detail_info", contact.emails[i].email); if (contact.emails[i].labelId != ERROR) { - valuesBucketEmail.PutString("extend7", std::to_string(contact.emails[i].labelId)); + valuesBucketEmail.Put("extend7", std::to_string(contact.emails[i].labelId)); } if (!contact.emails[i].labelName.empty()) { - valuesBucketEmail.PutString("custom_data", contact.emails[i].labelName); - valuesBucketEmail.PutString("extend7", std::to_string(Email::CUSTOM_LABEL)); + valuesBucketEmail.Put("custom_data", contact.emails[i].labelName); + valuesBucketEmail.Put("extend7", std::to_string(Email::CUSTOM_LABEL)); } if (!contact.emails[i].displayName.empty()) { - valuesBucketEmail.PutString("alias_detail_info", contact.emails[i].displayName); + valuesBucketEmail.Put("alias_detail_info", contact.emails[i].displayName); } - valuesBucketEmail.PutString("content_type", "email"); + valuesBucketEmail.Put("content_type", "email"); valueContactData.push_back(valuesBucketEmail); } } @@ -191,20 +191,20 @@ void ContactsBuild::GetValuesBucketEmail(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketEvent(Contacts &contact, std::vector &valueContactData) { unsigned int eventsSize = contact.events.size(); for (unsigned int i = 0; i < eventsSize; i++) { - NativeRdb::ValuesBucket valuesBucketEvent; - valuesBucketEvent.PutString("detail_info", contact.events[i].eventDate); + DataShare::DataShareValuesBucket valuesBucketEvent; + valuesBucketEvent.Put("detail_info", contact.events[i].eventDate); if (contact.events[i].labelId != ERROR) { - valuesBucketEvent.PutString("extend7", std::to_string(contact.events[i].labelId)); + valuesBucketEvent.Put("extend7", std::to_string(contact.events[i].labelId)); } if (!contact.events[i].labelName.empty()) { - valuesBucketEvent.PutString("custom_data", contact.events[i].labelName); - valuesBucketEvent.PutString("extend7", std::to_string(Event::CUSTOM_LABEL)); + valuesBucketEvent.Put("custom_data", contact.events[i].labelName); + valuesBucketEvent.Put("extend7", std::to_string(Event::CUSTOM_LABEL)); } - valuesBucketEvent.PutString("content_type", "contact_event"); + valuesBucketEvent.Put("content_type", "contact_event"); valueContactData.push_back(valuesBucketEvent); } } @@ -215,16 +215,16 @@ void ContactsBuild::GetValuesBucketEvent(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketGroup(Contacts &contact, std::vector &valueContactData) { unsigned int groupsSize = contact.groups.size(); for (unsigned int i = 0; i < groupsSize; i++) { - NativeRdb::ValuesBucket valuesBucketGroup; + DataShare::DataShareValuesBucket valuesBucketGroup; if (contact.groups[i].groupId != ERROR) { - valuesBucketGroup.PutString("detail_info", std::to_string(contact.groups[i].groupId)); + valuesBucketGroup.Put("detail_info", std::to_string(contact.groups[i].groupId)); } - valuesBucketGroup.PutString("alias_detail_info", contact.groups[i].title); - valuesBucketGroup.PutString("content_type", "group_membership"); + valuesBucketGroup.Put("alias_detail_info", contact.groups[i].title); + valuesBucketGroup.Put("content_type", "group_membership"); valueContactData.push_back(valuesBucketGroup); } } @@ -235,20 +235,20 @@ void ContactsBuild::GetValuesBucketGroup(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketImAddress(Contacts &contact, std::vector &valueContactData) { unsigned int imAddressSize = contact.imAddresses.size(); for (unsigned int i = 0; i < imAddressSize; i++) { - NativeRdb::ValuesBucket valuesBucketImAddress; - valuesBucketImAddress.PutString("detail_info", contact.imAddresses[i].imAddress); + DataShare::DataShareValuesBucket valuesBucketImAddress; + valuesBucketImAddress.Put("detail_info", contact.imAddresses[i].imAddress); if (contact.imAddresses[i].labelId != ERROR) { - valuesBucketImAddress.PutString("extend7", std::to_string(contact.imAddresses[i].labelId)); + valuesBucketImAddress.Put("extend7", std::to_string(contact.imAddresses[i].labelId)); } if (!contact.imAddresses[i].labelName.empty()) { - valuesBucketImAddress.PutString("custom_data", contact.imAddresses[i].labelName); - valuesBucketImAddress.PutString("extend7", std::to_string(ImAddress::CUSTOM_LABEL)); + valuesBucketImAddress.Put("custom_data", contact.imAddresses[i].labelName); + valuesBucketImAddress.Put("extend7", std::to_string(ImAddress::CUSTOM_LABEL)); } - valuesBucketImAddress.PutString("content_type", "im"); + valuesBucketImAddress.Put("content_type", "im"); valueContactData.push_back(valuesBucketImAddress); } } @@ -259,12 +259,12 @@ void ContactsBuild::GetValuesBucketImAddress(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketPortrait(Contacts &contact, std::vector &valueContactData) { if (!contact.portrait.uri.empty() || contact.portrait.uri != "") { - NativeRdb::ValuesBucket valuesBucketPortrait; - valuesBucketPortrait.PutString("detail_info", contact.portrait.uri); - valuesBucketPortrait.PutString("content_type", "photo"); + DataShare::DataShareValuesBucket valuesBucketPortrait; + valuesBucketPortrait.Put("detail_info", contact.portrait.uri); + valuesBucketPortrait.Put("content_type", "photo"); valueContactData.push_back(valuesBucketPortrait); } } @@ -276,20 +276,20 @@ void ContactsBuild::GetValuesBucketPortrait(Contacts &contact, std::vector &valueContactData) + Contacts &contact, std::vector &valueContactData) { unsigned int phoneNumbersSize = contact.phoneNumbers.size(); for (unsigned int i = 0; i < phoneNumbersSize; i++) { - NativeRdb::ValuesBucket valuesBucketPhoneNumber; - valuesBucketPhoneNumber.PutString("detail_info", contact.phoneNumbers[i].phoneNumber); + DataShare::DataShareValuesBucket valuesBucketPhoneNumber; + valuesBucketPhoneNumber.Put("detail_info", contact.phoneNumbers[i].phoneNumber); if (contact.phoneNumbers[i].labelId != ERROR) { - valuesBucketPhoneNumber.PutString("extend7", std::to_string(contact.phoneNumbers[i].labelId)); + valuesBucketPhoneNumber.Put("extend7", std::to_string(contact.phoneNumbers[i].labelId)); } if (!contact.phoneNumbers[i].labelName.empty()) { - valuesBucketPhoneNumber.PutString("custom_data", contact.phoneNumbers[i].labelName); - valuesBucketPhoneNumber.PutString("extend7", std::to_string(PhoneNumber::CUSTOM_LABEL)); + valuesBucketPhoneNumber.Put("custom_data", contact.phoneNumbers[i].labelName); + valuesBucketPhoneNumber.Put("extend7", std::to_string(PhoneNumber::CUSTOM_LABEL)); } - valuesBucketPhoneNumber.PutString("content_type", "phone"); + valuesBucketPhoneNumber.Put("content_type", "phone"); valueContactData.push_back(valuesBucketPhoneNumber); } } @@ -301,38 +301,38 @@ void ContactsBuild::GetValuesBucketPhoneNumber( * @param valueContactData Conditions for establish ValuesBucket operation */ void ContactsBuild::GetValuesBucketPostalAddress( - Contacts &contact, std::vector &valueContactData) + Contacts &contact, std::vector &valueContactData) { unsigned int postalAddressesSize = contact.postalAddresses.size(); for (unsigned int i = 0; i < postalAddressesSize; i++) { - NativeRdb::ValuesBucket valuesBucketPostalAddress; - valuesBucketPostalAddress.PutString("detail_info", contact.postalAddresses[i].postalAddress); + DataShare::DataShareValuesBucket valuesBucketPostalAddress; + valuesBucketPostalAddress.Put("detail_info", contact.postalAddresses[i].postalAddress); if (contact.postalAddresses[i].labelId != ERROR) { - valuesBucketPostalAddress.PutString("extend7", std::to_string(contact.postalAddresses[i].labelId)); + valuesBucketPostalAddress.Put("extend7", std::to_string(contact.postalAddresses[i].labelId)); } if (!contact.postalAddresses[i].labelName.empty()) { - valuesBucketPostalAddress.PutString("custom_data", contact.postalAddresses[i].labelName); - valuesBucketPostalAddress.PutString("extend7", std::to_string(PostalAddress::CUSTOM_LABEL)); + valuesBucketPostalAddress.Put("custom_data", contact.postalAddresses[i].labelName); + valuesBucketPostalAddress.Put("extend7", std::to_string(PostalAddress::CUSTOM_LABEL)); } if (!contact.postalAddresses[i].neighborhood.empty()) { - valuesBucketPostalAddress.PutString("neighborhood", contact.postalAddresses[i].neighborhood); + valuesBucketPostalAddress.Put("neighborhood", contact.postalAddresses[i].neighborhood); } if (!contact.postalAddresses[i].pobox.empty()) { - valuesBucketPostalAddress.PutString("pobox", contact.postalAddresses[i].pobox); + valuesBucketPostalAddress.Put("pobox", contact.postalAddresses[i].pobox); } if (!contact.postalAddresses[i].postcode.empty()) { - valuesBucketPostalAddress.PutString("postcode", contact.postalAddresses[i].postcode); + valuesBucketPostalAddress.Put("postcode", contact.postalAddresses[i].postcode); } if (!contact.postalAddresses[i].region.empty()) { - valuesBucketPostalAddress.PutString("region", contact.postalAddresses[i].region); + valuesBucketPostalAddress.Put("region", contact.postalAddresses[i].region); } if (!contact.postalAddresses[i].street.empty()) { - valuesBucketPostalAddress.PutString("street", contact.postalAddresses[i].street); + valuesBucketPostalAddress.Put("street", contact.postalAddresses[i].street); } if (!contact.postalAddresses[i].city.empty()) { - valuesBucketPostalAddress.PutString("city", contact.postalAddresses[i].city); + valuesBucketPostalAddress.Put("city", contact.postalAddresses[i].city); } - valuesBucketPostalAddress.PutString("content_type", "postal_address"); + valuesBucketPostalAddress.Put("content_type", "postal_address"); valueContactData.push_back(valuesBucketPostalAddress); } } @@ -343,20 +343,20 @@ void ContactsBuild::GetValuesBucketPostalAddress( * @param contact Conditions for establish ValuesBucket operation * @param valueContactData Conditions for establish ValuesBucket operation */ -void ContactsBuild::GetValuesBucketRelation(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketRelation(Contacts &contact, std::vector &valueContactData) { unsigned int relationsSize = contact.relations.size(); for (unsigned int i = 0; i < relationsSize; i++) { - NativeRdb::ValuesBucket valuesBucketRelation; - valuesBucketRelation.PutString("detail_info", contact.relations[i].relationName); + DataShare::DataShareValuesBucket valuesBucketRelation; + valuesBucketRelation.Put("detail_info", contact.relations[i].relationName); if (contact.relations[i].labelId != ERROR) { - valuesBucketRelation.PutString("extend7", std::to_string(contact.relations[i].labelId)); + valuesBucketRelation.Put("extend7", std::to_string(contact.relations[i].labelId)); } if (!contact.relations[i].labelName.empty()) { - valuesBucketRelation.PutString("custom_data", contact.relations[i].labelName); - valuesBucketRelation.PutString("extend7", std::to_string(Relation::CUSTOM_LABEL)); + valuesBucketRelation.Put("custom_data", contact.relations[i].labelName); + valuesBucketRelation.Put("extend7", std::to_string(Relation::CUSTOM_LABEL)); } - valuesBucketRelation.PutString("content_type", "relation"); + valuesBucketRelation.Put("content_type", "relation"); valueContactData.push_back(valuesBucketRelation); } } @@ -367,20 +367,20 @@ void ContactsBuild::GetValuesBucketRelation(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketSipAddress(Contacts &contact, std::vector &valueContactData) { unsigned int sipAddressesSize = contact.sipAddresses.size(); for (unsigned int i = 0; i < sipAddressesSize; i++) { - NativeRdb::ValuesBucket valuesBucketSipAddress; - valuesBucketSipAddress.PutString("detail_info", contact.sipAddresses[i].sipAddress); + DataShare::DataShareValuesBucket valuesBucketSipAddress; + valuesBucketSipAddress.Put("detail_info", contact.sipAddresses[i].sipAddress); if (contact.sipAddresses[i].labelId != ERROR) { - valuesBucketSipAddress.PutString("extend7", std::to_string(contact.sipAddresses[i].labelId)); + valuesBucketSipAddress.Put("extend7", std::to_string(contact.sipAddresses[i].labelId)); } if (!contact.sipAddresses[i].labelName.empty()) { - valuesBucketSipAddress.PutString("custom_data", contact.sipAddresses[i].labelName); - valuesBucketSipAddress.PutString("extend7", std::to_string(SipAddress::CUSTOM_LABEL)); + valuesBucketSipAddress.Put("custom_data", contact.sipAddresses[i].labelName); + valuesBucketSipAddress.Put("extend7", std::to_string(SipAddress::CUSTOM_LABEL)); } - valuesBucketSipAddress.PutString("content_type", "sip_address"); + valuesBucketSipAddress.Put("content_type", "sip_address"); valueContactData.push_back(valuesBucketSipAddress); } } @@ -391,13 +391,13 @@ void ContactsBuild::GetValuesBucketSipAddress(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketWebsite(Contacts &contact, std::vector &valueContactData) { unsigned int websitesSize = contact.websites.size(); for (unsigned int i = 0; i < websitesSize; i++) { - NativeRdb::ValuesBucket valuesBucketWebsite; - valuesBucketWebsite.PutString("detail_info", contact.websites[i].website); - valuesBucketWebsite.PutString("content_type", "website"); + DataShare::DataShareValuesBucket valuesBucketWebsite; + valuesBucketWebsite.Put("detail_info", contact.websites[i].website); + valuesBucketWebsite.Put("content_type", "website"); valueContactData.push_back(valuesBucketWebsite); } } @@ -408,36 +408,36 @@ void ContactsBuild::GetValuesBucketWebsite(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketName(Contacts &contact, std::vector &valueContactData) { if (!contact.name.fullName.empty() || contact.name.fullName != "") { - NativeRdb::ValuesBucket valuesBucketName; - valuesBucketName.PutString("detail_info", contact.name.fullName); + DataShare::DataShareValuesBucket valuesBucketName; + valuesBucketName.Put("detail_info", contact.name.fullName); if (!contact.name.namePrefix.empty()) { - valuesBucketName.PutString("alpha_name", contact.name.namePrefix); + valuesBucketName.Put("alpha_name", contact.name.namePrefix); } if (!contact.name.middleName.empty()) { - valuesBucketName.PutString("other_lan_last_name", contact.name.middleName); + valuesBucketName.Put("other_lan_last_name", contact.name.middleName); } if (!contact.name.nameSuffix.empty()) { - valuesBucketName.PutString("other_lan_first_name", contact.name.nameSuffix); + valuesBucketName.Put("other_lan_first_name", contact.name.nameSuffix); } if (!contact.name.familyName.empty()) { - valuesBucketName.PutString("family_name", contact.name.familyName); + valuesBucketName.Put("family_name", contact.name.familyName); } if (!contact.name.middleNamePhonetic.empty()) { - valuesBucketName.PutString("middle_name_phonetic", contact.name.middleNamePhonetic); + valuesBucketName.Put("middle_name_phonetic", contact.name.middleNamePhonetic); } if (!contact.name.givenName.empty()) { - valuesBucketName.PutString("given_name", contact.name.givenName); + valuesBucketName.Put("given_name", contact.name.givenName); } if (!contact.name.givenNamePhonetic.empty()) { - valuesBucketName.PutString("given_name_phonetic", contact.name.givenNamePhonetic); + valuesBucketName.Put("given_name_phonetic", contact.name.givenNamePhonetic); } if (!contact.name.familyNamePhonetic.empty()) { - valuesBucketName.PutString("phonetic_name", contact.name.familyNamePhonetic); + valuesBucketName.Put("phonetic_name", contact.name.familyNamePhonetic); } - valuesBucketName.PutString("content_type", "name"); + valuesBucketName.Put("content_type", "name"); valueContactData.push_back(valuesBucketName); } } @@ -448,12 +448,12 @@ void ContactsBuild::GetValuesBucketName(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketNickName(Contacts &contact, std::vector &valueContactData) { if (!contact.nickName.nickName.empty() || contact.nickName.nickName != "") { - NativeRdb::ValuesBucket valuesBucketNickName; - valuesBucketNickName.PutString("detail_info", contact.nickName.nickName); - valuesBucketNickName.PutString("content_type", "nickname"); + DataShare::DataShareValuesBucket valuesBucketNickName; + valuesBucketNickName.Put("detail_info", contact.nickName.nickName); + valuesBucketNickName.Put("content_type", "nickname"); valueContactData.push_back(valuesBucketNickName); } } @@ -464,12 +464,12 @@ void ContactsBuild::GetValuesBucketNickName(Contacts &contact, std::vector &valueContactData) +void ContactsBuild::GetValuesBucketNote(Contacts &contact, std::vector &valueContactData) { if (!contact.note.noteContent.empty() || contact.note.noteContent != "") { - NativeRdb::ValuesBucket valuesBucketNote; - valuesBucketNote.PutString("detail_info", contact.note.noteContent); - valuesBucketNote.PutString("content_type", "note"); + DataShare::DataShareValuesBucket valuesBucketNote; + valuesBucketNote.Put("detail_info", contact.note.noteContent); + valuesBucketNote.Put("content_type", "note"); valueContactData.push_back(valuesBucketNote); } } @@ -481,15 +481,15 @@ void ContactsBuild::GetValuesBucketNote(Contacts &contact, std::vector &valueContactData) + Contacts &contact, std::vector &valueContactData) { if (!contact.organization.name.empty()) { - NativeRdb::ValuesBucket valuesBucketData; - valuesBucketData.PutString("detail_info", contact.organization.name); + DataShare::DataShareValuesBucket valuesBucketData; + valuesBucketData.Put("detail_info", contact.organization.name); if (!contact.organization.title.empty()) { - valuesBucketData.PutString("position", contact.organization.title); + valuesBucketData.Put("position", contact.organization.title); } - valuesBucketData.PutString("content_type", "organization"); + valuesBucketData.Put("content_type", "organization"); valueContactData.push_back(valuesBucketData); } } diff --git a/contacts/src/contacts_control.cpp b/contacts/src/contacts_control.cpp index 373078f..d9db9dd 100644 --- a/contacts/src/contacts_control.cpp +++ b/contacts/src/contacts_control.cpp @@ -27,112 +27,112 @@ ContactsControl::~ContactsControl() { } -int64_t ContactsControl::RawContactInsert(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::ValuesBucket rawContactValues) +int64_t ContactsControl::RawContactInsert(std::shared_ptr dataShareHelper, + DataShare::DataShareValuesBucket rawContactValues) { int code = 0; - OHOS::Uri uriRawContact("dataability:///com.ohos.contactsdataability/contacts/raw_contact"); - code = dataAbilityHelper->Insert(uriRawContact, rawContactValues); + OHOS::Uri uriRawContact("datashare:///com.ohos.contactsdataability/contacts/raw_contact"); + code = dataShareHelper->Insert(uriRawContact, rawContactValues); HILOG_INFO(" ContactsControl::RawContactInsert insert code %{public}d", code); rawContactValues.Clear(); return code; } -int ContactsControl::ContactDataInsert(std::shared_ptr dataAbilityHelper, - std::vector contactDataValues) +int ContactsControl::ContactDataInsert(std::shared_ptr dataShareHelper, + std::vector contactDataValues) { int code = 0; - OHOS::Uri uriContactData("dataability:///com.ohos.contactsdataability/contacts/contact_data"); - code = dataAbilityHelper->BatchInsert(uriContactData, contactDataValues); + OHOS::Uri uriContactData("datashare:///com.ohos.contactsdataability/contacts/contact_data"); + code = dataShareHelper->BatchInsert(uriContactData, contactDataValues); HILOG_INFO(" ContactsControl::ContactDataInsert insert code %{public}d", code); contactDataValues.clear(); return code; } -int ContactsControl::ContactDataDelete(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactsControl::ContactDataDelete(std::shared_ptr dataShareHelper, + DataShare::DataSharePredicates predicates) { int code = 0; - OHOS::Uri uriContactData("dataability:///com.ohos.contactsdataability/contacts/contact_data"); - code = dataAbilityHelper->Delete(uriContactData, predicates); + OHOS::Uri uriContactData("datashare:///com.ohos.contactsdataability/contacts/contact_data"); + code = dataShareHelper->Delete(uriContactData, predicates); HILOG_INFO(" ContactsControl::ContactDataDelete insert code %{public}d", code); return code; } -int ContactsControl::RawContactUpdate(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactsControl::RawContactUpdate(std::shared_ptr dataShareHelper, + DataShare::DataShareValuesBucket updateValues, DataShare::DataSharePredicates predicates) { int code = 0; - OHOS::Uri uriRawContact("dataability:///com.ohos.contactsdataability/contacts/raw_contact"); - code = dataAbilityHelper->Update(uriRawContact, updateValues, predicates); + OHOS::Uri uriRawContact("datashare:///com.ohos.contactsdataability/contacts/raw_contact"); + code = dataShareHelper->Update(uriRawContact, predicates, updateValues); return code; } -int ContactsControl::ContactDataUpdate(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactsControl::ContactDataUpdate(std::shared_ptr dataShareHelper, + DataShare::DataShareValuesBucket updateValues, DataShare::DataSharePredicates predicates) { int code = 0; - OHOS::Uri uriContactData("dataability:///com.ohos.contactsdataability/contacts/contact_data"); - code = dataAbilityHelper->Update(uriContactData, updateValues, predicates); + OHOS::Uri uriContactData("datashare:///com.ohos.contactsdataability/contacts/contact_data"); + code = dataShareHelper->Update(uriContactData, predicates, updateValues); return code; } -int ContactsControl::ContactDelete(std::shared_ptr dataAbilityHelper, - OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactsControl::ContactDelete(std::shared_ptr dataShareHelper, + DataShare::DataSharePredicates predicates) { int code = 0; - OHOS::Uri uriContact("dataability:///com.ohos.contactsdataability/contacts/contact"); - code = dataAbilityHelper->Delete(uriContact, predicates); + OHOS::Uri uriContact("datashare:///com.ohos.contactsdataability/contacts/contact"); + code = dataShareHelper->Delete(uriContact, predicates); return code; } -std::shared_ptr ContactsControl::HolderQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactsControl::HolderQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; - OHOS::Uri uriContact("dataability:///com.ohos.contactsdataability/contacts/account"); - resultSet = dataAbilityHelper->Query(uriContact, columns, predicates); + std::shared_ptr resultSet; + OHOS::Uri uriContact("datashare:///com.ohos.contactsdataability/contacts/account"); + resultSet = dataShareHelper->Query(uriContact, predicates, columns); return resultSet; } -std::shared_ptr ContactsControl::ContactQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactsControl::ContactQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates) { HILOG_INFO("ContactsControl::ContactQuery is start"); - std::shared_ptr resultSet; - OHOS::Uri uriContact("dataability:///com.ohos.contactsdataability/contacts/contact_data"); - resultSet = dataAbilityHelper->Query(uriContact, columns, predicates); + std::shared_ptr resultSet; + OHOS::Uri uriContact("datashare:///com.ohos.contactsdataability/contacts/contact_data"); + resultSet = dataShareHelper->Query(uriContact, predicates, columns); return resultSet; } -std::shared_ptr ContactsControl::ContactDataQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactsControl::ContactDataQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; - OHOS::Uri uriContactData("dataability:///com.ohos.contactsdataability/contacts/contact_data"); - resultSet = dataAbilityHelper->Query(uriContactData, columns, predicates); + std::shared_ptr resultSet; + OHOS::Uri uriContactData("datashare:///com.ohos.contactsdataability/contacts/contact_data"); + resultSet = dataShareHelper->Query(uriContactData, predicates, columns); return resultSet; } -std::shared_ptr ContactsControl::GroupsQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactsControl::GroupsQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; - OHOS::Uri uriGroups("dataability:///com.ohos.contactsdataability/contacts/groups"); - resultSet = dataAbilityHelper->Query(uriGroups, columns, predicates); + std::shared_ptr resultSet; + OHOS::Uri uriGroups("datashare:///com.ohos.contactsdataability/contacts/groups"); + resultSet = dataShareHelper->Query(uriGroups, predicates, columns); return resultSet; } -std::shared_ptr ContactsControl::MyCardQuery( - std::shared_ptr dataAbilityHelper, std::vector columns, - OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactsControl::MyCardQuery( + std::shared_ptr dataShareHelper, std::vector columns, + DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; - OHOS::Uri uriProfileContact("dataability:///com.ohos.contactsdataability/profile/contact_data"); - resultSet = dataAbilityHelper->Query(uriProfileContact, columns, predicates); + std::shared_ptr resultSet; + OHOS::Uri uriProfileContact("datashare:///com.ohos.contactsdataability/profile/contact_data"); + resultSet = dataShareHelper->Query(uriProfileContact, predicates, columns); return resultSet; } } // namespace ContactsApi diff --git a/contacts/src/result_convert.cpp b/contacts/src/result_convert.cpp index 8e0c985..3d08c8f 100644 --- a/contacts/src/result_convert.cpp +++ b/contacts/src/result_convert.cpp @@ -36,7 +36,7 @@ ResultConvert::~ResultConvert() * @return The result returned by convert operation */ napi_value ResultConvert::ResultSetToObject( - napi_env env, std::shared_ptr &resultSet) + napi_env env, std::shared_ptr &resultSet) { if (resultSet == nullptr) { HILOG_ERROR("ResultConvert::ResultSetToObject resultSet is nullptr"); @@ -72,7 +72,7 @@ napi_value ResultConvert::ResultSetToObject( return array; } -void ResultConvert::PutQuickSearchKey(napi_env env, std::shared_ptr &resultSet, +void ResultConvert::PutQuickSearchKey(napi_env env, std::shared_ptr &resultSet, std::map &quickSearchMap, int contactIdValue) { std::string quickSearchValue = ""; @@ -122,7 +122,7 @@ napi_value ResultConvert::ConvertContactArray( * @param resultSet Target of convert operation */ void ResultConvert::ConvertContactObject( - napi_env env, napi_value napiObject, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, std::shared_ptr &resultSet) { int typeIdValue = 0; std::string typeId = "type_id"; @@ -145,7 +145,7 @@ void ResultConvert::ConvertContactObject( ConvertOrganization(env, napiObject, typeIdValue, resultSet); } -bool ResultConvert::IsEmpty(std::shared_ptr &resultSet) +bool ResultConvert::IsEmpty(std::shared_ptr &resultSet) { if (resultSet == nullptr) { HILOG_ERROR("ResultSetToHolder resultSet is nullptr"); @@ -161,7 +161,7 @@ bool ResultConvert::IsEmpty(std::shared_ptr } napi_value ResultConvert::ResultSetToHolder( - napi_env env, std::shared_ptr &resultSet) + napi_env env, std::shared_ptr &resultSet) { napi_value array; napi_create_array(env, &array); @@ -212,7 +212,7 @@ napi_value ResultConvert::ResultSetToHolder( } napi_value ResultConvert::ResultSetToGroup( - napi_env env, std::shared_ptr &resultSet) + napi_env env, std::shared_ptr &resultSet) { napi_value array; NAPI_CALL(env, napi_create_array(env, &array)); @@ -313,26 +313,26 @@ napi_value ResultConvert::GetNapiElementArray(napi_env env, napi_value napiObjec } napi_value ResultConvert::GetResultValue( - napi_env env, std::string &contentKey, std::shared_ptr &resultSet) + napi_env env, std::string &contentKey, std::shared_ptr &resultSet) { int columnIndex = ERROR; resultSet->GetColumnIndex(contentKey, columnIndex); - OHOS::NativeRdb::ColumnType columnType; - resultSet->GetColumnType(columnIndex, columnType); + OHOS::DataShare::DataType columnType; + resultSet->GetDataType(columnIndex, columnType); napi_value napiValue = nullptr; - if (columnType == OHOS::NativeRdb::ColumnType::TYPE_NULL) { + if (columnType == OHOS::DataShare::DataType::TYPE_NULL) { return napiValue; - } else if (columnType == OHOS::NativeRdb::ColumnType::TYPE_BLOB) { + } else if (columnType == OHOS::DataShare::DataType::TYPE_BLOB) { return napiValue; - } else if (columnType == OHOS::NativeRdb::ColumnType::TYPE_INTEGER) { + } else if (columnType == OHOS::DataShare::DataType::TYPE_INTEGER) { int intValue = 0; resultSet->GetInt(columnIndex, intValue); napi_create_int64(env, intValue, &napiValue); - } else if (columnType == OHOS::NativeRdb::ColumnType::TYPE_FLOAT) { + } else if (columnType == OHOS::DataShare::DataType::TYPE_FLOAT) { double doubleValue = 0; resultSet->GetDouble(columnIndex, doubleValue); napi_create_double(env, doubleValue, &napiValue); - } else if (columnType == OHOS::NativeRdb::ColumnType::TYPE_STRING) { + } else if (columnType == OHOS::DataShare::DataType::TYPE_STRING) { std::string stringValue; resultSet->GetString(columnIndex, stringValue); napi_create_string_utf8(env, stringValue.c_str(), NAPI_AUTO_LENGTH, &napiValue); @@ -348,7 +348,7 @@ napi_value ResultConvert::CreateNapiStringValue(napi_env env, const std::string } void ResultConvert::ConvertEmail( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == EMAIL) { const std::string emails = "emails"; @@ -381,7 +381,7 @@ void ResultConvert::ConvertEmail( } void ResultConvert::ConvertName( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == NAME) { const std::string name = "name"; @@ -429,7 +429,7 @@ void ResultConvert::ConvertName( } void ResultConvert::ConvertUri( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == PHOTO) { const std::string portrait = "portrait"; @@ -445,7 +445,7 @@ void ResultConvert::ConvertUri( } void ResultConvert::ConvertEvent( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == CONTACT_EVENT) { const std::string events = "events"; @@ -474,7 +474,7 @@ void ResultConvert::ConvertEvent( } void ResultConvert::ConvertGroup( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == GROUP_MEMBERSHIP) { const std::string groups = "groups"; @@ -498,7 +498,7 @@ void ResultConvert::ConvertGroup( } void ResultConvert::ConvertImAddress( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == IM) { const std::string imAddresses = "imAddresses"; @@ -527,7 +527,7 @@ void ResultConvert::ConvertImAddress( } void ResultConvert::ConvertPhoneNumber( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == PHONE) { const std::string phoneNumbers = "phoneNumbers"; @@ -556,7 +556,7 @@ void ResultConvert::ConvertPhoneNumber( } void ResultConvert::ConvertPostalAddress( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == POSTAL_ADDRESS) { const std::string postalAddresses = "postalAddresses"; @@ -603,7 +603,7 @@ void ResultConvert::ConvertPostalAddress( } void ResultConvert::ConvertRelation( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == RELATION) { const std::string relations = "relations"; @@ -632,7 +632,7 @@ void ResultConvert::ConvertRelation( } void ResultConvert::ConvertSipAddress( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == SIP_ADDRESS) { const std::string sipAddresses = "sipAddresses"; @@ -661,7 +661,7 @@ void ResultConvert::ConvertSipAddress( } void ResultConvert::ConvertWebsite( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == WEBSITE) { const std::string websites = "websites"; @@ -690,7 +690,7 @@ void ResultConvert::ConvertWebsite( } void ResultConvert::ConvertNickName( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == NICKNAME) { const std::string nickName = "nickName"; @@ -706,7 +706,7 @@ void ResultConvert::ConvertNickName( } void ResultConvert::ConvertNote( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == NOTE) { const std::string note = "note"; @@ -722,7 +722,7 @@ void ResultConvert::ConvertNote( } void ResultConvert::ConvertOrganization( - napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) + napi_env env, napi_value napiObject, int &typeId, std::shared_ptr &resultSet) { if (typeId == ORGANIZATION) { const std::string organization = "organization"; diff --git a/dataBusiness/calllog/include/calllog_ability.h b/dataBusiness/calllog/include/calllog_ability.h index fa8b3b7..38a1c84 100644 --- a/dataBusiness/calllog/include/calllog_ability.h +++ b/dataBusiness/calllog/include/calllog_ability.h @@ -16,38 +16,40 @@ #ifndef CALLLOG_ABILITY_H #define CALLLOG_ABILITY_H -#include "ability.h" -#include "ability_loader.h" +#include "abs_shared_result_set.h" +#include "datashare_ext_ability.h" +#include "datashare_values_bucket.h" #include "want.h" #include "calllog_database.h" namespace OHOS { -namespace AppExecFwk { -class CallLogAbility : public Ability { +namespace AbilityRuntime { +class CallLogAbility : public DataShare::DataShareExtAbility { public: CallLogAbility(); - ~CallLogAbility(); - virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; - virtual int BatchInsert(const Uri &uri, const std::vector &values) override; + virtual ~CallLogAbility() override; + static CallLogAbility* Create(); + sptr OnConnect(const AAFwk::Want &want) override; + virtual int Insert(const Uri &uri, const DataShare::DataShareValuesBucket &value) override; + virtual int BatchInsert(const Uri &uri, const std::vector &values) override; virtual void OnStart(const Want &want) override; - virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, - const NativeRdb::DataAbilityPredicates &predicates) override; - virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query(const Uri &uri, - const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; - virtual void Dump(const std::string &extra) override; + virtual int Update(const Uri &uri, const DataShare::DataSharePredicates &predicates, + const DataShare::DataShareValuesBucket &value) override; + virtual int Delete(const Uri &uri, const DataShare::DataSharePredicates &predicates) override; + virtual std::shared_ptr Query(const Uri &uri, + const DataShare::DataSharePredicates &predicates, std::vector &columns) override; private: static std::shared_ptr callLogDataBase_; static std::map uriValueMap_; int UriParse(Uri &uri); - int InsertExecute(const Uri &uri, const NativeRdb::ValuesBucket &value); + int InsertExecute(const Uri &uri, const OHOS::NativeRdb::ValuesBucket &value); void DataBaseNotifyChange(int code, Uri uri); bool IsBeginTransactionOK(int code, std::mutex &mutex); bool IsCommitOk(int code, std::mutex &mutex); }; -} // namespace AppExecFwk +} // namespace AbilityRuntime } // namespace OHOS #endif // CALLLOG_ABILITY_H diff --git a/dataBusiness/calllog/include/calllog_database.h b/dataBusiness/calllog/include/calllog_database.h index 2f54711..9cf1e8d 100644 --- a/dataBusiness/calllog/include/calllog_database.h +++ b/dataBusiness/calllog/include/calllog_database.h @@ -18,13 +18,14 @@ #include -#include "data_ability_predicates.h" +#include "datashare_predicates.h" +#include "datashare_result_set.h" +#include "datashare_values_bucket.h" #include "rdb_errno.h" #include "rdb_helper.h" #include "rdb_open_callback.h" #include "rdb_predicates.h" #include "rdb_store.h" -#include "result_set.h" #include "value_object.h" #include "common.h" diff --git a/dataBusiness/calllog/src/calllog_ability.cpp b/dataBusiness/calllog/src/calllog_ability.cpp index de47aed..3842d05 100644 --- a/dataBusiness/calllog/src/calllog_ability.cpp +++ b/dataBusiness/calllog/src/calllog_ability.cpp @@ -20,16 +20,18 @@ #include "ability_loader.h" #include "common.h" #include "contacts_common_event.h" -#include "data_ability_predicates.h" +#include "contacts_datashare_stub_impl.h" +#include "datashare_ext_ability_context.h" +#include "datashare_predicates.h" #include "file_utils.h" #include "predicates_convert.h" #include "rdb_predicates.h" +#include "rdb_utils.h" #include "sql_analyzer.h" #include "uri_utils.h" namespace OHOS { -namespace AppExecFwk { -REGISTER_AA(CallLogAbility); +namespace AbilityRuntime { namespace { std::mutex g_mutex; } @@ -38,7 +40,12 @@ std::map CallLogAbility::uriValueMap_ = { {"/com.ohos.calllogability/calls/calllog", Contacts::CALLLOG} }; -CallLogAbility::CallLogAbility() +CallLogAbility* CallLogAbility::Create() +{ + return new CallLogAbility(); +} + +CallLogAbility::CallLogAbility() : DataShareExtAbility() { } @@ -46,20 +53,30 @@ CallLogAbility::~CallLogAbility() { } -void CallLogAbility::Dump(const std::string &extra) +sptr CallLogAbility::OnConnect(const AAFwk::Want &want) { - HILOG_ERROR("CallLogAbility ====>Dump:%{public}s", extra.c_str()); - Contacts::FileUtils fileUtils; - std::string dirStr = Contacts::ContactsPath::DUMP_PATH; - fileUtils.WriteStringToFileAppend(dirStr, extra); + HILOG_INFO("CallLogAbility %{public}s begin.", __func__); + Extension::OnConnect(want); + sptr remoteObject = new (std::nothrow) DataShare::ContactsDataShareStubImpl( + std::static_pointer_cast(shared_from_this())); + if (remoteObject == nullptr) { + HILOG_ERROR("%{public}s No memory allocated for DataShareStubImpl", __func__); + return nullptr; + } + HILOG_INFO("CallLogAbility %{public}s end.", __func__); + return remoteObject->AsObject(); } void CallLogAbility::OnStart(const Want &want) { - std::string basePath = GetAbilityContext()->GetDatabaseDir(); - Contacts::ContactsPath::RDB_PATH = basePath + "/"; - Contacts::ContactsPath::RDB_BACKUP_PATH = basePath + "/backup/"; - Contacts::ContactsPath::DUMP_PATH = GetFilesDir() + "/"; + HILOG_INFO("CallLogAbility %{public}s begin.", __func__); + Extension::OnStart(want); + auto context = AbilityRuntime::Context::GetApplicationContext(); + if (context != nullptr) { + std::string basePath = context->GetDatabaseDir(); + Contacts::ContactsPath::RDB_PATH = basePath + "/"; + Contacts::ContactsPath::RDB_BACKUP_PATH = basePath + "/backup/"; + } } int CallLogAbility::UriParse(Uri &uri) @@ -115,10 +132,11 @@ bool CallLogAbility::IsCommitOk(int code, std::mutex &mutex) * * @return Insert database results code */ -int CallLogAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) +int CallLogAbility::Insert(const Uri &uri, const DataShare::DataShareValuesBucket &value) { + OHOS::NativeRdb::ValuesBucket valuesBucket = RdbDataShareAdapter::RdbUtils::ToValuesBucket(value); Contacts::SqlAnalyzer sqlAnalyzer; - bool isOk = sqlAnalyzer.CheckValuesBucket(value); + bool isOk = sqlAnalyzer.CheckValuesBucket(valuesBucket); if (!isOk) { HILOG_ERROR("CallLogAbility CheckValuesBucket is error"); return Contacts::RDB_EXECUTE_FAIL; @@ -130,7 +148,7 @@ int CallLogAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) g_mutex.unlock(); return Contacts::RDB_EXECUTE_FAIL; } - int resultId = InsertExecute(uri, value); + int resultId = InsertExecute(uri, valuesBucket); if (resultId == Contacts::OPERATION_ERROR) { callLogDataBase_->RollBack(); g_mutex.unlock(); @@ -147,7 +165,7 @@ int CallLogAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) return resultId; } -int CallLogAbility::InsertExecute(const Uri &uri, const NativeRdb::ValuesBucket &value) +int CallLogAbility::InsertExecute(const Uri &uri, const OHOS::NativeRdb::ValuesBucket &value) { int rowId = Contacts::RDB_EXECUTE_FAIL; OHOS::Uri uriTemp = uri; @@ -171,7 +189,7 @@ int CallLogAbility::InsertExecute(const Uri &uri, const NativeRdb::ValuesBucket * * @return Insert database results code */ -int CallLogAbility::BatchInsert(const Uri &uri, const std::vector &values) +int CallLogAbility::BatchInsert(const Uri &uri, const std::vector &values) { int rowRet = Contacts::RDB_EXECUTE_FAIL; unsigned int size = values.size(); @@ -189,8 +207,9 @@ int CallLogAbility::BatchInsert(const Uri &uri, const std::vectorRollBack(); g_mutex.unlock(); @@ -226,10 +245,11 @@ int CallLogAbility::BatchInsert(const Uri &uri, const std::vectorUpdateCallLog(value, rdbPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::CALLLOG, dataSharePredicates); + ret = callLogDataBase_->UpdateCallLog(valuesBucket, rdbPredicates); break; default: HILOG_ERROR("CallLogAbility ====>no match uri action"); @@ -265,7 +285,7 @@ int CallLogAbility::Update( * * @return Delete database results code */ -int CallLogAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) +int CallLogAbility::Delete(const Uri &uri, const DataShare::DataSharePredicates &predicates) { g_mutex.lock(); callLogDataBase_ = Contacts::CallLogDataBase::GetInstance(); @@ -273,16 +293,16 @@ int CallLogAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicate int ret = Contacts::RDB_EXECUTE_FAIL; OHOS::Uri uriTemp = uri; int parseCode = UriParse(uriTemp); - OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates; + DataShare::DataSharePredicates dataSharePredicates = predicates; OHOS::NativeRdb::RdbPredicates rdbPredicates(""); switch (parseCode) { case Contacts::CALLLOG: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::CallsTableName::CALLLOG, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::CALLLOG, dataSharePredicates); ret = callLogDataBase_->DeleteCallLog(rdbPredicates); break; default: - HILOG_ERROR("ContactsDataAbility ====>no match uri action"); + HILOG_ERROR("CallLogAbility ====>no match uri action"); break; } g_mutex.unlock(); @@ -299,31 +319,38 @@ int CallLogAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicate * * @return Query database results */ -std::shared_ptr CallLogAbility::Query( - const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) +std::shared_ptr CallLogAbility::Query( + const Uri &uri, const DataShare::DataSharePredicates &predicates, std::vector &columns) { - HILOG_INFO("ContactsDataAbility ====>Query start"); + HILOG_INFO("CallLogAbility ====>Query start"); callLogDataBase_ = Contacts::CallLogDataBase::GetInstance(); Contacts::PredicatesConvert predicatesConvert; - std::shared_ptr result; + std::shared_ptr result; OHOS::Uri uriTemp = uri; Contacts::UriUtils uriUtils; int parseCode = uriUtils.UriParse(uriTemp, uriValueMap_); - OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates; + DataShare::DataSharePredicates dataSharePredicates = predicates; OHOS::NativeRdb::RdbPredicates rdbPredicates(""); std::vector columnsTemp = columns; + bool isUriMatch = true; switch (parseCode) { case Contacts::CALLLOG: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::CallsTableName::CALLLOG, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::CALLLOG, dataSharePredicates); result = callLogDataBase_->Query(rdbPredicates, columnsTemp); break; default: + isUriMatch = false; HILOG_ERROR("CallLogAbility ====>no match uri action"); break; } - std::shared_ptr sharedPtrResult = std::move(result); - HILOG_INFO("ContactsDataAbility ====>Query end"); + if (!isUriMatch) { + return nullptr; + } + auto queryResultSet = RdbDataShareAdapter::RdbUtils::ToResultSetBridge(result); + std::shared_ptr sharedPtrResult = + std::make_shared(queryResultSet); + HILOG_INFO("CallLogAbility ====>Query end"); return sharedPtrResult; } @@ -331,5 +358,5 @@ void CallLogAbility::DataBaseNotifyChange(int code, Uri uri) { Contacts::ContactsCommonEvent::SendCallLogChange(code); } -} // namespace AppExecFwk +} // namespace AbilityRuntime } // namespace OHOS \ No newline at end of file diff --git a/dataBusiness/contacts/include/contacts.h b/dataBusiness/contacts/include/contacts.h index 1a1d211..5d97d86 100644 --- a/dataBusiness/contacts/include/contacts.h +++ b/dataBusiness/contacts/include/contacts.h @@ -16,7 +16,7 @@ #ifndef CONTACT_H #define CONTACT_H -#include "data_ability_predicates.h" +#include "datashare_predicates.h" #include "rdb_errno.h" #include "rdb_helper.h" #include "rdb_store.h" diff --git a/dataBusiness/contacts/include/contacts_data_ability.h b/dataBusiness/contacts/include/contacts_data_ability.h index 3e9dd5b..f8e7cd0 100644 --- a/dataBusiness/contacts/include/contacts_data_ability.h +++ b/dataBusiness/contacts/include/contacts_data_ability.h @@ -18,8 +18,9 @@ #include -#include "ability.h" -#include "ability_loader.h" +#include "abs_shared_result_set.h" +#include "datashare_ext_ability.h" +#include "datashare_values_bucket.h" #include "predicates_convert.h" #include "rdb_predicates.h" #include "want.h" @@ -27,46 +28,47 @@ #include "contacts_database.h" namespace OHOS { -namespace AppExecFwk { -class ContactsDataAbility : public Ability { +namespace AbilityRuntime { +class ContactsDataAbility : public DataShare::DataShareExtAbility { public: ContactsDataAbility(); - ~ContactsDataAbility(); - virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; - virtual int BatchInsert(const Uri &uri, const std::vector &values) override; + virtual ~ContactsDataAbility() override; + static ContactsDataAbility* Create(); + sptr OnConnect(const AAFwk::Want &want) override; + virtual int Insert(const Uri &uri, const DataShare::DataShareValuesBucket &value) override; + virtual int BatchInsert(const Uri &uri, const std::vector &values) override; virtual void OnStart(const Want &want) override; - virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, - const NativeRdb::DataAbilityPredicates &predicates) override; - virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query(const Uri &uri, - const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; - virtual void Dump(const std::string &extra) override; + virtual int Update(const Uri &uri, const DataShare::DataSharePredicates &predicates, + const DataShare::DataShareValuesBucket &value) override; + virtual int Delete(const Uri &uri, const DataShare::DataSharePredicates &predicates) override; + virtual std::shared_ptr Query(const Uri &uri, + const DataShare::DataSharePredicates &predicates, std::vector &columns) override; private: static std::shared_ptr contactDataBase_; static std::shared_ptr profileDataBase_; static std::map uriValueMap_; - int InsertExecute(int &code, const NativeRdb::ValuesBucket &value); + int InsertExecute(int &code, const OHOS::NativeRdb::ValuesBucket &value); int UriParseAndSwitch(Uri &uri); void SwitchProfile(Uri &uri); - void QueryExecute(std::shared_ptr &result, - OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates, std::vector &columnsTemp, + bool QueryExecute(std::shared_ptr &result, + DataShare::DataSharePredicates &dataSharePredicates, std::vector &columnsTemp, int &parseCode); - void QueryExecuteSwitchSplit(std::shared_ptr &result, - OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates, std::vector &columnsTemp, + bool QueryExecuteSwitchSplit(std::shared_ptr &result, + DataShare::DataSharePredicates &dataSharePredicates, std::vector &columnsTemp, int &parseCode); - void UpdateExecute(int &retCode, int code, const NativeRdb::ValuesBucket &value, - OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates); - void SwitchUpdate(int &retCode, int &code, const NativeRdb::ValuesBucket &value, - OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates); - void DeleteExecute(int &retCode, int code, OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates); + void UpdateExecute(int &retCode, int code, const OHOS::NativeRdb::ValuesBucket &value, + DataShare::DataSharePredicates &dataSharePredicates); + void SwitchUpdate(int &retCode, int &code, const OHOS::NativeRdb::ValuesBucket &value, + DataShare::DataSharePredicates &dataSharePredicates); + void DeleteExecute(int &retCode, int code, DataShare::DataSharePredicates &dataSharePredicates); void DataBaseNotifyChange(int code, Uri uri); bool IsBeginTransactionOK(int code, std::mutex &mutex); bool IsCommitOK(int code, std::mutex &mutex); int BackUp(); int Recover(int &code); }; -} // namespace AppExecFwk +} // namespace AbilityRuntime } // namespace OHOS #endif // CONTACTSDATAABILITY_CONTACT_DATA_ABILITY_TEST_H diff --git a/dataBusiness/contacts/include/contacts_database.h b/dataBusiness/contacts/include/contacts_database.h index adeaf90..f77918c 100644 --- a/dataBusiness/contacts/include/contacts_database.h +++ b/dataBusiness/contacts/include/contacts_database.h @@ -16,7 +16,8 @@ #ifndef CONTACT_DATABASE_H #define CONTACT_DATABASE_H -#include "data_ability_predicates.h" +#include "datashare_predicates.h" +#include "datashare_values_bucket.h" #include "rdb_errno.h" #include "rdb_helper.h" #include "rdb_open_callback.h" @@ -59,9 +60,9 @@ public: int RollBack(); static void DestroyInstanceAndRestore(std::string restorePath); std::shared_ptr SelectCandidate(); - int Split(OHOS::NativeRdb::DataAbilityPredicates predicates); + int Split(DataShare::DataSharePredicates predicates); int ContactMerge(); - int ReContactMerge(OHOS::NativeRdb::DataAbilityPredicates predicates); + int ReContactMerge(DataShare::DataSharePredicates predicates); int DeleteRecord(OHOS::NativeRdb::RdbPredicates &rdbPredicates); int GetTypeId(std::string typeText); void DeleteExecute(std::shared_ptr &store, diff --git a/dataBusiness/contacts/include/contacts_datashare_stub_impl.h b/dataBusiness/contacts/include/contacts_datashare_stub_impl.h new file mode 100644 index 0000000..1ae9ac2 --- /dev/null +++ b/dataBusiness/contacts/include/contacts_datashare_stub_impl.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DATASHARE_STUB_IMPL_H +#define DATASHARE_STUB_IMPL_H + +#include "datashare_stub.h" +#include "datashare_ext_ability.h" + +namespace OHOS { +namespace DataShare { +class ContactsDataShareStubImpl : public DataShareStub { +public: + explicit ContactsDataShareStubImpl(const std::shared_ptr& extension) + : contactsDataAbility_(extension) {}; + virtual ~ContactsDataShareStubImpl() {}; + + int Insert(const Uri &uri, const DataShareValuesBucket &value) override; + int Update(const Uri &uri, const DataSharePredicates &predicates, + const DataShareValuesBucket &value) override; + int Delete(const Uri &uri, const DataSharePredicates &predicates) override; + std::shared_ptr Query(const Uri &uri, + const DataSharePredicates &predicates, std::vector &columns) override; + int BatchInsert(const Uri &uri, const std::vector &values) override; + + std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; + int OpenFile(const Uri &uri, const std::string &mode) override; + int OpenRawFile(const Uri &uri, const std::string &mode) override; + std::string GetType(const Uri &uri) override; + bool RegisterObserver(const Uri &uri, const sptr &dataObserver) override; + bool UnregisterObserver(const Uri &uri, const sptr &dataObserver) override; + bool NotifyChange(const Uri &uri) override; + Uri NormalizeUri(const Uri &uri) override; + Uri DenormalizeUri(const Uri &uri) override; + +private: + std::shared_ptr GetOwner(const Uri &uri); + std::shared_ptr GetContactsDataAbility(); + std::shared_ptr GetCallLogAbility(); + std::shared_ptr GetVoiceMailAbility(); + +private: + std::shared_ptr contactsDataAbility_; + std::shared_ptr callLogAbility_; + std::shared_ptr voiceMailAbility_; +}; +} // namespace DataShare +} // namespace OHOS +#endif // DATASHARE_STUB_IMPL_H \ No newline at end of file diff --git a/dataBusiness/contacts/include/contacts_type.h b/dataBusiness/contacts/include/contacts_type.h index 59264bf..5b25b97 100644 --- a/dataBusiness/contacts/include/contacts_type.h +++ b/dataBusiness/contacts/include/contacts_type.h @@ -16,7 +16,7 @@ #ifndef CONTACT_TYPE_H #define CONTACT_TYPE_H -#include "data_ability_predicates.h" +#include "datashare_predicates.h" #include "rdb_errno.h" #include "rdb_store.h" #include "result_set.h" diff --git a/dataBusiness/contacts/include/contacts_update_helper.h b/dataBusiness/contacts/include/contacts_update_helper.h index 2db6e5f..347ac6a 100644 --- a/dataBusiness/contacts/include/contacts_update_helper.h +++ b/dataBusiness/contacts/include/contacts_update_helper.h @@ -16,7 +16,7 @@ #ifndef CONTACT_UPDATE_HELPER_H #define CONTACT_UPDATE_HELPER_H -#include "data_ability_predicates.h" +#include "datashare_predicates.h" #include "rdb_errno.h" #include "rdb_helper.h" #include "rdb_store.h" diff --git a/dataBusiness/contacts/include/raw_contacts.h b/dataBusiness/contacts/include/raw_contacts.h index b6ec8f7..d6802a4 100644 --- a/dataBusiness/contacts/include/raw_contacts.h +++ b/dataBusiness/contacts/include/raw_contacts.h @@ -16,7 +16,7 @@ #ifndef RAW_CONTACT_H #define RAW_CONTACT_H -#include "data_ability_predicates.h" +#include "datashare_predicates.h" #include "rdb_errno.h" #include "rdb_store.h" diff --git a/dataBusiness/contacts/src/contacts_data_ability.cpp b/dataBusiness/contacts/src/contacts_data_ability.cpp index 00d3c84..c8d2902 100644 --- a/dataBusiness/contacts/src/contacts_data_ability.cpp +++ b/dataBusiness/contacts/src/contacts_data_ability.cpp @@ -17,21 +17,24 @@ #include +#include "ability_loader.h" #include "common.h" #include "contacts_columns.h" #include "contacts_common_event.h" -#include "data_ability_predicates.h" +#include "contacts_datashare_stub_impl.h" +#include "datashare_ext_ability_context.h" +#include "datashare_predicates.h" #include "database_disaster_recovery.h" #include "file_utils.h" #include "hilog_wrapper.h" #include "profile_database.h" #include "rdb_predicates.h" +#include "rdb_utils.h" #include "sql_analyzer.h" #include "uri_utils.h" namespace OHOS { -namespace AppExecFwk { -REGISTER_AA(ContactsDataAbility); +namespace AbilityRuntime { namespace { std::mutex g_mutex; } @@ -69,7 +72,12 @@ std::map ContactsDataAbility::uriValueMap_ = { {"/com.ohos.contactsdataability/profile/contact_type", Contacts::PROFILE_TYPE} }; -ContactsDataAbility::ContactsDataAbility(void) +ContactsDataAbility* ContactsDataAbility::Create() +{ + return new ContactsDataAbility(); +} + +ContactsDataAbility::ContactsDataAbility() : DataShareExtAbility() { } @@ -77,20 +85,42 @@ ContactsDataAbility::~ContactsDataAbility() { } -void ContactsDataAbility::OnStart(const Want &want) +static DataShare::DataShareExtAbility *ContactsDataShareCreator(const std::unique_ptr &runtime) { - Ability::OnStart(want); - std::string basePath = GetAbilityContext()->GetDatabaseDir(); - Contacts::ContactsPath::RDB_PATH = basePath + "/"; - Contacts::ContactsPath::RDB_BACKUP_PATH = basePath + "/backup/"; - Contacts::ContactsPath::DUMP_PATH = GetFilesDir() + "/"; + HILOG_INFO("ContactsDataCreator::%{public}s", __func__); + return ContactsDataAbility::Create(); } -void ContactsDataAbility::Dump(const std::string &extra) +__attribute__((constructor)) void RegisterDataShareCreator() { - Contacts::FileUtils fileUtils; - std::string dirStr = Contacts::ContactsPath::DUMP_PATH; - fileUtils.WriteStringToFileAppend(dirStr, extra); + HILOG_INFO("ContactsDataCreator::%{public}s", __func__); + DataShare::DataShareExtAbility::SetCreator(ContactsDataShareCreator); +} + +sptr ContactsDataAbility::OnConnect(const AAFwk::Want &want) +{ + HILOG_INFO("ContactsDataAbility %{public}s begin.", __func__); + Extension::OnConnect(want); + sptr remoteObject = new (std::nothrow) DataShare::ContactsDataShareStubImpl( + std::static_pointer_cast(shared_from_this())); + if (remoteObject == nullptr) { + HILOG_ERROR("%{public}s No memory allocated for DataShareStubImpl", __func__); + return nullptr; + } + HILOG_INFO("ContactsDataAbility %{public}s end.", __func__); + return remoteObject->AsObject(); +} + +void ContactsDataAbility::OnStart(const Want &want) +{ + HILOG_INFO("ContactsDataAbility %{public}s begin.", __func__); + Extension::OnStart(want); + auto context = AbilityRuntime::Context::GetApplicationContext(); + if (context != nullptr) { + std::string basePath = context->GetDatabaseDir(); + Contacts::ContactsPath::RDB_PATH = basePath + "/"; + Contacts::ContactsPath::RDB_BACKUP_PATH = basePath + "/backup/"; + } } /** @@ -139,11 +169,12 @@ bool ContactsDataAbility::IsCommitOK(int code, std::mutex &mutex) * * @return Insert database results code */ -int ContactsDataAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) +int ContactsDataAbility::Insert(const Uri &uri, const DataShare::DataShareValuesBucket &value) { - HILOG_INFO("Insert start"); + HILOG_INFO("ContactsDataAbility Insert start"); + OHOS::NativeRdb::ValuesBucket valuesBucket = RdbDataShareAdapter::RdbUtils::ToValuesBucket(value); Contacts::SqlAnalyzer sqlAnalyzer; - bool isOk = sqlAnalyzer.CheckValuesBucket(value); + bool isOk = sqlAnalyzer.CheckValuesBucket(valuesBucket); if (!isOk) { HILOG_ERROR("ContactsDataAbility CheckValuesBucket error"); return Contacts::RDB_EXECUTE_FAIL; @@ -159,7 +190,7 @@ int ContactsDataAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &v g_mutex.unlock(); return Contacts::RDB_EXECUTE_FAIL; } - resultId = InsertExecute(code, value); + resultId = InsertExecute(code, valuesBucket); HILOG_INFO("Insert id = %{public}d", resultId); if (resultId == Contacts::OPERATION_ERROR) { contactDataBase_->RollBack(); @@ -174,11 +205,11 @@ int ContactsDataAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &v } g_mutex.unlock(); DataBaseNotifyChange(Contacts::CONTACT_INSERT, uri); - HILOG_INFO("Insert end"); + HILOG_INFO("ContactsDataAbility Insert end"); return resultId; } -int ContactsDataAbility::InsertExecute(int &code, const NativeRdb::ValuesBucket &value) +int ContactsDataAbility::InsertExecute(int &code, const OHOS::NativeRdb::ValuesBucket &value) { int rowId = Contacts::RDB_EXECUTE_FAIL; switch (code) { @@ -218,7 +249,7 @@ int ContactsDataAbility::InsertExecute(int &code, const NativeRdb::ValuesBucket * * @return BatchInsert database results code */ -int ContactsDataAbility::BatchInsert(const Uri &uri, const std::vector &values) +int ContactsDataAbility::BatchInsert(const Uri &uri, const std::vector &values) { unsigned int size = values.size(); if (size <= 0) { @@ -237,8 +268,9 @@ int ContactsDataAbility::BatchInsert(const Uri &uri, const std::vectorRollBack(); g_mutex.unlock(); @@ -273,10 +305,11 @@ int ContactsDataAbility::BatchInsert(const Uri &uri, const std::vectorUpdateRawContact(value, rdbPredicates); break; case Contacts::CONTACTS_CONTACT_DATA: case Contacts::PROFILE_CONTACT_DATA: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ContactTableName::CONTACT_DATA, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ContactTableName::CONTACT_DATA, dataSharePredicates); retCode = contactDataBase_->UpdateContactData(value, rdbPredicates); break; case Contacts::CONTACTS_GROUPS: case Contacts::PROFILE_GROUPS: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ContactTableName::GROUPS, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ContactTableName::GROUPS, dataSharePredicates); retCode = contactDataBase_->UpdateGroup(value, rdbPredicates); break; case Contacts::CONTACTS_BLOCKLIST: case Contacts::PROFILE_BLOCKLIST: rdbPredicates = predicatesConvert.ConvertPredicates( - Contacts::ContactTableName::CONTACT_BLOCKLIST, dataAbilityPredicates); + Contacts::ContactTableName::CONTACT_BLOCKLIST, dataSharePredicates); retCode = contactDataBase_->UpdateBlockList(value, rdbPredicates); break; default: - SwitchUpdate(retCode, code, value, dataAbilityPredicates); + SwitchUpdate(retCode, code, value, dataSharePredicates); break; } } -void ContactsDataAbility::SwitchUpdate(int &retCode, int &code, const NativeRdb::ValuesBucket &value, - OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates) +void ContactsDataAbility::SwitchUpdate(int &retCode, int &code, const OHOS::NativeRdb::ValuesBucket &value, + DataShare::DataSharePredicates &dataSharePredicates) { Contacts::PredicatesConvert predicatesConvert; OHOS::NativeRdb::RdbPredicates rdbPredicates(""); switch (code) { case Contacts::SPLIT_CONTACT: - retCode = contactDataBase_->Split(dataAbilityPredicates); + retCode = contactDataBase_->Split(dataSharePredicates); break; case Contacts::MANUAL_MERGE: - retCode = contactDataBase_->ReContactMerge(dataAbilityPredicates); + retCode = contactDataBase_->ReContactMerge(dataSharePredicates); break; case Contacts::AUTO_MERGE: retCode = contactDataBase_->ContactMerge(); @@ -371,7 +404,7 @@ void ContactsDataAbility::SwitchUpdate(int &retCode, int &code, const NativeRdb: * * @return Delete database results code */ -int ContactsDataAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) +int ContactsDataAbility::Delete(const Uri &uri, const DataShare::DataSharePredicates &predicates) { HILOG_INFO("ContactsDataAbility ====>Delete"); g_mutex.lock(); @@ -380,15 +413,15 @@ int ContactsDataAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPred int retCode = Contacts::RDB_EXECUTE_FAIL; OHOS::Uri uriTemp = uri; int code = UriParseAndSwitch(uriTemp); - OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates; - DeleteExecute(retCode, code, dataAbilityPredicates); + DataShare::DataSharePredicates dataSharePredicates = predicates; + DeleteExecute(retCode, code, dataSharePredicates); g_mutex.unlock(); DataBaseNotifyChange(Contacts::CONTACT_DELETE, uri); return retCode; } void ContactsDataAbility::DeleteExecute( - int &retCode, int code, OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates) + int &retCode, int code, DataShare::DataSharePredicates &dataSharePredicates) { Contacts::PredicatesConvert predicatesConvert; OHOS::NativeRdb::RdbPredicates rdbPredicates(""); @@ -396,43 +429,43 @@ void ContactsDataAbility::DeleteExecute( case Contacts::CONTACTS_CONTACT: case Contacts::PROFILE_CONTACT: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ContactTableName::CONTACT, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ContactTableName::CONTACT, dataSharePredicates); retCode = contactDataBase_->DeleteContact(rdbPredicates); break; case Contacts::CONTACTS_RAW_CONTACT: case Contacts::PROFILE_RAW_CONTACT: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ContactTableName::RAW_CONTACT, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ContactTableName::RAW_CONTACT, dataSharePredicates); retCode = contactDataBase_->DeleteRawContact(rdbPredicates); break; case Contacts::CONTACTS_CONTACT_DATA: case Contacts::PROFILE_CONTACT_DATA: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ContactTableName::CONTACT_DATA, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ContactTableName::CONTACT_DATA, dataSharePredicates); retCode = contactDataBase_->DeleteContactData(rdbPredicates); break; case Contacts::CONTACTS_GROUPS: case Contacts::PROFILE_GROUPS: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ContactTableName::GROUPS, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ContactTableName::GROUPS, dataSharePredicates); retCode = contactDataBase_->DeleteGroup(rdbPredicates); break; case Contacts::CONTACTS_BLOCKLIST: case Contacts::PROFILE_BLOCKLIST: rdbPredicates = predicatesConvert.ConvertPredicates( - Contacts::ContactTableName::CONTACT_BLOCKLIST, dataAbilityPredicates); + Contacts::ContactTableName::CONTACT_BLOCKLIST, dataSharePredicates); retCode = contactDataBase_->DeleteBlockList(rdbPredicates); break; case Contacts::CONTACTS_DELETE: case Contacts::PROFILE_DELETE: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_DELETED, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_DELETED, dataSharePredicates); retCode = contactDataBase_->CompletelyDelete(rdbPredicates); break; case Contacts::CONTACTS_DELETE_RECORD: case Contacts::PROFILE_DELETE_RECORD: rdbPredicates = predicatesConvert.ConvertPredicates( - Contacts::ContactTableName::DELETE_RAW_CONTACT, dataAbilityPredicates); + Contacts::ContactTableName::DELETE_RAW_CONTACT, dataSharePredicates); retCode = contactDataBase_->DeleteRecord(rdbPredicates); break; default: @@ -451,84 +484,93 @@ void ContactsDataAbility::DeleteExecute( * * @return Database query result */ -std::shared_ptr ContactsDataAbility::Query( - const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) +std::shared_ptr ContactsDataAbility::Query( + const Uri &uri, const DataShare::DataSharePredicates &predicates, std::vector &columns) { HILOG_INFO("ContactsDataAbility ====>Query start"); g_mutex.lock(); contactDataBase_ = Contacts::ContactsDataBase::GetInstance(); profileDataBase_ = Contacts::ProfileDatabase::GetInstance(); - std::shared_ptr result; + std::shared_ptr result; OHOS::Uri uriTemp = uri; int parseCode = UriParseAndSwitch(uriTemp); std::vector columnsTemp = columns; - OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates; - QueryExecute(result, dataAbilityPredicates, columnsTemp, parseCode); - std::shared_ptr sharedPtrResult = std::move(result); + DataShare::DataSharePredicates dataSharePredicates = predicates; + bool isUriMatch = QueryExecute(result, dataSharePredicates, columnsTemp, parseCode); + if (!isUriMatch) { + g_mutex.unlock(); + return nullptr; + } + auto queryResultSet = RdbDataShareAdapter::RdbUtils::ToResultSetBridge(result); + std::shared_ptr sharedPtrResult = + std::make_shared(queryResultSet); g_mutex.unlock(); HILOG_INFO("ContactsDataAbility ====>Query end"); return sharedPtrResult; } -void ContactsDataAbility::QueryExecute(std::shared_ptr &result, - OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates, std::vector &columnsTemp, +bool ContactsDataAbility::QueryExecute(std::shared_ptr &result, + DataShare::DataSharePredicates &dataSharePredicates, std::vector &columnsTemp, int &parseCode) { Contacts::PredicatesConvert predicatesConvert; OHOS::NativeRdb::RdbPredicates rdbPredicates(""); + bool isUriMatch = true; switch (parseCode) { case Contacts::CONTACTS_CONTACT: case Contacts::PROFILE_CONTACT: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_CONTACT, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_CONTACT, dataSharePredicates); result = contactDataBase_->Query(rdbPredicates, columnsTemp); break; case Contacts::CONTACTS_RAW_CONTACT: case Contacts::PROFILE_RAW_CONTACT: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_RAW_CONTACT, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_RAW_CONTACT, dataSharePredicates); result = contactDataBase_->Query(rdbPredicates, columnsTemp); break; case Contacts::CONTACTS_CONTACT_DATA: case Contacts::PROFILE_CONTACT_DATA: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_CONTACT_DATA, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_CONTACT_DATA, dataSharePredicates); result = contactDataBase_->Query(rdbPredicates, columnsTemp); break; case Contacts::CONTACTS_GROUPS: case Contacts::PROFILE_GROUPS: - rdbPredicates = predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_GROUPS, dataAbilityPredicates); + rdbPredicates = predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_GROUPS, dataSharePredicates); result = contactDataBase_->Query(rdbPredicates, columnsTemp); break; default: - QueryExecuteSwitchSplit(result, dataAbilityPredicates, columnsTemp, parseCode); + isUriMatch = QueryExecuteSwitchSplit(result, dataSharePredicates, columnsTemp, parseCode); break; } + return isUriMatch; } -void ContactsDataAbility::QueryExecuteSwitchSplit(std::shared_ptr &result, - OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates, std::vector &columnsTemp, +bool ContactsDataAbility::QueryExecuteSwitchSplit(std::shared_ptr &result, + DataShare::DataSharePredicates &dataSharePredicates, std::vector &columnsTemp, int &parseCode) { Contacts::PredicatesConvert predicatesConvert; OHOS::NativeRdb::RdbPredicates rdbPredicates(""); + bool isUriMatch = true; switch (parseCode) { case Contacts::CONTACTS_BLOCKLIST: case Contacts::PROFILE_BLOCKLIST: rdbPredicates = predicatesConvert.ConvertPredicates( - Contacts::ContactTableName::CONTACT_BLOCKLIST, dataAbilityPredicates); + Contacts::ContactTableName::CONTACT_BLOCKLIST, dataSharePredicates); result = contactDataBase_->Query(rdbPredicates, columnsTemp); break; case Contacts::CONTACTS_DELETE: case Contacts::PROFILE_DELETE: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_DELETED, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ViewName::VIEW_DELETED, dataSharePredicates); result = contactDataBase_->Query(rdbPredicates, columnsTemp); break; case Contacts::CONTACTS_SEARCH_CONTACT: case Contacts::PROFILE_SEARCH_CONTACT: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ViewName::SEARCH_CONTACT_VIEW, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ViewName::SEARCH_CONTACT_VIEW, dataSharePredicates); result = contactDataBase_->Query(rdbPredicates, columnsTemp); break; case Contacts::QUERY_MERGE_LIST: @@ -537,18 +579,20 @@ void ContactsDataAbility::QueryExecuteSwitchSplit(std::shared_ptrQuery(rdbPredicates, columnsTemp); break; case Contacts::ACCOUNT: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::ContactTableName::ACCOUNT, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::ContactTableName::ACCOUNT, dataSharePredicates); result = contactDataBase_->Query(rdbPredicates, columnsTemp); break; default: + isUriMatch = false; HILOG_ERROR("ContactsDataAbility ====>no matching uri action"); break; } + return isUriMatch; } int ContactsDataAbility::UriParseAndSwitch(Uri &uri) @@ -603,5 +647,5 @@ void ContactsDataAbility::DataBaseNotifyChange(int code, Uri uri) { Contacts::ContactsCommonEvent::SendContactChange(code); } -} // namespace AppExecFwk +} // namespace AbilityRuntime } // namespace OHOS \ No newline at end of file diff --git a/dataBusiness/contacts/src/contacts_database.cpp b/dataBusiness/contacts/src/contacts_database.cpp index 9200f8b..e216c32 100644 --- a/dataBusiness/contacts/src/contacts_database.cpp +++ b/dataBusiness/contacts/src/contacts_database.cpp @@ -1183,7 +1183,7 @@ std::shared_ptr ContactsDataBase::SelectCan * * @return The result returned by the split operation */ -int ContactsDataBase::Split(OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactsDataBase::Split(DataShare::DataSharePredicates predicates) { std::vector whereArgs = predicates.GetWhereArgs(); if (whereArgs.size() > 1) { @@ -1227,7 +1227,7 @@ int ContactsDataBase::ContactMerge() * * @return The result returned by the manualMerge operation */ -int ContactsDataBase::ReContactMerge(OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactsDataBase::ReContactMerge(DataShare::DataSharePredicates predicates) { MarkMerge(store_); int code = RDB_EXECUTE_FAIL; diff --git a/dataBusiness/contacts/src/contacts_datashare_stub_impl.cpp b/dataBusiness/contacts/src/contacts_datashare_stub_impl.cpp new file mode 100644 index 0000000..62313ad --- /dev/null +++ b/dataBusiness/contacts/src/contacts_datashare_stub_impl.cpp @@ -0,0 +1,240 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "calllog_ability.h" +#include "common.h" +#include "contacts_datashare_stub_impl.h" +#include "dataobs_mgr_client.h" +#include "hilog_wrapper.h" +#include "voicemail_ability.h" + +namespace OHOS { +namespace DataShare { +using DataObsMgrClient = OHOS::AAFwk::DataObsMgrClient; + +std::shared_ptr ContactsDataShareStubImpl::GetContactsDataAbility() +{ + return contactsDataAbility_; +} + +std::shared_ptr ContactsDataShareStubImpl::GetCallLogAbility() +{ + if (callLogAbility_ == nullptr) { + callLogAbility_.reset(CallLogAbility::Create()); + } + return callLogAbility_; +} + +std::shared_ptr ContactsDataShareStubImpl::GetVoiceMailAbility() +{ + if (voiceMailAbility_ == nullptr) { + voiceMailAbility_.reset(VoiceMailAbility::Create()); + } + return voiceMailAbility_; +} + +std::shared_ptr ContactsDataShareStubImpl::GetOwner(const Uri &uri) +{ + OHOS::Uri uriTemp = uri; + std::string path = uriTemp.GetPath(); + if (path.find("com.ohos.contactsdataability") != std::string::npos) { + return GetContactsDataAbility(); + } + if (path.find("com.ohos.calllogability") != std::string::npos) { + return GetCallLogAbility(); + } + if (path.find("com.ohos.voicemailability") != std::string::npos) { + return GetVoiceMailAbility(); + } + return nullptr; +} + +int ContactsDataShareStubImpl::Insert(const Uri &uri, const DataShareValuesBucket &value) +{ + HILOG_INFO("insert begin."); + int ret = 0; + auto client = sptr(this); + auto extension = client->GetOwner(uri); + if (extension == nullptr) { + HILOG_ERROR("insert failed, extension is null."); + return ret; + } + ret = extension->Insert(uri, value); + HILOG_INFO("insert end successfully. ret: %{public}d", ret); + if (ret != Contacts::OPERATION_ERROR) { + NotifyChange(uri); + } + return ret; +} + +int ContactsDataShareStubImpl::Update(const Uri &uri, const DataSharePredicates &predicates, + const DataShareValuesBucket &value) +{ + HILOG_INFO("update begin."); + int ret = 0; + auto client = sptr(this); + auto extension = client->GetOwner(uri); + if (extension == nullptr) { + HILOG_ERROR("update failed, extension is null."); + return ret; + } + ret = extension->Update(uri, predicates, value); + HILOG_INFO("update end successfully. ret: %{public}d", ret); + if (ret != Contacts::OPERATION_ERROR) { + NotifyChange(uri); + } + return ret; +} + +int ContactsDataShareStubImpl::Delete(const Uri &uri, const DataSharePredicates &predicates) +{ + HILOG_INFO("delete begin."); + int ret = 0; + auto client = sptr(this); + auto extension = client->GetOwner(uri); + if (extension == nullptr) { + HILOG_ERROR("delete failed, extension is null."); + return ret; + } + ret = extension->Delete(uri, predicates); + HILOG_INFO("delete end successfully. ret: %{public}d", ret); + if (ret != Contacts::OPERATION_ERROR) { + NotifyChange(uri); + } + return ret; +} + +std::shared_ptr ContactsDataShareStubImpl::Query(const Uri &uri, + const DataSharePredicates &predicates, std::vector &columns) +{ + HILOG_INFO("query begin."); + std::shared_ptr resultSet = nullptr; + auto client = sptr(this); + auto extension = client->GetOwner(uri); + if (extension == nullptr) { + HILOG_ERROR("query failed, extension is null."); + return nullptr; + } + resultSet = extension->Query(uri, predicates, columns); + HILOG_INFO("query end successfully."); + return resultSet; +} + +int ContactsDataShareStubImpl::BatchInsert(const Uri &uri, const std::vector &values) +{ + HILOG_INFO("batch insert begin."); + int ret = 0; + auto client = sptr(this); + auto extension = client->GetOwner(uri); + if (extension == nullptr) { + HILOG_ERROR("batch insert failed, extension is null."); + return ret; + } + ret = extension->BatchInsert(uri, values); + HILOG_INFO("batch insert end successfully. ret: %{public}d", ret); + if (ret != Contacts::OPERATION_ERROR) { + NotifyChange(uri); + } + return ret; +} + +std::vector ContactsDataShareStubImpl::GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) +{ + HILOG_INFO("GetFileTypes not supported"); + std::vector result; + return result; +} + +int ContactsDataShareStubImpl::OpenFile(const Uri &uri, const std::string &mode) +{ + HILOG_INFO("OpenFile not supported"); + return -1; +} + +int ContactsDataShareStubImpl::OpenRawFile(const Uri &uri, const std::string &mode) +{ + HILOG_INFO("OpenRawFile not supported"); + return -1; +} + +std::string ContactsDataShareStubImpl::GetType(const Uri &uri) +{ + HILOG_INFO("GetType not supported"); + return ""; +} + +bool ContactsDataShareStubImpl::RegisterObserver(const Uri &uri, const sptr &dataObserver) +{ + HILOG_INFO("%{public}s begin.", __func__); + auto obsMgrClient = DataObsMgrClient::GetInstance(); + if (obsMgrClient == nullptr) { + HILOG_ERROR("%{public}s obsMgrClient is nullptr", __func__); + return false; + } + + ErrCode ret = obsMgrClient->RegisterObserver(uri, dataObserver); + if (ret != ERR_OK) { + HILOG_ERROR("%{public}s obsMgrClient->RegisterObserver error return %{public}d", __func__, ret); + return false; + } + return true; +} + +bool ContactsDataShareStubImpl::UnregisterObserver(const Uri &uri, const sptr &dataObserver) +{ + HILOG_INFO("%{public}s begin.", __func__); + auto obsMgrClient = DataObsMgrClient::GetInstance(); + if (obsMgrClient == nullptr) { + HILOG_ERROR("%{public}s obsMgrClient is nullptr", __func__); + return false; + } + + ErrCode ret = obsMgrClient->UnregisterObserver(uri, dataObserver); + if (ret != ERR_OK) { + HILOG_ERROR("%{public}s obsMgrClient->UnregisterObserver error return %{public}d", __func__, ret); + return false; + } + return true; +} + +bool ContactsDataShareStubImpl::NotifyChange(const Uri &uri) +{ + auto obsMgrClient = DataObsMgrClient::GetInstance(); + if (obsMgrClient == nullptr) { + HILOG_ERROR("%{public}s obsMgrClient is nullptr", __func__); + return false; + } + + ErrCode ret = obsMgrClient->NotifyChange(uri); + if (ret != ERR_OK) { + HILOG_ERROR("%{public}s obsMgrClient->NotifyChange error return %{public}d", __func__, ret); + return false; + } + return true; +} + +Uri ContactsDataShareStubImpl::NormalizeUri(const Uri &uri) +{ + HILOG_INFO("NormalizeUri not supported"); + return uri; +} + +Uri ContactsDataShareStubImpl::DenormalizeUri(const Uri &uri) +{ + HILOG_INFO("DenormalizeUri not supported"); + return uri; +} +} // namespace DataShare +} // namespace OHOS diff --git a/dataBusiness/contacts/src/contacts_type.cpp b/dataBusiness/contacts/src/contacts_type.cpp index d5336d1..35be5c2 100644 --- a/dataBusiness/contacts/src/contacts_type.cpp +++ b/dataBusiness/contacts/src/contacts_type.cpp @@ -94,7 +94,6 @@ int ContactsType::LookupTypeId(std::shared_ptr rdbSto std::unique_ptr resultSet = store_->QuerySql(sqlBuilder, selectionArgs); int ret = resultSet->GoToFirstRow(); if (ret != OHOS::NativeRdb::E_OK) { - HILOG_ERROR("ContactsType lookupTypeId ret :%{public}d", ret); return RDB_EXECUTE_FAIL; } int columnIndex = RDB_EXECUTE_FAIL; diff --git a/dataBusiness/voicemail/include/voicemail_ability.h b/dataBusiness/voicemail/include/voicemail_ability.h index 1ade7ba..d197d0b 100644 --- a/dataBusiness/voicemail/include/voicemail_ability.h +++ b/dataBusiness/voicemail/include/voicemail_ability.h @@ -16,36 +16,38 @@ #ifndef VOICEMAIL_ABILITY_H #define VOICEMAIL_ABILITY_H -#include "ability.h" -#include "ability_loader.h" +#include "abs_shared_result_set.h" +#include "datashare_ext_ability.h" +#include "datashare_values_bucket.h" #include "voicemail_database.h" #include "want.h" namespace OHOS { -namespace AppExecFwk { -class VoiceMailAbility : public Ability { +namespace AbilityRuntime { +class VoiceMailAbility : public DataShare::DataShareExtAbility { public: VoiceMailAbility(); - ~VoiceMailAbility(); - virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; - virtual int BatchInsert(const Uri &uri, const std::vector &values) override; + virtual ~VoiceMailAbility() override; + static VoiceMailAbility* Create(); + sptr OnConnect(const AAFwk::Want &want) override; + virtual int Insert(const Uri &uri, const DataShare::DataShareValuesBucket &value) override; + virtual int BatchInsert(const Uri &uri, const std::vector &values) override; virtual void OnStart(const Want &want) override; - virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, - const NativeRdb::DataAbilityPredicates &predicates) override; - virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query(const Uri &uri, - const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; - virtual void Dump(const std::string &extra) override; + virtual int Update(const Uri &uri, const DataShare::DataSharePredicates &predicates, + const DataShare::DataShareValuesBucket &value) override; + virtual int Delete(const Uri &uri, const DataShare::DataSharePredicates &predicates) override; + virtual std::shared_ptr Query(const Uri &uri, + const DataShare::DataSharePredicates &predicates, std::vector &columns) override; private: static std::shared_ptr voiceMailDataBase_; static std::map uriValueMap_; - int InsertExecute(const OHOS::Uri &uri, const NativeRdb::ValuesBucket &value); + int InsertExecute(const OHOS::Uri &uri, const OHOS::NativeRdb::ValuesBucket &value); void DataBaseNotifyChange(int code, Uri uri); bool IsBeginTransactionOK(int code, std::mutex &mutex); bool IsCommitOK(int code, std::mutex &mutex); int UriParse(Uri &uri); }; -} // namespace AppExecFwk +} // namespace AbilityRuntime } // namespace OHOS #endif // VOICEMAIL_ABILITY_H diff --git a/dataBusiness/voicemail/include/voicemail_database.h b/dataBusiness/voicemail/include/voicemail_database.h index 7b02409..a296208 100644 --- a/dataBusiness/voicemail/include/voicemail_database.h +++ b/dataBusiness/voicemail/include/voicemail_database.h @@ -16,7 +16,7 @@ #ifndef VOICEMAIL_DATABASE_H #define VOICEMAIL_DATABASE_H -#include "data_ability_predicates.h" +#include "datashare_predicates.h" #include "rdb_errno.h" #include "rdb_helper.h" #include "rdb_open_callback.h" diff --git a/dataBusiness/voicemail/src/voicemail_ability.cpp b/dataBusiness/voicemail/src/voicemail_ability.cpp index ee85d10..44fad70 100644 --- a/dataBusiness/voicemail/src/voicemail_ability.cpp +++ b/dataBusiness/voicemail/src/voicemail_ability.cpp @@ -21,16 +21,18 @@ #include "common.h" #include "contacts_columns.h" #include "contacts_common_event.h" -#include "data_ability_predicates.h" +#include "contacts_datashare_stub_impl.h" +#include "datashare_ext_ability_context.h" +#include "datashare_predicates.h" #include "file_utils.h" #include "predicates_convert.h" #include "rdb_predicates.h" +#include "rdb_utils.h" #include "sql_analyzer.h" #include "uri_utils.h" namespace OHOS { -namespace AppExecFwk { -REGISTER_AA(VoiceMailAbility); +namespace AbilityRuntime { namespace { std::mutex g_mutex; } @@ -40,7 +42,12 @@ std::map VoiceMailAbility::uriValueMap_ = { {"/com.ohos.voicemailability/calls/replaying", Contacts::REPLAYING} }; -VoiceMailAbility::VoiceMailAbility() +VoiceMailAbility* VoiceMailAbility::Create() +{ + return new VoiceMailAbility(); +} + +VoiceMailAbility::VoiceMailAbility() : DataShareExtAbility() { } @@ -48,21 +55,30 @@ VoiceMailAbility::~VoiceMailAbility() { } -void VoiceMailAbility::Dump(const std::string &extra) +sptr VoiceMailAbility::OnConnect(const AAFwk::Want &want) { - HILOG_ERROR("VoiceMailAbility ====>Dump:%{public}s", extra.c_str()); - Contacts::FileUtils fileUtils; - std::string dirStr = Contacts::ContactsPath::DUMP_PATH; - fileUtils.WriteStringToFileAppend(dirStr, extra); + HILOG_INFO("VoiceMailAbility %{public}s begin.", __func__); + Extension::OnConnect(want); + sptr remoteObject = new (std::nothrow) DataShare::ContactsDataShareStubImpl( + std::static_pointer_cast(shared_from_this())); + if (remoteObject == nullptr) { + HILOG_ERROR("%{public}s No memory allocated for DataShareStubImpl", __func__); + return nullptr; + } + HILOG_INFO("VoiceMailAbility %{public}s end.", __func__); + return remoteObject->AsObject(); } void VoiceMailAbility::OnStart(const Want &want) { - Ability::OnStart(want); - std::string basePath = GetAbilityContext()->GetDatabaseDir(); - Contacts::ContactsPath::RDB_PATH = basePath + "/"; - Contacts::ContactsPath::RDB_BACKUP_PATH = basePath + "/backup/"; - Contacts::ContactsPath::DUMP_PATH = GetFilesDir() + "/"; + HILOG_INFO("VoiceMailAbility %{public}s begin.", __func__); + Extension::OnStart(want); + auto context = AbilityRuntime::Context::GetApplicationContext(); + if (context != nullptr) { + std::string basePath = context->GetDatabaseDir(); + Contacts::ContactsPath::RDB_PATH = basePath + "/"; + Contacts::ContactsPath::RDB_BACKUP_PATH = basePath + "/backup/"; + } } /** @@ -111,10 +127,11 @@ bool VoiceMailAbility::IsCommitOK(int code, std::mutex &mutex) * * @return Insert database results code */ -int VoiceMailAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) +int VoiceMailAbility::Insert(const Uri &uri, const DataShare::DataShareValuesBucket &value) { + OHOS::NativeRdb::ValuesBucket valuesBucket = RdbDataShareAdapter::RdbUtils::ToValuesBucket(value); Contacts::SqlAnalyzer sqlAnalyzer; - bool isOk = sqlAnalyzer.CheckValuesBucket(value); + bool isOk = sqlAnalyzer.CheckValuesBucket(valuesBucket); if (!isOk) { HILOG_ERROR("VoiceMailAbility CheckValuesBucket is error"); return Contacts::RDB_EXECUTE_FAIL; @@ -127,7 +144,7 @@ int VoiceMailAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &valu g_mutex.unlock(); return Contacts::RDB_EXECUTE_FAIL; } - rowRet = InsertExecute(uri, value); + rowRet = InsertExecute(uri, valuesBucket); if (rowRet == Contacts::OPERATION_ERROR) { voiceMailDataBase_->RollBack(); g_mutex.unlock(); @@ -151,7 +168,7 @@ int VoiceMailAbility::UriParse(Uri &uri) return parseCode; } -int VoiceMailAbility::InsertExecute(const OHOS::Uri &uri, const NativeRdb::ValuesBucket &initialValues) +int VoiceMailAbility::InsertExecute(const OHOS::Uri &uri, const OHOS::NativeRdb::ValuesBucket &initialValues) { int rowId = Contacts::RDB_EXECUTE_FAIL; OHOS::Uri uriTemp = uri; @@ -178,7 +195,7 @@ int VoiceMailAbility::InsertExecute(const OHOS::Uri &uri, const NativeRdb::Value * * @return BatchInsert database results code */ -int VoiceMailAbility::BatchInsert(const Uri &uri, const std::vector &values) +int VoiceMailAbility::BatchInsert(const Uri &uri, const std::vector &values) { unsigned int size = values.size(); if (size <= 0) { @@ -194,8 +211,9 @@ int VoiceMailAbility::BatchInsert(const Uri &uri, const std::vectorRollBack(); g_mutex.unlock(); @@ -231,10 +249,11 @@ int VoiceMailAbility::BatchInsert(const Uri &uri, const std::vectorUpdateVoiceMail(value, rdbPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::VOICEMAIL, dataSharePredicates); + ret = voiceMailDataBase_->UpdateVoiceMail(valuesBucket, rdbPredicates); break; case Contacts::REPLAYING: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::CallsTableName::REPLYING, dataAbilityPredicates); - ret = voiceMailDataBase_->UpdateVoiceMail(value, rdbPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::REPLYING, dataSharePredicates); + ret = voiceMailDataBase_->UpdateVoiceMail(valuesBucket, rdbPredicates); break; default: HILOG_ERROR("VoiceMailAbility ====>no match uri action"); @@ -275,7 +294,7 @@ int VoiceMailAbility::Update( * * @return Delete database results code */ -int VoiceMailAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) +int VoiceMailAbility::Delete(const Uri &uri, const DataShare::DataSharePredicates &predicates) { g_mutex.lock(); voiceMailDataBase_ = Contacts::VoiceMailDataBase::GetInstance(); @@ -283,17 +302,17 @@ int VoiceMailAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPredica int ret = Contacts::RDB_EXECUTE_FAIL; OHOS::Uri uriTemp = uri; int parseCode = UriParse(uriTemp); - OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates; + DataShare::DataSharePredicates dataSharePredicates = predicates; OHOS::NativeRdb::RdbPredicates rdbPredicates(""); switch (parseCode) { case Contacts::VOICEMAIL: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::CallsTableName::VOICEMAIL, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::VOICEMAIL, dataSharePredicates); ret = voiceMailDataBase_->DeleteVoiceMail(rdbPredicates); break; case Contacts::REPLAYING: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::CallsTableName::REPLYING, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::REPLYING, dataSharePredicates); ret = voiceMailDataBase_->DeleteVoiceMail(rdbPredicates); break; default: @@ -314,34 +333,41 @@ int VoiceMailAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPredica * * @return Query database results */ -std::shared_ptr VoiceMailAbility::Query( - const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) +std::shared_ptr VoiceMailAbility::Query( + const Uri &uri, const DataShare::DataSharePredicates &predicates, std::vector &columns) { HILOG_ERROR("VoiceMailAbility ====>Query start"); voiceMailDataBase_ = Contacts::VoiceMailDataBase::GetInstance(); Contacts::PredicatesConvert predicatesConvert; OHOS::Uri uriTemp = uri; int parseCode = UriParse(uriTemp); - std::shared_ptr result; - OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates; + std::shared_ptr result; + DataShare::DataSharePredicates dataSharePredicates = predicates; OHOS::NativeRdb::RdbPredicates rdbPredicates(""); std::vector columnsTemp = columns; + bool isUriMatch = true; switch (parseCode) { case Contacts::VOICEMAIL: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::CallsTableName::VOICEMAIL, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::VOICEMAIL, dataSharePredicates); result = voiceMailDataBase_->Query(rdbPredicates, columnsTemp); break; case Contacts::REPLAYING: rdbPredicates = - predicatesConvert.ConvertPredicates(Contacts::CallsTableName::REPLYING, dataAbilityPredicates); + predicatesConvert.ConvertPredicates(Contacts::CallsTableName::REPLYING, dataSharePredicates); result = voiceMailDataBase_->Query(rdbPredicates, columnsTemp); break; default: + isUriMatch = false; HILOG_ERROR("VoiceMailAbility ====>no match uri action"); break; } - std::shared_ptr sharedPtrResult = std::move(result); + if (!isUriMatch) { + return nullptr; + } + auto queryResultSet = RdbDataShareAdapter::RdbUtils::ToResultSetBridge(result); + std::shared_ptr sharedPtrResult = + std::make_shared(queryResultSet); HILOG_ERROR("VoiceMailAbility ====>Query end"); return sharedPtrResult; } @@ -350,5 +376,5 @@ void VoiceMailAbility::DataBaseNotifyChange(int code, Uri uri) { Contacts::ContactsCommonEvent::SendCallLogChange(code); } -} // namespace AppExecFwk +} // namespace AbilityRuntime } // namespace OHOS diff --git a/entry/src/main/ets/Application/ContactsDataAbilityStage.ts b/entry/src/main/ets/Application/ContactsDataAbilityStage.ts new file mode 100644 index 0000000..6d9932b --- /dev/null +++ b/entry/src/main/ets/Application/ContactsDataAbilityStage.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import AbilityStage from "@ohos.app.ability.AbilityStage" +import LogUtils from '../common/utils/LogUtils' + +const TAG = "ContactsDataAbilityStage"; + +export default class ContactsDataAbilityStage extends AbilityStage { + onCreate() { + LogUtils.i(TAG, "onCreate") + } + + onDestroy() { + LogUtils.i(TAG, "onDestroy") + } +} + diff --git a/entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts b/entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts new file mode 100644 index 0000000..9f4472a --- /dev/null +++ b/entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import Extension from '@ohos.application.DataShareExtensionAbility' + +export default class DataShareExtAbility extends Extension { + private rdbStore_; + + onCreate(want) { + console.log('[ttt] [ContactsDataShare] <> DataShareExtAbility onCreate, want:' + want.abilityName); + } + + getFileTypes(uri: string, mimeTypeFilter: string) { + console.info('[ttt] [ContactsDataShare] <> [getFileTypes] enter'); + } + + insert(uri, value, callback) { + console.info('[ttt] [ContactsDataShare] <> [insert] enter'); + } + + update(uri, value, predicates, callback) { + console.info('[ttt] [ContactsDataShare] <> [update] enter'); + } + + delete(uri, predicates, callback) { + console.info('[ttt] [ContactsDataShare] <> [delete] enter'); + } + + query(uri, columns, predicates, callback) { + console.info('[ttt] [ContactsDataShare] <> [query] enter'); + } + + getType(uri: string) { + console.info('[ttt] [ContactsDataShare] <> [getType] enter'); + } + + batchInsert(uri: string, valueBuckets, callback) { + console.info('[ttt] [ContactsDataShare] <> [batchInsert] enter'); + } + + normalizeUri(uri: string) { + console.info('[ttt] [ContactsDataShare] <> [normalizeUri] enter'); + } + + denormalizeUri(uri: string) { + console.info('[ttt] [ContactsDataShare] <> [denormalizeUri] enter'); + } +}; diff --git a/entry/src/main/ets/common/utils/LogUtils.ts b/entry/src/main/ets/common/utils/LogUtils.ts new file mode 100644 index 0000000..82c46e0 --- /dev/null +++ b/entry/src/main/ets/common/utils/LogUtils.ts @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * log tool utils + */ +export class LogUtils { + d(TAG, msg): void { + console.debug("[ContactsData:]" + TAG + ":" + msg); + } + + i(TAG, msg): void { + console.info("[ContactsData:]" + TAG + ":" + msg); + } + + w(TAG, msg): void { + console.warn("[ContactsData:]" + TAG + ":" + msg); + } + + e(TAG, msg): void { + console.error("[ContactsData:]" + TAG + ":" + msg); + } +} + +let mLogUtil = new LogUtils(); + +export default mLogUtil as LogUtils; + diff --git a/entry/src/main/module.json b/entry/src/main/module.json new file mode 100644 index 0000000..40245bf --- /dev/null +++ b/entry/src/main/module.json @@ -0,0 +1,61 @@ +{ + "module": { + "name": "contactsdata", + "type": "entry", + "srcEntrance": "./ets/Application/ContactsDataAbilityStage.ts", + "description": "$string:app_name", + "mainElement": "MainAbility", + "deviceTypes": [ + "default", + "smartVision", + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "", + "abilities": [ + { + "name": "MainAbility", + "srcEntrance": "", + "description": "dataability_description", + "visible": false + } + ], + "extensionAbilities": [ + { + "name": "ContactsDataAbility", + "srcEntrance": "./ets/DataShareExtAbility/DataShareExtAbility.ts", + "readPermission": "ohos.permission.READ_CONTACTS", + "writePermission": "ohos.permission.WRITE_CONTACTS", + "description": "dataability_description", + "type": "dataShare", + "uri": "datashare://com.ohos.contactsdataability", + "visible": true, + "srcLanguage": "c++" + }, + { + "name": "VoiceMailAbility", + "srcEntrance": "./ets/DataShareExtAbility/DataShareExtAbility.ts", + "permissions": [ + "ohos.permission.MANAGE_VOICEMAIL" + ], + "description": "dataability_description", + "type": "dataShare", + "uri": "datashare://com.ohos.voicemailability", + "visible": true, + "srcLanguage": "c++" + }, + { + "name": "CallLogAbility", + "srcEntrance": "./ets/DataShareExtAbility/DataShareExtAbility.ts", + "readPermission": "ohos.permission.READ_CALL_LOG", + "writePermission": "ohos.permission.WRITE_CALL_LOG", + "description": "dataability_description", + "type": "dataShare", + "uri": "datashare://com.ohos.calllogability", + "visible": true, + "srcLanguage": "c++" + } + ] + } +} \ No newline at end of file diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000..eff784e --- /dev/null +++ b/entry/src/main/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name": "app_name", + "value": "ContactsData" + } + ] +} \ No newline at end of file diff --git a/jstest/Calllog_test.js b/jstest/Calllog_test.js index dc23361..819e9ac 100644 --- a/jstest/Calllog_test.js +++ b/jstest/Calllog_test.js @@ -13,12 +13,11 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, describe, expect, it} from 'deccjsunit/index' -const URI_CALLLOG = "dataability:///com.ohos.calllogability"; -const calllogUri = "dataability:///com.ohos.calllogability/calls/calllog"; +const URI_CALLLOG = "datashare:///com.ohos.calllogability"; +const calllogUri = "datashare:///com.ohos.calllogability/calls/calllog"; import common from './common.js'; describe('CalllogTest', function() { @@ -26,13 +25,13 @@ describe('CalllogTest', function() { async function calllogQueryForALL(map, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info(tag + ': calllogQueryByInsert start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info(tag + ': calllogQueryByInsert start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -55,13 +54,13 @@ describe('CalllogTest', function() { async function calllogQueryForDelete(map, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info(tag + ': calllogQueryForDelete start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info(tag + ': calllogQueryForDelete start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); expect(resultSet.goToFirstRow() == false).assertTrue(); console.info(tag + " :logMessage calllogQueryForDelete: goToFirstRow " + resultSet.goToFirstRow()); resultSet.close(); @@ -72,13 +71,13 @@ describe('CalllogTest', function() { async function calllogQueryForBatchInsert(array, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info(tag + ': calllogQueryForBatchInsert start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info(tag + ': calllogQueryForBatchInsert start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("phone_number", array[0].get("phone_number")); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); var size = array.size(); console.info(tag + ' : logMessage calllogQueryForBatchInsert: size' + size); expect(resultSet.rowCount == size).assertEqual(true); @@ -105,10 +104,10 @@ describe('CalllogTest', function() { async function calllogDelete(tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(calllogUri, condition); + var deleteCode = await dataShareHelper.delete(calllogUri, condition); console.info(tag + ': calllogDelete deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); } @@ -120,10 +119,10 @@ describe('CalllogTest', function() { */ it("calllog_insert_test_100", 0, async function(done) { console.info("--------logMessage calllog_insert_test_100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var calllogId = await DAHelper.insert(calllogUri, common.getCallLogInsert()); + var calllogId = await dataShareHelper.insert(calllogUri, common.getCallLogInsert()); console.info("logMessage calllog_insert_test_100: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); var map = common.getCallLogInsertMap() @@ -144,11 +143,11 @@ describe('CalllogTest', function() { */ it("calllog_update_test_400", 0, async function(done) { console.info("--------logMessage calllog_update_test_400 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var calllogId = await DAHelper.insert(calllogUri, common.getCallLogInsert()); + var calllogId = await dataShareHelper.insert(calllogUri, common.getCallLogInsert()); console.info("logMessage calllog_update_test_400: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await UpdateOneCalllog(); @@ -161,9 +160,9 @@ describe('CalllogTest', function() { async function UpdateOneCalllog() { try { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString()); - var updateCode = await DAHelper.update(calllogUri, common.getCallLogUpdate(), condition); + var updateCode = await dataShareHelper.update(calllogUri, common.getCallLogUpdate(), condition); console.info("logMessage calllog_update_test_400: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); var map = common.getCallLogUpdateMap(); @@ -184,12 +183,12 @@ describe('CalllogTest', function() { */ it("calllog_update_test_500", 0, async function(done) { console.info("--------logMessage calllog_update_test_500 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(12); var insertValues = {"phone_number" : phoneNumber, "ring_duration" : "500"}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_update_test_500: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await UpdateAllCalllog(); @@ -201,10 +200,10 @@ describe('CalllogTest', function() { async function UpdateAllCalllog() { var updateValues = {"answer_state" : "1"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var updateCode = await DAHelper.update(calllogUri, updateValues, condition) + var updateCode = await dataShareHelper.update(calllogUri, updateValues, condition) console.info("logMessage calllog_update_test_500: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); var map = new Map([ [ "phone_number", phoneNumber ], [ "ring_duration", "500" ] ]) @@ -226,12 +225,12 @@ describe('CalllogTest', function() { */ it("calllog_delete_test_1300", 0, async function(done) { console.info("--------logMessage calllog_delete_test_1300 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(5); var insertValues = {"phone_number" : phoneNumber, "ring_duration" : "200"}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_delete_test_1300: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await DeleteOneCalllog(); @@ -244,9 +243,9 @@ describe('CalllogTest', function() { async function DeleteOneCalllog() { try { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString()); - var deleteCode = await DAHelper.delete(calllogUri, condition); + var deleteCode = await dataShareHelper.delete(calllogUri, condition); console.info("logMessage calllog_delete_test_1300: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); var map = new Map(); @@ -266,8 +265,8 @@ describe('CalllogTest', function() { */ it("calllog_batchInset_test_1600", 0, async function(done) { console.info("--------logMessage calllog_batchInset_test_1600 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(13); var addBulk_value1 = {"phone_number" : phoneNumber, "ring_duration" : "333"}; var addBulk_value2 = {"phone_number" : phoneNumber, "ring_duration" : "600"}; @@ -281,7 +280,7 @@ describe('CalllogTest', function() { listAddBluk[3] = addBulk_value4; listAddBluk[4] = addBulk_value5; try { - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); console.info("logMessage calllog_batchInset_test_1600: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); await calllogQueryForBatchInsert(common.getCallLogBatchInsert(), "calllog_batchInset_test_1600"); @@ -300,12 +299,12 @@ describe('CalllogTest', function() { */ it("calllog_query_test_1200", 0, async function(done) { console.info("------------calllog_query_test_1200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(5); var insertValues = {"phone_number" : phoneNumber, "ring_duration" : "200"}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_query_test_1200: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); var map = new Map([ [ "phone_number", phoneNumber ], [ "ring_duration", "200" ] ]); @@ -325,12 +324,12 @@ describe('CalllogTest', function() { */ it("calllog_query_test_1100", 0, async function(done) { console.info("------------calllog_query_test_1100 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(7); var insertValues = {"phone_number" : phoneNumber, "ring_duration" : "100"}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_query_test_1100: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await QueryCalllog(); @@ -344,12 +343,12 @@ describe('CalllogTest', function() { async function QueryCalllog() { var resultColumns = [ "id", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.lessThan("ring_duration", "200").orderByAsc("id"); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info("logMessage calllog_query_test_1100: columnNames:" + resultSet.columnNames); @@ -375,12 +374,12 @@ describe('CalllogTest', function() { */ it("calllog_query_test_800", 0, async function(done) { console.info("------------calllog_query_test_800 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(10); var insertValues = {"phone_number" : phoneNumber, "ring_duration" : "100"}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_query_test_800: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await QueryOneCalllog(); @@ -394,10 +393,10 @@ describe('CalllogTest', function() { async function QueryOneCalllog() { var resultColumns = [ "id", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString()); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info("logMessage calllog_query_test_800: columnNames:" + resultSet.columnNames); @@ -423,13 +422,13 @@ describe('CalllogTest', function() { */ it("calllog_fuzzyquery_test_100", 0, async function(done) { console.info("------------calllog_fuzzyquery_test_100 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(8); var phoneNumber_Test = phoneNumber.substring(0,3); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_fuzzyquery_test_100: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await QueryByStartsWithPhoneNumber(); @@ -443,10 +442,10 @@ describe('CalllogTest', function() { async function QueryByStartsWithPhoneNumber() { var resultColumns = [ "id", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("phone_number", phoneNumber_Test + "%"); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info("logMessage calllog_fuzzyquery_test_100: columnNames:" + resultSet.columnNames); @@ -473,13 +472,13 @@ describe('CalllogTest', function() { */ it("calllog_fuzzyquery_test_200", 0, async function(done) { console.info("------------calllog_fuzzyquery_test_200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(8); var phoneNumber_Test = phoneNumber.substring(6,9); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_fuzzyquery_test_200: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await QueryByEndWithPhoneNumber(); @@ -493,10 +492,10 @@ describe('CalllogTest', function() { async function QueryByEndWithPhoneNumber() { var resultColumns = [ "id", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("phone_number", "%" + phoneNumber_Test); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info("logMessage calllog_fuzzyquery_test_200: columnNames:" + resultSet.columnNames); @@ -523,12 +522,12 @@ describe('CalllogTest', function() { */ it("calllog_fuzzyquery_test_300", 0, async function(done) { console.info("------------calllog_fuzzyquery_test_300 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(15); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_fuzzyquery_test_300: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await QueryByPhoneNumberContainsField(); @@ -542,11 +541,11 @@ describe('CalllogTest', function() { async function QueryByPhoneNumberContainsField() { var resultColumns = [ "id", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var phoneNumber_Test = phoneNumber.substring(7,10); condition.like("phone_number", "%" + phoneNumber_Test + "%"); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info("logMessage calllog_fuzzyquery_test_300: columnNames:" + resultSet.columnNames); @@ -573,12 +572,12 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_insert_test_200", 0, async function(done) { console.info("------------abnormal_calllog_insert_test_200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(9); var insertValues = {"phone_numbers" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage abnormal_calllog_insert_test_200: calllogId = " + calllogId); expect(calllogId == -1).assertTrue(); done(); @@ -595,13 +594,13 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_insert_test_300", 0, async function(done) { console.info("------------abnormal_calllog_insert_test_300 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/calls/calllogs"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/calls/calllogs"; var phoneNumber = randomNum(8); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(errorUri, insertValues); + var calllogId = await dataShareHelper.insert(errorUri, insertValues); console.info("logMessage abnormal_calllog_insert_test_300: calllogId = " + calllogId); expect(calllogId == -1).assertTrue(); done(); @@ -618,12 +617,12 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_update_test_600", 0, async function(done) { console.info("------------abnormal_calllog_update_test_600 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(9); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage abnormal_calllog_update_test_600: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await abnormalUpdate(); @@ -638,10 +637,10 @@ describe('CalllogTest', function() { { var phoneNumber_Test = randomNum(7); var updateValues = {"phone_numbers" : phoneNumber_Test}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", calllogId.toString()); try { - var updataCode = await DAHelper.update(calllogUri, updateValues, condition); + var updataCode = await dataShareHelper.update(calllogUri, updateValues, condition); console.info("logMessage abnormal_calllog_update_test_600: updataCode = " + updataCode); expect(updataCode == -1).assertTrue(); var map = new Map(); @@ -662,13 +661,13 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_update_test_700", 0, async function(done) { console.info("------------abnormal_calllog_update_test_700 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/calls/calllogs"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/calls/calllogs"; var phoneNumber = randomNum(6); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage abnormal_calllog_update_test_700: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await abnormalUpdate(); @@ -683,10 +682,10 @@ describe('CalllogTest', function() { { var phoneNumber_Test = randomNum(7); var updateValues = {"phone_numbers" : phoneNumber_Test}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString()); try { - var updataCode = await DAHelper.update(errorUri, updateValues, condition); + var updataCode = await dataShareHelper.update(errorUri, updateValues, condition); console.info("logMessage abnormal_calllog_update_test_700: updataCode = " + updataCode); expect(updataCode == -1).assertTrue(); var map = new Map(); @@ -708,12 +707,12 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_delete_test_1400", 0, async function(done) { console.info("------------abnormal_calllog_delete_test_1400 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(5); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage abnormal_calllog_delete_test_1400: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await abnormalDelete(); @@ -726,10 +725,10 @@ describe('CalllogTest', function() { async function abnormalDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", calllogId.toString()); try { - var deleteCode = await DAHelper.delete(calllogUri, condition); + var deleteCode = await dataShareHelper.delete(calllogUri, condition); console.info("logMessage abnormal_calllog_delete_test_1400: deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); var map = new Map(); @@ -750,13 +749,13 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_delete_test_1500", 0, async function(done) { console.info("------------abnormal_calllog_delete_test_1500 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/calls/calllogs"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/calls/calllogs"; var phoneNumber = randomNum(6); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage abnormal_calllog_delete_test_1500: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await abnormalDelete(); @@ -769,10 +768,10 @@ describe('CalllogTest', function() { async function abnormalDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString()); try { - var deleteCode = await DAHelper.delete(errorUri, condition); + var deleteCode = await dataShareHelper.delete(errorUri, condition); console.info("logMessage abnormal_calllog_delete_test_1500: deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); done() @@ -794,12 +793,12 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_query_test_900", 0, async function(done) { console.info("------------abnormal_calllog_query_test_900 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(6); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage abnormal_calllog_query_test_900: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await abnormalQuery(); @@ -813,10 +812,10 @@ describe('CalllogTest', function() { async function abnormalQuery() { var resultColumns = [ "id", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", calllogId.toString()); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); console.info('logMessage abnormal_calllog_query_test_900: goToFirstRow' + resultSet.goToFirstRow()); expect(resultSet.goToFirstRow()).assertEqual(false); resultSet.close(); @@ -834,8 +833,8 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_batchinsert_test_1700", 0, async function(done) { console.info("--------logMessage abnormal_calllog_batchinsert_test_1700 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(9); var phoneNumber_Test = randomNum(6); var addBulk_value1 = {"phone_number" : phoneNumber, "ring_duration" : "500"}; @@ -850,7 +849,7 @@ describe('CalllogTest', function() { listAddBluk[3] = addBulk_value4; listAddBluk[4] = addBulk_value5; try { - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); console.info("logMessage abnormal_calllog_batchinsert_test_1700: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == -1).assertTrue(); done(); @@ -867,10 +866,10 @@ describe('CalllogTest', function() { */ it("calllog_delete_test_1800", 0, async function(done) { console.info("--------logMessage calllog_delete_test_1800 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var calllogId = await DAHelper.insert(calllogUri, common.getCallLogInsert()); + var calllogId = await dataShareHelper.insert(calllogUri, common.getCallLogInsert()); console.info("logMessage calllog_delete_test_1800: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); var map = common.getCallLogInsertMap() @@ -885,9 +884,9 @@ describe('CalllogTest', function() { async function executeBatch() { console.info("logMessage calllog_delete_test_1800: executeBatch start "); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString()); - DAHelper.executeBatch(URI_CALLLOG, [ { + dataShareHelper.executeBatch(URI_CALLLOG, [ { uri : calllogUri, type : featureAbility.DataAbilityOperationType.TYPE_DELETE, predicates : condition, @@ -912,10 +911,10 @@ describe('CalllogTest', function() { */ it("calllog_update_test_1900", 0, async function(done) { console.info("--------logMessage calllog_update_test_1900 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var calllogId = await DAHelper.insert(calllogUri, common.getCallLogInsert()); + var calllogId = await dataShareHelper.insert(calllogUri, common.getCallLogInsert()); console.info("logMessage calllog_update_test_1900: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); var map = common.getCallLogInsertMap() @@ -931,9 +930,9 @@ describe('CalllogTest', function() { { var phoneNumber = randomNum(8); var updateValues = {"phone_number" : phoneNumber}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString()); - DAHelper.executeBatch(URI_CALLLOG, [ { + dataShareHelper.executeBatch(URI_CALLLOG, [ { uri : calllogUri, type : featureAbility.DataAbilityOperationType.TYPE_UPDATE, valuesBucket : updateValues, @@ -959,14 +958,14 @@ describe('CalllogTest', function() { */ it("calllog_Delete_test_2000", 0, async function(done) { console.info("--------logMessage calllog_Delete_test_2000 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(5); var insertValues = {"phone_number" : phoneNumber, "ring_duration" : "200"}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); - var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); - var calllogIdThree = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); + var calllogIdTwo = await dataShareHelper.insert(calllogUri, insertValues); + var calllogIdThree = await dataShareHelper.insert(calllogUri, insertValues); expect(calllogId > 0).assertTrue(); expect(calllogIdTwo > 0).assertTrue(); expect(calllogIdThree > 0).assertTrue(); @@ -980,17 +979,17 @@ describe('CalllogTest', function() { async function DeleteCalllog() { try { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString()); condition.or(); condition.equalTo("id", calllogIdTwo.toString()); condition.or(); condition.equalTo("id", calllogIdThree.toString()); - var deleteCode = await DAHelper.delete(calllogUri, condition); + var deleteCode = await dataShareHelper.delete(calllogUri, condition); console.info("logMessage calllog_Delete_test_2000: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); var resultColumns = []; - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); expect(resultSet.rowCount == 0).assertTrue(); resultSet.close(); } catch (error) { @@ -1007,20 +1006,20 @@ describe('CalllogTest', function() { */ it("calllog_Delete_test_2100", 0, async function(done) { console.info("--------logMessage calllog_Delete_test_2100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var calllogId = await DAHelper.insert(calllogUri, common.getCallLogInsert()); + var calllogId = await dataShareHelper.insert(calllogUri, common.getCallLogInsert()); console.info("logMessage calllog_Delete_test_2100: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); var map = common.getCallLogInsertMap() map.set("id", calllogId.toString()); await calllogQueryForALL(map, "calllog_Delete_test_2100"); await calllogDelete("calllog_Delete_test_2100"); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId); var resultColumns = []; - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); expect(resultSet.rowCount == 0).assertTrue(); resultSet.close(); done(); @@ -1037,20 +1036,20 @@ describe('CalllogTest', function() { */ it("calllog_queryContains_test_2200", 0, async function(done) { console.info("--------logMessage calllog_queryContains_test_2200 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(17); var phoneNumber_Test = phoneNumber.substring(13,18); var insertValues = {"phone_number" : phoneNumber} try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage calllog_queryContains_test_2200: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); var resultColumns = [ "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.contains("phone_number", phoneNumber_Test); - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -1076,13 +1075,13 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_update_test_2300", 0, async function(done) { console.info("--------logMessage abnormal_calllog_update_test_2300 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(10); var insertValues = {phone_number : phoneNumber, display_name : "name2300"} try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); - var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); + var calllogIdTwo = await dataShareHelper.insert(calllogUri, insertValues); expect(calllogId > 0).assertTrue(); expect(calllogIdTwo > 0).assertTrue(); await UpdateOneCalllog(); @@ -1096,8 +1095,8 @@ describe('CalllogTest', function() { try { var insertValues = {phone_number : phoneNumber, display_names : "nameUpdateError2300"}; var condition = - new ohos_data_ability.DataAbilityPredicates(); - var updateCode = await DAHelper.update(calllogUri, insertValues, condition); + new dataShare.DataSharePredicates(); + var updateCode = await dataShareHelper.update(calllogUri, insertValues, condition); console.info("logMessage abnormal_calllog_update_test_2300: updateCode = " + updateCode); expect(updateCode == -1).assertTrue(); var map = new Map(); @@ -1122,19 +1121,19 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_query_test_2400", 0, async function(done) { console.info("--------logMessage abnormal_calllog_query_test_2400 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(10); var insertValues = {phone_number : phoneNumber, display_name : "name2300"} try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); - var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); + var calllogIdTwo = await dataShareHelper.insert(calllogUri, insertValues); expect(calllogId > 0).assertTrue(); expect(calllogIdTwo > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", calllogId.toString() + "ksks"); var resultColumns = [ "display_names" ]; - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); console.info("abnormal_calllog_query_test_2400: resultSet.rowCount = " + resultSet.rowCount); expect(resultSet.rowCount == -1).assertTrue(); resultSet.close(); @@ -1154,20 +1153,20 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_query_test_2500", 0, async function(done) { console.info("--------logMessage abnormal_calllog_query_test_2500 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(10); var insertValues = {phone_number : phoneNumber, display_name : "name2300"} try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info('abnormal_calllog_query_test_2500 calllogId = ' + calllogId); - var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); + var calllogIdTwo = await dataShareHelper.insert(calllogUri, insertValues); console.info('abnormal_calllog_query_test_2500 calllogIdTwo = ' + calllogIdTwo); expect(calllogId > 0).assertTrue(); expect(calllogIdTwo > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var resultColumns = [ "display_names" ]; - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.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(); @@ -1187,29 +1186,29 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_delete_test_2600", 0, async function(done) { console.info("--------logMessage abnormal_calllog_delete_test_2600 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(10); var insertValues = {phone_number : phoneNumber, display_name : "name2300"} try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); - var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); + var calllogIdTwo = await dataShareHelper.insert(calllogUri, insertValues); expect(calllogId > 0).assertTrue(); expect(calllogIdTwo > 0).assertTrue(); } catch (error) { console.info("logMessage abnormal_calllog_delete_test_2600: calllog insert error = " + error); done(); } - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", calllogIdTwo.toString()); condition.or(); condition.equalTo("id", calllogId.toString()); - var code = await DAHelper.delete(calllogUri, condition); + var code = await dataShareHelper.delete(calllogUri, condition); console.info("logMessage abnormal_calllog_delete_test_2600: code = " + code); expect(code == -1).assertTrue(); condition.clear(); var resultColumns = []; - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); var count = 2; expect(resultSet.rowCount == count).assertTrue(); resultSet.close(); @@ -1223,13 +1222,13 @@ describe('CalllogTest', function() { * @tc.desc Function test */ it("abnormal_calllog_delete_test_2700", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(14); var insertValues = {phone_number : phoneNumber, display_name : "name2700"} try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); - var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); + var calllogIdTwo = await dataShareHelper.insert(calllogUri, insertValues); expect(calllogId > 0).assertTrue(); expect(calllogIdTwo > 0).assertTrue(); await UpdateOneCalllog(); @@ -1242,11 +1241,11 @@ describe('CalllogTest', function() { { try { var insertValues = {phone_number : phoneNumber, display_names : "nameUpdateError2700"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", calllogIdTwo.toString()); condition.or(); condition.equalTo("id", calllogId.toString()); - var updateCode = await DAHelper.update(calllogUri, insertValues, condition); + var updateCode = await dataShareHelper.update(calllogUri, insertValues, condition); console.info("logMessage abnormal_calllog_delete_test_2700: updateCode = " + updateCode); expect(updateCode == -1).assertTrue(); var map = new Map(); @@ -1270,13 +1269,13 @@ describe('CalllogTest', function() { */ it("abnormal_calllog_query_test_2800", 0, async function(done) { console.info("------------abnormal_calllog_query_test_2800 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(8); var phoneNumber_Test = phoneNumber.substring(0,3); var insertValues = {"phone_number" : phoneNumber}; try { - var calllogId = await DAHelper.insert(calllogUri, insertValues); + var calllogId = await dataShareHelper.insert(calllogUri, insertValues); console.info("logMessage abnormal_calllog_query_test_2800: calllogId = " + calllogId); expect(calllogId > 0).assertTrue(); await QueryByStartsWithPhoneNumberError(); @@ -1290,10 +1289,10 @@ describe('CalllogTest', function() { async function QueryByStartsWithPhoneNumberError() { var resultColumns = [ "id", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("phone_numbers", phoneNumber_Test + "%"); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); console.info("logMessage abnormal_calllog_query_test_2800: resultSet.rowCount = " + resultSet.rowCount); expect(resultSet.rowCount == -1).assertTrue(); resultSet.close(); @@ -1305,11 +1304,11 @@ describe('CalllogTest', function() { }); afterAll(async function() { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('callllog afterAll logMessage get DAHelper success! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('callllog afterAll logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(calllogUri, condition); + var deleteCode = await dataShareHelper.delete(calllogUri, condition); console.info('callllog afterAll end logMessage deleteCode = ' + deleteCode); }); diff --git a/jstest/ContactCard_test.js b/jstest/ContactCard_test.js index 7217243..6053cf8 100644 --- a/jstest/ContactCard_test.js +++ b/jstest/ContactCard_test.js @@ -13,22 +13,21 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' import common from './common.js'; -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const profilecontactUri = "dataability:///com.ohos.contactsdataability/profile/contact"; -const profileRawContactUri = "dataability:///com.ohos.contactsdataability/profile/raw_contact"; -const profileContactDataUri = "dataability:///com.ohos.contactsdataability/profile/contact_data"; -const profileGroupUri = "dataability:///com.ohos.contactsdataability/profile/groups"; -const profileBlocklistUri = "dataability:///com.ohos.contactsdataability/profile/contact_blocklist"; -const profilesearchContactUri = "dataability:///com.ohos.contactsdataability/profile/search_contact"; -const profileDeletedContactsUri = "dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const profilecontactUri = "datashare:///com.ohos.contactsdataability/profile/contact"; +const profileRawContactUri = "datashare:///com.ohos.contactsdataability/profile/raw_contact"; +const profileContactDataUri = "datashare:///com.ohos.contactsdataability/profile/contact_data"; +const profileGroupUri = "datashare:///com.ohos.contactsdataability/profile/groups"; +const profileBlocklistUri = "datashare:///com.ohos.contactsdataability/profile/contact_blocklist"; +const profilesearchContactUri = "datashare:///com.ohos.contactsdataability/profile/search_contact"; +const profileDeletedContactsUri = "datashare:///com.ohos.contactsdataability/profile/deleted_raw_contact"; const profile_deleted_raw_contact_record = - "dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact_record"; + "datashare:///com.ohos.contactsdataability/profile/deleted_raw_contact_record"; describe('ContactCardTest', function() { console.info("-------ContactsTest is starting!--------"); @@ -53,13 +52,13 @@ describe('ContactCardTest', function() { async function contactsQuery(map, tag, uri) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': contactsQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - var resultSet = await DAHelper.query(uri, resultColumns, condition); + var resultSet = await dataShareHelper.query(uri, resultColumns, condition); sleep(sleep_two); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { @@ -81,13 +80,13 @@ describe('ContactCardTest', function() { async function queryBatch(map, tag, size) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryBatch start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryBatch start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", map.get("raw_contact_id")); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_one); console.info(tag + ': queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == size).assertEqual(true); @@ -99,13 +98,13 @@ describe('ContactCardTest', function() { async function queryIdForDelete(map, tag, uri) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryIdForDelete start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryIdForDelete start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - var resultSet = await DAHelper.query(uri, resultColumns, condition); + var resultSet = await dataShareHelper.query(uri, resultColumns, condition); sleep(sleep_one); expect(resultSet.goToFirstRow() == false).assertTrue(); console.info(tag + " :logMessage queryIdForDelete: goToFirstRow " + resultSet.goToFirstRow()); @@ -118,10 +117,10 @@ describe('ContactCardTest', function() { async function deleteAll(uri, tag) { try { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(uri, condition); + var deleteCode = await dataShareHelper.delete(uri, condition); console.info(tag + ': deleteAll deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); } catch (error) { @@ -132,18 +131,18 @@ describe('ContactCardTest', function() { async function deleteRawContact(tag) { try { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); - var deleteCode = await DAHelper.delete(profileRawContactUri, condition); + var deleteCode = await dataShareHelper.delete(profileRawContactUri, condition); console.info(tag + ': deleteRawContact deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); sleep(sleep_one); - var conditionAll = new ohos_data_ability.DataAbilityPredicates(); + var conditionAll = new dataShare.DataSharePredicates(); conditionAll.greaterThan("id", "0"); - var code = await DAHelper.delete(profileDeletedContactsUri, conditionAll); + var code = await dataShareHelper.delete(profileDeletedContactsUri, conditionAll); console.info(tag + ': Completely delete code = ' + code); expect(code == 0).assertTrue(); } catch (error) { @@ -153,11 +152,11 @@ describe('ContactCardTest', function() { async function insertData(rawContactId, type, value, position) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); var contactDataValues1 = {"raw_contact_id" : rawContactId, "content_type" : type, "detail_info" : value, "position" : position}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); console.info("logMessage : contactDataId " + contactDataId); expect(contactDataId > 0).assertTrue(); } catch (error) { @@ -173,10 +172,10 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_100", 0, async function(done) { console.info("------logMessage contactCard_insert_test_100 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(profileRawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contactCard_insert_test_100: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -198,19 +197,19 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_400", 0, async function(done) { console.info("------logMessage contactCard_insert_test_400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insert_test_400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataNameInsert(DAHelper, rawContactId); - await dataCompanyInsert(DAHelper, rawContactId); - await dataPhoneInsert(DAHelper, rawContactId); + await dataNameInsert(dataShareHelper, rawContactId); + await dataCompanyInsert(dataShareHelper, rawContactId); + await dataPhoneInsert(dataShareHelper, rawContactId); await deleteRawContact("contactCard_insert_test_400"); await deleteAll(profileContactDataUri, "contactCard_insert_test_400"); done(); @@ -220,7 +219,7 @@ describe('ContactCardTest', function() { } }); - async function dataNameInsert(DAHelper, rawContactId) + async function dataNameInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -228,7 +227,7 @@ describe('ContactCardTest', function() { "detail_info" : "xiaocheng" }; try { - var contactDataId1 = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); console.info("logMessage contactCard_insert_test_400: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); var map = new Map(); @@ -242,7 +241,7 @@ describe('ContactCardTest', function() { } } - async function dataCompanyInsert(DAHelper, rawContactId) + async function dataCompanyInsert(dataShareHelper, rawContactId) { var contactDataValues2 = { "raw_contact_id" : rawContactId, @@ -251,7 +250,7 @@ describe('ContactCardTest', function() { "position" : "developer" }; try { - var contactDataId2 = await DAHelper.insert(profileContactDataUri, contactDataValues2); + var contactDataId2 = await dataShareHelper.insert(profileContactDataUri, contactDataValues2); console.info("logMessage contactCard_insert_test_400: contactDataId2 " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); var map = new Map(); @@ -265,7 +264,7 @@ describe('ContactCardTest', function() { } } - async function dataPhoneInsert(DAHelper, rawContactId) + async function dataPhoneInsert(dataShareHelper, rawContactId) { var contactDataValues3 = { "raw_contact_id" : rawContactId, @@ -273,7 +272,7 @@ describe('ContactCardTest', function() { "detail_info" : "12345678" }; try { - var contactDataId3 = await DAHelper.insert(profileContactDataUri, contactDataValues3); + var contactDataId3 = await dataShareHelper.insert(profileContactDataUri, contactDataValues3); sleep(sleep_one); console.info("logMessage contactCard_insert_test_400: contactDataId3 " + contactDataId3); expect(contactDataId3 > 0).assertTrue(); @@ -294,19 +293,19 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_500", 0, async function(done) { console.info("------logMessage contactCard_insert_test_500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insert_test_500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataEmailInsert(DAHelper, rawContactId); - await dataNickNameInsert(DAHelper, rawContactId); - await dataPostalAddressInsert(DAHelper, rawContactId); + await dataEmailInsert(dataShareHelper, rawContactId); + await dataNickNameInsert(dataShareHelper, rawContactId); + await dataPostalAddressInsert(dataShareHelper, rawContactId); await deleteRawContact("contactCard_insert_test_500"); await deleteAll(profileContactDataUri, "contactCard_insert_test_500"); done(); @@ -316,7 +315,7 @@ describe('ContactCardTest', function() { } }); - async function dataEmailInsert(DAHelper, rawContactId) + async function dataEmailInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -324,7 +323,7 @@ describe('ContactCardTest', function() { "detail_info" : "166@163.com" }; try { - var contactDataId1 = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); sleep(sleep_one); console.info("logMessage contactCard_insert_test_500: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -337,7 +336,7 @@ describe('ContactCardTest', function() { } } - async function dataNickNameInsert(DAHelper, rawContactId) + async function dataNickNameInsert(dataShareHelper, rawContactId) { var contactDataValues2 = { "raw_contact_id" : rawContactId, @@ -345,7 +344,7 @@ describe('ContactCardTest', function() { "detail_info" : "xiaocheng" }; try { - var contactDataId2 = await DAHelper.insert(profileContactDataUri, contactDataValues2); + var contactDataId2 = await dataShareHelper.insert(profileContactDataUri, contactDataValues2); console.info("logMessage contactCard_insert_test_500: contactDataId2 " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); var map = new Map(); @@ -357,7 +356,7 @@ describe('ContactCardTest', function() { } } - async function dataPostalAddressInsert(DAHelper, rawContactId) + async function dataPostalAddressInsert(dataShareHelper, rawContactId) { var contactDataValues3 = { "raw_contact_id" : rawContactId, @@ -365,7 +364,7 @@ describe('ContactCardTest', function() { "detail_info" : "NanJingSoftRoad" }; try { - var contactDataId3 = await DAHelper.insert(profileContactDataUri, contactDataValues3); + var contactDataId3 = await dataShareHelper.insert(profileContactDataUri, contactDataValues3); console.info("logMessage contactCard_insert_test_500: contactDataId3 " + contactDataId3); expect(contactDataId3 > 0).assertTrue(); var map = new Map(); @@ -384,19 +383,19 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_600", 0, async function(done) { console.info("------logMessage contactCard_insert_test_600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues) + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues) console.info("logMessage contactCard_insert_test_600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataNoteInsert(DAHelper, rawContactId); - await dataAimInsert(DAHelper, rawContactId); - await dataEventInsert(DAHelper, rawContactId); + await dataNoteInsert(dataShareHelper, rawContactId); + await dataAimInsert(dataShareHelper, rawContactId); + await dataEventInsert(dataShareHelper, rawContactId); await deleteRawContact("contactCard_insert_test_600"); await deleteAll(profileContactDataUri, "contactCard_insert_test_600"); done(); @@ -406,7 +405,7 @@ describe('ContactCardTest', function() { } }); - async function dataNoteInsert(DAHelper, rawContactId) + async function dataNoteInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -414,7 +413,7 @@ describe('ContactCardTest', function() { "detail_info" : "javaGangster" }; try { - var contactDataId1 = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); console.info("logMessage contactCard_insert_test_600: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); var map = new Map(); @@ -427,11 +426,11 @@ describe('ContactCardTest', function() { } } - async function dataAimInsert(DAHelper, rawContactId) + async function dataAimInsert(dataShareHelper, rawContactId) { var contactDataValues2 = {"raw_contact_id" : rawContactId, "content_type" : "im", "detail_info" : "aaaaa"}; try { - var contactDataId2 = await DAHelper.insert(profileContactDataUri, contactDataValues2); + var contactDataId2 = await dataShareHelper.insert(profileContactDataUri, contactDataValues2); console.info("logMessage contactCard_insert_test_600: contactDataId2 " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); var map = new Map(); @@ -443,7 +442,7 @@ describe('ContactCardTest', function() { } } - async function dataEventInsert(DAHelper, rawContactId) + async function dataEventInsert(dataShareHelper, rawContactId) { var contactDataValues3 = { "raw_contact_id" : rawContactId, @@ -451,7 +450,7 @@ describe('ContactCardTest', function() { "detail_info" : "19960229" }; try { - var contactDataId3 = await DAHelper.insert(profileContactDataUri, contactDataValues3); + var contactDataId3 = await dataShareHelper.insert(profileContactDataUri, contactDataValues3); console.info("logMessage contactCard_insert_test_600: contactDataId3 " + contactDataId3); expect(contactDataId3 > 0).assertTrue(); var map = new Map(); @@ -470,19 +469,19 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_700", 0, async function(done) { console.info("------logMessage contactCard_insert_test_700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insert_test_700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataWebsiteInsert(DAHelper, rawContactId); - await dataRelationInsert(DAHelper, rawContactId); - await dataWebsiteInsert(DAHelper, rawContactId); + await dataWebsiteInsert(dataShareHelper, rawContactId); + await dataRelationInsert(dataShareHelper, rawContactId); + await dataWebsiteInsert(dataShareHelper, rawContactId); await deleteRawContact("contactCard_insert_test_700"); await deleteAll(profileContactDataUri, "contactCard_insert_test_700"); done(); @@ -492,7 +491,7 @@ describe('ContactCardTest', function() { } }); - async function dataWebsiteInsert(DAHelper, rawContactId) + async function dataWebsiteInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -500,7 +499,7 @@ describe('ContactCardTest', function() { "detail_info" : "www.com" }; try { - var contactDataId1 = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); sleep(sleep_one); console.info("logMessage contactCard_insert_test_700: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -514,7 +513,7 @@ describe('ContactCardTest', function() { } } - async function dataRelationInsert(DAHelper, rawContactId) + async function dataRelationInsert(dataShareHelper, rawContactId) { var contactDataValues2 = { "raw_contact_id" : rawContactId, @@ -522,7 +521,7 @@ describe('ContactCardTest', function() { "detail_info" : "Secretary" }; try { - var contactDataId2 = await DAHelper.insert(profileContactDataUri, contactDataValues2); + var contactDataId2 = await dataShareHelper.insert(profileContactDataUri, contactDataValues2); sleep(sleep_one); console.info("logMessage contactCard_insert_test_700: contactDataId2 " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); @@ -536,7 +535,7 @@ describe('ContactCardTest', function() { } } - async function dataGroupInsert(DAHelper, rawContactId) + async function dataGroupInsert(dataShareHelper, rawContactId) { var contactDataValues3 = { "raw_contact_id" : rawContactId, @@ -544,7 +543,7 @@ describe('ContactCardTest', function() { "detail_info" : "1" }; try { - var contactDataId3 = await DAHelper.insert(profileContactDataUri, contactDataValues3); + var contactDataId3 = await dataShareHelper.insert(profileContactDataUri, contactDataValues3); sleep(sleep_one); console.info("logMessage contactCard_insert_test_700: contactDataId3 " + contactDataId3); expect(contactDataId3 > 0).assertTrue(); @@ -565,17 +564,17 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_800", 0, async function(done) { console.info("------logMessage contactCard_insert_test_800 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insert_test_800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataMiscInsert(DAHelper, rawContactId); + await dataMiscInsert(dataShareHelper, rawContactId); await deleteRawContact("contactCard_insert_test_800"); await deleteAll(profileContactDataUri, "contactCard_insert_test_800"); done(); @@ -585,7 +584,7 @@ describe('ContactCardTest', function() { } }); - async function dataMiscInsert(DAHelper, rawContactId) + async function dataMiscInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -593,7 +592,7 @@ describe('ContactCardTest', function() { "detail_info" : "1234" }; try { - var contactDataId1 = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); sleep(sleep_one); console.info("logMessage contactCard_insert_test_800: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -613,8 +612,8 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_900", 0, async function(done) { console.info("------logMessage contactCard_update_test_900 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "licheng", @@ -624,10 +623,10 @@ describe('ContactCardTest', function() { "phonetic_name" : "licheng||lc" }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await rawContactUpdate(DAHelper, rawContactId); + await rawContactUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_900"); await deleteAll(profileContactDataUri, "contactCard_update_test_900"); done(); @@ -637,7 +636,7 @@ describe('ContactCardTest', function() { } }); - async function rawContactUpdate(DAHelper, rawContactId) + async function rawContactUpdate(dataShareHelper, rawContactId) { var updateValues = { "display_name" : "dacheng", @@ -646,10 +645,10 @@ describe('ContactCardTest', function() { "favorite" : 0, "phonetic_name" : "dacheng||dc" }; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileRawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileRawContactUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_900: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -673,15 +672,15 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_1200", 0, async function(done) { console.info("------logMessage contactCard_update_test_1200 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_1200: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforedataNameInsert(DAHelper, rawContactId); - await dataNameUpdate(DAHelper, rawContactId); + await beforedataNameInsert(dataShareHelper, rawContactId); + await dataNameUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_1200"); await deleteAll(profileContactDataUri, "contactCard_update_test_1200"); done(); @@ -691,11 +690,11 @@ describe('ContactCardTest', function() { } }); - async function beforedataNameInsert(DAHelper, rawContactId) + async function beforedataNameInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "name", "detail_info" : "xiaoyuan"}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_1200: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -704,13 +703,13 @@ describe('ContactCardTest', function() { } } - async function dataNameUpdate(DAHelper, rawContactId) + async function dataNameUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "dayuan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_1200: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -730,15 +729,15 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_1300", 0, async function(done) { console.info("------logMessage contactCard_update_test_1300 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_1300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforedataCompanyInsert(DAHelper, rawContactId); - await dataCompanyUpdate(DAHelper, rawContactId); + await beforedataCompanyInsert(dataShareHelper, rawContactId); + await dataCompanyUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_1300"); await deleteAll(profileContactDataUri, "contactCard_update_test_1300"); done(); @@ -748,7 +747,7 @@ describe('ContactCardTest', function() { } }); - async function beforedataCompanyInsert(DAHelper, rawContactId) + async function beforedataCompanyInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -757,7 +756,7 @@ describe('ContactCardTest', function() { "position" : "Testers", }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_1300: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -766,13 +765,13 @@ describe('ContactCardTest', function() { } } - async function dataCompanyUpdate(DAHelper, rawContactId) + async function dataCompanyUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "OOOO", "position" : "developer"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_1300: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -793,15 +792,15 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_1400", 0, async function(done) { console.info("------logMessage contactCard_update_test_1400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_1400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataPhoneInsert(DAHelper, rawContactId); - await dataPhoneUpdate(DAHelper, rawContactId); + await beforeDataPhoneInsert(dataShareHelper, rawContactId); + await dataPhoneUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_1400"); await deleteAll(profileContactDataUri, "contactCard_update_test_1400"); done(); @@ -811,11 +810,11 @@ describe('ContactCardTest', function() { } }); - async function beforeDataPhoneInsert(DAHelper, rawContactId) + async function beforeDataPhoneInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "phone", "detail_info" : "123456"}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_1400: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -824,13 +823,13 @@ describe('ContactCardTest', function() { } } - async function dataPhoneUpdate(DAHelper, rawContactId) + async function dataPhoneUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "99663355"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_1400: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -850,16 +849,16 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_1500", 0, async function(done) { console.info("------logMessage contactCard_update_test_1500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_1500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforedataNickNameInsert(DAHelper, rawContactId); - await dataNickNameUpdate(DAHelper, rawContactId); + await beforedataNickNameInsert(dataShareHelper, rawContactId); + await dataNickNameUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_1500"); await deleteAll(profileContactDataUri, "contactCard_update_test_1500"); done(); @@ -869,7 +868,7 @@ describe('ContactCardTest', function() { } }); - async function beforedataNickNameInsert(DAHelper, rawContactId) + async function beforedataNickNameInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -877,7 +876,7 @@ describe('ContactCardTest', function() { "detail_info" : "xiaoyuan" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_1500: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -886,13 +885,13 @@ describe('ContactCardTest', function() { } } - async function dataNickNameUpdate(DAHelper, rawContactId) + async function dataNickNameUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "fengyuan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_1500: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -912,16 +911,16 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_1600", 0, async function(done) { console.info("------logMessage contactCard_update_test_1600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_1600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataEmailInsert(DAHelper, rawContactId); - await dataEmailUpdate(DAHelper, rawContactId); + await beforeDataEmailInsert(dataShareHelper, rawContactId); + await dataEmailUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_1600"); await deleteAll(profileContactDataUri, "contactCard_update_test_1600"); done(); @@ -931,7 +930,7 @@ describe('ContactCardTest', function() { } }); - async function beforeDataEmailInsert(DAHelper, rawContactId) + async function beforeDataEmailInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -939,7 +938,7 @@ describe('ContactCardTest', function() { "detail_info" : "166@163.com" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_1600: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -948,13 +947,13 @@ describe('ContactCardTest', function() { } } - async function dataEmailUpdate(DAHelper, rawContactId) + async function dataEmailUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "199@163.com"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition) + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition) sleep(sleep_one); console.info('logMessage contactCard_update_test_1600: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -974,15 +973,15 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_1700", 0, async function(done) { console.info("------logMessage contactCard_update_test_1700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_1700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataPostalInsert(DAHelper, rawContactId); + await beforeDataPostalInsert(dataShareHelper, rawContactId); await dataPostalUpdate(); await deleteRawContact("contactCard_update_test_1700"); await deleteAll(profileContactDataUri, "contactCard_update_test_1700"); @@ -993,7 +992,7 @@ describe('ContactCardTest', function() { } }); - async function beforeDataPostalInsert(DAHelper, rawContactId) + async function beforeDataPostalInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1001,7 +1000,7 @@ describe('ContactCardTest', function() { "detail_info" : "NanJing" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_1700: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1010,13 +1009,13 @@ describe('ContactCardTest', function() { } } - async function dataPostalUpdate(DAHelper, rawContactId) + async function dataPostalUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "BeiJing"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_1700: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1036,16 +1035,16 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_1800", 0, async function(done) { console.info("------logMessage contactCard_update_test_1800 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_1800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforedataNoteInsert(DAHelper, rawContactId); - await dataNoteUpdate(DAHelper, rawContactId); + await beforedataNoteInsert(dataShareHelper, rawContactId); + await dataNoteUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_1800"); await deleteAll(profileContactDataUri, "contactCard_update_test_1800"); done(); @@ -1055,11 +1054,11 @@ describe('ContactCardTest', function() { } }); - async function beforedataNoteInsert(DAHelper, rawContactId) + async function beforedataNoteInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "note", "detail_info" : "Gangster"}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_1800: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1068,13 +1067,13 @@ describe('ContactCardTest', function() { } } - async function dataNoteUpdate(DAHelper, rawContactId) + async function dataNoteUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "God"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_1800: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1094,16 +1093,16 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_1900", 0, async function(done) { console.info("------logMessage contactCard_update_test_1900 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues) + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues) console.info("logMessage contactCard_update_test_1900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataAimInsert(DAHelper, rawContactId); - await dataAimUpdate(DAHelper, rawContactId); + await beforeDataAimInsert(dataShareHelper, rawContactId); + await dataAimUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_1900"); await deleteAll(profileContactDataUri, "contactCard_update_test_1900"); done(); @@ -1113,11 +1112,11 @@ describe('ContactCardTest', function() { } }); - async function beforeDataAimInsert(DAHelper, rawContactId) + async function beforeDataAimInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "im", "detail_info" : "aaaaa"}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_1900: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1126,13 +1125,13 @@ describe('ContactCardTest', function() { } } - async function dataAimUpdate(DAHelper, rawContactId) + async function dataAimUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "bbbbb"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_1900: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1152,16 +1151,16 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_2000", 0, async function(done) { console.info("------logMessage contactCard_update_test_2000 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_2000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataEventInsert(DAHelper, rawContactId); - await dataEventUpdate(DAHelper, rawContactId); + await beforeDataEventInsert(dataShareHelper, rawContactId); + await dataEventUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_2000"); await deleteAll(profileContactDataUri, "contactCard_update_test_2000"); done(); @@ -1171,7 +1170,7 @@ describe('ContactCardTest', function() { } }); - async function beforeDataEventInsert(DAHelper, rawContactId) + async function beforeDataEventInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -1179,7 +1178,7 @@ describe('ContactCardTest', function() { "detail_info" : "19960229" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); sleep(sleep_one); console.info('logMessage contactCard_update_test_2000: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1188,13 +1187,13 @@ describe('ContactCardTest', function() { } } - async function dataEventUpdate(DAHelper, rawContactId) + async function dataEventUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "19971021"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_2000: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1214,16 +1213,16 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_2100", 0, async function(done) { console.info("------logMessage contactCard_update_test_2100 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_2100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataWebsiteInsert(DAHelper, rawContactId); - await dataWebsiteUpdate(DAHelper, rawContactId); + await beforeDataWebsiteInsert(dataShareHelper, rawContactId); + await dataWebsiteUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_2100"); await deleteAll(profileContactDataUri, "contactCard_update_test_2100"); done(); @@ -1233,7 +1232,7 @@ describe('ContactCardTest', function() { } }); - async function beforeDataWebsiteInsert(DAHelper, rawContactId) + async function beforeDataWebsiteInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -1241,7 +1240,7 @@ describe('ContactCardTest', function() { "detail_info" : "www.com" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); sleep(sleep_one); console.info('logMessage contactCard_update_test_2100: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1250,13 +1249,13 @@ describe('ContactCardTest', function() { } } - async function dataWebsiteUpdate(DAHelper, rawContactId) + async function dataWebsiteUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "www.123.com"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_2100: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1276,16 +1275,16 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_2200", 0, async function(done) { console.info("------logMessage contactCard_update_test_2200 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_2200: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataRelationInsert(DAHelper, rawContactId); - await dataRelationUpdate(DAHelper, rawContactId); + await beforeDataRelationInsert(dataShareHelper, rawContactId); + await dataRelationUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_2200"); await deleteAll(profileContactDataUri, "contactCard_update_test_2200"); done(); @@ -1295,7 +1294,7 @@ describe('ContactCardTest', function() { } }); - async function beforeDataRelationInsert(DAHelper, rawContactId) + async function beforeDataRelationInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1303,7 +1302,7 @@ describe('ContactCardTest', function() { "detail_info" : "Secretary" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_update_test_2200: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); } catch (error) { @@ -1311,13 +1310,13 @@ describe('ContactCardTest', function() { } } - async function dataRelationUpdate(DAHelper, rawContactId) + async function dataRelationUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "spouse"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_2200: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1337,16 +1336,16 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_2300", 0, async function(done) { console.info("------logMessage contactCard_update_test_2300 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_update_test_2300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataGroupInsert(DAHelper, rawContactId); - await dataGroupUpdate(DAHelper, rawContactId); + await beforeDataGroupInsert(dataShareHelper, rawContactId); + await dataGroupUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_2300"); await deleteAll(profileContactDataUri, "contactCard_update_test_2300"); done(); @@ -1356,7 +1355,7 @@ describe('ContactCardTest', function() { } }); - async function beforeDataGroupInsert(DAHelper, rawContactId) + async function beforeDataGroupInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1364,7 +1363,7 @@ describe('ContactCardTest', function() { "detail_info" : "2" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_update_test_2300: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1373,13 +1372,13 @@ describe('ContactCardTest', function() { } } - async function dataGroupUpdate(DAHelper, rawContactId) + async function dataGroupUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "7"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_2300: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1399,17 +1398,17 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_2400", 0, async function(done) { console.info("------logMessage contactCard_update_test_2400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); sleep(sleep_one); console.info("logMessage contactCard_update_test_2400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataMiscInsert(DAHelper, rawContactId); - await dataMiscUpdate(DAHelper, rawContactId); + await beforeDataMiscInsert(dataShareHelper, rawContactId); + await dataMiscUpdate(dataShareHelper, rawContactId); await deleteRawContact("contactCard_update_test_2400"); await deleteAll(profileContactDataUri, "contactCard_update_test_2400"); done(); @@ -1419,7 +1418,7 @@ describe('ContactCardTest', function() { } }); - async function beforeDataMiscInsert(DAHelper, rawContactId) + async function beforeDataMiscInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -1427,7 +1426,7 @@ describe('ContactCardTest', function() { "detail_info" : "1234" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); sleep(sleep_one); console.info('logMessage contactCard_update_test_2400: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1436,13 +1435,13 @@ describe('ContactCardTest', function() { } } - async function dataMiscUpdate(DAHelper, rawContactId) + async function dataMiscUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "999"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contactCard_update_test_2400: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1462,15 +1461,15 @@ describe('ContactCardTest', function() { */ it("contactCard_favorite_test_2500", 0, async function(done) { console.info("-------logMessage contactCard_favorite_test_2500 is starting!------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaocai", "company" : "TT", "position" : "Testers"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues) + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues) console.info('logMessage contactCard_favorite_test_2500: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); - await updateFavorite(DAHelper, rawContactId); + await updateFavorite(dataShareHelper, rawContactId); await deleteRawContact("contactCard_favorite_test_2500"); done(); } catch (error) { @@ -1479,13 +1478,13 @@ describe('ContactCardTest', function() { } }); - async function updateFavorite(DAHelper, rawContactId) + async function updateFavorite(dataShareHelper, rawContactId) { var updateValues = {"favorite" : 1}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileRawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileRawContactUri, updateValues, condition); sleep(sleep_one); console.info("logMessage contactCard_favorite_test_2500: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -1508,14 +1507,14 @@ describe('ContactCardTest', function() { */ it("contactCard_unfavorite_test_2600", 0, async function(done) { console.info("-------logMessage contactCard_unfavorite_test_2600 is starting!------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaohong", "company" : "TT", "position" : "Testers", "favorite" : 1}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info('logMessage contactCard_unfavorite_test_2600: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); - await updateUnFavorite(DAHelper, rawContactId); + await updateUnFavorite(dataShareHelper, rawContactId); await deleteRawContact("contactCard_unfavorite_test_2600"); done(); } catch (error) { @@ -1524,13 +1523,13 @@ describe('ContactCardTest', function() { } }); - async function updateUnFavorite(DAHelper, rawContactId) + async function updateUnFavorite(dataShareHelper, rawContactId) { var updateValues = {"favorite" : 0}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(profileRawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileRawContactUri, updateValues, condition); sleep(sleep_one); console.info("logMessage contactCard_unfavorite_test_2600: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -1553,10 +1552,10 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_2700", 0, async function(done) { console.info("-------logMessage contactCard_insert_test_2700 is starting!------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var blocklistId = await DAHelper.insert(profileBlocklistUri, common.getProfileBlockList()); + var blocklistId = await dataShareHelper.insert(profileBlocklistUri, common.getProfileBlockList()); sleep(sleep_one); console.info('logMessage contactCard_insert_test_2700: blocklistId = ' + blocklistId); expect(blocklistId > 0).assertTrue(); @@ -1578,10 +1577,10 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_2800", 0, async function(done) { console.info("-------logMessage contactCard_delete_test_2800 is starting!------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var blocklistId = await DAHelper.insert(profileBlocklistUri, common.getProfileBlockList()); + var blocklistId = await dataShareHelper.insert(profileBlocklistUri, common.getProfileBlockList()); sleep(sleep_one); console.info('logMessage contactCard_delete_test_2800: blocklistId = ' + blocklistId); expect(blocklistId > 0).assertTrue(); @@ -1594,10 +1593,10 @@ describe('ContactCardTest', function() { async function BlocklistDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", blocklistId.toString()); try { - var deleteCode = await DAHelper.delete(profileBlocklistUri, condition); + var deleteCode = await dataShareHelper.delete(profileBlocklistUri, condition); sleep(sleep_one); console.info("logMessage contactCard_delete_test_2800: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -1618,16 +1617,16 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_2900", 0, async function(done) { console.info("-------logMessage contactCard_insert_test_2900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var groupValues = {"group_name" : "TestersThird"}; try { - var groupId = await DAHelper.insert(profileGroupUri, groupValues); + var groupId = await dataShareHelper.insert(profileGroupUri, groupValues); sleep(sleep_one); console.info("logMessage contactCard_insert_test_2900: groupId =" + groupId); expect(groupId > 0).assertTrue(); - await groupRawContactInsert(DAHelper); + await groupRawContactInsert(dataShareHelper); await deleteRawContact("contactCard_insert_test_2900"); await deleteAll(profileGroupUri, "contactCard_insert_test_2900"); await deleteAll(profileContactDataUri, "contactCard_insert_test_2900"); @@ -1638,21 +1637,21 @@ describe('ContactCardTest', function() { } }); - async function groupRawContactInsert(DAHelper) + async function groupRawContactInsert(dataShareHelper) { var rawContactValues = {"display_name" : "liyu"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_insert_test_2900: rawContactId =" + rawContactId); expect(rawContactId > 0).assertTrue(); - await groupDataInsert(DAHelper, rawContactId); + await groupDataInsert(dataShareHelper, rawContactId); } catch (error) { console.info("logMessage contactCard_insert_test_2900: raw_contact insert error =" + error); } } - async function groupDataInsert(DAHelper, rawContactId) + async function groupDataInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1660,7 +1659,7 @@ describe('ContactCardTest', function() { "detail_info" : groupId.toString() }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues) + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues) sleep(sleep_one); console.info("logMessage contactCard_insert_test_2900: contactDataId =" + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1681,16 +1680,16 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_3000", 0, async function(done) { console.info("-------logMessage contactCard_delete_test_3000 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var groupValues = {"group_name" : "TestersFourth"}; try { - var groupId = await DAHelper.insert(profileGroupUri, groupValues); + var groupId = await dataShareHelper.insert(profileGroupUri, groupValues); sleep(sleep_one); console.info("logMessage contactCard_delete_test_3000: groupId =" + groupId); expect(groupId > 0).assertTrue(); - await groupAfterRawContactInsert(DAHelper); + await groupAfterRawContactInsert(dataShareHelper); await deleteRawContact("contactCard_delete_test_3000"); await deleteAll(profileGroupUri, "contactCard_delete_test_3000"); await deleteAll(profileContactDataUri, "contactCard_delete_test_3000"); @@ -1701,21 +1700,21 @@ describe('ContactCardTest', function() { } }); - async function groupAfterRawContactInsert(DAHelper) + async function groupAfterRawContactInsert(dataShareHelper) { var rawContactValues = {"display_name" : "liyuchen"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_delete_test_3000: rawContactId =" + rawContactId); expect(rawContactId > 0).assertTrue(); - await deleteGroupContactDataInsert(DAHelper, rawContactId); + await deleteGroupContactDataInsert(dataShareHelper, rawContactId); } catch (error) { console.info("logMessage contactCard_delete_test_3000: raw_contact insert error =" + error); } } - async function deleteGroupContactDataInsert(DAHelper, rawContactId) + async function deleteGroupContactDataInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1723,21 +1722,21 @@ describe('ContactCardTest', function() { "detail_info" : groupId.toString() }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info("logMessage contactCard_delete_test_3000: contactDataId =" + contactDataId); expect(contactDataId > 0).assertTrue(); - await deleteGroup(DAHelper, contactDataId); + await deleteGroup(dataShareHelper, contactDataId); } catch (error) { console.info("logMessage contactCard_delete_test_3000: contact_data insert error =" + error); } } - async function deleteGroup(DAHelper, contactDataId) + async function deleteGroup(dataShareHelper, contactDataId) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", contactDataId.toString()); try { - var deleteCode = await DAHelper.delete(profileContactDataUri, condition); + var deleteCode = await dataShareHelper.delete(profileContactDataUri, condition); sleep(sleep_one); console.info("logMessage contactCard_delete_test_3000: deleteCode =" + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -1756,16 +1755,16 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3100", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyu"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await RawContactQuery(DAHelper, rawContactId); + await RawContactQuery(dataShareHelper, rawContactId); await deleteRawContact("contactCard_query_test_3100"); done(); } catch (error) { @@ -1774,13 +1773,13 @@ describe('ContactCardTest', function() { } }); - async function RawContactQuery(DAHelper, rawContactId) + async function RawContactQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_two); if (resultSet.goToFirstRow()) { do { @@ -1803,12 +1802,12 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3200", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3200 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues1 = {"display_name" : "xiaoyu"}; try { - var rawContactId1 = await DAHelper.insert(profileRawContactUri, rawContactValues1); + var rawContactId1 = await dataShareHelper.insert(profileRawContactUri, rawContactValues1); sleep(sleep_one); console.info("logMessage contactCard_query_test_3200: rawContactId = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); @@ -1819,11 +1818,11 @@ describe('ContactCardTest', function() { var rawContactValues2 = {"display_name" : "xiaohong"}; try { - var rawContactId2 = await DAHelper.insert(profileRawContactUri, rawContactValues2); + var rawContactId2 = await dataShareHelper.insert(profileRawContactUri, rawContactValues2); sleep(sleep_one); console.info("logMessage contactCard_query_test_3200: rawContactId = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - await queryTwoRaw(DAHelper, rawContactId1, rawContactId2); + await queryTwoRaw(dataShareHelper, rawContactId1, rawContactId2); await deleteRawContact("contactCard_query_test_3200"); done(); } catch (error) { @@ -1832,15 +1831,15 @@ describe('ContactCardTest', function() { } }); - async function queryTwoRaw(DAHelper, rawContactId1, rawContactId2) + async function queryTwoRaw(dataShareHelper, rawContactId1, rawContactId2) { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId1.toString()); condition.or(); condition.equalTo("id", rawContactId2.toString()); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_one); console.info('logMessage contactCard_query_test_3200: goToFirstRow' + resultSet.goToFirstRow()); expect(resultSet.goToFirstRow()).assertEqual(true); @@ -1865,12 +1864,12 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3300", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3300 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues1 = {"display_name" : "xiaoyu"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues1); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues1); sleep(sleep_one); console.info("logMessage contactCard_query_test_3300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -1879,10 +1878,10 @@ describe('ContactCardTest', function() { done(); } var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -1908,8 +1907,8 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3400", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3400 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = { "display_name" : "xiaoyuzhou", @@ -1919,11 +1918,11 @@ describe('ContactCardTest', function() { "phonetic_name" : "xiaoyu||xy" }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await queryAllInformation(DAHelper, rawContactId); + await queryAllInformation(dataShareHelper, rawContactId); await deleteRawContact("contactCard_query_test_3400"); done(); } catch (error) { @@ -1932,13 +1931,13 @@ describe('ContactCardTest', function() { } }); - async function queryAllInformation(DAHelper, rawContactId) + async function queryAllInformation(dataShareHelper, rawContactId) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -1972,11 +1971,11 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3500", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3500 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyuzhou"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -1986,7 +1985,7 @@ describe('ContactCardTest', function() { } var groupValues = {"group_name" : "BossBoard3500"}; try { - var groupId = await DAHelper.insert(profileGroupUri, groupValues); + var groupId = await dataShareHelper.insert(profileGroupUri, groupValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3500: groupId = " + groupId); expect(groupId > 0).assertTrue(); @@ -1994,14 +1993,14 @@ describe('ContactCardTest', function() { console.info("logMessage contactCard_query_test_3500: group insert error = " + error); done(); } - await groupBossBoardInsert(DAHelper, rawContactId, groupId); + await groupBossBoardInsert(dataShareHelper, rawContactId, groupId); await deleteRawContact("contactCard_query_test_3500"); await deleteAll(profileGroupUri, "contactCard_query_test_3500"); await deleteAll(profileContactDataUri, "contactCard_query_test_3500"); done(); }); - async function groupBossBoardInsert(DAHelper, rawContactId, groupId) + async function groupBossBoardInsert(dataShareHelper, rawContactId, groupId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2009,26 +2008,26 @@ describe('ContactCardTest', function() { "detail_info" : groupId.toString() }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3500: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); - await groupBossBoardQuery(DAHelper, rawContactId, groupId); + await groupBossBoardQuery(dataShareHelper, rawContactId, groupId); } catch (error) { console.info("logMessage contactCard_query_test_3500: query error = " + error); } } - async function groupBossBoardQuery(DAHelper, rawContactId, groupId) + async function groupBossBoardQuery(dataShareHelper, rawContactId, groupId) { var resultColumns = [ "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 9 data is group condition.equalTo("type_id", "9"); condition.and(); condition.equalTo("detail_info", groupId.toString()); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2051,11 +2050,11 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3600", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3600 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyuzhou", "favorite" : 1}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -2070,12 +2069,12 @@ describe('ContactCardTest', function() { async function queryFavorite() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("favorite", "1"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2101,11 +2100,11 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3700", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3700 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyuzhou", "lastest_contacted_time" : 60}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -2120,12 +2119,12 @@ describe('ContactCardTest', function() { async function queryContacted() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.lessThan("lastest_contacted_time", "100"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2151,16 +2150,16 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3800", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3800 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaocai"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await rawContactDelete(DAHelper, rawContactId); - await deletedRawContactQuery(DAHelper, rawContactId); + await rawContactDelete(dataShareHelper, rawContactId); + await deletedRawContactQuery(dataShareHelper, rawContactId); await deleteAll(profileDeletedContactsUri, "contactCard_query_test_3800") done(); } catch (error) { @@ -2169,12 +2168,12 @@ describe('ContactCardTest', function() { } }); - async function rawContactDelete(DAHelper, rawContactId) + async function rawContactDelete(dataShareHelper, rawContactId) { - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(profileRawContactUri, condition1); + var deleteCode = await dataShareHelper.delete(profileRawContactUri, condition1); sleep(sleep_one); console.info('logMessage contactCard_query_test_3800: deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -2184,13 +2183,13 @@ describe('ContactCardTest', function() { } } - async function deletedRawContactQuery(DAHelper, rawContactId) + async function deletedRawContactQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "raw_contact_id", "display_name", "is_deleted" ]; - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(deletedprofileRawContactUri, resultColumns, condition2); + var resultSet = await dataShareHelper.query(deletedprofileRawContactUri, resultColumns, condition2); sleep(sleep_one); if (resultSet.goToFirstRow()) { console.info('logMessage contactCard_query_test_3800: id = ' + resultSet.getString(0)); @@ -2215,11 +2214,11 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_3900", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_3900 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaocai"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -2234,7 +2233,7 @@ describe('ContactCardTest', function() { } }); - async function queryPhoneInsert(DAHelper, rawContactId) + async function queryPhoneInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2242,7 +2241,7 @@ describe('ContactCardTest', function() { "detail_info" : "1853696321" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_3900: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -2251,14 +2250,14 @@ describe('ContactCardTest', function() { } } - async function phoneQuery(DAHelper, rawContactId) + async function phoneQuery(dataShareHelper, rawContactId) { var resultColumns = [ "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 5 data is phone condition.equalTo("content_type", "phone"); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2282,17 +2281,17 @@ describe('ContactCardTest', function() { it("contactCard_query_test_4000", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_4000 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyu"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_4000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await queryEmailInsert(DAHelper, rawContactId); - await emailQuery(DAHelper, contactDataId, rawContactId); + await queryEmailInsert(dataShareHelper, rawContactId); + await emailQuery(dataShareHelper, contactDataId, rawContactId); await deleteRawContact("contactCard_query_test_4000"); await deleteAll(profileContactDataUri, "contactCard_query_test_4000"); done(); @@ -2302,7 +2301,7 @@ describe('ContactCardTest', function() { } }); - async function queryEmailInsert(DAHelper, rawContactId) + async function queryEmailInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2310,7 +2309,7 @@ describe('ContactCardTest', function() { "detail_info" : "16658@163.com" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_4000: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -2319,14 +2318,14 @@ describe('ContactCardTest', function() { } } - async function emailQuery(DAHelper, contactDataId, rawContactId) + async function emailQuery(dataShareHelper, contactDataId, rawContactId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 1 data content_type is email condition.equalTo("type_id", "1").limitAs(array_three).orderByDesc("id"); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2351,18 +2350,18 @@ describe('ContactCardTest', function() { */ it("contactCard_query_test_4100", 0, async function(done) { console.info("-----------logMessage contactCard_query_test_4100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyu"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_4100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await queryTwoDataInsert(DAHelper, rawContactId); - await queryTwoDataInsertCompany(DAHelper, rawContactId); - await queryTwo(DAHelper, rawContactId); + await queryTwoDataInsert(dataShareHelper, rawContactId); + await queryTwoDataInsertCompany(dataShareHelper, rawContactId); + await queryTwo(dataShareHelper, rawContactId); await deleteRawContact("contactCard_query_test_4100"); await deleteAll(profileContactDataUri, "contactCard_query_test_4100"); del @@ -2373,11 +2372,11 @@ describe('ContactCardTest', function() { } }); - async function queryTwoDataInsert(DAHelper, rawContactId) + async function queryTwoDataInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "name", "detail_info" : "xiaoyu"}; try { - var contactDataId1 = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId1 = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contactCard_query_test_4100: contactDataId = " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -2386,7 +2385,7 @@ describe('ContactCardTest', function() { } } - async function queryTwoDataInsertCompany(DAHelper, rawContactId) + async function queryTwoDataInsertCompany(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2395,7 +2394,7 @@ describe('ContactCardTest', function() { "position" : "Testers" }; try { - var contactDataId2 = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId2 = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info("logMessage contactCard_query_test_4100: contactDataId = " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); } catch (error) { @@ -2403,13 +2402,13 @@ describe('ContactCardTest', function() { } } - async function queryTwo(DAHelper, rawContactId) + async function queryTwo(dataShareHelper, rawContactId) { var resultColumns = [ "id", "raw_contact_id", "detail_info", "position" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); var array = [ {detail_info : "xiaoyu", position : ""}, {detail_info : "OOOO", position : "Testers"} ]; var i = 0; @@ -2440,17 +2439,17 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_4400", 0, async function(done) { console.info("-------logMessage contactCard_delete_test_4400 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); sleep(sleep_one); console.info("logMessage contactCard_delete_test_4400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await deleteRaw(DAHelper, rawContactId); - await queryDelete(DAHelper, rawContactId); + await deleteRaw(dataShareHelper, rawContactId); + await queryDelete(dataShareHelper, rawContactId); done(); } catch (error) { console.info("logMessage contactCard_delete_test_4400: raw_contact insert error :" + error); @@ -2458,12 +2457,12 @@ describe('ContactCardTest', function() { } }); - async function deleteRaw(DAHelper, rawContactId) + async function deleteRaw(dataShareHelper, rawContactId) { - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(profileRawContactUri, condition1); + var deleteCode = await dataShareHelper.delete(profileRawContactUri, condition1); sleep(sleep_one); console.info("logMessage contactCard_delete_test_4400: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -2472,13 +2471,13 @@ describe('ContactCardTest', function() { } } - async function queryDelete(DAHelper, rawContactId) + async function queryDelete(dataShareHelper, rawContactId) { var resultColumns = [ "id", "delete_time", "display_name" ]; - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(deletedprofileRawContactUri, resultColumns, condition2); + var resultSet = await dataShareHelper.query(deletedprofileRawContactUri, resultColumns, condition2); sleep(sleep_one); if (resultSet.goToFirstRow()) { console.info("logMessage contactCard_delete_test_4400: columnNames:" + resultSet.columnNames); @@ -2501,18 +2500,18 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_4700", 0, async function(done) { console.info("-------logMessage contactCard_delete_test_4700 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaozhang", "company" : "OOOO", "position" : "TestManager"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); sleep(sleep_one); console.info("logMessage contactCard_delete_test_4700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await queryDeleteCompanyData(DAHelper, rawContactId); - await rawContactDelete(DAHelper, rawContactId); - await companyRawContactDeleteQuery(DAHelper, rawContactId); + await queryDeleteCompanyData(dataShareHelper, rawContactId); + await rawContactDelete(dataShareHelper, rawContactId); + await companyRawContactDeleteQuery(dataShareHelper, rawContactId); await deleteAll(profileContactDataUri, "contactCard_delete_test_4700"); done(); } catch (error) { @@ -2521,7 +2520,7 @@ describe('ContactCardTest', function() { } }); - async function queryDeleteCompanyData(DAHelper, rawContactId) + async function queryDeleteCompanyData(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2530,7 +2529,7 @@ describe('ContactCardTest', function() { "position" : "TestManager" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contactCard_delete_test_4700: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -2539,12 +2538,12 @@ describe('ContactCardTest', function() { } } - async function rawContactDelete(DAHelper, rawContactId) + async function rawContactDelete(dataShareHelper, rawContactId) { - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(profileRawContactUri, condition1); + var deleteCode = await dataShareHelper.delete(profileRawContactUri, condition1); sleep(sleep_one); console.info("logMessage contactCard_delete_test_4700: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -2554,13 +2553,13 @@ describe('ContactCardTest', function() { } } - async function companyRawContactDeleteQuery(DAHelper, rawContactId) + async function companyRawContactDeleteQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "display_name", "backup_data" ]; - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(deletedprofileRawContactUri, resultColumns, condition2); + var resultSet = await dataShareHelper.query(deletedprofileRawContactUri, resultColumns, condition2); sleep(sleep_one); if (resultSet.goToFirstRow()) { console.info("logMessage contactCard_delete_test_4700: columnNames:" + resultSet.columnNames); @@ -2583,17 +2582,17 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_4800", 0, async function(done) { console.info("-------logMessage contactCard_delete_test_4800 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaopeng"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); sleep(sleep_one); console.info("logMessage contactCard_delete_test_4800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await ContactDelete(DAHelper, rawContactId); - await DeletedRawContactQuery(DAHelper, rawContactId) + await ContactDelete(dataShareHelper, rawContactId); + await DeletedRawContactQuery(dataShareHelper, rawContactId) await deleteAll(profileContactDataUri, "contactCard_delete_test_4800"); done(); } catch (error) { @@ -2602,12 +2601,12 @@ describe('ContactCardTest', function() { } }); - async function ContactDelete(DAHelper, rawContactId) + async function ContactDelete(dataShareHelper, rawContactId) { - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("name_raw_contact_id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(profilecontactUri, condition1); + var deleteCode = await dataShareHelper.delete(profilecontactUri, condition1); sleep(sleep_one); console.info("logMessage contactCard_delete_test_4800: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -2616,13 +2615,13 @@ describe('ContactCardTest', function() { } } - async function DeletedRawContactQuery(DAHelper, rawContactId) + async function DeletedRawContactQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "delete_time", "display_name" ]; - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(deletedprofileRawContactUri, resultColumns, condition2); + var resultSet = await dataShareHelper.query(deletedprofileRawContactUri, resultColumns, condition2); sleep(sleep_one) if (resultSet.goToFirstRow()) { @@ -2646,17 +2645,17 @@ describe('ContactCardTest', function() { */ it("contactCard_batchinsert_test_4900", 0, async function(done) { console.info("--------logMessage contactCard_batchinsert_test_4900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var batchInsertCode = await DAHelper.batchInsert(profileRawContactUri, common.getContactBatchCompany()); + var batchInsertCode = await dataShareHelper.batchInsert(profileRawContactUri, common.getContactBatchCompany()); sleep(sleep_one); console.info("logMessage contactCard_batchinsert_test_4900: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("company", "TT4900"); - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); console.info( 'contactCard_batchinsert_test_4900 : queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == result_size_five).assertEqual(true); @@ -2676,11 +2675,11 @@ describe('ContactCardTest', function() { */ it("contactCard_batchinsert_test_5000", 0, async function(done) { console.info("--------logMessage contactCard_batchinsert_test_5000 start!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaozhi"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contactCard_batchinsert_test_5000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -2694,7 +2693,7 @@ describe('ContactCardTest', function() { { try { var batchInsertCode = - await DAHelper.batchInsert(profileContactDataUri, common.getContactBatchCompanyTwo()); + await dataShareHelper.batchInsert(profileContactDataUri, common.getContactBatchCompanyTwo()); sleep(sleep_one); console.info("logMessage contactCard_batchinsert_test_5000: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -2717,11 +2716,11 @@ describe('ContactCardTest', function() { */ it("contactCard_batchinsert_test_5400", 0, async function(done) { console.info("--------logMessage contactCard_batchinsert_test_5400 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(13); try { - var batchInsertCode = await DAHelper.batchInsert(profileBlocklistUri, common.getPhoneNumberBatch()); + var batchInsertCode = await dataShareHelper.batchInsert(profileBlocklistUri, common.getPhoneNumberBatch()); sleep(sleep_one); console.info("logMessage contactCard_batchinsert_test_5400: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -2735,10 +2734,10 @@ describe('ContactCardTest', function() { async function BlocklistDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("phone_number", phoneNumber); try { - var deleteCode = await DAHelper.delete(profileBlocklistUri, condition); + var deleteCode = await dataShareHelper.delete(profileBlocklistUri, condition); console.info("logMessage contactCard_batchinsert_test_5400: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); await query(0); @@ -2752,10 +2751,10 @@ describe('ContactCardTest', function() { async function query(size) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("phone_number", phoneNumber); try { - var resultSet = await DAHelper.query(profileBlocklistUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileBlocklistUri, resultColumns, condition); sleep(sleep_one); console.info('contactCard_batchinsert_test_5400 : queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); @@ -2774,8 +2773,8 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_5300", 0, async function(done) { console.info("--------logMessage contactCard_update_test_5300 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValuesOne = {"display_name" : "fengyuan", "favorite" : 1}; var rawContactValuesTwo = {"display_name" : "xiaoli", "favorite" : 1}; @@ -2785,12 +2784,12 @@ describe('ContactCardTest', function() { listAddBluk[1] = rawContactValuesTwo; listAddBluk[array_two] = rawContactValuesThree; try { - var batchInsertCode = await DAHelper.batchInsert(profileRawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(profileRawContactUri, listAddBluk); sleep(sleep_one); console.info("logMessage contactCard_update_test_5300: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); - await RawContactUpdateUnFavorites(DAHelper); - await queryUnFavorites(DAHelper); + await RawContactUpdateUnFavorites(dataShareHelper); + await queryUnFavorites(dataShareHelper); await deleteRawContact("contactCard_update_test_5300"); done(); } catch (error) { @@ -2799,15 +2798,15 @@ describe('ContactCardTest', function() { } }); - async function RawContactUpdateUnFavorites(DAHelper) + async function RawContactUpdateUnFavorites(dataShareHelper) { var updateValues = {"favorite" : 0}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("display_name", "fengyuan"); condition.or(); condition.equalTo("display_name", "xiaoma"); try { - var updateCode = await DAHelper.update(profileRawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(profileRawContactUri, updateValues, condition); sleep(sleep_one); console.info("logMessage contactCard_update_test_5300: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -2816,15 +2815,15 @@ describe('ContactCardTest', function() { } } - async function queryUnFavorites(DAHelper) + async function queryUnFavorites(dataShareHelper) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("display_name", "fengyuan"); condition.or(); condition.equalTo("display_name", "xiaoma"); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_one); console.info( 'contactCard_update_test_5300 : queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); @@ -2852,11 +2851,11 @@ describe('ContactCardTest', function() { */ it("contactCard_batchinsert_test_5500", 0, async function(done) { console.info("--------logMessage contactCard_batchinsert_test_5500 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var groupValues = {"group_name" : "ManagerGroup"}; try { - var groupId = await DAHelper.insert(profileGroupUri, groupValues); + var groupId = await dataShareHelper.insert(profileGroupUri, groupValues); console.info("logMessage contactCard_batchinsert_test_5500: groupId = " + groupId); expect(groupId > 0).assertTrue(); } catch (error) { @@ -2866,7 +2865,7 @@ describe('ContactCardTest', function() { try { var rawContactValues1 = {"display_name" : "xiaohuang"}; - var rawContactId1 = await DAHelper.insert(profileRawContactUri, rawContactValues1); + var rawContactId1 = await dataShareHelper.insert(profileRawContactUri, rawContactValues1); console.info("logMessage contactCard_batchinsert_test_5500: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); } catch (error) { @@ -2876,7 +2875,7 @@ describe('ContactCardTest', function() { try { var rawContactValues2 = {"display_name" : "xiaolv"}; - var rawContactId2 = await DAHelper.insert(profileRawContactUri, rawContactValues2); + var rawContactId2 = await dataShareHelper.insert(profileRawContactUri, rawContactValues2); console.info("logMessage contactCard_batchinsert_test_5500: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); } catch (error) { @@ -2886,21 +2885,21 @@ describe('ContactCardTest', function() { try { var rawContactValues3 = {"display_name" : "xiaobai"}; - var rawContactId3 = await DAHelper.insert(profileRawContactUri, rawContactValues3); + var rawContactId3 = await dataShareHelper.insert(profileRawContactUri, rawContactValues3); console.info("logMessage contactCard_batchinsert_test_5500: rawContactId3 = " + rawContactId3); expect(rawContactId3 > 0).assertTrue(); } catch (error) { console.info("logMessage contactCard_batchinsert_test_5500: raw_contact_3 insert error = " + error); done(); } - await threeDataInsert(DAHelper, rawContactId1, rawContactId2, rawContactId3, groupId); + await threeDataInsert(dataShareHelper, rawContactId1, rawContactId2, rawContactId3, groupId); await deleteRawContact("contactCard_batchinsert_test_5500"); await deleteAll(profileGroupUri, "contactCard_batchinsert_test_5500"); await deleteAll(profileContactDataUri, "contactCard_batchinsert_test_5500"); done(); }); - async function threeDataInsert(DAHelper, rawContactId1, rawContactId2, rawContactId3, groupId) + async function threeDataInsert(dataShareHelper, rawContactId1, rawContactId2, rawContactId3, groupId) { var contactDataValues1 = { "raw_contact_id" : rawContactId1, @@ -2922,42 +2921,42 @@ describe('ContactCardTest', function() { listAddBluk[1] = contactDataValues2; listAddBluk[array_two] = contactDataValues3; try { - var batchInsertCode = await DAHelper.batchInsert(profileContactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(profileContactDataUri, listAddBluk); sleep(sleep_one); console.info("logMessage contactCard_batchinsert_test_5500: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); - await ContactDataDelete(DAHelper, rawContactId1, rawContactId3); + await ContactDataDelete(dataShareHelper, rawContactId1, rawContactId3); } catch (error) { console.info("logMessage contactCard_batchinsert_test_5500: batchInsert error = " + error); } } - async function ContactDataDelete(DAHelper, rawContactId1, rawContactId3) + async function ContactDataDelete(dataShareHelper, rawContactId1, rawContactId3) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId1.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactId3.toString()); try { - var deleteCode = await DAHelper.delete(profileContactDataUri, condition); + var deleteCode = await dataShareHelper.delete(profileContactDataUri, condition); sleep(sleep_one); console.info("logMessage contactCard_batchinsert_test_5500: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); - await queryTwoData(DAHelper, rawContactId1, rawContactId3); + await queryTwoData(dataShareHelper, rawContactId1, rawContactId3); } catch (error) { console.info("logMessage contactCard_batchinsert_test_5500: delete error = " + error); } } - async function queryTwoData(DAHelper, rawContactId1, rawContactId3) + async function queryTwoData(dataShareHelper, rawContactId1, rawContactId3) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId1.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactId3.toString()); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); console.info( 'contactCard_batchinsert_test_5500 : queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); @@ -2975,12 +2974,12 @@ describe('ContactCardTest', function() { */ it("contactCard_pinyin_query_test_200", 0, async function(done) { console.info("--------logMessage contactCard_pinyin_query_test_200 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "小黄"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info('logMessage contactCard_pinyin_query_test_200 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); await ContactDataInsert(); @@ -3000,10 +2999,10 @@ describe('ContactCardTest', function() { "detail_info" : "xiaohuang" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_pinyin_query_test_200 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await SearchQuery(DAHelper, rawContactId); + await SearchQuery(dataShareHelper, rawContactId); } catch (error) { console.info('logMessage contactCard_pinyin_query_test_200 contact_data insert error = ' + error); done(); @@ -3011,13 +3010,13 @@ describe('ContactCardTest', function() { } }); - async function SearchQuery(DAHelper, rawContactId) + async function SearchQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "search_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(profilesearchContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profilesearchContactUri, resultColumns, condition); var map = common.getSearchMap(); map.set("raw_contact_id", rawContactId.toString()); if (resultSet.goToFirstRow()) { @@ -3043,12 +3042,12 @@ describe('ContactCardTest', function() { */ it("contactCard_pinyin_query_test_100", 0, async function(done) { console.info("--------logMessage contactCard_pinyin_query_test_100 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "鍵盤"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_pinyin_query_test_100 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3065,11 +3064,11 @@ describe('ContactCardTest', function() { { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "name", "detail_info" : "鍵盤"}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_pinyin_query_test_100 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await SearchContactQueryChinese(DAHelper, rawContactId); + await SearchContactQueryChinese(dataShareHelper, rawContactId); } catch (error) { console.info('logMessage contactCard_pinyin_query_test_100 contact_data insert error = ' + error); done(); @@ -3077,13 +3076,13 @@ describe('ContactCardTest', function() { } }); - async function SearchContactQueryChinese(DAHelper, rawContactId) + async function SearchContactQueryChinese(dataShareHelper, rawContactId) { var resultColumns = [ "raw_contact_id", "search_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(profilesearchContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profilesearchContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contactCard_pinyin_query_test_100: id = ' + resultSet.getString(0)); @@ -3106,12 +3105,12 @@ describe('ContactCardTest', function() { */ it("contactCard_pinyin_query_test_300", 0, async function(done) { console.info("--------logMessage contactCard_pinyin_query_test_300 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "Tom"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_pinyin_query_test_300 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3127,10 +3126,10 @@ describe('ContactCardTest', function() { { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "name", "detail_info" : "Tom"}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_pinyin_query_test_300 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await SearchContactQuery(DAHelper, rawContactId); + await SearchContactQuery(dataShareHelper, rawContactId); } catch (error) { console.info('logMessage contactCard_pinyin_query_test_300 contact_data insert error = ' + error); done(); @@ -3138,13 +3137,13 @@ describe('ContactCardTest', function() { } }); - async function SearchContactQuery(DAHelper, rawContactId) + async function SearchContactQuery(dataShareHelper, rawContactId) { var resultColumns = [ "raw_contact_id", "search_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(profilesearchContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profilesearchContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contactCard_pinyin_query_test_300: id = ' + resultSet.getString(0)); @@ -3167,12 +3166,12 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_400", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_400 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "400xiaoming400"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_400 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3187,12 +3186,12 @@ describe('ContactCardTest', function() { async function RawContactNameQuery() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("display_name", "%xiaoming40%"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contactCard_fuzzyquery_test_400: id = ' + resultSet.getString(0)); @@ -3217,10 +3216,10 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_500", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_500 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); var rawContactValues = {"display_name" : "500xiaoming500", "phonetic_name" : "500xiaoming500||xm"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_500 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3235,7 +3234,7 @@ describe('ContactCardTest', function() { async function RawContactPhoneticNameQuery() { var resultColumns = [ "id", "display_name", "phonetic_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("phonetic_name", "%xiaoming%"); condition.and(); condition.equalTo("is_deleted", "0"); @@ -3244,7 +3243,7 @@ describe('ContactCardTest', function() { condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contactCard_fuzzyquery_test_500: id = ' + resultSet.getString(0)); @@ -3272,16 +3271,16 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_600", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_600 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming", "company" : "TT600", "position" : "Testers600"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_600 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); - await RawContactCompanyQuery(DAHelper, rawContactId); + await RawContactCompanyQuery(dataShareHelper, rawContactId); await deleteRawContact("contactCard_fuzzyquery_test_600"); done(); } catch (error) { @@ -3290,10 +3289,10 @@ describe('ContactCardTest', function() { } }); - async function RawContactCompanyQuery(DAHelper, rawContactId) + async function RawContactCompanyQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "display_name", "company", "position" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("company", "%TT6%"); condition.and(); condition.equalTo("is_deleted", "0"); @@ -3302,7 +3301,7 @@ describe('ContactCardTest', function() { condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contactCard_fuzzyquery_test_600: id = ' + resultSet.getString(0)); @@ -3329,12 +3328,12 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_700", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_700 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_700 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3355,11 +3354,11 @@ describe('ContactCardTest', function() { "detail_info" : "14528963" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_700 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryPhone(DAHelper, rawContactId, contactDataId); + await fuzzyQueryPhone(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contactCard_fuzzyquery_test_700 contact_data insert error = ' + contactDataId); done(); @@ -3367,16 +3366,16 @@ describe('ContactCardTest', function() { } }); - async function fuzzyQueryPhone(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryPhone(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 5 data is phone condition.like("detail_info", "%52896%"); condition.and(); condition.equalTo("type_id", "5"); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -3402,12 +3401,12 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_800", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_800 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_800 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3428,10 +3427,10 @@ describe('ContactCardTest', function() { "detail_info" : "daming" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_fuzzyquery_test_800 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryPhoneNickName(DAHelper, rawContactId, contactDataId); + await fuzzyQueryPhoneNickName(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contactCard_fuzzyquery_test_800 contact_data insert error = ' + contactDataId); done(); @@ -3439,16 +3438,16 @@ describe('ContactCardTest', function() { } }); - async function fuzzyQueryPhoneNickName(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryPhoneNickName(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 3 data is nickname condition.like("detail_info", "%daming%"); condition.and(); condition.equalTo("type_id", "3"); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -3473,12 +3472,12 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_900", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_900 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3499,10 +3498,10 @@ describe('ContactCardTest', function() { "detail_info" : "1564@163.com" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_fuzzyquery_test_900 ; = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryEmail(DAHelper, rawContactId, contactDataId); + await fuzzyQueryEmail(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contactCard_fuzzyquery_test_900 contact_data insert error = ' + error); done(); @@ -3510,16 +3509,16 @@ describe('ContactCardTest', function() { } }); - async function fuzzyQueryEmail(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryEmail(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 1 data is email condition.like("detail_info", "%1564%"); condition.and(); condition.equalTo("type_id", "1"); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -3545,12 +3544,12 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_1000", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_1000 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_1000 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3571,11 +3570,11 @@ describe('ContactCardTest', function() { "detail_info" : "nanjing1000" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_1000 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryAddress(DAHelper, rawContactId, contactDataId); + await fuzzyQueryAddress(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contactCard_fuzzyquery_test_1000 contact_data insert error = ' + error); done(); @@ -3583,16 +3582,16 @@ describe('ContactCardTest', function() { } }); - async function fuzzyQueryAddress(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryAddress(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 1 data is postal_address condition.like("detail_info", "%nanjing10%"); condition.and(); condition.equalTo("type_id", "7"); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -3619,12 +3618,12 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_1100", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_1100 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_1100 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3645,11 +3644,11 @@ describe('ContactCardTest', function() { "detail_info" : "java1100" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contactCard_fuzzyquery_test_1100 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryNote(DAHelper, rawContactId, contactDataId); + await fuzzyQueryNote(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contactCard_fuzzyquery_test_1100 contact_data insert error = ' + error); done(); @@ -3657,16 +3656,16 @@ describe('ContactCardTest', function() { } }); - async function fuzzyQueryNote(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryNote(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 10 data is note condition.like("detail_info", "%java11%"); condition.and(); condition.equalTo("type_id", "10"); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contactCard_fuzzyquery_test_1100: id = ' + resultSet.getString(0)); @@ -3692,12 +3691,12 @@ describe('ContactCardTest', function() { */ it("contactCard_fuzzyquery_test_1200", 0, async function(done) { console.info("--------logMessage contactCard_fuzzyquery_test_1200 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info('logMessage contactCard_fuzzyquery_test_1200 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); await ContactDataAimInsert(); @@ -3717,10 +3716,10 @@ describe('ContactCardTest', function() { "detail_info" : "aaaa1200" }; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_fuzzyquery_test_1200 ; = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryIM(DAHelper, rawContactId, contactDataId); + await fuzzyQueryIM(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contactCard_fuzzyquery_test_1200 contact_data insert error = ' + error); done(); @@ -3728,16 +3727,16 @@ describe('ContactCardTest', function() { } }); - async function fuzzyQueryIM(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryIM(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 10 data is im account number condition.like("detail_info", "%aa12%"); condition.and(); condition.equalTo("type_id", "2"); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contactCard_fuzzyquery_test_1200: id = ' + resultSet.getString(0)); @@ -3763,12 +3762,12 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_insert_test_200", 0, async function(done) { console.info("------------abnormal_contactCard_insert_test_200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_names" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info("logMessage abnormal_contactCard_insert_test_200: rawContactId = " + rawContactId); expect(rawContactId).assertEqual(-1); done(); @@ -3785,13 +3784,13 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_insert_test_300", 0, async function(done) { console.info("------------abnormal_contactCard_insert_test_300 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/contacts/raw_contacts"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/contacts/raw_contacts"; var rawContactValues = {"display_name" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(errorUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(errorUri, rawContactValues); console.info("logMessage abnormal_contactCard_insert_test_300: rawContactId = " + rawContactId); expect(rawContactId == -1).assertTrue(); done(); @@ -3808,12 +3807,12 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_update_test_1100", 0, async function(done) { console.info("------------abnormal_contactCard_update_test_1100 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info("logMessage abnormal_contactCard_update_test_1100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalUpdate(); @@ -3827,10 +3826,10 @@ describe('ContactCardTest', function() { async function AbnormalUpdate() { var updateValues = {"display_names" : "xiaosan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); try { - var updataCode = await DAHelper.update(profileRawContactUri, updateValues, condition) + var updataCode = await dataShareHelper.update(profileRawContactUri, updateValues, condition) console.info("logMessage abnormal_contactCard_update_test_1100: updataCode = " + updataCode); expect(updataCode == -1).assertTrue(); var map = new Map(); @@ -3851,13 +3850,13 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_update_test_1000", 0, async function(done) { console.info("------------abnormal_contactCard_update_test_1000 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/contacts/raw_contacts"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/contacts/raw_contacts"; var rawContactValues = {"display_name" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info("logMessage abnormal_contactCard_update_test_1000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalUpdate(); @@ -3871,10 +3870,10 @@ describe('ContactCardTest', function() { async function AbnormalUpdate() { var updateValues = {"display_name" : "xiaosan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var updataCode = await DAHelper.update(errorUri, updateValues, condition); + var updataCode = await dataShareHelper.update(errorUri, updateValues, condition); console.info("logMessage abnormal_contactCard_update_test_1000: updataCode = " + updataCode); expect(updataCode == -1).assertTrue(); var map = new Map(); @@ -3895,12 +3894,12 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_delete_test_4500", 0, async function(done) { console.info("------------abnormal_contactCard_delete_test_4500 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaozhi"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info("logMessage abnormal_contactCard_delete_test_4500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalDelete(); @@ -3913,10 +3912,10 @@ describe('ContactCardTest', function() { async function AbnormalDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(profileRawContactUri, condition); + var deleteCode = await dataShareHelper.delete(profileRawContactUri, condition); console.info("logMessage abnormal_contactCard_delete_test_4500: deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); var map = new Map(); @@ -3938,13 +3937,13 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_delete_test_4600", 0, async function(done) { console.info("------------abnormal_contactCard_delete_test_4600 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/contacts/raw_contacts"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/contacts/raw_contacts"; var rawContactValues = {"display_name" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info("logMessage abnormal_contactCard_delete_test_4600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalDelete(); @@ -3957,10 +3956,10 @@ describe('ContactCardTest', function() { async function AbnormalDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(errorUri, condition); + var deleteCode = await dataShareHelper.delete(errorUri, condition); console.info("logMessage abnormal_contactCard_delete_test_4600: deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); var map = new Map(); @@ -3982,12 +3981,12 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_query_test_4200", 0, async function(done) { console.info("------------abnormal_contactCard_query_test_4200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaozhicheng"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues) + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues) console.info("logMessage abnormal_contactCard_query_test_4200: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalQuery(); @@ -4001,10 +4000,10 @@ describe('ContactCardTest', function() { async function AbnormalQuery() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info( 'logMessage abnormal_contactCard_query_test_4200: goToFirstRow' + resultSet.goToFirstRow()); @@ -4023,8 +4022,8 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_batchinsert_test_5100", 0, async function(done) { console.info("--------logMessage abnormal_contactCard_batchinsert_test_5100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var addBulk_value1 = {"display_name" : "zhangsan"}; var addBulk_value2 = {"display_names" : "lisi"}; @@ -4038,7 +4037,7 @@ describe('ContactCardTest', function() { listAddBluk[array_three] = addBulk_value4; listAddBluk[array_four] = addBulk_value5; try { - var batchInsertCode = await DAHelper.batchInsert(profileRawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(profileRawContactUri, listAddBluk); console.info("logMessage abnormal_contactCard_batchinsert_test_5100: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == -1).assertTrue(); done(); @@ -4055,12 +4054,12 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_insert_data_5300", 0, async function(done) { console.info("--------logMessage abnormal_contactCard_insert_data_5300 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaotian"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage abnormal_contactCard_insert_data_5300 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -4076,7 +4075,7 @@ describe('ContactCardTest', function() { { var contactDataValues = {"content_type" : "im", "detail_info" : "aaaa"}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage abnormal_contactCard_insert_data_5300 ; = ' + contactDataId); expect(contactDataId == -1).assertTrue(); } catch (error) { @@ -4093,12 +4092,12 @@ describe('ContactCardTest', function() { */ it("abnormal_contactCard_insert_data_5400", 0, async function(done) { console.info("--------logMessage abnormal_contactCard_insert_data_5400 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaotian"}; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, rawContactValues); console.info('logMessage abnormal_contactCard_insert_data_5400 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); await ContactDataAimInsert(); @@ -4113,7 +4112,7 @@ describe('ContactCardTest', function() { { var contactDataValues = {"raw_contact_id" : rawContactId, "detail_info" : "aaaa"}; try { - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage abnormal_contactCard_insert_data_5400 ; = ' + contactDataId); expect(contactDataId == -1).assertTrue(); } catch (error) { @@ -4130,10 +4129,10 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_5500", 0, async function(done) { console.info("--------logMessage contactCard_delete_test_5500 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(profileRawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, common.getProfileRawContact()); console.info("logMessage contactCard_delete_test_5500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var map = common.getProfileRawContactMap(); @@ -4146,9 +4145,9 @@ describe('ContactCardTest', function() { } async function executeBatch() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - DAHelper.executeBatch(URI_CONTACTS, [ { + dataShareHelper.executeBatch(URI_CONTACTS, [ { uri : profileRawContactUri, type : featureAbility.DataAbilityOperationType.TYPE_DELETE, predicates : condition, @@ -4174,10 +4173,10 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_5600", 0, async function(done) { console.info("--------logMessage contactCard_update_test_5600 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(profileRawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, common.getProfileRawContact()); console.info("logMessage contactCard_update_test_5600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var map = common.getProfileRawContactMap(); @@ -4192,9 +4191,9 @@ describe('ContactCardTest', function() { async function executeBatch() { var updateValues = {"display_name" : "xiaoxiaoxiao"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - DAHelper.executeBatch(URI_CONTACTS, [ { + dataShareHelper.executeBatch(URI_CONTACTS, [ { uri : profileRawContactUri, type : featureAbility.DataAbilityOperationType.TYPE_UPDATE, valuesBucket : updateValues, @@ -4221,24 +4220,24 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_5700", 0, async function(done) { console.info("------logMessage contactCard_insert_test_5700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(profileRawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contactCard_insert_test_5700: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); var map = common.getProfileRawContactMap(); map.set("id", rawContactId.toString()); await contactsQuery(map, "contactCard_insert_test_5700", profileRawContactUri); - var rawContactIdOne = await DAHelper.insert(profileRawContactUri, common.getProfileRawContact()); + var rawContactIdOne = await dataShareHelper.insert(profileRawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contactCard_insert_test_5700: rawContactIdOne = ' + rawContactIdOne); expect(rawContactIdOne > 0).assertTrue(); var map = common.getProfileRawContactMap(); map.set("id", rawContactIdOne.toString()); await contactsQuery(map, "contactCard_insert_test_5700", profileRawContactUri); - var rawContactIdTwo = await DAHelper.insert(profileRawContactUri, common.getProfileRawContact()); + var rawContactIdTwo = await dataShareHelper.insert(profileRawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contactCard_insert_test_5700: rawContactIdTwo = ' + rawContactIdTwo); expect(rawContactIdTwo > 0).assertTrue(); @@ -4260,15 +4259,15 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_5800", 0, async function(done) { console.info("------logMessage contactCard_insert_test_5800 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var name; for (var i = 0; i < 20000; i++) { name += "i"; } var contcatvalues = {"display_name" : name} try { - var rawContactId = await DAHelper.insert(profileRawContactUri, contcatvalues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, contcatvalues); sleep(sleep_one); console.info('logMessage contactCard_insert_test_5800: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -4291,11 +4290,11 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_5900", 0, async function(done) { console.info("------logMessage contactCard_insert_test_5900 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var contcatvalues = {"display_name" : "xiao5900"} try { - var rawContactId = await DAHelper.insert(profileRawContactUri, contcatvalues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, contcatvalues); console.info('logMessage contactCard_insert_test_5900: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); var contactDataValues1 = { @@ -4303,7 +4302,7 @@ describe('ContactCardTest', function() { "content_type" : "phone", "detail_info" : "19960229" }; - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues1); console.info('logMessage contactCard_insert_test_5900: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -4312,7 +4311,7 @@ describe('ContactCardTest', function() { map.set("detail_info", "19960229"); await contactsQuery(map, "contactCard_insert_test_5900", profileContactDataUri); - var rawContactIdOne = await DAHelper.insert(profileRawContactUri, contcatvalues); + var rawContactIdOne = await dataShareHelper.insert(profileRawContactUri, contcatvalues); console.info('logMessage contactCard_insert_test_5900: rawContactId = ' + rawContactIdOne); expect(rawContactIdOne > 0).assertTrue(); var contactDataValues2 = { @@ -4320,7 +4319,7 @@ describe('ContactCardTest', function() { "content_type" : "phone", "detail_info" : "111111032" }; - var contactDataId1 = await DAHelper.insert(profileContactDataUri, contactDataValues2); + var contactDataId1 = await dataShareHelper.insert(profileContactDataUri, contactDataValues2); console.info('logMessage contactCard_insert_test_5900: contactDataId = ' + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -4346,8 +4345,8 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_6000", 0, async function(done) { console.info("------logMessage contactCard_insert_test_6000 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "licheng", @@ -4357,7 +4356,7 @@ describe('ContactCardTest', function() { "phonetic_name" : "licheng||lc" }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insert_test_6000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -4386,21 +4385,21 @@ describe('ContactCardTest', function() { */ it("contactCard_insertData_test_6100", 0, async function(done) { console.info("------logMessage contactCard_insertData_test_6100 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertData_test_6100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactDataValues = common.getProfileContactData(); contactDataValues["raw_contact_id"] = rawContactId; console.info('logMessage contactCard_insertData_test_6100: contactDataValues["raw_contact_id"] = ' + contactDataValues.raw_contact_id); - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_insertData_test_6100: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); var map = common.getProfileContactDataMap(); @@ -4423,41 +4422,41 @@ describe('ContactCardTest', function() { */ it("contactCard_update_test_6200", 0, async function(done) { console.info("--------logMessage contactCard_update_test_6200 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = { "display_name" : "xiaocai", }; - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); expect(rawContactId > 0).assertTrue(); console.info("logMessage contactCard_update_test_6200: rawContactId = " + rawContactId); var insertRawContactValuesOne = { "display_name" : "xiaocai1", }; - var rawContactIdOne = await DAHelper.insert(profileRawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesOne); expect(rawContactIdOne > 0).assertTrue(); console.info("logMessage contactCard_update_test_6200: rawContactIdOne = " + rawContactIdOne); var insertRawContactValuesTwo = { "display_name" : "xiaocai1", }; - var rawContactIdTwo = await DAHelper.insert(profileRawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesTwo); expect(rawContactIdTwo > 0).assertTrue(); console.info("logMessage contactCard_update_test_6200: rawContactIdTwo = " + rawContactIdTwo); var updateValues = {"display_name" : "xiaosan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); - var updataCode = await DAHelper.update(profileRawContactUri, updateValues, condition); + var updataCode = await dataShareHelper.update(profileRawContactUri, updateValues, condition); console.info("logMessage contactCard_update_test_6200: updataCode = " + updataCode); expect(updataCode == 0).assertTrue(); sleep(sleep_one); await queryUpdateThree( - "contactCard_update_test_6200", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo); + "contactCard_update_test_6200", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo); await deleteRawContact("contactCard_update_test_6200"); done(); } catch (error) { @@ -4466,20 +4465,20 @@ describe('ContactCardTest', function() { } }); - async function queryUpdateThree(tag, DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo) + async function queryUpdateThree(tag, dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': contactsQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -4502,17 +4501,17 @@ describe('ContactCardTest', function() { */ it("contactCard_UpdateRawContcat_test_6300", 0, async function(done) { console.info("------logMessage contactCard_UpdateRawContcat_test_6300 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(profileRawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, common.getProfileRawContact()); console.info("logMessage contactCard_UpdateRawContcat_test_6300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); sleep(sleep_two); var updateValues = common.getProfileRawContactUpdate(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - var updataCode = await DAHelper.update(profileRawContactUri, updateValues, condition); + var updataCode = await dataShareHelper.update(profileRawContactUri, updateValues, condition); console.info('logMessage contactCard_UpdateRawContcat_test_6300: updataCode = ' + updataCode); sleep(sleep_one); var map = common.getProfileRawContactUpdateMap(); @@ -4534,14 +4533,14 @@ describe('ContactCardTest', function() { */ it("contactCard_insertDataUpdate_test_6400", 0, async function(done) { console.info("------logMessage contactCard_insertDataUpdate_test_6400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertDataUpdate_test_6400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -4549,14 +4548,14 @@ describe('ContactCardTest', function() { contactDataValues["raw_contact_id"] = rawContactId; console.info('logMessage contactCard_insertDataUpdate_test_6400: contactDataValues.raw_contact_id = ' + contactDataValues.raw_contact_id); - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_insertDataUpdate_test_6400: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); var updateValues = common.getProfileContactDataUpdate(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", contactDataId.toString()); - var updataCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updataCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); console.info('logMessage contactCard_insertDataUpdate_test_6400: updataCode = ' + updataCode); sleep(sleep_one); var map = common.getProfileContactDataUpdateMap(); @@ -4579,14 +4578,14 @@ describe('ContactCardTest', function() { */ it("contactCard_insertDataUpdateAll_test_6500", 0, async function(done) { console.info("------logMessage contactCard_insertDataUpdateAll_test_6500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertDataUpdateAll_test_6500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await insertData(rawContactId, "name", "xiaocai", ""); @@ -4603,12 +4602,12 @@ describe('ContactCardTest', function() { await insertData(rawContactId, "group_membership", 1, ""); await insertData(rawContactId, "contact_misc", "5678", ""); var updateValues = {"detail_info" : "xiaocai"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); - var updataCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updataCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); console.info('logMessage contactCard_insertDataUpdateAll_test_6500: updataCode = ' + updataCode); sleep(sleep_one); - await queryUpdateAllData("contactCard_insertDataUpdateAll_test_6500", DAHelper, rawContactId); + await queryUpdateAllData("contactCard_insertDataUpdateAll_test_6500", dataShareHelper, rawContactId); await deleteRawContact("contactCard_insertDataUpdateAll_test_6500"); await deleteAll(profileContactDataUri, "contactCard_insertDataUpdateAll_test_6500"); done(); @@ -4618,16 +4617,16 @@ describe('ContactCardTest', function() { } }); - async function queryUpdateAllData(tag, DAHelper, rawContactId) + async function queryUpdateAllData(tag, dataShareHelper, rawContactId) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': contactsQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("row_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -4649,25 +4648,25 @@ describe('ContactCardTest', function() { */ it("contactCard_insertFavorite_test_6600", 0, async function(done) { console.info("------logMessage contactCard_insertFavorite_test_6600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xiaocai", "favorite" : 1}; - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertFavorite_test_6600: rawContactId = " + rawContactId); var insertRawContactValuesOne = {"display_name" : "xiaotian", "favorite" : 1}; - var rawContactIdOne = await DAHelper.insert(profileRawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesOne); console.info("logMessage contactCard_insertFavorite_test_6600: rawContactId = " + rawContactIdOne); var insertRawContactValuesTwo = {"display_name" : "xiaoli", "favorite" : 1}; - var rawContactIdTwo = await DAHelper.insert(profileRawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesTwo); console.info("logMessage contactCard_insertFavorite_test_6600: rawContactId = " + rawContactIdTwo); sleep(sleep_one); await queryThreeFavorite( - "contactCard_insertFavorite_test_6600", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 1); + "contactCard_insertFavorite_test_6600", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 1); await deleteRawContact("contactCard_insertFavorite_test_6600"); done(); } catch (error) { @@ -4676,20 +4675,20 @@ describe('ContactCardTest', function() { } }); - async function queryThreeFavorite(tag, DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, favoritevalue) + async function queryThreeFavorite(tag, dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, favoritevalue) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryThreeFavorite start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryThreeFavorite start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "favorite" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -4711,34 +4710,34 @@ describe('ContactCardTest', function() { */ it("contactCard_unFavorite_test_6700", 0, async function(done) { console.info("------logMessage contactCard_unFavorite_test_6700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xiaocai", "favorite" : 1}; - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_unFavorite_test_6700: rawContactId = " + rawContactId); var insertRawContactValuesOne = {"display_name" : "xiaotian", "favorite" : 1}; - var rawContactIdOne = await DAHelper.insert(profileRawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesOne); console.info("logMessage contactCard_unFavorite_test_6700: rawContactId = " + rawContactIdOne); var insertRawContactValuesTwo = {"display_name" : "xiaoli", "favorite" : 1}; - var rawContactIdTwo = await DAHelper.insert(profileRawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesTwo); console.info("logMessage contactCard_unFavorite_test_6700: rawContactId = " + rawContactIdTwo); var updateValues = {"favorite" : 0}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); - var updataCode = await DAHelper.update(profileRawContactUri, updateValues, condition); + var updataCode = await dataShareHelper.update(profileRawContactUri, updateValues, condition); console.info("logMessage contactCard_unFavorite_test_6700: updataCode = " + updataCode); sleep(sleep_one); await queryThreeFavorite( - "contactCard_unFavorite_test_6700", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 0); + "contactCard_unFavorite_test_6700", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 0); await deleteRawContact("contactCard_unFavorite_test_6700"); done(); } catch (error) { @@ -4754,14 +4753,14 @@ describe('ContactCardTest', function() { */ it("contactCard_insertContactBlocklist_test_6800", 0, async function(done) { console.info("--------logMessage contactCard_insertContactBlocklist_test_6800 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var batchInsertCode = await DAHelper.insert(profileBlocklistUri, common.getProfileBlockList()); + var batchInsertCode = await dataShareHelper.insert(profileBlocklistUri, common.getProfileBlockList()); console.info("logMessage contactCard_insertContactBlocklist_test_6800: insert = " + batchInsertCode); - var batchInsertCodeOne = await DAHelper.insert(profileBlocklistUri, common.getProfileBlockList()); + var batchInsertCodeOne = await dataShareHelper.insert(profileBlocklistUri, common.getProfileBlockList()); console.info("logMessage contactCard_insertContactBlocklist_test_6800: insert = " + batchInsertCodeOne); - var batchInsertCodeTwo = await DAHelper.insert(profileBlocklistUri, common.getProfileBlockList()); + var batchInsertCodeTwo = await dataShareHelper.insert(profileBlocklistUri, common.getProfileBlockList()); console.info("logMessage contactCard_insertContactBlocklist_test_6800: insert = " + batchInsertCodeTwo); sleep(sleep_one); expect(batchInsertCode > 0).assertTrue(); @@ -4776,11 +4775,11 @@ describe('ContactCardTest', function() { async function query(size) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var phoneNumber = randomNum(8); condition.equalTo("phone_number", phoneNumber); try { - var resultSet = await DAHelper.query(profileBlocklistUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileBlocklistUri, resultColumns, condition); sleep(sleep_one); console.info('contactCard_insertContactBlocklist_test_6800 :resultSet.goToFirstRow() = ' + resultSet.goToFirstRow()); @@ -4801,15 +4800,15 @@ describe('ContactCardTest', function() { */ it("contactCard_removeContactBlocklist_test_6900", 0, async function(done) { console.info("--------logMessage contactCard_removeContactBlocklist_test_6900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var batchInsertCode = await DAHelper.insert(profileBlocklistUri, common.getProfileBlockList()); + var batchInsertCode = await dataShareHelper.insert(profileBlocklistUri, common.getProfileBlockList()); console.info( "logMessage contactCard_removeContactBlocklist_test_6900: batchInsertCode = " + batchInsertCode); - var batchInsertCodeOne = await DAHelper.insert(profileBlocklistUri, common.getProfileBlockList()); + var batchInsertCodeOne = await dataShareHelper.insert(profileBlocklistUri, common.getProfileBlockList()); console.info("logMessage contactCard_removeContactBlocklist_test_6900: insert = " + batchInsertCodeOne); - var batchInsertCodeTwo = await DAHelper.insert(profileBlocklistUri, common.getProfileBlockList()); + var batchInsertCodeTwo = await dataShareHelper.insert(profileBlocklistUri, common.getProfileBlockList()); console.info("logMessage contactCard_removeContactBlocklist_test_6900: insert = " + batchInsertCodeTwo); sleep(sleep_one); expect(batchInsertCode > 0).assertTrue(); @@ -4823,11 +4822,11 @@ describe('ContactCardTest', function() { async function query(size) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var phoneNumber = randomNum(8); condition.equalTo("phone_number", phoneNumber); try { - var resultSet = await DAHelper.query(profileBlocklistUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileBlocklistUri, resultColumns, condition); console.info('contactCard_removeContactBlocklist_test_6900 : resultSet = ' + resultSet); expect(resultSet.rowCount == size).assertEqual(true); resultSet.close(); @@ -4844,32 +4843,32 @@ describe('ContactCardTest', function() { */ it("contactCard_insertGroup_test_7000", 0, async function(done) { console.info("------logMessage contactCard_insertGroup_test_7000 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = { "display_name" : "xiaocai", }; - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertGroup_test_7000: rawContactId = " + rawContactId); await insertData(rawContactId, "group_membership", 1, ""); var insertRawContactValuesOne = { "display_name" : "xiaotian", }; - var rawContactIdOne = await DAHelper.insert(profileRawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesOne); console.info("logMessage contactCard_insertGroup_test_7000: rawContactId = " + rawContactIdOne); await insertData(rawContactIdOne, "group_membership", 1, ""); var insertRawContactValuesTwo = { "display_name" : "xiaoli", }; - var rawContactIdTwo = await DAHelper.insert(profileRawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesTwo); console.info("logMessage contactCard_insertGroup_test_7000: rawContactId = " + rawContactIdTwo); await insertData(rawContactIdTwo, "group_membership", 1, ""); sleep(sleep_one); await queryThreeGroup( - "contactCard_insertGroup_test_7000", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 1); + "contactCard_insertGroup_test_7000", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 1); await deleteRawContact("contactCard_insertGroup_test_7000"); done(); } catch (error) { @@ -4878,19 +4877,19 @@ describe('ContactCardTest', function() { } }); - async function queryThreeGroup(tag, DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, groupId) + async function queryThreeGroup(tag, dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, groupId) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryThreeGroup start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryThreeGroup start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -4912,10 +4911,10 @@ describe('ContactCardTest', function() { */ it("contactCard_insert_test_7100", 0, async function(done) { console.info("---------logMessage contactCard_insert_test_7100 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(profileGroupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(profileGroupUri, common.getProfileGroup()); console.info("logMessage contactCard_insert_test_7100: groupId = " + groupId); expect(groupId > 0).assertTrue(); var map = common.getProfileGroupMap(); @@ -4936,34 +4935,34 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_7200", 0, async function(done) { console.info("------logMessage contactCard_delete_test_7200 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = { "display_name" : "xiaocai", }; - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_delete_test_7200: rawContactId = " + rawContactId); await insertData(rawContactId, "group_membership", 1, ""); var insertRawContactValuesOne = { "display_name" : "xiaotian", }; - var rawContactIdOne = await DAHelper.insert(profileRawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesOne); console.info("logMessage contactCard_delete_test_7200: rawContactId = " + rawContactIdOne); await insertData(rawContactIdOne, "group_membership", 1, ""); var insertRawContactValuesTwo = { "display_name" : "xiaoli", }; - var rawContactIdTwo = await DAHelper.insert(profileRawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(profileRawContactUri, insertRawContactValuesTwo); console.info("logMessage contactCard_delete_test_7200: rawContactId = " + rawContactIdTwo); await insertData(rawContactIdTwo, "group_membership", 1, ""); sleep(sleep_one); await deleteAll(profileContactDataUri, "contactCard_delete_test_7200"); sleep(sleep_one); await queryZeroGroup( - "contactCard_delete_test_7200", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo); + "contactCard_delete_test_7200", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo); await deleteRawContact("contactCard_delete_test_7200"); done(); } catch (error) { @@ -4972,20 +4971,20 @@ describe('ContactCardTest', function() { } }); - async function queryZeroGroup(tag, DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo) + async function queryZeroGroup(tag, dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryZeroGroup start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryZeroGroup start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactIdOne.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); console.info(tag + ': queryZeroGroup! resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == 0).assertEqual(true); resultSet.close(); @@ -5001,10 +5000,10 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_7300", 0, async function(done) { console.info("---------logMessage contactCard_delete_test_7300 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(profileGroupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(profileGroupUri, common.getProfileGroup()); console.info("logMessage contactCard_delete_test_7300: groupId = " + groupId); expect(groupId > 0).assertTrue(); var map = common.getProfileGroupMap(); @@ -5025,10 +5024,10 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_7400", 0, async function(done) { console.info("------logMessage contactCard_delete_test_7400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(profileRawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contactCard_delete_test_7400: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -5039,9 +5038,9 @@ describe('ContactCardTest', function() { await deleteAll(profileRawContactUri, "contactCard_delete_test_7400"); sleep(sleep_one); await contactsQuery(map, "contactCard_delete_test_7400", profileRawContactUri); - var conditionAll = new ohos_data_ability.DataAbilityPredicates(); + var conditionAll = new dataShare.DataSharePredicates(); conditionAll.greaterThan("id", "0"); - var code = await DAHelper.delete(profileDeletedContactsUri, conditionAll); + var code = await dataShareHelper.delete(profileDeletedContactsUri, conditionAll); console.info('contactCard_delete_test_7400 : Completely delete code = ' + code); expect(code == 0).assertTrue(); done(); @@ -5058,19 +5057,19 @@ describe('ContactCardTest', function() { */ it("contactCard_delete_test_7500", 0, async function(done) { console.info("------logMessage contactCard_delete_test_7500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_delete_test_7500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactDataValues = common.getProfileContactData(); contactDataValues["raw_contact_id"] = rawContactId; - var contactDataId = await DAHelper.insert(profileContactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(profileContactDataUri, contactDataValues); console.info('logMessage contactCard_delete_test_7500: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); await deleteAll(profileContactDataUri, "contactCard_delete_test_7500"); @@ -5093,34 +5092,34 @@ describe('ContactCardTest', function() { */ it("contactCard_insertDataAll_test_7600", 0, async function(done) { console.info("------logMessage contactCard_insertDataAll_test_7600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertDataAll_test_7600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactdata1 = await insertData(rawContactId, "name", "xiaocai", ""); - await queryAlldata("contactCard_insertDataAll_test_7600", DAHelper, rawContactId, contactdata1, "xiaocai"); + await queryAlldata("contactCard_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdata1, "xiaocai"); var contactdata2 = await insertData(rawContactId, "phone", "6500", ""); - await queryAlldata("contactCard_insertDataAll_test_7600", DAHelper, rawContactId, contactdata2, "6500"); + await queryAlldata("contactCard_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdata2, "6500"); var contactdatd3 = await insertData(rawContactId, "organization", "TTTTT", "Deve"); - await queryAlldata("contactCard_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd3, "TTTTT"); + await queryAlldata("contactCard_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd3, "TTTTT"); var contactdatd4 = await insertData(rawContactId, "nickname", "xxxxcai", ""); - await queryAlldata("contactCard_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd4, "xxxxcai"); + await queryAlldata("contactCard_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd4, "xxxxcai"); var contactdatd5 = await insertData(rawContactId, "email", "111@fox.com", ""); await queryAlldata( - "contactCard_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd5, "111@fox.com"); + "contactCard_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd5, "111@fox.com"); var contactdatd6 = await insertData(rawContactId, "postal_address", "dddd", ""); - await queryAlldata("contactCard_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd6, "dddd"); + await queryAlldata("contactCard_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd6, "dddd"); var contactdatd7 = await insertData(rawContactId, "note", "caicai", ""); - await queryAlldata("contactCard_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd7, "caicai"); + await queryAlldata("contactCard_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd7, "caicai"); var contactdatd8 = await insertData(rawContactId, "im", "999999999", ""); await queryAlldata( - "contactCard_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd8, "999999999"); + "contactCard_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd8, "999999999"); sleep(sleep_one); await deleteRawContact("contactCard_insertDataAll_test_7600"); await deleteAll(profileContactDataUri, "contactCard_insertDataAll_test_7600"); @@ -5131,13 +5130,13 @@ describe('ContactCardTest', function() { } }); - async function queryAlldata(tag, DAHelper, rawContactId, contactdata, values) + async function queryAlldata(tag, dataShareHelper, rawContactId, contactdata, values) { var resultColumns = [ "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", contactdata.toString()); try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -5164,45 +5163,45 @@ describe('ContactCardTest', function() { */ it("contactCard_insertDataAll_test_7700", 0, async function(done) { console.info("------logMessage contactCard_insertDataAll_test_7700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertDataAll_test_7700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactdata1 = await insertData(rawContactId, "name", "xiaocai", ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdata1, "xiaocai"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdata1, "xiaocai"); var contactdata2 = await insertData(rawContactId, "phone", "6500", ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdata2, "6500"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdata2, "6500"); var contactdatd3 = await insertData(rawContactId, "organization", "TTTTT", "Deve"); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd3, "TTTTT"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd3, "TTTTT"); var contactdatd4 = await insertData(rawContactId, "nickname", "xxxxcai", ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd4, "xxxxcai"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd4, "xxxxcai"); var contactdatd5 = await insertData(rawContactId, "email", "111@fox.com", ""); await queryAlldata( - "contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd5, "111@fox.com"); + "contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd5, "111@fox.com"); var contactdatd6 = await insertData(rawContactId, "postal_address", "dddd", ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd6, "dddd"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd6, "dddd"); var contactdatd7 = await insertData(rawContactId, "note", "caicai", ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd7, "caicai"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd7, "caicai"); var contactdatd8 = await insertData(rawContactId, "im", "999999999", ""); await queryAlldata( - "contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd8, "999999999"); + "contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd8, "999999999"); var contactdatd9 = await insertData(rawContactId, "contact_event", "1125", ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd9, "1125"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd9, "1125"); var contactdatd10 = await insertData(rawContactId, "website", "wwww.xxx.com", ""); await queryAlldata( - "contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd10, "wwww.xxx.com"); + "contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd10, "wwww.xxx.com"); var contactdatd11 = await insertData(rawContactId, "relation", "xiaobai", ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd11, "xiaobai"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd11, "xiaobai"); var contactdatd12 = await insertData(rawContactId, "group_membership", 1, ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd12, 1); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd12, 1); var contactdatd13 = await insertData(rawContactId, "contact_misc", "5678", ""); - await queryAlldata("contactCard_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd13, "5678"); + await queryAlldata("contactCard_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd13, "5678"); sleep(sleep_one); await deleteRawContact("contactCard_insertDataAll_test_7700"); await deleteAll(profileContactDataUri, "contactCard_insertDataAll_test_7700"); @@ -5220,30 +5219,30 @@ describe('ContactCardTest', function() { */ it("contactCard_insertDataUpdateMore_test_7800", 0, async function(done) { console.info("------logMessage contactCard_insertDataUpdateMore_test_7800 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xiaocai"}; - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertDataUpdateMore_test_7800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var insertRawContactValues = {"display_name" : "xiaotian"}; - var rawContactId1 = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId1 = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_insertDataUpdateMore_test_7800: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); await insertData(rawContactId, "name", "xiaotian", ""); var updateValues = {"detail_info" : "xiaocai7800"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactId1.toString()) - var updataCode = await DAHelper.update(profileContactDataUri, updateValues, condition); + var updataCode = await dataShareHelper.update(profileContactDataUri, updateValues, condition); console.info('logMessage contactCard_insertDataUpdateMore_test_7800: updataCode = ' + updataCode); sleep(sleep_one); await insertDataUpdateMoreQuery( - "contactCard_insertDataUpdateMore_test_7800", DAHelper, rawContactId, rawContactId1); + "contactCard_insertDataUpdateMore_test_7800", dataShareHelper, rawContactId, rawContactId1); await deleteRawContact("contactCard_insertDataUpdateMore_test_7800"); await deleteAll(profileContactDataUri, "contactCard_insertDataUpdateMore_test_7800"); done(); @@ -5253,15 +5252,15 @@ describe('ContactCardTest', function() { } }); - async function insertDataUpdateMoreQuery(tag, DAHelper, rawContactId, rawContactId1) + async function insertDataUpdateMoreQuery(tag, dataShareHelper, rawContactId, rawContactId1) { var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactId1.toString()) try { - var resultSet = await DAHelper.query(profileContactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileContactDataUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -5284,31 +5283,31 @@ describe('ContactCardTest', function() { */ it("contactCard_deleterestore_test_7900", 0, async function(done) { console.info("------logMessage contactCard_deleterestore_test_7900 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xaioli7900"}; - var rawContactId = await DAHelper.insert(profileRawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(profileRawContactUri, insertRawContactValues); console.info("logMessage contactCard_deleterestore_test_7900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); sleep(sleep_one); - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("id", rawContactId.toString()); - var deleteCode = await DAHelper.delete(profileRawContactUri, condition1); + var deleteCode = await dataShareHelper.delete(profileRawContactUri, condition1); console.info("contactCard_deleterestore_test_7900 : deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); sleep(sleep_one); - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("id", rawContactId.toString()); var updatevalue = {"is_deleted" : 0}; - var updateCode = await DAHelper.update(profileRawContactUri, updatevalue, condition2); + var updateCode = await dataShareHelper.update(profileRawContactUri, updatevalue, condition2); console.info('contactCard_deleterestore_test_7900 : update = ' + updateCode); sleep(sleep_one); - var condition3 = new ohos_data_ability.DataAbilityPredicates(); + var condition3 = new dataShare.DataSharePredicates(); condition3.equalTo("id", rawContactId.toString()); - var deleteCode = await DAHelper.delete(profile_deleted_raw_contact_record, condition3); + var deleteCode = await dataShareHelper.delete(profile_deleted_raw_contact_record, condition3); var map = new Map(); map.set("id", rawContactId.toString()); @@ -5323,21 +5322,21 @@ describe('ContactCardTest', function() { afterAll(async function() { var tag = "Contacts_test_start_deleted"; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - let DAHelperContact = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': start ! DAHelperContact = ' + DAHelperContact); - var deleteBlockList = await DAHelperContact.delete(profileBlocklistUri, condition); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); + var deleteBlockList = await dataShareHelper.delete(profileBlocklistUri, condition); console.info(tag + " : logMessage : deleteBlockList = " + deleteBlockList); - var deletedGroup = await DAHelperContact.delete(profileGroupUri, condition); + var deletedGroup = await dataShareHelper.delete(profileGroupUri, condition); console.info(tag + " : logMessage : deletedGroup = " + deletedGroup); - var dataDeletedCode = await DAHelperContact.delete(profileContactDataUri, condition); + var dataDeletedCode = await dataShareHelper.delete(profileContactDataUri, condition); sleep(sleep_two); console.info(tag + " : logMessage : dataDeletedCode = " + dataDeletedCode); - var rawContactDeleted = await DAHelperContact.delete(profileRawContactUri, condition); + var rawContactDeleted = await dataShareHelper.delete(profileRawContactUri, condition); sleep(sleep_two); console.info(tag + " : logMessage : rawContactDeleted = " + rawContactDeleted); - var deleted = await DAHelperContact.delete(profileDeletedContactsUri, condition); + var deleted = await dataShareHelper.delete(profileDeletedContactsUri, condition); sleep(sleep_two); console.info(tag + " : logMessage : deleted = " + deleted); }); diff --git a/jstest/ContactMerge_test.js b/jstest/ContactMerge_test.js index 5bd4d73..0491634 100644 --- a/jstest/ContactMerge_test.js +++ b/jstest/ContactMerge_test.js @@ -13,19 +13,18 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -const contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +const contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; -const autoMergeUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact/auto_merge"; -const splitUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact/split_contact"; -const manualMergeUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact/manual_merge"; -const uriQueryMergeList = "dataability:///com.ohos.contactsdataability/contacts/raw_contact/query_merge_list"; -const deletedUri = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; +const autoMergeUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact/auto_merge"; +const splitUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact/split_contact"; +const manualMergeUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact/manual_merge"; +const uriQueryMergeList = "datashare:///com.ohos.contactsdataability/contacts/raw_contact/query_merge_list"; +const deletedUri = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; describe('ContactMergeTest', function() { console.info("ContactMergeTest start!"); @@ -47,11 +46,11 @@ describe('ContactMergeTest', function() { return; } } - async function ContactDataInsert1(DAHelper, rawContactId1) + async function ContactDataInsert1(dataShareHelper, rawContactId1) { var contactDataValues = {"raw_contact_id" : rawContactId1, "content_type" : "name", "detail_info" : "xiaoli"}; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_auto_merge_and_spilt_test_100: contactDataId1 = " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -60,11 +59,11 @@ describe('ContactMergeTest', function() { } } - async function ContactDataInsert2(DAHelper, rawContactId2) + async function ContactDataInsert2(dataShareHelper, rawContactId2) { var contactDataValues = {"raw_contact_id" : rawContactId2, "content_type" : "name", "detail_info" : "xiaoli"}; try { - var contactDataId2 = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId2 = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_auto_merge_and_spilt_test_100: contactDataId2 = " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); @@ -73,19 +72,19 @@ describe('ContactMergeTest', function() { } } - async function AutoMerge(DAHelper, rawContactId1) + async function AutoMerge(dataShareHelper, rawContactId1) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; try { - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); console.info("logMessage contact_auto_merge_and_spilt_test_100: autoMergeCode = " + autoMergeCode); expect(autoMergeCode == 0).assertTrue(); var map = new Map(); map.set("id", rawContactId1.toString()); await ContactMergeQuery(map, "contact_auto_merge_and_spilt_test_100", result_two); sleep(sleep_two); - await ContactSplit(DAHelper, rawContactId1); + await ContactSplit(dataShareHelper, rawContactId1); await deleteAll(rawContactUri, "contact_auto_merge_and_spilt_test_100"); await deleteAll(contactDataUri, "contact_auto_merge_and_spilt_test_100"); } catch (error) { @@ -93,14 +92,14 @@ describe('ContactMergeTest', function() { } } - async function ContactSplit(DAHelper, rawContactId1) + async function ContactSplit(dataShareHelper, rawContactId1) { - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); var array = [ rawContactId1.toString() ]; condition2.in("raw_contact_id", array); var updateValues2 = {}; try { - var splitCode = await DAHelper.update(splitUri, updateValues2, condition2); + var splitCode = await dataShareHelper.update(splitUri, updateValues2, condition2); sleep(sleep_three); console.info('logMessage contact_auto_merge_and_spilt_test_100 splitCode = ' + splitCode); expect(splitCode == 0).assertTrue(); @@ -114,24 +113,24 @@ describe('ContactMergeTest', function() { async function deleteAll(uri, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(uri, condition); + var deleteCode = await dataShareHelper.delete(uri, condition); console.info(tag + ': deleteAll deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); } async function ContactMergeQuery(map, tag, size) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ' : ContactMergeQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ' : ContactMergeQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "contact_id" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); console.info(tag + ' : map_id = ' + map.get("id")); condition.equalTo("id", map.get("id")); try { - var resultSetID = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSetID = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(sleep_one); var conatctID; if (resultSetID.goToFirstRow()) { @@ -141,10 +140,10 @@ describe('ContactMergeTest', function() { } while (resultSetID.goToNextRow()); } resultSetID.close(); - var pre = new ohos_data_ability.DataAbilityPredicates(); + var pre = new dataShare.DataSharePredicates(); pre.equalTo("contact_id", conatctID); var newResultColumns = []; - var resultSet = await DAHelper.query(rawContactUri, newResultColumns, pre); + var resultSet = await dataShareHelper.query(rawContactUri, newResultColumns, pre); sleep(sleep_one); console.info(tag + ' : ContactMergeQuery start ! rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == size).assertEqual(true); @@ -156,16 +155,16 @@ describe('ContactMergeTest', function() { async function updateContactData(updateDataValue, contactDataId, testName) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); var updateValues = {"detail_info" : updateDataValue}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", contactDataId.toString()); - var code = await DAHelper.update(contactDataUri, updateValues, condition); + var code = await dataShareHelper.update(contactDataUri, updateValues, condition); console.info(testName + " updateContactData: code = " + code); sleep(sleep_three); } - async function insertContactData(DAHelper, rawContactId, detailInfo, types, tag) + async function insertContactData(dataShareHelper, rawContactId, detailInfo, types, tag) { var size = detailInfo.length; for (var i = 0; i < size; i++) { @@ -175,7 +174,7 @@ describe('ContactMergeTest', function() { "detail_info" : detailInfo[i] }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_two); expect(contactDataId > 0).assertTrue(); console.info(tag + ' logMessage : insert contactDataId = ' + contactDataId); @@ -185,12 +184,12 @@ describe('ContactMergeTest', function() { } } - async function insertContactDataSingle(DAHelper, rawContactId, detailInfo, type) + async function insertContactDataSingle(dataShareHelper, rawContactId, detailInfo, type) { var size = detailInfo.length; var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : type, "detail_info" : detailInfo}; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); expect(contactDataId1 > 0).assertTrue(); } catch (error) { @@ -199,13 +198,13 @@ describe('ContactMergeTest', function() { return contactDataId1; } - async function ManualMergeList(DAHelper, rawContactList, testName) + async function ManualMergeList(dataShareHelper, rawContactList, testName) { - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.in("raw_contact_id", rawContactList); var updateValues2 = {}; try { - var ManualMergeCode = await DAHelper.update(manualMergeUri, updateValues2, condition2); + var ManualMergeCode = await dataShareHelper.update(manualMergeUri, updateValues2, condition2); sleep(sleep_one); console.info("logMessage " + testName + " ManualMergeCode = " + ManualMergeCode); expect(ManualMergeCode == 0).assertTrue(); @@ -226,16 +225,16 @@ describe('ContactMergeTest', function() { */ it("contact_autoMerge_and_spilt_test_100", 0, async function(done) { console.info("------logMessage contact_autoMerge_and_spilt_test_100 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues1 = {"display_name" : "xiaoli"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_autoMerge_and_spilt_test_100: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - await ContactDataInsert1(DAHelper, rawContactId1); + await ContactDataInsert1(dataShareHelper, rawContactId1); } catch (error) { console.info('logMessage contact_autoMerge_and_spilt_test_100: raw_contact_1 insert error = ' + error); done(); @@ -243,16 +242,16 @@ describe('ContactMergeTest', function() { var insertRawContactValues2 = {"display_name" : "xiaoli"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_autoMerge_and_spilt_test_100: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - await ContactDataInsert2(DAHelper, rawContactId2); + await ContactDataInsert2(dataShareHelper, rawContactId2); } catch (error) { console.info('logMessage contact_autoMerge_and_spilt_test_100: raw_contact_2 insert error = ' + error); done(); } - await AutoMerge(DAHelper, rawContactId1); + await AutoMerge(dataShareHelper, rawContactId1); done(); }); @@ -264,16 +263,16 @@ describe('ContactMergeTest', function() { */ it("contact_manualMerge_test_200", 0, async function(done) { console.info("------logMessage contact_manualMerge_test_200 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues1 = {"display_name" : "xiaoming"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_200: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - await manualMergeDataInsert(DAHelper, rawContactId1); + await manualMergeDataInsert(dataShareHelper, rawContactId1); } catch (error) { console.info('logMessage contact_manualMerge_test_200: raw_contact_1 insert error = ' + error); done(); @@ -281,21 +280,21 @@ describe('ContactMergeTest', function() { var insertRawContactValues2 = {"display_name" : "xiaoming"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_200: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - await manualMergeDataInsertTwo(DAHelper, rawContactId2); + await manualMergeDataInsertTwo(dataShareHelper, rawContactId2); } catch (error) { console.info('logMessage contact_manualMerge_test_200: raw_contact_2 insert error = ' + error); done(); } var rawContactIds = [ rawContactId1 + "", rawContactId2 + "" ]; - await ManualMergeList(DAHelper, rawContactIds, "contact_query_merge_list_test_2000"); + await ManualMergeList(dataShareHelper, rawContactIds, "contact_query_merge_list_test_2000"); done(); }); - async function manualMergeDataInsert(DAHelper, rawContactId1) + async function manualMergeDataInsert(dataShareHelper, rawContactId1) { var contactDataValuesOne = { "raw_contact_id" : rawContactId1, @@ -311,7 +310,7 @@ describe('ContactMergeTest', function() { listAddBluk[0] = contactDataValuesOne; listAddBluk[1] = contactDataValuesTwo; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_200: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -320,11 +319,11 @@ describe('ContactMergeTest', function() { } } - async function manualMergeDataInsertTwo(DAHelper, rawContactId2) + async function manualMergeDataInsertTwo(dataShareHelper, rawContactId2) { var contactDataValues = {"raw_contact_id" : rawContactId2, "content_type" : "name", "detail_info" : "xiaoming"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_200: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -341,16 +340,16 @@ describe('ContactMergeTest', function() { */ it("contact_autoMerge_test_300", 0, async function(done) { console.info("------logMessage contact_autoMerge_test_300 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues1 = {"display_name" : "xiaohong"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_autoMerge_test_300: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - await autoMergeDataInsert(DAHelper, rawContactId1); + await autoMergeDataInsert(dataShareHelper, rawContactId1); } catch (error) { console.info('logMessage contact_autoMerge_test_300: raw_contact_1 insert error = ' + error); done(); @@ -358,21 +357,21 @@ describe('ContactMergeTest', function() { var insertRawContactValues2 = {"display_name" : "xiaohong"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_autoMerge_test_300: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - await autoMergeDataInsertTwo(DAHelper, rawContactId2); + await autoMergeDataInsertTwo(dataShareHelper, rawContactId2); } catch (error) { console.info('logMessage contact_autoMerge_test_300: raw_contact_2 insert error = ' + error); done(); } - await AutoMerger(DAHelper, rawContactId1, "contact_autoMerge_test_300"); + await AutoMerger(dataShareHelper, rawContactId1, "contact_autoMerge_test_300"); done(); }); - async function autoMergeDataInsert(DAHelper, rawContactId1) + async function autoMergeDataInsert(dataShareHelper, rawContactId1) { var contactDataValuesOne = { "raw_contact_id" : rawContactId1, @@ -388,7 +387,7 @@ describe('ContactMergeTest', function() { listAddBluk[0] = contactDataValuesOne; listAddBluk[1] = contactDataValuesTwo; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); sleep(sleep_one); console.info("logMessage contact_autoMerge_test_300: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -397,7 +396,7 @@ describe('ContactMergeTest', function() { } } - async function autoMergeDataInsertTwo(DAHelper, rawContactId2) + async function autoMergeDataInsertTwo(dataShareHelper, rawContactId2) { var contactDataValuesThree = { "raw_contact_id" : rawContactId2, @@ -413,7 +412,7 @@ describe('ContactMergeTest', function() { listAddBluk2[0] = contactDataValuesThree; listAddBluk2[1] = contactDataValuesFour; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk2); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk2); sleep(sleep_one); console.info("logMessage contact_autoMerge_test_300: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -422,12 +421,12 @@ describe('ContactMergeTest', function() { } } - async function AutoMerger(DAHelper, rawContactId1, testName) + async function AutoMerger(dataShareHelper, rawContactId1, testName) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; try { - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); sleep(sleep_one); console.info("logMessage " + testName + "autoMergeCode = " + autoMergeCode); expect(autoMergeCode == 0).assertTrue(); @@ -441,13 +440,13 @@ describe('ContactMergeTest', function() { } } - async function AutoNotMerger(DAHelper, rawContactId1, testName) + async function AutoNotMerger(dataShareHelper, rawContactId1, testName) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; try { sleep(sleep_two); - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); console.info("logMessage " + testName + "autoMergeCode = " + autoMergeCode); expect(autoMergeCode == -1).assertTrue(); var map = new Map(); @@ -468,16 +467,16 @@ describe('ContactMergeTest', function() { */ it("contact_manualMerge_test_400", 0, async function(done) { console.info("------logMessage contact_manualMerge_test_400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues1 = {"display_name" : "xiaozhang"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_400: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - await noequalPhoneDataInsert(DAHelper, rawContactId1) + await noequalPhoneDataInsert(dataShareHelper, rawContactId1) } catch (error) { console.info('logMessage contact_manualMerge_test_400: raw_contact_1 insert error = ' + error); done(); @@ -485,21 +484,21 @@ describe('ContactMergeTest', function() { var insertRawContactValues2 = {"display_name" : "xiaozhang"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_400: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - await noequalPhoneDataInsertTwo(DAHelper, rawContactId2) + await noequalPhoneDataInsertTwo(dataShareHelper, rawContactId2) } catch (error) { console.info('logMessage contact_manualMerge_test_400: raw_contact_2 insert error = ' + error); done(); } - await noequalManualMerge(DAHelper, rawContactId1, rawContactId2); + await noequalManualMerge(dataShareHelper, rawContactId1, rawContactId2); done(); }); - async function noequalPhoneDataInsert(DAHelper, rawContactId1) + async function noequalPhoneDataInsert(dataShareHelper, rawContactId1) { var contactDataValuesOne = { "raw_contact_id" : rawContactId1, @@ -515,7 +514,7 @@ describe('ContactMergeTest', function() { listAddBluk[0] = contactDataValuesOne; listAddBluk[1] = contactDataValuesTwo; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_400: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -524,7 +523,7 @@ describe('ContactMergeTest', function() { } } - async function noequalPhoneDataInsertTwo(DAHelper, rawContactId2) + async function noequalPhoneDataInsertTwo(dataShareHelper, rawContactId2) { var contactDataValuesThree = { "raw_contact_id" : rawContactId2, @@ -540,7 +539,7 @@ describe('ContactMergeTest', function() { listAddBluk2[0] = contactDataValuesThree; listAddBluk2[1] = contactDataValuesFour; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk2); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk2); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_400: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -549,14 +548,14 @@ describe('ContactMergeTest', function() { } } - async function noequalManualMerge(DAHelper, rawContactId1, rawContactId2) + async function noequalManualMerge(dataShareHelper, rawContactId1, rawContactId2) { - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); var id = [ rawContactId1.toString(), rawContactId2.toString() ]; condition2.in("raw_contact_id", id); var updateValues2 = {}; try { - var ManualMergeCode = await DAHelper.update(manualMergeUri, updateValues2, condition2); + var ManualMergeCode = await dataShareHelper.update(manualMergeUri, updateValues2, condition2); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_400 ManualMergeCode = " + ManualMergeCode); expect(ManualMergeCode == 0).assertTrue(); @@ -578,16 +577,16 @@ describe('ContactMergeTest', function() { */ it("contact_manualMerge_test_500", 0, async function(done) { console.info("------logMessage contact_manualMerge_test_500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues1 = {"display_name" : "xiaozhou"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_500: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - await manualDataInsert(DAHelper, rawContactId1) + await manualDataInsert(dataShareHelper, rawContactId1) } catch (error) { console.info('logMessage contact_manualMerge_test_500: raw_contact_1 insert error = ' + error); done(); @@ -595,20 +594,20 @@ describe('ContactMergeTest', function() { var insertRawContactValues2 = {"display_name" : "xiaozhou"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_500: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - await manualDataInsertTwo(DAHelper, rawContactId2) + await manualDataInsertTwo(dataShareHelper, rawContactId2) } catch (error) { console.info('logMessage contact_manualMerge_test_500: raw_contact_2 insert error = ' + error); done(); } - await hasOneNoPhoneManualMerge(DAHelper, rawContactId1, rawContactId2); + await hasOneNoPhoneManualMerge(dataShareHelper, rawContactId1, rawContactId2); done(); }); - async function manualDataInsert(DAHelper, rawContactId1) + async function manualDataInsert(dataShareHelper, rawContactId1) { var contactDataValuesOne = { "raw_contact_id" : rawContactId1, @@ -630,7 +629,7 @@ describe('ContactMergeTest', function() { listAddBluk[1] = contactDataValuesTwo; listAddBluk[array_two] = contactDataValuesThree; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_500: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -639,7 +638,7 @@ describe('ContactMergeTest', function() { } } - async function manualDataInsertTwo(DAHelper, rawContactId2) + async function manualDataInsertTwo(dataShareHelper, rawContactId2) { var contactDataValuesFour = { "raw_contact_id" : rawContactId2, @@ -647,7 +646,7 @@ describe('ContactMergeTest', function() { "detail_info" : "xiaozhou" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValuesFour); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValuesFour); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_500: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -656,14 +655,14 @@ describe('ContactMergeTest', function() { } } - async function hasOneNoPhoneManualMerge(DAHelper, rawContactId1, rawContactId2) + async function hasOneNoPhoneManualMerge(dataShareHelper, rawContactId1, rawContactId2) { - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); var id = [ rawContactId1.toString(), rawContactId2.toString() ]; condition2.in("raw_contact_id", id); var updateValues2 = {}; try { - var ManualMergeCode = await DAHelper.update(manualMergeUri, updateValues2, condition2); + var ManualMergeCode = await dataShareHelper.update(manualMergeUri, updateValues2, condition2); sleep(sleep_one); console.info("logMessage contact_manualMerge_test_500 ManualMergeCode = " + ManualMergeCode); expect(ManualMergeCode == 0).assertTrue(); @@ -684,11 +683,11 @@ describe('ContactMergeTest', function() { */ it("contact_autoMerge_test_600", 0, async function(done) { console.info("------logMessage contact_autoMerge_test_600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues1 = {"display_name" : "xiaoliu"}; - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_autoMerge_test_600: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); @@ -699,7 +698,7 @@ describe('ContactMergeTest', function() { try { var insertRawContactValues2 = {"display_name" : "xiaoliu"}; - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_autoMerge_test_600: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); @@ -710,7 +709,7 @@ describe('ContactMergeTest', function() { try { var insertRawContactValues3 = {"display_name" : "xiaoliu"}; - var rawContactId3 = await DAHelper.insert(rawContactUri, insertRawContactValues3); + var rawContactId3 = await dataShareHelper.insert(rawContactUri, insertRawContactValues3); sleep(sleep_one); console.info("logMessage contact_autoMerge_test_600: rawContactId3 = " + rawContactId3); expect(rawContactId3 > 0).assertTrue(); @@ -723,7 +722,7 @@ describe('ContactMergeTest', function() { done(); }); - async function ContactDataBatchInsert(DAHelper, rawContactId1, rawContactId2, rawContactId3) + async function ContactDataBatchInsert(dataShareHelper, rawContactId1, rawContactId2, rawContactId3) { var contactDataValues1 = {"raw_contact_id" : rawContactId1, "content_type" : "name", "detail_info" : "xiaoliu"}; var contactDataValues2 = {"raw_contact_id" : rawContactId2, "content_type" : "name", "detail_info" : "xiaoliu"}; @@ -733,7 +732,7 @@ describe('ContactMergeTest', function() { listAddBluk[1] = contactDataValues2; listAddBluk[array_two] = contactDataValues3; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); sleep(sleep_two); console.info("logMessage contact_autoMerge_test_600: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -745,12 +744,12 @@ describe('ContactMergeTest', function() { } } - async function threeAutoMerger(DAHelper, rawContactId1) + async function threeAutoMerger(dataShareHelper, rawContactId1) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; try { - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); sleep(sleep_one); console.info("logMessage contact_autoMerge_test_600 autoMergeCode = " + autoMergeCode); expect(autoMergeCode == 0).assertTrue(); @@ -768,16 +767,16 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_700", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_700 is starting!-----"); var insertRawContactValues1 = {"display_name" : "xiaowu"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_700: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - await queryContactDataInsert(DAHelper, rawContactId1); + await queryContactDataInsert(dataShareHelper, rawContactId1); } catch (error) { console.info('logMessage contact_query_merge_list_test_700: raw_contact_1 insert error = ' + error); done(); @@ -785,24 +784,24 @@ describe('ContactMergeTest', function() { var insertRawContactValues2 = {"display_name" : "xiaowu"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_700: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - await queryContactDataInsertTwo(DAHelper, rawContactId2); + await queryContactDataInsertTwo(dataShareHelper, rawContactId2); } catch (error) { console.info('logMessage contact_query_merge_list_test_700: raw_contact_2 insert error = ' + error); done(); } - await queryMergeList(DAHelper, rawContactId1, rawContactId2, "contact_query_merge_list_test_700"); + await queryMergeList(dataShareHelper, rawContactId1, rawContactId2, "contact_query_merge_list_test_700"); done(); }); - async function queryContactDataInsert(DAHelper, rawContactId1) + async function queryContactDataInsert(dataShareHelper, rawContactId1) { var contactDataValues = {"raw_contact_id" : rawContactId1, "content_type" : "name", "detail_info" : "xiaowu"}; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_700: contactDataId1 = " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -811,7 +810,7 @@ describe('ContactMergeTest', function() { } } - async function queryContactDataInsertTwo(DAHelper, rawContactId2) + async function queryContactDataInsertTwo(dataShareHelper, rawContactId2) { var contactDataValuesOne = { "raw_contact_id" : rawContactId2, @@ -827,7 +826,7 @@ describe('ContactMergeTest', function() { listAddBluk[0] = contactDataValuesOne; listAddBluk[1] = contactDataValuesTwo; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_700: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -836,15 +835,15 @@ describe('ContactMergeTest', function() { } } - async function queryMergeList(DAHelper, rawContactId1, rawContactId2, testName) + async function queryMergeList(dataShareHelper, rawContactId1, rawContactId2, testName) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var columns = []; - var predicates = new ohos_data_ability.DataAbilityPredicates(); + var predicates = new dataShare.DataSharePredicates(); try { sleep(sleep_three); - var resultSet = await DAHelper.query(uriQueryMergeList, columns, predicates); + var resultSet = await dataShareHelper.query(uriQueryMergeList, columns, predicates); var array = [ rawContactId1, rawContactId2 ]; var i = 0; if (resultSet.rowCount > 0) { @@ -873,37 +872,37 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_800", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_800 is starting!-----"); var insertRawContactValues1 = {"display_name" : "xiaowuu"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_800: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "xiaowuu", "1854154" ]; var types = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_800"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_800"); } catch (error) { console.info('logMessage contact_query_merge_list_test_800: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "xiaowuu"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_800: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "xiaowuu", "1854154414242" ]; var types1 = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_800"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_800"); } catch (error) { console.info('logMessage contact_query_merge_list_test_800: raw_contact_2 insert error = ' + error); done(); } var rawContactIds = [ rawContactId1 + "", rawContactId2 + "" ]; - await ManualMergeList(DAHelper, rawContactIds, "contact_query_merge_list_test_800"); + await ManualMergeList(dataShareHelper, rawContactIds, "contact_query_merge_list_test_800"); done(); }); @@ -914,47 +913,47 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_900", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_900 is starting!-----"); var insertRawContactValues1 = {"display_name" : "xiaowusu"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_900: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "xiaowusu" ]; var types = [ "name" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_900"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_900"); } catch (error) { console.info('logMessage contact_query_merge_list_test_900: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "kxiaowusu"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_900: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "kxiaowusu" ]; var types1 = [ "name" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_900"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_900"); } catch (error) { console.info('logMessage contact_query_merge_list_test_900: raw_contact_2 insert error = ' + error); done(); } - await ManualNotMerge(DAHelper, rawContactId1, rawContactId2, "contact_query_merge_list_test_900"); + await ManualNotMerge(dataShareHelper, rawContactId1, rawContactId2, "contact_query_merge_list_test_900"); done(); }); - async function ManualNotMerge(DAHelper, rawContactId1, rawContactId2, tag) + async function ManualNotMerge(dataShareHelper, rawContactId1, rawContactId2, tag) { - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); var id = [ rawContactId1.toString(), rawContactId2.toString() ]; condition2.in("raw_contact_id", id); var updateValues2 = {}; try { - var ManualMergeCode = await DAHelper.update(manualMergeUri, updateValues2, condition2); + var ManualMergeCode = await dataShareHelper.update(manualMergeUri, updateValues2, condition2); sleep(sleep_one); console.info(tag + "logMessage ManualMergeCode = " + ManualMergeCode); expect(ManualMergeCode == -1).assertTrue(); @@ -975,41 +974,41 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1000", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1000 is starting!-----"); var insertRawContactValues1 = {"display_name" : "xiaotiantian"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1000: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "xiaotiantian", "1854154414242441" ]; var types = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1000"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1000"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1000: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "xiaotiantian"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1000: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "xiaotiantian", "1854154414242441" ]; var types1 = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1000"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1000"); sleep(sleep_two); } catch (error) { console.info('logMessage contact_query_merge_list_test_1000: raw_contact_2 insert error = ' + error); done(); } - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; try { sleep(sleep_three); - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); console.info("logMessage contact_query_merge_list_test_1000: autoMergeCode = " + autoMergeCode); expect(autoMergeCode == 0).assertTrue(); var map = new Map(); @@ -1030,36 +1029,36 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1100", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1100 is starting!-----"); var insertRawContactValues1 = {"display_name" : "wsxiuklkk"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1100: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "wsxiuklkk", "56465465" ]; var types = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1100"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1100"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1100: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "xiaolilili"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1100: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "xiaolilili", "8954598595" ]; var types1 = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1100"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1100"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1100: raw_contact_2 insert error = ' + error); done(); } - await ManualNotMerge(DAHelper, rawContactId1, rawContactId2, "contact_query_merge_list_test_1100"); + await ManualNotMerge(dataShareHelper, rawContactId1, rawContactId2, "contact_query_merge_list_test_1100"); done(); }); @@ -1070,36 +1069,36 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1200", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1200 is starting!-----"); var insertRawContactValues1 = {"display_name" : "lwsxiuklkk"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1200: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "lwsxiuklkk", "122504", "122505" ]; var types = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1200"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1200"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1200: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "lwsxiuklkk"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1200: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "lwsxiuklkk", "122504", "122505" ]; var types1 = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1200"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1200"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1200: raw_contact_2 insert error = ' + error); done(); } - await AutoMerger(DAHelper, rawContactId1, "contact_query_merge_list_test_1200"); + await AutoMerger(dataShareHelper, rawContactId1, "contact_query_merge_list_test_1200"); done(); }); @@ -1110,37 +1109,37 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1300", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1300 is starting!-----"); var insertRawContactValues1 = {"display_name" : "xiaowuuklkk"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1300: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "xiaowuuklkk", "56465465", "122504" ]; var types = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1300"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1300"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1300: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "xiaowuuklkk"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1300: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "xiaowuuklkk", "8954598595", "1225054" ]; var types1 = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1300"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1300"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1300: raw_contact_2 insert error = ' + error); done(); } var rawContactIds = [ rawContactId1 + "", rawContactId2 + "" ]; - await ManualMergeList(DAHelper, rawContactIds, "contact_query_merge_list_test_1300"); + await ManualMergeList(dataShareHelper, rawContactIds, "contact_query_merge_list_test_1300"); done(); }); @@ -1151,37 +1150,37 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1400", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1400 is starting!-----"); var insertRawContactValues1 = {"display_name" : "limingm"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1400: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "limingm", "122504555", "1122505" ]; var types = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1400"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1400"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1400: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "limingm"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1400: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "limingm", "122504555", "1225056" ]; var types1 = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1400"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1400"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1400: raw_contact_2 insert error = ' + error); done(); } var rawContactIds = [ rawContactId1 + "", rawContactId2 + "" ]; - await ManualMergeList(DAHelper, rawContactIds, "contact_query_merge_list_test_1400"); + await ManualMergeList(dataShareHelper, rawContactIds, "contact_query_merge_list_test_1400"); done(); }); @@ -1193,37 +1192,37 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1500", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1500 is starting!-----"); var insertRawContactValues1 = {"display_name" : "kplimingm"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1500: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "kplimingm", "7122504555", "1122505" ]; var types = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1500"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1500"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1500: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "kplimingm"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1500: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "kplimingm", "7122504555" ]; var types1 = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1500"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1500"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1500: raw_contact_2 insert error = ' + error); done(); } var rawContactIds = [ rawContactId1 + "", rawContactId2 + "" ]; - await ManualMergeList(DAHelper, rawContactIds, "contact_query_merge_list_test_1500"); + await ManualMergeList(dataShareHelper, rawContactIds, "contact_query_merge_list_test_1500"); done(); }); @@ -1235,37 +1234,37 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1600", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1600 is starting!-----"); var insertRawContactValues1 = {"display_name" : "pkplimingm"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1600: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "pkplimingm", "87122504555", "11122505" ]; var types = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1600"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1600"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1600: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "pkplimingm"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1600: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "pkplimingm", "7122554504555", "11122505" ]; var types1 = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1600"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1600"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1600: raw_contact_2 insert error = ' + error); done(); } var rawContactIds = [ rawContactId1 + "", rawContactId2 + "" ]; - await ManualMergeList(DAHelper, rawContactIds, "contact_query_merge_list_test_1600"); + await ManualMergeList(dataShareHelper, rawContactIds, "contact_query_merge_list_test_1600"); done(); }); @@ -1275,50 +1274,50 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1700", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1700 is starting!-----"); var insertRawContactValues1 = {"display_name" : "llllllk"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1700: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "llllllk", "87122504555", "11122505" ]; var types = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1700"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1700"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1700: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "llllllk"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1700: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "llllllk", "7555", "02505" ]; var types1 = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1700"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1700"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1700: raw_contact_2 insert error = ' + error); done(); } var insertRawContactValues3 = {"display_name" : "llllllk"}; try { - var rawContactId3 = await DAHelper.insert(rawContactUri, insertRawContactValues3); + var rawContactId3 = await dataShareHelper.insert(rawContactUri, insertRawContactValues3); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1700: rawContactId2 = " + rawContactId3); expect(rawContactId3 > 0).assertTrue(); var detailInfo1 = [ "llllllk", "87555", "002505" ]; var types1 = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId3, detailInfo1, types1, "contact_query_merge_list_test_1700"); + await insertContactData(dataShareHelper, rawContactId3, detailInfo1, types1, "contact_query_merge_list_test_1700"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1700: raw_contact_2 insert error = ' + error); done(); } var rawContactIds = [ rawContactId1 + "", rawContactId2 + "", rawContactId3 + "" ]; - await ManualMergeList(DAHelper, rawContactIds, "contact_query_merge_list_test_1700"); + await ManualMergeList(dataShareHelper, rawContactIds, "contact_query_merge_list_test_1700"); done(); }); @@ -1328,52 +1327,52 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1800", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1800 is starting!-----"); var insertRawContactValues1 = {"display_name" : "jggbgbk"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1800: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "jggbgbk", "85555", "996174" ]; var types = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1800"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "contact_query_merge_list_test_1800"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1800: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "jggbgbk"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1800: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "jggbgbk", "85555", "996174" ]; var types1 = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1800"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "contact_query_merge_list_test_1800"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1800: raw_contact_2 insert error = ' + error); done(); } var insertRawContactValues3 = {"display_name" : "jggbgbk"}; try { - var rawContactId3 = await DAHelper.insert(rawContactUri, insertRawContactValues3); + var rawContactId3 = await dataShareHelper.insert(rawContactUri, insertRawContactValues3); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1800: rawContactId2 = " + rawContactId3); expect(rawContactId3 > 0).assertTrue(); var detailInfo1 = [ "jggbgbk", "85555", "996174" ]; var types1 = [ "name", "phone", "phone" ]; - await insertContactData(DAHelper, rawContactId3, detailInfo1, types1, "contact_query_merge_list_test_1800"); + await insertContactData(dataShareHelper, rawContactId3, detailInfo1, types1, "contact_query_merge_list_test_1800"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1800: raw_contact_2 insert error = ' + error); done(); } - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; try { - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1800 autoMergeCode = " + autoMergeCode); expect(autoMergeCode == 0).assertTrue(); @@ -1396,33 +1395,33 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_1900", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_1900 is starting!-----"); var insertRawContactValues1 = {"display_name" : "owjiuh"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1900: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - var dataId = insertContactDataSingle(DAHelper, rawContactId1, "owjiuh", "name"); + var dataId = insertContactDataSingle(dataShareHelper, rawContactId1, "owjiuh", "name"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1900: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "owjiuh"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_1900: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - var dataId = insertContactDataSingle(DAHelper, rawContactId1, "owjiuh", "name"); + var dataId = insertContactDataSingle(dataShareHelper, rawContactId1, "owjiuh", "name"); } catch (error) { console.info('logMessage contact_query_merge_list_test_1900: raw_contact_2 insert error = ' + error); done(); } await updateContactData("owjiuh111", dataId, "contact_query_merge_list_test_1900"); - await AutoNotMerger(DAHelper, rawContactId1, "contact_query_merge_list_test_1900"); + await AutoNotMerger(dataShareHelper, rawContactId1, "contact_query_merge_list_test_1900"); done(); }); @@ -1434,29 +1433,29 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("contact_query_merge_list_test_2000", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage contact_query_merge_list_test_2000 is starting!-----"); var insertRawContactValues1 = {"display_name" : "ollwjiuh"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_2000: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - await insertContactDataSingle(DAHelper, rawContactId1, "ollwjiuh", "name"); - var dataIdTwo = await insertContactDataSingle(DAHelper, rawContactId1, "8554544", "phone"); + await insertContactDataSingle(dataShareHelper, rawContactId1, "ollwjiuh", "name"); + var dataIdTwo = await insertContactDataSingle(dataShareHelper, rawContactId1, "8554544", "phone"); } catch (error) { console.info('logMessage contact_query_merge_list_test_2000: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "ollwjiuh"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_merge_list_test_2000: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); - await insertContactDataSingle(DAHelper, rawContactId2, "ollwjiuh", "name"); - await insertContactDataSingle(DAHelper, rawContactId2, "8554544", "phone"); + await insertContactDataSingle(dataShareHelper, rawContactId2, "ollwjiuh", "name"); + await insertContactDataSingle(dataShareHelper, rawContactId2, "8554544", "phone"); sleep(sleep_two); } catch (error) { console.info('logMessage contact_query_merge_list_test_2000: raw_contact_2 insert error = ' + error); @@ -1465,7 +1464,7 @@ describe('ContactMergeTest', function() { await updateContactData("8554544444", dataIdTwo, "contact_query_merge_list_test_2000"); sleep(sleep_three); var rawContactIds = [ rawContactId1 + "", rawContactId2 + "" ]; - await ManualMergeList(DAHelper, rawContactIds, "contact_query_merge_list_test_2000"); + await ManualMergeList(dataShareHelper, rawContactIds, "contact_query_merge_list_test_2000"); done(); }); @@ -1475,41 +1474,41 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("abnormal_merge_Update_test_2100", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage abnormal_merge_Update_test_2100 is starting!-----"); var insertRawContactValues1 = {"display_name" : "2100mergeTest"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2100: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "2100mergeTest" ]; var types = [ "name" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2100"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2100"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2100: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "2100mergeTestTwo"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2100: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "2100mergeTestTwo" ]; var types1 = [ "name" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2100"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2100"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2100: raw_contact_2 insert error = ' + error); done(); } - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); console.info("logMessage abnormal_merge_Update_test_2100 autoMergeCode = " + autoMergeCode); expect(autoMergeCode == -1).assertTrue(); - await ManualNotMerge(DAHelper, rawContactId1, rawContactId2, "abnormal_merge_Update_test_2100"); + await ManualNotMerge(dataShareHelper, rawContactId1, rawContactId2, "abnormal_merge_Update_test_2100"); done(); }); @@ -1519,48 +1518,48 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("abnormal_merge_Update_test_2200", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage abnormal_merge_Update_test_2200 is starting!-----"); var insertRawContactValues1 = {"display_name" : "2200mergeTest"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2200: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "2200mergeTest", "45544" ]; var types = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2200"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2200"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2200: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "2200mergeTestTwo"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2200: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "2200mergeTestTwo", "55134865" ]; var types1 = [ "name", "phone" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2200"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2200"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2200: raw_contact_2 insert error = ' + error); done(); } - await queryMergeListError(DAHelper, rawContactId1, rawContactId2, "abnormal_merge_Update_test_2200"); + await queryMergeListError(dataShareHelper, rawContactId1, rawContactId2, "abnormal_merge_Update_test_2200"); done(); }); - async function queryMergeListError(DAHelper, rawContactId1, rawContactId2, testName) + async function queryMergeListError(dataShareHelper, rawContactId1, rawContactId2, testName) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var columns = [ "display_names" ]; - var predicates = new ohos_data_ability.DataAbilityPredicates(); + var predicates = new dataShare.DataSharePredicates(); try { sleep(sleep_three); - var resultSet = await DAHelper.query(uriQueryMergeList, columns, predicates); + var resultSet = await dataShareHelper.query(uriQueryMergeList, columns, predicates); console.info(testName + 'resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == 0).assertTrue(); resultSet.close(); @@ -1578,36 +1577,36 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("abnormal_merge_Update_test_2300", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage abnormal_merge_Update_test_2300 is starting!-----"); var insertRawContactValues1 = {"display_name" : "2300mergeTest"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2300: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "2300mergeTest" ]; var types = [ "name" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2300"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2300"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2300: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "2300mergeTestName"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2300: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "2300mergeTestName" ]; var types1 = [ "name" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2300"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2300"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2300: raw_contact_2 insert error = ' + error); done(); } - await AutoNotMerger(DAHelper, rawContactId1, "abnormal_merge_Update_test_2300"); + await AutoNotMerger(dataShareHelper, rawContactId1, "abnormal_merge_Update_test_2300"); done(); }); @@ -1618,36 +1617,36 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("abnormal_merge_Update_test_2400", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage abnormal_merge_Update_test_2400 is starting!-----"); var insertRawContactValues1 = {"display_name" : "2400mergeTest"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2400: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "2400mergeTest" ]; var types = [ "namee" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2400"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2400"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2400: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "2400mergeTest"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2400: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "2400mergeTest" ]; var types1 = [ "name" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2400"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2400"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2400: raw_contact_2 insert error = ' + error); done(); } - await AutoNotMerger(DAHelper, rawContactId1, "abnormal_merge_Update_test_2400"); + await AutoNotMerger(dataShareHelper, rawContactId1, "abnormal_merge_Update_test_2400"); done(); }); @@ -1657,44 +1656,44 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("abnormal_merge_Update_test_2500", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage abnormal_merge_Update_test_2500 is starting!-----"); var insertRawContactValues1 = {"display_name" : "2500mergeTest"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2500: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "2500mergeTest" ]; var types = [ "name" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2500"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2500"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2500: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "2500mergeTest"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2500: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "2500mergeTest" ]; var types1 = [ "name" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2500"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2500"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2500: raw_contact_2 insert error = ' + error); done(); } - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2500 autoMergeCode = " + autoMergeCode); expect(autoMergeCode == 0).assertTrue(); var map = new Map(); map.set("id", rawContactId1.toString()); - await ContactNotSplit(DAHelper, 0, "abnormal_merge_Update_test_2500"); + await ContactNotSplit(dataShareHelper, 0, "abnormal_merge_Update_test_2500"); await ContactMergeQuery(map, "abnormal_merge_Update_test_2500", result_two); await deleteAll(rawContactUri, "abnormal_merge_Update_test_2500"); await deleteAll(contactDataUri, "abnormal_merge_Update_test_2500"); @@ -1707,58 +1706,58 @@ describe('ContactMergeTest', function() { * @tc.desc Function test */ it("abnormal_merge_Update_test_2600", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('before delete_all: start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('before delete_all: start ! dataShareHelper = ' + dataShareHelper); console.info("------logMessage abnormal_merge_Update_test_2600 is starting!-----"); var insertRawContactValues1 = {"display_name" : "2600mergeTest"}; try { - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2600: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var detailInfo = [ "2600mergeTest" ]; var types = [ "name" ]; - await insertContactData(DAHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2600"); + await insertContactData(dataShareHelper, rawContactId1, detailInfo, types, "abnormal_merge_Update_test_2600"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2600: raw_contact_1 insert error = ' + error); done(); } var insertRawContactValues2 = {"display_name" : "2600mergeTest"}; try { - var rawContactId2 = await DAHelper.insert(rawContactUri, insertRawContactValues2); + var rawContactId2 = await dataShareHelper.insert(rawContactUri, insertRawContactValues2); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2600: rawContactId2 = " + rawContactId2); expect(rawContactId2 > 0).assertTrue(); var detailInfo1 = [ "2600mergeTest" ]; var types1 = [ "name" ]; - await insertContactData(DAHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2600"); + await insertContactData(dataShareHelper, rawContactId2, detailInfo1, types1, "abnormal_merge_Update_test_2600"); } catch (error) { console.info('logMessage abnormal_merge_Update_test_2600: raw_contact_2 insert error = ' + error); done(); } - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {}; - var autoMergeCode = await DAHelper.update(autoMergeUri, updateValues, condition); + var autoMergeCode = await dataShareHelper.update(autoMergeUri, updateValues, condition); sleep(sleep_one); console.info("logMessage abnormal_merge_Update_test_2600 autoMergeCode = " + autoMergeCode); expect(autoMergeCode == 0).assertTrue(); var map = new Map(); map.set("id", rawContactId1.toString()); - await ContactNotSplit(DAHelper, -1, "abnormal_merge_Update_test_2600"); + await ContactNotSplit(dataShareHelper, -1, "abnormal_merge_Update_test_2600"); await ContactMergeQuery(map, "abnormal_merge_Update_test_2600", result_two); await deleteAll(rawContactUri, "abnormal_merge_Update_test_2600"); await deleteAll(contactDataUri, "abnormal_merge_Update_test_2600"); done(); }); - async function ContactNotSplit(DAHelper, rawContactId1, testName) + async function ContactNotSplit(dataShareHelper, rawContactId1, testName) { - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); var array = [ rawContactId1.toString() ]; condition2.in("raw_contact_id", array); var updateValues2 = {}; try { - var splitCode = await DAHelper.update(splitUri, updateValues2, condition2); + var splitCode = await dataShareHelper.update(splitUri, updateValues2, condition2); sleep(4000); console.info(testName + 'logMessage splitCode = ' + splitCode); expect(splitCode == -1).assertTrue(); @@ -1768,11 +1767,11 @@ describe('ContactMergeTest', function() { } afterAll(async function() { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('merge afterAll delete_All: start ! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); - var deletedAll = await DAHelper.delete(deletedUri, condition); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('merge afterAll delete_All: start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); + var deletedAll = await dataShareHelper.delete(deletedUri, condition); sleep(4000); - console.info('merge afterAll delete_All : deletedAll ! DAHelper = ' + deletedAll); + console.info('merge afterAll delete_All : deletedAll ! dataShareHelper = ' + deletedAll); }); }); diff --git a/jstest/Contacts_test.js b/jstest/Contacts_test.js index 9dc3a2a..ed78b2b 100644 --- a/jstest/Contacts_test.js +++ b/jstest/Contacts_test.js @@ -13,22 +13,21 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' import common from './common.js'; -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const contactUri = "dataability:///com.ohos.contactsdataability/contacts/contact"; -const rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -const contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; -const groupUri = "dataability:///com.ohos.contactsdataability/contacts/groups"; -const contactBlocklistUri = "dataability:///com.ohos.contactsdataability/contacts/contact_blocklist"; -const deletedRawContactUri = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; -const searchContactUri = "dataability:///com.ohos.contactsdataability/contacts/search_contact"; -const deletedUri = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; -const deleted_raw_contact_record = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact_record"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const contactUri = "datashare:///com.ohos.contactsdataability/contacts/contact"; +const rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +const contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; +const groupUri = "datashare:///com.ohos.contactsdataability/contacts/groups"; +const contactBlocklistUri = "datashare:///com.ohos.contactsdataability/contacts/contact_blocklist"; +const deletedRawContactUri = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; +const searchContactUri = "datashare:///com.ohos.contactsdataability/contacts/search_contact"; +const deletedUri = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; +const deleted_raw_contact_record = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact_record"; describe('ContactsTest', function() { console.info("-------ContactsTest is starting!--------"); @@ -52,13 +51,13 @@ describe('ContactsTest', function() { async function contactsQuery(map, tag, uri) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': contactsQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - var resultSet = await DAHelper.query(uri, resultColumns, condition); + var resultSet = await dataShareHelper.query(uri, resultColumns, condition); sleep(sleep_two); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { @@ -80,13 +79,13 @@ describe('ContactsTest', function() { async function queryBatch(map, tag, size) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryBatch start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryBatch start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", map.get("raw_contact_id")); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(sleep_one); console.info(tag + ': queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == size).assertEqual(true); @@ -98,13 +97,13 @@ describe('ContactsTest', function() { async function queryIdForDelete(map, tag, uri) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryIdForDelete start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryIdForDelete start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - var resultSet = await DAHelper.query(uri, resultColumns, condition); + var resultSet = await dataShareHelper.query(uri, resultColumns, condition); sleep(sleep_one); expect(resultSet.goToFirstRow() == false).assertTrue(); console.info(tag + " :logMessage queryIdForDelete: goToFirstRow " + resultSet.goToFirstRow()); @@ -117,10 +116,10 @@ describe('ContactsTest', function() { async function deleteAll(uri, tag) { try { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(uri, condition); + var deleteCode = await dataShareHelper.delete(uri, condition); console.info(tag + ': deleteAll deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); } catch (error) { @@ -131,18 +130,18 @@ describe('ContactsTest', function() { async function deleteRawContact(tag) { try { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); - var deleteCode = await DAHelper.delete(rawContactUri, condition); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition); console.info(tag + ': deleteRawContact deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); sleep(sleep_one); - var conditionAll = new ohos_data_ability.DataAbilityPredicates(); + var conditionAll = new dataShare.DataSharePredicates(); conditionAll.greaterThan("id", "0"); - var code = await DAHelper.delete(deletedUri, conditionAll); + var code = await dataShareHelper.delete(deletedUri, conditionAll); console.info(tag + ': Completely delete code = ' + code); expect(code == 0).assertTrue(); } catch (error) { @@ -152,11 +151,11 @@ describe('ContactsTest', function() { async function insertData(rawContactId, type, value, position) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); var contactDataValues1 = {"raw_contact_id" : rawContactId, "content_type" : type, "detail_info" : value, "position" : position}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues1); console.info("logMessage : contactDataId1 " + contactDataId1); expect(contactDataId > 0).assertTrue(); } catch (error) { @@ -172,10 +171,10 @@ describe('ContactsTest', function() { */ it("contact_insert_test_100", 0, async function(done) { console.info("------logMessage contact_insert_test_100 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(rawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(rawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contact_insert_test_100: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -197,19 +196,19 @@ describe('ContactsTest', function() { */ it("contact_insert_test_400", 0, async function(done) { console.info("------logMessage contact_insert_test_400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insert_test_400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataNameInsert(DAHelper, rawContactId); - await dataCompanyInsert(DAHelper, rawContactId); - await dataPhoneInsert(DAHelper, rawContactId); + await dataNameInsert(dataShareHelper, rawContactId); + await dataCompanyInsert(dataShareHelper, rawContactId); + await dataPhoneInsert(dataShareHelper, rawContactId); await deleteRawContact("contact_insert_test_400"); await deleteAll(contactDataUri, "contact_insert_test_400"); done(); @@ -219,7 +218,7 @@ describe('ContactsTest', function() { } }); - async function dataNameInsert(DAHelper, rawContactId) + async function dataNameInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -227,7 +226,7 @@ describe('ContactsTest', function() { "detail_info" : "xiaocheng" }; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues1); console.info("logMessage contact_insert_test_400: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); var map = new Map(); @@ -241,7 +240,7 @@ describe('ContactsTest', function() { } } - async function dataCompanyInsert(DAHelper, rawContactId) + async function dataCompanyInsert(dataShareHelper, rawContactId) { var contactDataValues2 = { "raw_contact_id" : rawContactId, @@ -250,7 +249,7 @@ describe('ContactsTest', function() { "position" : "developer" }; try { - var contactDataId2 = await DAHelper.insert(contactDataUri, contactDataValues2); + var contactDataId2 = await dataShareHelper.insert(contactDataUri, contactDataValues2); console.info("logMessage contact_insert_test_400: contactDataId2 " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); var map = new Map(); @@ -264,7 +263,7 @@ describe('ContactsTest', function() { } } - async function dataPhoneInsert(DAHelper, rawContactId) + async function dataPhoneInsert(dataShareHelper, rawContactId) { var contactDataValues3 = { "raw_contact_id" : rawContactId, @@ -272,7 +271,7 @@ describe('ContactsTest', function() { "detail_info" : "12345678" }; try { - var contactDataId3 = await DAHelper.insert(contactDataUri, contactDataValues3); + var contactDataId3 = await dataShareHelper.insert(contactDataUri, contactDataValues3); sleep(sleep_one); console.info("logMessage contact_insert_test_400: contactDataId3 " + contactDataId3); expect(contactDataId3 > 0).assertTrue(); @@ -293,19 +292,19 @@ describe('ContactsTest', function() { */ it("contact_insert_test_500", 0, async function(done) { console.info("------logMessage contact_insert_test_500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insert_test_500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataEmailInsert(DAHelper, rawContactId); - await dataNickNameInsert(DAHelper, rawContactId); - await dataPostalAddressInsert(DAHelper, rawContactId); + await dataEmailInsert(dataShareHelper, rawContactId); + await dataNickNameInsert(dataShareHelper, rawContactId); + await dataPostalAddressInsert(dataShareHelper, rawContactId); await deleteRawContact("contact_insert_test_500"); await deleteAll(contactDataUri, "contact_insert_test_500"); done(); @@ -315,7 +314,7 @@ describe('ContactsTest', function() { } }); - async function dataEmailInsert(DAHelper, rawContactId) + async function dataEmailInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -323,7 +322,7 @@ describe('ContactsTest', function() { "detail_info" : "166@163.com" }; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues1); sleep(sleep_one); console.info("logMessage contact_insert_test_500: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -336,7 +335,7 @@ describe('ContactsTest', function() { } } - async function dataNickNameInsert(DAHelper, rawContactId) + async function dataNickNameInsert(dataShareHelper, rawContactId) { var contactDataValues2 = { "raw_contact_id" : rawContactId, @@ -344,7 +343,7 @@ describe('ContactsTest', function() { "detail_info" : "xiaocheng" }; try { - var contactDataId2 = await DAHelper.insert(contactDataUri, contactDataValues2); + var contactDataId2 = await dataShareHelper.insert(contactDataUri, contactDataValues2); console.info("logMessage contact_insert_test_500: contactDataId2 " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); var map = new Map(); @@ -356,7 +355,7 @@ describe('ContactsTest', function() { } } - async function dataPostalAddressInsert(DAHelper, rawContactId) + async function dataPostalAddressInsert(dataShareHelper, rawContactId) { var contactDataValues3 = { "raw_contact_id" : rawContactId, @@ -364,7 +363,7 @@ describe('ContactsTest', function() { "detail_info" : "NanJingSoftRoad" }; try { - var contactDataId3 = await DAHelper.insert(contactDataUri, contactDataValues3); + var contactDataId3 = await dataShareHelper.insert(contactDataUri, contactDataValues3); console.info("logMessage contact_insert_test_500: contactDataId3 " + contactDataId3); expect(contactDataId3 > 0).assertTrue(); var map = new Map(); @@ -383,19 +382,19 @@ describe('ContactsTest', function() { */ it("contact_insert_test_600", 0, async function(done) { console.info("------logMessage contact_insert_test_600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues) + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues) console.info("logMessage contact_insert_test_600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataNoteInsert(DAHelper, rawContactId); - await dataAimInsert(DAHelper, rawContactId); - await dataEventInsert(DAHelper, rawContactId); + await dataNoteInsert(dataShareHelper, rawContactId); + await dataAimInsert(dataShareHelper, rawContactId); + await dataEventInsert(dataShareHelper, rawContactId); await deleteRawContact("contact_insert_test_600"); await deleteAll(contactDataUri, "contact_insert_test_600"); done(); @@ -405,7 +404,7 @@ describe('ContactsTest', function() { } }); - async function dataNoteInsert(DAHelper, rawContactId) + async function dataNoteInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -413,7 +412,7 @@ describe('ContactsTest', function() { "detail_info" : "javaGangster" }; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues1); console.info("logMessage contact_insert_test_600: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); var map = new Map(); @@ -426,11 +425,11 @@ describe('ContactsTest', function() { } } - async function dataAimInsert(DAHelper, rawContactId) + async function dataAimInsert(dataShareHelper, rawContactId) { var contactDataValues2 = {"raw_contact_id" : rawContactId, "content_type" : "im", "detail_info" : "aaaaa"}; try { - var contactDataId2 = await DAHelper.insert(contactDataUri, contactDataValues2); + var contactDataId2 = await dataShareHelper.insert(contactDataUri, contactDataValues2); console.info("logMessage contact_insert_test_600: contactDataId2 " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); var map = new Map(); @@ -442,7 +441,7 @@ describe('ContactsTest', function() { } } - async function dataEventInsert(DAHelper, rawContactId) + async function dataEventInsert(dataShareHelper, rawContactId) { var contactDataValues3 = { "raw_contact_id" : rawContactId, @@ -450,7 +449,7 @@ describe('ContactsTest', function() { "detail_info" : "19960229" }; try { - var contactDataId3 = await DAHelper.insert(contactDataUri, contactDataValues3); + var contactDataId3 = await dataShareHelper.insert(contactDataUri, contactDataValues3); console.info("logMessage contact_insert_test_600: contactDataId3 " + contactDataId3); expect(contactDataId3 > 0).assertTrue(); var map = new Map(); @@ -469,19 +468,19 @@ describe('ContactsTest', function() { */ it("contact_insert_test_700", 0, async function(done) { console.info("------logMessage contact_insert_test_700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insert_test_700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataWebsiteInsert(DAHelper, rawContactId); - await dataRelationInsert(DAHelper, rawContactId); - await dataWebsiteInsert(DAHelper, rawContactId); + await dataWebsiteInsert(dataShareHelper, rawContactId); + await dataRelationInsert(dataShareHelper, rawContactId); + await dataWebsiteInsert(dataShareHelper, rawContactId); await deleteRawContact("contact_insert_test_700"); await deleteAll(contactDataUri, "contact_insert_test_700"); done(); @@ -491,7 +490,7 @@ describe('ContactsTest', function() { } }); - async function dataWebsiteInsert(DAHelper, rawContactId) + async function dataWebsiteInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -499,7 +498,7 @@ describe('ContactsTest', function() { "detail_info" : "www.com" }; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues1); sleep(sleep_one); console.info("logMessage contact_insert_test_700: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -513,7 +512,7 @@ describe('ContactsTest', function() { } } - async function dataRelationInsert(DAHelper, rawContactId) + async function dataRelationInsert(dataShareHelper, rawContactId) { var contactDataValues2 = { "raw_contact_id" : rawContactId, @@ -521,7 +520,7 @@ describe('ContactsTest', function() { "detail_info" : "Secretary" }; try { - var contactDataId2 = await DAHelper.insert(contactDataUri, contactDataValues2); + var contactDataId2 = await dataShareHelper.insert(contactDataUri, contactDataValues2); sleep(sleep_one); console.info("logMessage contact_insert_test_700: contactDataId2 " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); @@ -535,7 +534,7 @@ describe('ContactsTest', function() { } } - async function dataGroupInsert(DAHelper, rawContactId) + async function dataGroupInsert(dataShareHelper, rawContactId) { var contactDataValues3 = { "raw_contact_id" : rawContactId, @@ -543,7 +542,7 @@ describe('ContactsTest', function() { "detail_info" : "1" }; try { - var contactDataId3 = await DAHelper.insert(contactDataUri, contactDataValues3); + var contactDataId3 = await dataShareHelper.insert(contactDataUri, contactDataValues3); sleep(sleep_one); console.info("logMessage contact_insert_test_700: contactDataId3 " + contactDataId3); expect(contactDataId3 > 0).assertTrue(); @@ -564,17 +563,17 @@ describe('ContactsTest', function() { */ it("contact_insert_test_800", 0, async function(done) { console.info("------logMessage contact_insert_test_800 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocheng", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insert_test_800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await dataMiscInsert(DAHelper, rawContactId); + await dataMiscInsert(dataShareHelper, rawContactId); await deleteRawContact("contact_insert_test_800"); await deleteAll(contactDataUri, "contact_insert_test_800"); done(); @@ -584,7 +583,7 @@ describe('ContactsTest', function() { } }); - async function dataMiscInsert(DAHelper, rawContactId) + async function dataMiscInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -592,7 +591,7 @@ describe('ContactsTest', function() { "detail_info" : "1234" }; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues1); sleep(sleep_one); console.info("logMessage contact_insert_test_800: contactDataId1 " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -612,8 +611,8 @@ describe('ContactsTest', function() { */ it("contact_update_test_900", 0, async function(done) { console.info("------logMessage contact_update_test_900 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "licheng", @@ -623,10 +622,10 @@ describe('ContactsTest', function() { "phonetic_name" : "licheng||lc" }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await rawContactUpdate(DAHelper, rawContactId); + await rawContactUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_900"); await deleteAll(contactDataUri, "contact_update_test_900"); done(); @@ -636,7 +635,7 @@ describe('ContactsTest', function() { } }); - async function rawContactUpdate(DAHelper, rawContactId) + async function rawContactUpdate(dataShareHelper, rawContactId) { var updateValues = { "display_name" : "dacheng", @@ -645,10 +644,10 @@ describe('ContactsTest', function() { "favorite" : 0, "phonetic_name" : "dacheng||dc" }; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(rawContactUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_900: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -672,15 +671,15 @@ describe('ContactsTest', function() { */ it("contact_update_test_1200", 0, async function(done) { console.info("------logMessage contact_update_test_1200 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_1200: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforedataNameInsert(DAHelper, rawContactId); - await dataNameUpdate(DAHelper, rawContactId); + await beforedataNameInsert(dataShareHelper, rawContactId); + await dataNameUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_1200"); await deleteAll(contactDataUri, "contact_update_test_1200"); done(); @@ -690,11 +689,11 @@ describe('ContactsTest', function() { } }); - async function beforedataNameInsert(DAHelper, rawContactId) + async function beforedataNameInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "name", "detail_info" : "xiaoyuan"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_1200: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -703,13 +702,13 @@ describe('ContactsTest', function() { } } - async function dataNameUpdate(DAHelper, rawContactId) + async function dataNameUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "dayuan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_1200: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -729,15 +728,15 @@ describe('ContactsTest', function() { */ it("contact_update_test_1300", 0, async function(done) { console.info("------logMessage contact_update_test_1300 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_1300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforedataCompanyInsert(DAHelper, rawContactId); - await dataCompanyUpdate(DAHelper, rawContactId); + await beforedataCompanyInsert(dataShareHelper, rawContactId); + await dataCompanyUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_1300"); await deleteAll(contactDataUri, "contact_update_test_1300"); done(); @@ -747,7 +746,7 @@ describe('ContactsTest', function() { } }); - async function beforedataCompanyInsert(DAHelper, rawContactId) + async function beforedataCompanyInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -756,7 +755,7 @@ describe('ContactsTest', function() { "position" : "Testers", }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_1300: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -765,13 +764,13 @@ describe('ContactsTest', function() { } } - async function dataCompanyUpdate(DAHelper, rawContactId) + async function dataCompanyUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "OOOO", "position" : "developer"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_1300: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -792,15 +791,15 @@ describe('ContactsTest', function() { */ it("contact_update_test_1400", 0, async function(done) { console.info("------logMessage contact_update_test_1400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_1400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataPhoneInsert(DAHelper, rawContactId); - await dataPhoneUpdate(DAHelper, rawContactId); + await beforeDataPhoneInsert(dataShareHelper, rawContactId); + await dataPhoneUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_1400"); await deleteAll(contactDataUri, "contact_update_test_1400"); done(); @@ -810,11 +809,11 @@ describe('ContactsTest', function() { } }); - async function beforeDataPhoneInsert(DAHelper, rawContactId) + async function beforeDataPhoneInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "phone", "detail_info" : "123456"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_1400: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -823,13 +822,13 @@ describe('ContactsTest', function() { } } - async function dataPhoneUpdate(DAHelper, rawContactId) + async function dataPhoneUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "99663355"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_1400: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -849,16 +848,16 @@ describe('ContactsTest', function() { */ it("contact_update_test_1500", 0, async function(done) { console.info("------logMessage contact_update_test_1500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_1500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforedataNickNameInsert(DAHelper, rawContactId); - await dataNickNameUpdate(DAHelper, rawContactId); + await beforedataNickNameInsert(dataShareHelper, rawContactId); + await dataNickNameUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_1500"); await deleteAll(contactDataUri, "contact_update_test_1500"); done(); @@ -868,7 +867,7 @@ describe('ContactsTest', function() { } }); - async function beforedataNickNameInsert(DAHelper, rawContactId) + async function beforedataNickNameInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -876,7 +875,7 @@ describe('ContactsTest', function() { "detail_info" : "xiaoyuan" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_1500: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -885,13 +884,13 @@ describe('ContactsTest', function() { } } - async function dataNickNameUpdate(DAHelper, rawContactId) + async function dataNickNameUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "fengyuan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_1500: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -911,16 +910,16 @@ describe('ContactsTest', function() { */ it("contact_update_test_1600", 0, async function(done) { console.info("------logMessage contact_update_test_1600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_1600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataEmailInsert(DAHelper, rawContactId); - await dataEmailUpdate(DAHelper, rawContactId); + await beforeDataEmailInsert(dataShareHelper, rawContactId); + await dataEmailUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_1600"); await deleteAll(contactDataUri, "contact_update_test_1600"); done(); @@ -930,7 +929,7 @@ describe('ContactsTest', function() { } }); - async function beforeDataEmailInsert(DAHelper, rawContactId) + async function beforeDataEmailInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -938,7 +937,7 @@ describe('ContactsTest', function() { "detail_info" : "166@163.com" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_1600: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -947,13 +946,13 @@ describe('ContactsTest', function() { } } - async function dataEmailUpdate(DAHelper, rawContactId) + async function dataEmailUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "199@163.com"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition) + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition) sleep(sleep_one); console.info('logMessage contact_update_test_1600: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -973,15 +972,15 @@ describe('ContactsTest', function() { */ it("contact_update_test_1700", 0, async function(done) { console.info("------logMessage contact_update_test_1700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_1700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataPostalInsert(DAHelper, rawContactId); + await beforeDataPostalInsert(dataShareHelper, rawContactId); await dataPostalUpdate(); await deleteRawContact("contact_update_test_1700"); await deleteAll(contactDataUri, "contact_update_test_1700"); @@ -992,7 +991,7 @@ describe('ContactsTest', function() { } }); - async function beforeDataPostalInsert(DAHelper, rawContactId) + async function beforeDataPostalInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1000,7 +999,7 @@ describe('ContactsTest', function() { "detail_info" : "NanJing" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_1700: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1009,13 +1008,13 @@ describe('ContactsTest', function() { } } - async function dataPostalUpdate(DAHelper, rawContactId) + async function dataPostalUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "BeiJing"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_1700: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1035,16 +1034,16 @@ describe('ContactsTest', function() { */ it("contact_update_test_1800", 0, async function(done) { console.info("------logMessage contact_update_test_1800 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_1800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforedataNoteInsert(DAHelper, rawContactId); - await dataNoteUpdate(DAHelper, rawContactId); + await beforedataNoteInsert(dataShareHelper, rawContactId); + await dataNoteUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_1800"); await deleteAll(contactDataUri, "contact_update_test_1800"); done(); @@ -1054,11 +1053,11 @@ describe('ContactsTest', function() { } }); - async function beforedataNoteInsert(DAHelper, rawContactId) + async function beforedataNoteInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "note", "detail_info" : "Gangster"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_1800: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1067,13 +1066,13 @@ describe('ContactsTest', function() { } } - async function dataNoteUpdate(DAHelper, rawContactId) + async function dataNoteUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "God"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_1800: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1093,16 +1092,16 @@ describe('ContactsTest', function() { */ it("contact_update_test_1900", 0, async function(done) { console.info("------logMessage contact_update_test_1900 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues) + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues) console.info("logMessage contact_update_test_1900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataAimInsert(DAHelper, rawContactId); - await dataAimUpdate(DAHelper, rawContactId); + await beforeDataAimInsert(dataShareHelper, rawContactId); + await dataAimUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_1900"); await deleteAll(contactDataUri, "contact_update_test_1900"); done(); @@ -1112,11 +1111,11 @@ describe('ContactsTest', function() { } }); - async function beforeDataAimInsert(DAHelper, rawContactId) + async function beforeDataAimInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "im", "detail_info" : "aaaaa"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_1900: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1125,13 +1124,13 @@ describe('ContactsTest', function() { } } - async function dataAimUpdate(DAHelper, rawContactId) + async function dataAimUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "bbbbb"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_1900: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1151,16 +1150,16 @@ describe('ContactsTest', function() { */ it("contact_update_test_2000", 0, async function(done) { console.info("------logMessage contact_update_test_2000 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_2000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataEventInsert(DAHelper, rawContactId); - await dataEventUpdate(DAHelper, rawContactId); + await beforeDataEventInsert(dataShareHelper, rawContactId); + await dataEventUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_2000"); await deleteAll(contactDataUri, "contact_update_test_2000"); done(); @@ -1170,7 +1169,7 @@ describe('ContactsTest', function() { } }); - async function beforeDataEventInsert(DAHelper, rawContactId) + async function beforeDataEventInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -1178,7 +1177,7 @@ describe('ContactsTest', function() { "detail_info" : "19960229" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues1); sleep(sleep_one); console.info('logMessage contact_update_test_2000: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1187,13 +1186,13 @@ describe('ContactsTest', function() { } } - async function dataEventUpdate(DAHelper, rawContactId) + async function dataEventUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "19971021"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_2000: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1213,16 +1212,16 @@ describe('ContactsTest', function() { */ it("contact_update_test_2100", 0, async function(done) { console.info("------logMessage contact_update_test_2100 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_2100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataWebsiteInsert(DAHelper, rawContactId); - await dataWebsiteUpdate(DAHelper, rawContactId); + await beforeDataWebsiteInsert(dataShareHelper, rawContactId); + await dataWebsiteUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_2100"); await deleteAll(contactDataUri, "contact_update_test_2100"); done(); @@ -1232,7 +1231,7 @@ describe('ContactsTest', function() { } }); - async function beforeDataWebsiteInsert(DAHelper, rawContactId) + async function beforeDataWebsiteInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -1240,7 +1239,7 @@ describe('ContactsTest', function() { "detail_info" : "www.com" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues1); sleep(sleep_one); console.info('logMessage contact_update_test_2100: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1249,13 +1248,13 @@ describe('ContactsTest', function() { } } - async function dataWebsiteUpdate(DAHelper, rawContactId) + async function dataWebsiteUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "www.123.com"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_2100: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1275,16 +1274,16 @@ describe('ContactsTest', function() { */ it("contact_update_test_2200", 0, async function(done) { console.info("------logMessage contact_update_test_2200 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_2200: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataRelationInsert(DAHelper, rawContactId); - await dataRelationUpdate(DAHelper, rawContactId); + await beforeDataRelationInsert(dataShareHelper, rawContactId); + await dataRelationUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_2200"); await deleteAll(contactDataUri, "contact_update_test_2200"); done(); @@ -1294,7 +1293,7 @@ describe('ContactsTest', function() { } }); - async function beforeDataRelationInsert(DAHelper, rawContactId) + async function beforeDataRelationInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1302,7 +1301,7 @@ describe('ContactsTest', function() { "detail_info" : "Secretary" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_update_test_2200: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); } catch (error) { @@ -1310,13 +1309,13 @@ describe('ContactsTest', function() { } } - async function dataRelationUpdate(DAHelper, rawContactId) + async function dataRelationUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "spouse"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_2200: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1336,16 +1335,16 @@ describe('ContactsTest', function() { */ it("contact_update_test_2300", 0, async function(done) { console.info("------logMessage contact_update_test_2300 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_update_test_2300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataGroupInsert(DAHelper, rawContactId); - await dataGroupUpdate(DAHelper, rawContactId); + await beforeDataGroupInsert(dataShareHelper, rawContactId); + await dataGroupUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_2300"); await deleteAll(contactDataUri, "contact_update_test_2300"); done(); @@ -1355,7 +1354,7 @@ describe('ContactsTest', function() { } }); - async function beforeDataGroupInsert(DAHelper, rawContactId) + async function beforeDataGroupInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1363,7 +1362,7 @@ describe('ContactsTest', function() { "detail_info" : "2" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_update_test_2300: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1372,13 +1371,13 @@ describe('ContactsTest', function() { } } - async function dataGroupUpdate(DAHelper, rawContactId) + async function dataGroupUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "7"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_2300: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1398,17 +1397,17 @@ describe('ContactsTest', function() { */ it("contact_update_test_2400", 0, async function(done) { console.info("------logMessage contact_update_test_2400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoyuan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); sleep(sleep_one); console.info("logMessage contact_update_test_2400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await beforeDataMiscInsert(DAHelper, rawContactId); - await dataMiscUpdate(DAHelper, rawContactId); + await beforeDataMiscInsert(dataShareHelper, rawContactId); + await dataMiscUpdate(dataShareHelper, rawContactId); await deleteRawContact("contact_update_test_2400"); await deleteAll(contactDataUri, "contact_update_test_2400"); done(); @@ -1418,7 +1417,7 @@ describe('ContactsTest', function() { } }); - async function beforeDataMiscInsert(DAHelper, rawContactId) + async function beforeDataMiscInsert(dataShareHelper, rawContactId) { var contactDataValues1 = { "raw_contact_id" : rawContactId, @@ -1426,7 +1425,7 @@ describe('ContactsTest', function() { "detail_info" : "1234" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues1); sleep(sleep_one); console.info('logMessage contact_update_test_2400: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1435,13 +1434,13 @@ describe('ContactsTest', function() { } } - async function dataMiscUpdate(DAHelper, rawContactId) + async function dataMiscUpdate(dataShareHelper, rawContactId) { var updateValues = {"detail_info" : "999"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(sleep_one); console.info('logMessage contact_update_test_2400: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -1461,15 +1460,15 @@ describe('ContactsTest', function() { */ it("contact_favorite_test_2500", 0, async function(done) { console.info("-------logMessage contact_favorite_test_2500 is starting!------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaocai", "company" : "TT", "position" : "Testers"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues) + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues) console.info('logMessage contact_favorite_test_2500: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); - await updateFavorite(DAHelper, rawContactId); + await updateFavorite(dataShareHelper, rawContactId); await deleteRawContact("contact_favorite_test_2500"); done(); } catch (error) { @@ -1478,13 +1477,13 @@ describe('ContactsTest', function() { } }); - async function updateFavorite(DAHelper, rawContactId) + async function updateFavorite(dataShareHelper, rawContactId) { var updateValues = {"favorite" : 1}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(rawContactUri, updateValues, condition); sleep(sleep_one); console.info("logMessage contact_favorite_test_2500: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -1507,14 +1506,14 @@ describe('ContactsTest', function() { */ it("contact_unfavorite_test_2600", 0, async function(done) { console.info("-------logMessage contact_unfavorite_test_2600 is starting!------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaohong", "company" : "TT", "position" : "Testers", "favorite" : 1}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info('logMessage contact_unfavorite_test_2600: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); - await updateUnFavorite(DAHelper, rawContactId); + await updateUnFavorite(dataShareHelper, rawContactId); await deleteRawContact("contact_unfavorite_test_2600"); done(); } catch (error) { @@ -1523,13 +1522,13 @@ describe('ContactsTest', function() { } }); - async function updateUnFavorite(DAHelper, rawContactId) + async function updateUnFavorite(dataShareHelper, rawContactId) { var updateValues = {"favorite" : 0}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var updateCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(rawContactUri, updateValues, condition); sleep(sleep_one); console.info("logMessage contact_unfavorite_test_2600: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -1552,10 +1551,10 @@ describe('ContactsTest', function() { */ it("contact_insert_test_2700", 0, async function(done) { console.info("-------logMessage contact_insert_test_2700 is starting!------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var blocklistId = await DAHelper.insert(contactBlocklistUri, common.getProfileBlockList()); + var blocklistId = await dataShareHelper.insert(contactBlocklistUri, common.getProfileBlockList()); sleep(sleep_one); console.info('logMessage contact_insert_test_2700: blocklistId = ' + blocklistId); expect(blocklistId > 0).assertTrue(); @@ -1577,10 +1576,10 @@ describe('ContactsTest', function() { */ it("contact_delete_test_2800", 0, async function(done) { console.info("-------logMessage contact_delete_test_2800 is starting!------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var blocklistId = await DAHelper.insert(contactBlocklistUri, common.getProfileBlockList()); + var blocklistId = await dataShareHelper.insert(contactBlocklistUri, common.getProfileBlockList()); sleep(sleep_one); console.info('logMessage contact_delete_test_2800: blocklistId = ' + blocklistId); expect(blocklistId > 0).assertTrue(); @@ -1593,10 +1592,10 @@ describe('ContactsTest', function() { async function BlocklistDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", blocklistId.toString()); try { - var deleteCode = await DAHelper.delete(contactBlocklistUri, condition); + var deleteCode = await dataShareHelper.delete(contactBlocklistUri, condition); sleep(sleep_one); console.info("logMessage contact_delete_test_2800: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -1617,16 +1616,16 @@ describe('ContactsTest', function() { */ it("contact_insert_test_2900", 0, async function(done) { console.info("-------logMessage contact_insert_test_2900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var groupValues = {"group_name" : "TestersThird"}; try { - var groupId = await DAHelper.insert(groupUri, groupValues); + var groupId = await dataShareHelper.insert(groupUri, groupValues); sleep(sleep_one); console.info("logMessage contact_insert_test_2900: groupId =" + groupId); expect(groupId > 0).assertTrue(); - await groupRawContactInsert(DAHelper); + await groupRawContactInsert(dataShareHelper); await deleteRawContact("contact_insert_test_2900"); await deleteAll(groupUri, "contact_insert_test_2900"); await deleteAll(contactDataUri, "contact_insert_test_2900"); @@ -1637,21 +1636,21 @@ describe('ContactsTest', function() { } }); - async function groupRawContactInsert(DAHelper) + async function groupRawContactInsert(dataShareHelper) { var rawContactValues = {"display_name" : "liyu"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_insert_test_2900: rawContactId =" + rawContactId); expect(rawContactId > 0).assertTrue(); - await groupDataInsert(DAHelper, rawContactId); + await groupDataInsert(dataShareHelper, rawContactId); } catch (error) { console.info("logMessage contact_insert_test_2900: raw_contact insert error =" + error); } } - async function groupDataInsert(DAHelper, rawContactId) + async function groupDataInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1659,7 +1658,7 @@ describe('ContactsTest', function() { "detail_info" : groupId.toString() }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues) + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues) sleep(sleep_one); console.info("logMessage contact_insert_test_2900: contactDataId =" + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -1680,16 +1679,16 @@ describe('ContactsTest', function() { */ it("contact_delete_test_3000", 0, async function(done) { console.info("-------logMessage contact_delete_test_3000 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var groupValues = {"group_name" : "TestersFourth"}; try { - var groupId = await DAHelper.insert(groupUri, groupValues); + var groupId = await dataShareHelper.insert(groupUri, groupValues); sleep(sleep_one); console.info("logMessage contact_delete_test_3000: groupId =" + groupId); expect(groupId > 0).assertTrue(); - await groupAfterRawContactInsert(DAHelper); + await groupAfterRawContactInsert(dataShareHelper); await deleteRawContact("contact_delete_test_3000"); await deleteAll(groupUri, "contact_delete_test_3000"); await deleteAll(contactDataUri, "contact_delete_test_3000"); @@ -1700,21 +1699,21 @@ describe('ContactsTest', function() { } }); - async function groupAfterRawContactInsert(DAHelper) + async function groupAfterRawContactInsert(dataShareHelper) { var rawContactValues = {"display_name" : "liyuchen"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_delete_test_3000: rawContactId =" + rawContactId); expect(rawContactId > 0).assertTrue(); - await deleteGroupContactDataInsert(DAHelper, rawContactId); + await deleteGroupContactDataInsert(dataShareHelper, rawContactId); } catch (error) { console.info("logMessage contact_delete_test_3000: raw_contact insert error =" + error); } } - async function deleteGroupContactDataInsert(DAHelper, rawContactId) + async function deleteGroupContactDataInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -1722,21 +1721,21 @@ describe('ContactsTest', function() { "detail_info" : groupId.toString() }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info("logMessage contact_delete_test_3000: contactDataId =" + contactDataId); expect(contactDataId > 0).assertTrue(); - await deleteGroup(DAHelper, contactDataId); + await deleteGroup(dataShareHelper, contactDataId); } catch (error) { console.info("logMessage contact_delete_test_3000: contact_data insert error =" + error); } } - async function deleteGroup(DAHelper, contactDataId) + async function deleteGroup(dataShareHelper, contactDataId) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", contactDataId.toString()); try { - var deleteCode = await DAHelper.delete(contactDataUri, condition); + var deleteCode = await dataShareHelper.delete(contactDataUri, condition); sleep(sleep_one); console.info("logMessage contact_delete_test_3000: deleteCode =" + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -1755,16 +1754,16 @@ describe('ContactsTest', function() { */ it("contact_query_test_3100", 0, async function(done) { console.info("-----------logMessage contact_query_test_3100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyu"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_3100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await RawContactQuery(DAHelper, rawContactId); + await RawContactQuery(dataShareHelper, rawContactId); await deleteRawContact("contact_query_test_3100"); done(); } catch (error) { @@ -1773,13 +1772,13 @@ describe('ContactsTest', function() { } }); - async function RawContactQuery(DAHelper, rawContactId) + async function RawContactQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(sleep_two); if (resultSet.goToFirstRow()) { do { @@ -1802,12 +1801,12 @@ describe('ContactsTest', function() { */ it("contact_query_test_3200", 0, async function(done) { console.info("-----------logMessage contact_query_test_3200 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues1 = {"display_name" : "xiaoyu"}; try { - var rawContactIdOne = await DAHelper.insert(rawContactUri, rawContactValues1); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, rawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_test_3200: rawContactId = " + rawContactIdOne); expect(rawContactIdOne > 0).assertTrue(); @@ -1818,11 +1817,11 @@ describe('ContactsTest', function() { var rawContactValues2 = {"display_name" : "xiaohong"}; try { - var rawContactIdTwo = await DAHelper.insert(rawContactUri, rawContactValues2); + var rawContactIdTwo = await dataShareHelper.insert(rawContactUri, rawContactValues2); sleep(sleep_one); console.info("logMessage contact_query_test_3200: rawContactId = " + rawContactIdTwo); expect(rawContactIdTwo > 0).assertTrue(); - await queryTwoRaw(DAHelper, rawContactIdOne, rawContactIdTwo); + await queryTwoRaw(dataShareHelper, rawContactIdOne, rawContactIdTwo); await deleteRawContact("contact_query_test_3200"); done(); } catch (error) { @@ -1831,15 +1830,15 @@ describe('ContactsTest', function() { } }); - async function queryTwoRaw(DAHelper, rawContactIdOne, rawContactIdTwo) + async function queryTwoRaw(dataShareHelper, rawContactIdOne, rawContactIdTwo) { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(sleep_one); console.info('logMessage contact_query_test_3200: goToFirstRow' + resultSet.goToFirstRow()); expect(resultSet.goToFirstRow()).assertEqual(true); @@ -1864,12 +1863,12 @@ describe('ContactsTest', function() { */ it("contact_query_test_3300", 0, async function(done) { console.info("-----------logMessage contact_query_test_3300 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues1 = {"display_name" : "xiaoyu"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues1); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues1); sleep(sleep_one); console.info("logMessage contact_query_test_3300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -1878,10 +1877,10 @@ describe('ContactsTest', function() { done(); } var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var resultSet = await DAHelper.query(profileRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(profileRawContactUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -1907,8 +1906,8 @@ describe('ContactsTest', function() { */ it("contact_query_test_3400", 0, async function(done) { console.info("-----------logMessage contact_query_test_3400 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = { "display_name" : "xiaoyuzhou", @@ -1918,11 +1917,11 @@ describe('ContactsTest', function() { "phonetic_name" : "xiaoyu||xy" }; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_3400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await queryAllInformation(DAHelper, rawContactId); + await queryAllInformation(dataShareHelper, rawContactId); await deleteRawContact("contact_query_test_3400"); done(); } catch (error) { @@ -1931,13 +1930,13 @@ describe('ContactsTest', function() { } }); - async function queryAllInformation(DAHelper, rawContactId) + async function queryAllInformation(dataShareHelper, rawContactId) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -1971,11 +1970,11 @@ describe('ContactsTest', function() { */ it("contact_query_test_3500", 0, async function(done) { console.info("-----------logMessage contact_query_test_3500 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyuzhou"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_3500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -1985,7 +1984,7 @@ describe('ContactsTest', function() { } var groupValues = {"group_name" : "BossBoard3500"}; try { - var groupId = await DAHelper.insert(groupUri, groupValues); + var groupId = await dataShareHelper.insert(groupUri, groupValues); sleep(sleep_one); console.info("logMessage contact_query_test_3500: groupId = " + groupId); expect(groupId > 0).assertTrue(); @@ -1993,14 +1992,14 @@ describe('ContactsTest', function() { console.info("logMessage contact_query_test_3500: group insert error = " + error); done(); } - await groupBossBoardInsert(DAHelper, rawContactId, groupId); + await groupBossBoardInsert(dataShareHelper, rawContactId, groupId); await deleteRawContact("contact_query_test_3500"); await deleteAll(groupUri, "contact_query_test_3500"); await deleteAll(contactDataUri, "contact_query_test_3500"); done(); }); - async function groupBossBoardInsert(DAHelper, rawContactId, groupId) + async function groupBossBoardInsert(dataShareHelper, rawContactId, groupId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2008,26 +2007,26 @@ describe('ContactsTest', function() { "detail_info" : groupId.toString() }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_query_test_3500: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); - await groupBossBoardQuery(DAHelper, rawContactId, groupId); + await groupBossBoardQuery(dataShareHelper, rawContactId, groupId); } catch (error) { console.info("logMessage contact_query_test_3500: query error = " + error); } } - async function groupBossBoardQuery(DAHelper, rawContactId, groupId) + async function groupBossBoardQuery(dataShareHelper, rawContactId, groupId) { var resultColumns = [ "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 9 data is group condition.equalTo("type_id", "9"); condition.and(); condition.equalTo("detail_info", groupId.toString()); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2050,11 +2049,11 @@ describe('ContactsTest', function() { */ it("contact_query_test_3600", 0, async function(done) { console.info("-----------logMessage contact_query_test_3600 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyuzhou", "favorite" : 1}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_3600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -2069,12 +2068,12 @@ describe('ContactsTest', function() { async function queryFavorite() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("favorite", "1"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2099,11 +2098,11 @@ describe('ContactsTest', function() { */ it("contact_query_test_3700", 0, async function(done) { console.info("-----------logMessage contact_query_test_3700 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyuzhou", "lastest_contacted_time" : 60}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_3700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -2118,12 +2117,12 @@ describe('ContactsTest', function() { async function queryContacted() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.lessThan("lastest_contacted_time", "100"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2148,16 +2147,16 @@ describe('ContactsTest', function() { */ it("contact_query_test_3800", 0, async function(done) { console.info("-----------logMessage contact_query_test_3800 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaocai"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_3800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await rawContactDelete(DAHelper, rawContactId); - await deletedRawContactQuery(DAHelper, rawContactId); + await rawContactDelete(dataShareHelper, rawContactId); + await deletedRawContactQuery(dataShareHelper, rawContactId); await deleteAll(deletedUri, "contact_query_test_3800") done(); } catch (error) { @@ -2166,12 +2165,12 @@ describe('ContactsTest', function() { } }); - async function rawContactDelete(DAHelper, rawContactId) + async function rawContactDelete(dataShareHelper, rawContactId) { - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(rawContactUri, condition1); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition1); sleep(sleep_one); console.info('logMessage contact_query_test_3800: deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -2181,13 +2180,13 @@ describe('ContactsTest', function() { } } - async function deletedRawContactQuery(DAHelper, rawContactId) + async function deletedRawContactQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "raw_contact_id", "display_name", "is_deleted" ]; - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(deletedRawContactUri, resultColumns, condition2); + var resultSet = await dataShareHelper.query(deletedRawContactUri, resultColumns, condition2); sleep(sleep_one); if (resultSet.goToFirstRow()) { console.info('logMessage contact_query_test_3800: id = ' + resultSet.getString(0)); @@ -2212,11 +2211,11 @@ describe('ContactsTest', function() { */ it("contact_query_test_3900", 0, async function(done) { console.info("-----------logMessage contact_query_test_3900 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaocai"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_3900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -2231,7 +2230,7 @@ describe('ContactsTest', function() { } }); - async function queryPhoneInsert(DAHelper, rawContactId) + async function queryPhoneInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2239,7 +2238,7 @@ describe('ContactsTest', function() { "detail_info" : "1853696321" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_query_test_3900: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -2248,14 +2247,14 @@ describe('ContactsTest', function() { } } - async function phoneQuery(DAHelper, rawContactId) + async function phoneQuery(dataShareHelper, rawContactId) { var resultColumns = [ "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 5 data is phone condition.equalTo("content_type", "phone"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2279,17 +2278,17 @@ describe('ContactsTest', function() { it("contact_query_test_4000", 0, async function(done) { console.info("-----------logMessage contact_query_test_4000 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyu"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_4000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await queryEmailInsert(DAHelper, rawContactId); - await emailQuery(DAHelper, contactDataId, rawContactId); + await queryEmailInsert(dataShareHelper, rawContactId); + await emailQuery(dataShareHelper, contactDataId, rawContactId); await deleteRawContact("contact_query_test_4000"); await deleteAll(contactDataUri, "contact_query_test_4000"); done(); @@ -2299,7 +2298,7 @@ describe('ContactsTest', function() { } }); - async function queryEmailInsert(DAHelper, rawContactId) + async function queryEmailInsert(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2307,7 +2306,7 @@ describe('ContactsTest', function() { "detail_info" : "16658@163.com" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_query_test_4000: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -2316,14 +2315,14 @@ describe('ContactsTest', function() { } } - async function emailQuery(DAHelper, contactDataId, rawContactId) + async function emailQuery(dataShareHelper, contactDataId, rawContactId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 1 data content_type is email condition.equalTo("type_id", "1").limitAs(array_three).orderByDesc("id"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -2348,18 +2347,18 @@ describe('ContactsTest', function() { */ it("contact_query_test_4100", 0, async function(done) { console.info("-----------logMessage contact_query_test_4100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoyu"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_query_test_4100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await queryTwoDataInsert(DAHelper, rawContactId); - await queryTwoDataInsertCompany(DAHelper, rawContactId); - await queryTwo(DAHelper, rawContactId); + await queryTwoDataInsert(dataShareHelper, rawContactId); + await queryTwoDataInsertCompany(dataShareHelper, rawContactId); + await queryTwo(dataShareHelper, rawContactId); await deleteRawContact("contact_query_test_4100"); await deleteAll(contactDataUri, "contact_query_test_4100"); del @@ -2370,11 +2369,11 @@ describe('ContactsTest', function() { } }); - async function queryTwoDataInsert(DAHelper, rawContactId) + async function queryTwoDataInsert(dataShareHelper, rawContactId) { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "name", "detail_info" : "xiaoyu"}; try { - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_query_test_4100: contactDataId = " + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -2383,7 +2382,7 @@ describe('ContactsTest', function() { } } - async function queryTwoDataInsertCompany(DAHelper, rawContactId) + async function queryTwoDataInsertCompany(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2392,7 +2391,7 @@ describe('ContactsTest', function() { "position" : "Testers" }; try { - var contactDataId2 = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId2 = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info("logMessage contact_query_test_4100: contactDataId = " + contactDataId2); expect(contactDataId2 > 0).assertTrue(); } catch (error) { @@ -2400,13 +2399,13 @@ describe('ContactsTest', function() { } } - async function queryTwo(DAHelper, rawContactId) + async function queryTwo(dataShareHelper, rawContactId) { var resultColumns = [ "id", "raw_contact_id", "detail_info", "position" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); var array = [ {detail_info : "xiaoyu", position : ""}, {detail_info : "OOOO", position : "Testers"} ]; var i = 0; @@ -2437,17 +2436,17 @@ describe('ContactsTest', function() { */ it("contact_delete_test_4400", 0, async function(done) { console.info("-------logMessage contact_delete_test_4400 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); sleep(sleep_one); console.info("logMessage contact_delete_test_4400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await deleteRaw(DAHelper, rawContactId); - await queryDelete(DAHelper, rawContactId); + await deleteRaw(dataShareHelper, rawContactId); + await queryDelete(dataShareHelper, rawContactId); done(); } catch (error) { console.info("logMessage contact_delete_test_4400: raw_contact insert error :" + error); @@ -2455,12 +2454,12 @@ describe('ContactsTest', function() { } }); - async function deleteRaw(DAHelper, rawContactId) + async function deleteRaw(dataShareHelper, rawContactId) { - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(rawContactUri, condition1); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition1); sleep(sleep_one); console.info("logMessage contact_delete_test_4400: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -2469,13 +2468,13 @@ describe('ContactsTest', function() { } } - async function queryDelete(DAHelper, rawContactId) + async function queryDelete(dataShareHelper, rawContactId) { var resultColumns = [ "id", "delete_time", "display_name" ]; - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(deletedRawContactUri, resultColumns, condition2); + var resultSet = await dataShareHelper.query(deletedRawContactUri, resultColumns, condition2); sleep(sleep_one); if (resultSet.goToFirstRow()) { console.info("logMessage contact_delete_test_4400: columnNames:" + resultSet.columnNames); @@ -2498,18 +2497,18 @@ describe('ContactsTest', function() { */ it("contact_delete_test_4700", 0, async function(done) { console.info("-------logMessage contact_delete_test_4700 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaozhang", "company" : "OOOO", "position" : "TestManager"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); sleep(sleep_one); console.info("logMessage contact_delete_test_4700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await queryDeleteCompanyData(DAHelper, rawContactId); - await rawContactDelete(DAHelper, rawContactId); - await companyRawContactDeleteQuery(DAHelper, rawContactId); + await queryDeleteCompanyData(dataShareHelper, rawContactId); + await rawContactDelete(dataShareHelper, rawContactId); + await companyRawContactDeleteQuery(dataShareHelper, rawContactId); await deleteAll(contactDataUri, "contact_delete_test_4700"); done(); } catch (error) { @@ -2518,7 +2517,7 @@ describe('ContactsTest', function() { } }); - async function queryDeleteCompanyData(DAHelper, rawContactId) + async function queryDeleteCompanyData(dataShareHelper, rawContactId) { var contactDataValues = { "raw_contact_id" : rawContactId, @@ -2527,7 +2526,7 @@ describe('ContactsTest', function() { "position" : "TestManager" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info("logMessage contact_delete_test_4700: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -2536,12 +2535,12 @@ describe('ContactsTest', function() { } } - async function rawContactDelete(DAHelper, rawContactId) + async function rawContactDelete(dataShareHelper, rawContactId) { - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(rawContactUri, condition1); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition1); sleep(sleep_one); console.info("logMessage contact_delete_test_4700: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -2551,13 +2550,13 @@ describe('ContactsTest', function() { } } - async function companyRawContactDeleteQuery(DAHelper, rawContactId) + async function companyRawContactDeleteQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "display_name", "backup_data" ]; - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(deletedRawContactUri, resultColumns, condition2); + var resultSet = await dataShareHelper.query(deletedRawContactUri, resultColumns, condition2); sleep(sleep_one); if (resultSet.goToFirstRow()) { console.info("logMessage contact_delete_test_4700: columnNames:" + resultSet.columnNames); @@ -2580,17 +2579,17 @@ describe('ContactsTest', function() { */ it("contact_delete_test_4800", 0, async function(done) { console.info("-------logMessage contact_delete_test_4800 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = {"display_name" : "xiaopeng"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); sleep(sleep_one); console.info("logMessage contact_delete_test_4800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - await ContactDelete(DAHelper, rawContactId); - await DeletedRawContactQuery(DAHelper, rawContactId) + await ContactDelete(dataShareHelper, rawContactId); + await DeletedRawContactQuery(dataShareHelper, rawContactId) await deleteAll(contactDataUri, "contact_delete_test_4800"); done(); } catch (error) { @@ -2599,12 +2598,12 @@ describe('ContactsTest', function() { } }); - async function ContactDelete(DAHelper, rawContactId) + async function ContactDelete(dataShareHelper, rawContactId) { - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("name_raw_contact_id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(contactUri, condition1); + var deleteCode = await dataShareHelper.delete(contactUri, condition1); sleep(sleep_one); console.info("logMessage contact_delete_test_4800: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -2613,13 +2612,13 @@ describe('ContactsTest', function() { } } - async function DeletedRawContactQuery(DAHelper, rawContactId) + async function DeletedRawContactQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "delete_time", "display_name" ]; - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(deletedRawContactUri, resultColumns, condition2); + var resultSet = await dataShareHelper.query(deletedRawContactUri, resultColumns, condition2); sleep(sleep_one) if (resultSet.goToFirstRow()) { @@ -2643,17 +2642,17 @@ describe('ContactsTest', function() { */ it("contact_batchinsert_test_4900", 0, async function(done) { console.info("--------logMessage contact_batchinsert_test_4900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, common.getContactBatchCompany()); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, common.getContactBatchCompany()); sleep(sleep_one); console.info("logMessage contact_batchinsert_test_4900: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("company", "TT4900"); - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); console.info( 'contact_batchinsert_test_4900 : queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == 5).assertEqual(true); @@ -2673,11 +2672,11 @@ describe('ContactsTest', function() { */ it("contact_batchinsert_test_5000", 0, async function(done) { console.info("--------logMessage contact_batchinsert_test_5000 start!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaozhi"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info("logMessage contact_batchinsert_test_5000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -2690,7 +2689,7 @@ describe('ContactsTest', function() { async function ContactDataBatchInsert() { try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, common.getContactBatchCompanyTwo()); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, common.getContactBatchCompanyTwo()); sleep(sleep_one); console.info("logMessage contact_batchinsert_test_5000: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -2713,11 +2712,11 @@ describe('ContactsTest', function() { */ it("contact_batchinsert_test_5400", 0, async function(done) { console.info("--------logMessage contact_batchinsert_test_5400 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(13); try { - var batchInsertCode = await DAHelper.batchInsert(contactBlocklistUri, common.getPhoneNumberBatch()); + var batchInsertCode = await dataShareHelper.batchInsert(contactBlocklistUri, common.getPhoneNumberBatch()); sleep(sleep_one); console.info("logMessage contact_batchinsert_test_5400: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -2731,10 +2730,10 @@ describe('ContactsTest', function() { async function BlocklistDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("phone_number", phoneNumber); try { - var deleteCode = await DAHelper.delete(contactBlocklistUri, condition); + var deleteCode = await dataShareHelper.delete(contactBlocklistUri, condition); console.info("logMessage contact_batchinsert_test_5400: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); await query(0); @@ -2748,10 +2747,10 @@ describe('ContactsTest', function() { async function query(size) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("phone_number", phoneNumber); try { - var resultSet = await DAHelper.query(contactBlocklistUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactBlocklistUri, resultColumns, condition); sleep(sleep_one); console.info( 'contact_batchinsert_test_5400 : queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); @@ -2770,8 +2769,8 @@ describe('ContactsTest', function() { */ it("contact_update_test_5300", 0, async function(done) { console.info("--------logMessage contact_update_test_5300 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValuesOne = {"display_name" : "fengyuan", "favorite" : 1}; var rawContactValuesTwo = {"display_name" : "xiaoli", "favorite" : 1}; @@ -2781,12 +2780,12 @@ describe('ContactsTest', function() { listAddBluk[1] = rawContactValuesTwo; listAddBluk[array_two] = rawContactValuesThree; try { - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); sleep(sleep_one); console.info("logMessage contact_update_test_5300: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); - await RawContactUpdateUnFavorites(DAHelper); - await queryUnFavorites(DAHelper); + await RawContactUpdateUnFavorites(dataShareHelper); + await queryUnFavorites(dataShareHelper); await deleteRawContact("contact_update_test_5300"); done(); } catch (error) { @@ -2795,15 +2794,15 @@ describe('ContactsTest', function() { } }); - async function RawContactUpdateUnFavorites(DAHelper) + async function RawContactUpdateUnFavorites(dataShareHelper) { var updateValues = {"favorite" : 0}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("display_name", "fengyuan"); condition.or(); condition.equalTo("display_name", "xiaoma"); try { - var updateCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(rawContactUri, updateValues, condition); sleep(sleep_one); console.info("logMessage contact_update_test_5300: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -2812,15 +2811,15 @@ describe('ContactsTest', function() { } } - async function queryUnFavorites(DAHelper) + async function queryUnFavorites(dataShareHelper) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("display_name", "fengyuan"); condition.or(); condition.equalTo("display_name", "xiaoma"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(sleep_one); console.info('contact_update_test_5300 : queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == array_two).assertEqual(true); @@ -2847,11 +2846,11 @@ describe('ContactsTest', function() { */ it("contact_batchinsert_test_5500", 0, async function(done) { console.info("--------logMessage contact_batchinsert_test_5500 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var groupValues = {"group_name" : "ManagerGroup"}; try { - var groupId = await DAHelper.insert(groupUri, groupValues); + var groupId = await dataShareHelper.insert(groupUri, groupValues); console.info("logMessage contact_batchinsert_test_5500: groupId = " + groupId); expect(groupId > 0).assertTrue(); } catch (error) { @@ -2861,7 +2860,7 @@ describe('ContactsTest', function() { try { var rawContactValues1 = {"display_name" : "xiaohuang"}; - var rawContactIdOne = await DAHelper.insert(rawContactUri, rawContactValues1); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, rawContactValues1); console.info("logMessage contact_batchinsert_test_5500: rawContactIdOne = " + rawContactIdOne); expect(rawContactIdOne > 0).assertTrue(); } catch (error) { @@ -2871,7 +2870,7 @@ describe('ContactsTest', function() { try { var rawContactValues2 = {"display_name" : "xiaolv"}; - var rawContactIdTwo = await DAHelper.insert(rawContactUri, rawContactValues2); + var rawContactIdTwo = await dataShareHelper.insert(rawContactUri, rawContactValues2); console.info("logMessage contact_batchinsert_test_5500: rawContactIdTwo = " + rawContactIdTwo); expect(rawContactIdTwo > 0).assertTrue(); } catch (error) { @@ -2881,21 +2880,21 @@ describe('ContactsTest', function() { try { var rawContactValues3 = {"display_name" : "xiaobai"}; - var rawContactId3 = await DAHelper.insert(rawContactUri, rawContactValues3); + var rawContactId3 = await dataShareHelper.insert(rawContactUri, rawContactValues3); console.info("logMessage contact_batchinsert_test_5500: rawContactId3 = " + rawContactId3); expect(rawContactId3 > 0).assertTrue(); } catch (error) { console.info("logMessage contact_batchinsert_test_5500: raw_contact_3 insert error = " + error); done(); } - await threeDataInsert(DAHelper, rawContactIdOne, rawContactIdTwo, rawContactId3, groupId); + await threeDataInsert(dataShareHelper, rawContactIdOne, rawContactIdTwo, rawContactId3, groupId); await deleteRawContact("contact_batchinsert_test_5500"); await deleteAll(groupUri, "contact_batchinsert_test_5500"); await deleteAll(contactDataUri, "contact_batchinsert_test_5500"); done(); }); - async function threeDataInsert(DAHelper, rawContactIdOne, rawContactIdTwo, rawContactId3, groupId) + async function threeDataInsert(dataShareHelper, rawContactIdOne, rawContactIdTwo, rawContactId3, groupId) { var contactDataValues1 = { "raw_contact_id" : rawContactIdOne, @@ -2917,42 +2916,42 @@ describe('ContactsTest', function() { listAddBluk[1] = contactDataValues2; listAddBluk[array_two] = contactDataValues3; try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); sleep(sleep_one); console.info("logMessage contact_batchinsert_test_5500: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); - await ContactDataDelete(DAHelper, rawContactIdOne, rawContactId3); + await ContactDataDelete(dataShareHelper, rawContactIdOne, rawContactId3); } catch (error) { console.info("logMessage contact_batchinsert_test_5500: batchInsert error = " + error); } } - async function ContactDataDelete(DAHelper, rawContactIdOne, rawContactId3) + async function ContactDataDelete(dataShareHelper, rawContactIdOne, rawContactId3) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactIdOne.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactId3.toString()); try { - var deleteCode = await DAHelper.delete(contactDataUri, condition); + var deleteCode = await dataShareHelper.delete(contactDataUri, condition); sleep(sleep_one); console.info("logMessage contact_batchinsert_test_5500: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); - await queryTwoData(DAHelper, rawContactIdOne, rawContactId3); + await queryTwoData(dataShareHelper, rawContactIdOne, rawContactId3); } catch (error) { console.info("logMessage contact_batchinsert_test_5500: delete error = " + error); } } - async function queryTwoData(DAHelper, rawContactIdOne, rawContactId3) + async function queryTwoData(dataShareHelper, rawContactIdOne, rawContactId3) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactIdOne.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactId3.toString()); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); console.info( 'contact_batchinsert_test_5500 : queryBatch start ! resultSet.rowCount = ' + resultSet.rowCount); @@ -2970,12 +2969,12 @@ describe('ContactsTest', function() { */ it("contact_pinyin_query_test_200", 0, async function(done) { console.info("--------logMessage contact_pinyin_query_test_200 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "小黄"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info('logMessage contact_pinyin_query_test_200 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); await ContactDataInsert(); @@ -2995,10 +2994,10 @@ describe('ContactsTest', function() { "detail_info" : "xiaohuang" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_pinyin_query_test_200 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await SearchQuery(DAHelper, rawContactId); + await SearchQuery(dataShareHelper, rawContactId); } catch (error) { console.info('logMessage contact_pinyin_query_test_200 contact_data insert error = ' + error); done(); @@ -3006,13 +3005,13 @@ describe('ContactsTest', function() { } }); - async function SearchQuery(DAHelper, rawContactId) + async function SearchQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "search_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(searchContactUri, resultColumns, condition); var map = common.getSearchMap(); map.set("raw_contact_id", rawContactId.toString()); if (resultSet.goToFirstRow()) { @@ -3038,12 +3037,12 @@ describe('ContactsTest', function() { */ it("contact_pinyin_query_test_100", 0, async function(done) { console.info("--------logMessage contact_pinyin_query_test_100 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "鍵盤"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_pinyin_query_test_100 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3060,11 +3059,11 @@ describe('ContactsTest', function() { { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "name", "detail_info" : "鍵盤"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_pinyin_query_test_100 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await SearchContactQueryChinese(DAHelper, rawContactId); + await SearchContactQueryChinese(dataShareHelper, rawContactId); } catch (error) { console.info('logMessage contact_pinyin_query_test_100 contact_data insert error = ' + error); done(); @@ -3072,13 +3071,13 @@ describe('ContactsTest', function() { } }); - async function SearchContactQueryChinese(DAHelper, rawContactId) + async function SearchContactQueryChinese(dataShareHelper, rawContactId) { var resultColumns = [ "raw_contact_id", "search_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(searchContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contact_pinyin_query_test_100: id = ' + resultSet.getString(0)); @@ -3100,12 +3099,12 @@ describe('ContactsTest', function() { */ it("contact_pinyin_query_test_300", 0, async function(done) { console.info("--------logMessage contact_pinyin_query_test_300 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "Tom"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_pinyin_query_test_300 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3121,10 +3120,10 @@ describe('ContactsTest', function() { { var contactDataValues = {"raw_contact_id" : rawContactId, "content_type" : "name", "detail_info" : "Tom"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_pinyin_query_test_300 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await SearchContactQuery(DAHelper, rawContactId); + await SearchContactQuery(dataShareHelper, rawContactId); } catch (error) { console.info('logMessage contact_pinyin_query_test_300 contact_data insert error = ' + error); done(); @@ -3132,13 +3131,13 @@ describe('ContactsTest', function() { } }); - async function SearchContactQuery(DAHelper, rawContactId) + async function SearchContactQuery(dataShareHelper, rawContactId) { var resultColumns = [ "raw_contact_id", "search_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(searchContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contact_pinyin_query_test_300: id = ' + resultSet.getString(0)); @@ -3160,12 +3159,12 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_400", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_400 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "400xiaoming400"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_400 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3180,12 +3179,12 @@ describe('ContactsTest', function() { async function RawContactNameQuery() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("display_name", "%xiaoming40%"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contact_fuzzyquery_test_400: id = ' + resultSet.getString(0)); @@ -3210,10 +3209,10 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_500", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_500 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); var rawContactValues = {"display_name" : "500xiaoming500", "phonetic_name" : "500xiaoming500||xm"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_500 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3228,7 +3227,7 @@ describe('ContactsTest', function() { async function RawContactPhoneticNameQuery() { var resultColumns = [ "id", "display_name", "phonetic_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("phonetic_name", "%xiaoming%"); condition.and(); condition.equalTo("is_deleted", "0"); @@ -3237,7 +3236,7 @@ describe('ContactsTest', function() { condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contact_fuzzyquery_test_500: id = ' + resultSet.getString(0)); @@ -3265,16 +3264,16 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_600", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_600 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming", "company" : "TT600", "position" : "Testers600"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_600 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); - await RawContactCompanyQuery(DAHelper, rawContactId); + await RawContactCompanyQuery(dataShareHelper, rawContactId); await deleteRawContact("contact_fuzzyquery_test_600"); done(); } catch (error) { @@ -3283,10 +3282,10 @@ describe('ContactsTest', function() { } }); - async function RawContactCompanyQuery(DAHelper, rawContactId) + async function RawContactCompanyQuery(dataShareHelper, rawContactId) { var resultColumns = [ "id", "display_name", "company", "position" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("company", "%TT6%"); condition.and(); condition.equalTo("is_deleted", "0"); @@ -3295,7 +3294,7 @@ describe('ContactsTest', function() { condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contact_fuzzyquery_test_600: id = ' + resultSet.getString(0)); @@ -3321,12 +3320,12 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_700", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_700 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_700 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3347,11 +3346,11 @@ describe('ContactsTest', function() { "detail_info" : "14528963" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_700 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryPhone(DAHelper, rawContactId, contactDataId); + await fuzzyQueryPhone(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contact_fuzzyquery_test_700 contact_data insert error = ' + contactDataId); done(); @@ -3359,16 +3358,16 @@ describe('ContactsTest', function() { } }); - async function fuzzyQueryPhone(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryPhone(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 5 data is phone condition.like("detail_info", "%52896%"); condition.and(); condition.equalTo("type_id", "5"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -3393,12 +3392,12 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_800", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_800 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_800 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3419,10 +3418,10 @@ describe('ContactsTest', function() { "detail_info" : "daming" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_fuzzyquery_test_800 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryPhoneNickName(DAHelper, rawContactId, contactDataId); + await fuzzyQueryPhoneNickName(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contact_fuzzyquery_test_800 contact_data insert error = ' + contactDataId); done(); @@ -3430,16 +3429,16 @@ describe('ContactsTest', function() { } }); - async function fuzzyQueryPhoneNickName(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryPhoneNickName(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 3 data is nickname condition.like("detail_info", "%daming%"); condition.and(); condition.equalTo("type_id", "3"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -3463,12 +3462,12 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_900", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_900 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3489,10 +3488,10 @@ describe('ContactsTest', function() { "detail_info" : "1564@163.com" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_fuzzyquery_test_900 ; = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryEmail(DAHelper, rawContactId, contactDataId); + await fuzzyQueryEmail(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contact_fuzzyquery_test_900 contact_data insert error = ' + error); done(); @@ -3500,16 +3499,16 @@ describe('ContactsTest', function() { } }); - async function fuzzyQueryEmail(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryEmail(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 1 data is email condition.like("detail_info", "%1564%"); condition.and(); condition.equalTo("type_id", "1"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -3534,12 +3533,12 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_1000", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_1000 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_1000 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3560,11 +3559,11 @@ describe('ContactsTest', function() { "detail_info" : "nanjing1000" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_1000 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryAddress(DAHelper, rawContactId, contactDataId); + await fuzzyQueryAddress(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contact_fuzzyquery_test_1000 contact_data insert error = ' + error); done(); @@ -3572,16 +3571,16 @@ describe('ContactsTest', function() { } }); - async function fuzzyQueryAddress(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryAddress(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 1 data is postal_address condition.like("detail_info", "%nanjing10%"); condition.and(); condition.equalTo("type_id", "7"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(sleep_one); if (resultSet.goToFirstRow()) { do { @@ -3606,12 +3605,12 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_1100", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_1100 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_1100 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -3632,11 +3631,11 @@ describe('ContactsTest', function() { "detail_info" : "java1100" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); sleep(sleep_one); console.info('logMessage contact_fuzzyquery_test_1100 contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryNote(DAHelper, rawContactId, contactDataId); + await fuzzyQueryNote(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contact_fuzzyquery_test_1100 contact_data insert error = ' + error); done(); @@ -3644,16 +3643,16 @@ describe('ContactsTest', function() { } }); - async function fuzzyQueryNote(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryNote(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 10 data is note condition.like("detail_info", "%java11%"); condition.and(); condition.equalTo("type_id", "10"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contact_fuzzyquery_test_1100: id = ' + resultSet.getString(0)); @@ -3677,12 +3676,12 @@ describe('ContactsTest', function() { */ it("contact_fuzzyquery_test_1200", 0, async function(done) { console.info("--------logMessage contact_fuzzyquery_test_1200 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoming"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info('logMessage contact_fuzzyquery_test_1200 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); await ContactDataAimInsert(); @@ -3702,10 +3701,10 @@ describe('ContactsTest', function() { "detail_info" : "aaaa1200" }; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_fuzzyquery_test_1200 ; = ' + contactDataId); expect(contactDataId > 0).assertTrue(); - await fuzzyQueryIM(DAHelper, rawContactId, contactDataId); + await fuzzyQueryIM(dataShareHelper, rawContactId, contactDataId); } catch (error) { console.info('logMessage contact_fuzzyquery_test_1200 contact_data insert error = ' + error); done(); @@ -3713,16 +3712,16 @@ describe('ContactsTest', function() { } }); - async function fuzzyQueryIM(DAHelper, rawContactId, contactDataId) + async function fuzzyQueryIM(dataShareHelper, rawContactId, contactDataId) { var resultColumns = [ "id", "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); // type_id = 10 data is im account number condition.like("detail_info", "%aa12%"); condition.and(); condition.equalTo("type_id", "2"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('logMessage contact_fuzzyquery_test_1200: id = ' + resultSet.getString(0)); @@ -3746,12 +3745,12 @@ describe('ContactsTest', function() { */ it("abnormal_contact_insert_test_200", 0, async function(done) { console.info("------------abnormal_contact_insert_test_200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_names" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_insert_test_200: rawContactId = " + rawContactId); expect(rawContactId).assertEqual(-1); done(); @@ -3768,13 +3767,13 @@ describe('ContactsTest', function() { */ it("abnormal_contact_insert_test_300", 0, async function(done) { console.info("------------abnormal_contact_insert_test_300 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/contacts/raw_contacts"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/contacts/raw_contacts"; var rawContactValues = {"display_name" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(errorUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(errorUri, rawContactValues); console.info("logMessage abnormal_contact_insert_test_300: rawContactId = " + rawContactId); expect(rawContactId == -1).assertTrue(); done(); @@ -3791,12 +3790,12 @@ describe('ContactsTest', function() { */ it("abnormal_contact_update_test_1100", 0, async function(done) { console.info("------------abnormal_contact_update_test_1100 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_update_test_1100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalUpdate(); @@ -3810,10 +3809,10 @@ describe('ContactsTest', function() { async function AbnormalUpdate() { var updateValues = {"display_names" : "xiaosan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); try { - var updataCode = await DAHelper.update(rawContactUri, updateValues, condition) + var updataCode = await dataShareHelper.update(rawContactUri, updateValues, condition) console.info("logMessage abnormal_contact_update_test_1100: updataCode = " + updataCode); expect(updataCode == -1).assertTrue(); var map = new Map(); @@ -3834,13 +3833,13 @@ describe('ContactsTest', function() { */ it("abnormal_contact_update_test_1000", 0, async function(done) { console.info("------------abnormal_contact_update_test_1000 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/contacts/raw_contacts"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/contacts/raw_contacts"; var rawContactValues = {"display_name" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_update_test_1000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalUpdate(); @@ -3854,10 +3853,10 @@ describe('ContactsTest', function() { async function AbnormalUpdate() { var updateValues = {"display_name" : "xiaosan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var updataCode = await DAHelper.update(errorUri, updateValues, condition); + var updataCode = await dataShareHelper.update(errorUri, updateValues, condition); console.info("logMessage abnormal_contact_update_test_1000: updataCode = " + updataCode); expect(updataCode == -1).assertTrue(); var map = new Map(); @@ -3878,12 +3877,12 @@ describe('ContactsTest', function() { */ it("abnormal_contact_delete_test_4500", 0, async function(done) { console.info("------------abnormal_contact_delete_test_4500 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaozhi"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_delete_test_4500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalDelete(); @@ -3896,10 +3895,10 @@ describe('ContactsTest', function() { async function AbnormalDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(rawContactUri, condition); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition); console.info("logMessage abnormal_contact_delete_test_4500: deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); var map = new Map(); @@ -3921,13 +3920,13 @@ describe('ContactsTest', function() { */ it("abnormal_contact_delete_test_4600", 0, async function(done) { console.info("------------abnormal_contact_delete_test_4600 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/contacts/raw_contacts"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/contacts/raw_contacts"; var rawContactValues = {"display_name" : "xiaoshan"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_delete_test_4600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalDelete(); @@ -3940,10 +3939,10 @@ describe('ContactsTest', function() { async function AbnormalDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var deleteCode = await DAHelper.delete(errorUri, condition); + var deleteCode = await dataShareHelper.delete(errorUri, condition); console.info("logMessage abnormal_contact_delete_test_4600: deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); var map = new Map(); @@ -3965,12 +3964,12 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_4200", 0, async function(done) { console.info("------------abnormal_contact_query_test_4200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaozhicheng"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_4200: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalQuery(); @@ -3984,10 +3983,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_4200: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -4005,8 +4004,8 @@ describe('ContactsTest', function() { */ it("abnormal_contact_batchinsert_test_5100", 0, async function(done) { console.info("--------logMessage abnormal_contact_batchinsert_test_5100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var addBulk_value1 = {"display_name" : "zhangsan"}; var addBulk_value2 = {"display_names" : "lisi"}; @@ -4020,7 +4019,7 @@ describe('ContactsTest', function() { listAddBluk[array_three] = addBulk_value4; listAddBluk[array_four] = addBulk_value5; try { - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); console.info("logMessage abnormal_contact_batchinsert_test_5100: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == -1).assertTrue(); done(); @@ -4037,12 +4036,12 @@ describe('ContactsTest', function() { */ it("abnormal_contact_insert_data_5300", 0, async function(done) { console.info("--------logMessage abnormal_contact_insert_data_5300 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaotian"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage abnormal_contact_insert_data_5300 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -4058,7 +4057,7 @@ describe('ContactsTest', function() { { var contactDataValues = {"content_type" : "im", "detail_info" : "aaaa"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage abnormal_contact_insert_data_5300 ; = ' + contactDataId); expect(contactDataId == -1).assertTrue(); } catch (error) { @@ -4075,12 +4074,12 @@ describe('ContactsTest', function() { */ it("abnormal_contact_insert_data_5400", 0, async function(done) { console.info("--------logMessage abnormal_contact_insert_data_5400 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "xiaotian"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info('logMessage abnormal_contact_insert_data_5400 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); await ContactDataAimInsert(); @@ -4095,7 +4094,7 @@ describe('ContactsTest', function() { { var contactDataValues = {"raw_contact_id" : rawContactId, "detail_info" : "aaaa"}; try { - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage abnormal_contact_insert_data_5400 ; = ' + contactDataId); expect(contactDataId == -1).assertTrue(); } catch (error) { @@ -4112,10 +4111,10 @@ describe('ContactsTest', function() { */ it("contact_delete_test_5500", 0, async function(done) { console.info("--------logMessage contact_delete_test_5500 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(rawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(rawContactUri, common.getProfileRawContact()); console.info("logMessage contact_delete_test_5500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var map = common.getProfileRawContactMap(); @@ -4128,9 +4127,9 @@ describe('ContactsTest', function() { } async function executeBatch() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - DAHelper.executeBatch(URI_CONTACTS, [ { + dataShareHelper.executeBatch(URI_CONTACTS, [ { uri : rawContactUri, type : featureAbility.DataAbilityOperationType.TYPE_DELETE, predicates : condition, @@ -4155,10 +4154,10 @@ describe('ContactsTest', function() { */ it("contact_update_test_5600", 0, async function(done) { console.info("--------logMessage contact_update_test_5600 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(rawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(rawContactUri, common.getProfileRawContact()); console.info("logMessage contact_update_test_5600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var map = common.getProfileRawContactMap(); @@ -4173,9 +4172,9 @@ describe('ContactsTest', function() { async function executeBatch() { var updateValues = {"display_name" : "xiaoxiaoxiao"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - DAHelper.executeBatch(URI_CONTACTS, [ { + dataShareHelper.executeBatch(URI_CONTACTS, [ { uri : rawContactUri, type : featureAbility.DataAbilityOperationType.TYPE_UPDATE, valuesBucket : updateValues, @@ -4201,24 +4200,24 @@ describe('ContactsTest', function() { */ it("contact_insert_test_5700", 0, async function(done) { console.info("------logMessage contact_insert_test_5700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(rawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(rawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contact_insert_test_5700: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); var map = common.getProfileRawContactMap(); map.set("id", rawContactId.toString()); await contactsQuery(map, "contact_insert_test_5700", rawContactUri); - var rawContactIdOne = await DAHelper.insert(rawContactUri, common.getProfileRawContact()); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contact_insert_test_5700: rawContactIdOne = ' + rawContactIdOne); expect(rawContactIdOne > 0).assertTrue(); var map = common.getProfileRawContactMap(); map.set("id", rawContactIdOne.toString()); await contactsQuery(map, "contact_insert_test_5700", rawContactUri); - var rawContactIdTwo = await DAHelper.insert(rawContactUri, common.getProfileRawContact()); + var rawContactIdTwo = await dataShareHelper.insert(rawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contact_insert_test_5700: rawContactIdTwo = ' + rawContactIdTwo); expect(rawContactIdTwo > 0).assertTrue(); @@ -4240,15 +4239,15 @@ describe('ContactsTest', function() { */ it("contact_insert_test_5800", 0, async function(done) { console.info("------logMessage contact_insert_test_5800 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var name; for (var i = 0; i < 20000; i++) { name += "i"; } var contcatvalues = {"display_name" : name} try { - var rawContactId = await DAHelper.insert(rawContactUri, contcatvalues); + var rawContactId = await dataShareHelper.insert(rawContactUri, contcatvalues); sleep(sleep_one); console.info('logMessage contact_insert_test_5800: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -4271,11 +4270,11 @@ describe('ContactsTest', function() { */ it("contact_insert_test_5900", 0, async function(done) { console.info("------logMessage contact_insert_test_5900 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var contcatvalues = {"display_name" : "xiao5900"} try { - var rawContactId = await DAHelper.insert(rawContactUri, contcatvalues); + var rawContactId = await dataShareHelper.insert(rawContactUri, contcatvalues); console.info('logMessage contact_insert_test_5900: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); var contactDataValues1 = { @@ -4283,7 +4282,7 @@ describe('ContactsTest', function() { "content_type" : "phone", "detail_info" : "19960229" }; - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues1); console.info('logMessage contact_insert_test_5900: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); @@ -4292,7 +4291,7 @@ describe('ContactsTest', function() { map.set("detail_info", "19960229"); await contactsQuery(map, "contact_insert_test_5900", contactDataUri); - var rawContactIdOne = await DAHelper.insert(rawContactUri, contcatvalues); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, contcatvalues); console.info('logMessage contact_insert_test_5900: rawContactId = ' + rawContactIdOne); expect(rawContactIdOne > 0).assertTrue(); var contactDataValues2 = { @@ -4300,7 +4299,7 @@ describe('ContactsTest', function() { "content_type" : "phone", "detail_info" : "111111032" }; - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues2); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues2); console.info('logMessage contact_insert_test_5900: contactDataId = ' + contactDataId1); expect(contactDataId1 > 0).assertTrue(); @@ -4326,8 +4325,8 @@ describe('ContactsTest', function() { */ it("contact_insert_test_6000", 0, async function(done) { console.info("------logMessage contact_insert_test_6000 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "licheng", @@ -4337,7 +4336,7 @@ describe('ContactsTest', function() { "phonetic_name" : "licheng||lc" }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insert_test_6000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -4366,21 +4365,21 @@ describe('ContactsTest', function() { */ it("contact_insertData_test_6100", 0, async function(done) { console.info("------logMessage contact_insertData_test_6100 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insertData_test_6100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactDataValues = common.getProfileContactData(); contactDataValues["raw_contact_id"] = rawContactId; console.info('logMessage contact_insertData_test_6100: contactDataValues["raw_contact_id"] = ' + contactDataValues.raw_contact_id); - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_insertData_test_6100: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); var map = common.getProfileContactDataMap(); @@ -4403,41 +4402,41 @@ describe('ContactsTest', function() { */ it("contact_update_test_6200", 0, async function(done) { console.info("--------logMessage contact_update_test_6200 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = { "display_name" : "xiaocai", }; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); expect(rawContactId > 0).assertTrue(); console.info("logMessage contact_update_test_6200: rawContactId = " + rawContactId); var insertRawContactValuesOne = { "display_name" : "xiaocai1", }; - var rawContactIdOne = await DAHelper.insert(rawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, insertRawContactValuesOne); expect(rawContactIdOne > 0).assertTrue(); console.info("logMessage contact_update_test_6200: rawContactIdOne = " + rawContactIdOne); var insertRawContactValuesTwo = { "display_name" : "xiaocai1", }; - var rawContactIdTwo = await DAHelper.insert(rawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(rawContactUri, insertRawContactValuesTwo); expect(rawContactIdTwo > 0).assertTrue(); console.info("logMessage contact_update_test_6200: rawContactIdTwo = " + rawContactIdTwo); var updateValues = {"display_name" : "xiaosan"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); - var updataCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updataCode = await dataShareHelper.update(rawContactUri, updateValues, condition); console.info("logMessage contact_update_test_6200: updataCode = " + updataCode); expect(updataCode == 0).assertTrue(); sleep(sleep_one); await queryUpdateThree( - "contact_update_test_6200", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo); + "contact_update_test_6200", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo); await deleteRawContact("contact_update_test_6200"); done(); } catch (error) { @@ -4446,20 +4445,20 @@ describe('ContactsTest', function() { } }); - async function queryUpdateThree(tag, DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo) + async function queryUpdateThree(tag, dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': contactsQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -4482,17 +4481,17 @@ describe('ContactsTest', function() { */ it("contact_UpdateRawContcat_test_6300", 0, async function(done) { console.info("------logMessage contact_UpdateRawContcat_test_6300 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(rawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(rawContactUri, common.getProfileRawContact()); console.info("logMessage contact_UpdateRawContcat_test_6300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); sleep(sleep_two); var updateValues = common.getProfileRawContactUpdate(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - var updataCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updataCode = await dataShareHelper.update(rawContactUri, updateValues, condition); console.info('logMessage contact_UpdateRawContcat_test_6300: updataCode = ' + updataCode); sleep(3000); var map = common.getProfileRawContactUpdateMap(); @@ -4514,14 +4513,14 @@ describe('ContactsTest', function() { */ it("contact_insertDataUpdate_test_6400", 0, async function(done) { console.info("------logMessage contact_insertDataUpdate_test_6400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insertDataUpdate_test_6400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -4529,14 +4528,14 @@ describe('ContactsTest', function() { contactDataValues["raw_contact_id"] = rawContactId; console.info('logMessage contact_insertDataUpdate_test_6400: contactDataValues.raw_contact_id = ' + contactDataValues.raw_contact_id); - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_insertDataUpdate_test_6400: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); var updateValues = common.getProfileContactDataUpdate(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", contactDataId.toString()); - var updataCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updataCode = await dataShareHelper.update(contactDataUri, updateValues, condition); console.info('logMessage contact_insertDataUpdate_test_6400: updataCode = ' + updataCode); sleep(sleep_one); var map = common.getProfileContactDataUpdateMap(); @@ -4559,14 +4558,14 @@ describe('ContactsTest', function() { */ it("contact_insertDataUpdateAll_test_6500", 0, async function(done) { console.info("------logMessage contact_insertDataUpdateAll_test_6500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insertDataUpdateAll_test_6500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await insertData(rawContactId, "name", "xiaocai", ""); @@ -4583,12 +4582,12 @@ describe('ContactsTest', function() { await insertData(rawContactId, "group_membership", 1, ""); await insertData(rawContactId, "contact_misc", "5678", ""); var updateValues = {"detail_info" : "xiaocai"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); - var updataCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updataCode = await dataShareHelper.update(contactDataUri, updateValues, condition); console.info('logMessage contact_insertDataUpdateAll_test_6500: updataCode = ' + updataCode); sleep(sleep_one); - await queryUpdateAllData("contact_insertDataUpdateAll_test_6500", DAHelper, rawContactId); + await queryUpdateAllData("contact_insertDataUpdateAll_test_6500", dataShareHelper, rawContactId); await deleteRawContact("contact_insertDataUpdateAll_test_6500"); await deleteAll(contactDataUri, "contact_insertDataUpdateAll_test_6500"); done(); @@ -4598,16 +4597,16 @@ describe('ContactsTest', function() { } }); - async function queryUpdateAllData(tag, DAHelper, rawContactId) + async function queryUpdateAllData(tag, dataShareHelper, rawContactId) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': contactsQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': contactsQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("row_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -4629,25 +4628,25 @@ describe('ContactsTest', function() { */ it("contact_insertFavorite_test_6600", 0, async function(done) { console.info("------logMessage contact_insertFavorite_test_6600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xiaocai", "favorite" : 1}; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insertFavorite_test_6600: rawContactId = " + rawContactId); var insertRawContactValuesOne = {"display_name" : "xiaotian", "favorite" : 1}; - var rawContactIdOne = await DAHelper.insert(rawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, insertRawContactValuesOne); console.info("logMessage contact_insertFavorite_test_6600: rawContactId = " + rawContactIdOne); var insertRawContactValuesTwo = {"display_name" : "xiaoli", "favorite" : 1}; - var rawContactIdTwo = await DAHelper.insert(rawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(rawContactUri, insertRawContactValuesTwo); console.info("logMessage contact_insertFavorite_test_6600: rawContactId = " + rawContactIdTwo); sleep(sleep_one); await queryThreeFavorite( - "contact_insertFavorite_test_6600", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 1); + "contact_insertFavorite_test_6600", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 1); await deleteRawContact("contact_insertFavorite_test_6600"); done(); } catch (error) { @@ -4656,20 +4655,20 @@ describe('ContactsTest', function() { } }); - async function queryThreeFavorite(tag, DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, favoritevalue) + async function queryThreeFavorite(tag, dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, favoritevalue) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryThreeFavorite start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryThreeFavorite start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "favorite" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -4691,34 +4690,34 @@ describe('ContactsTest', function() { */ it("contact_unFavorite_test_6700", 0, async function(done) { console.info("------logMessage contact_unFavorite_test_6700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xiaocai", "favorite" : 1}; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_unFavorite_test_6700: rawContactId = " + rawContactId); var insertRawContactValuesOne = {"display_name" : "xiaotian", "favorite" : 1}; - var rawContactIdOne = await DAHelper.insert(rawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, insertRawContactValuesOne); console.info("logMessage contact_unFavorite_test_6700: rawContactId = " + rawContactIdOne); var insertRawContactValuesTwo = {"display_name" : "xiaoli", "favorite" : 1}; - var rawContactIdTwo = await DAHelper.insert(rawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(rawContactUri, insertRawContactValuesTwo); console.info("logMessage contact_unFavorite_test_6700: rawContactId = " + rawContactIdTwo); var updateValues = {"favorite" : 0}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); - var updataCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updataCode = await dataShareHelper.update(rawContactUri, updateValues, condition); console.info("logMessage contact_unFavorite_test_6700: updataCode = " + updataCode); sleep(sleep_one); await queryThreeFavorite( - "contact_unFavorite_test_6700", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 0); + "contact_unFavorite_test_6700", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 0); await deleteRawContact("contact_unFavorite_test_6700"); done(); } catch (error) { @@ -4734,14 +4733,14 @@ describe('ContactsTest', function() { */ it("contact_insertContactBlocklist_test_6800", 0, async function(done) { console.info("--------logMessage contact_insertContactBlocklist_test_6800 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var batchInsertCode = await DAHelper.insert(contactBlocklistUri, common.getProfileBlockList()); + var batchInsertCode = await dataShareHelper.insert(contactBlocklistUri, common.getProfileBlockList()); console.info("logMessage contact_insertContactBlocklist_test_6800: insert = " + batchInsertCode); - var batchInsertCodeOne = await DAHelper.insert(contactBlocklistUri, common.getProfileBlockList()); + var batchInsertCodeOne = await dataShareHelper.insert(contactBlocklistUri, common.getProfileBlockList()); console.info("logMessage contact_insertContactBlocklist_test_6800: insert = " + batchInsertCodeOne); - var batchInsertCodeTwo = await DAHelper.insert(contactBlocklistUri, common.getProfileBlockList()); + var batchInsertCodeTwo = await dataShareHelper.insert(contactBlocklistUri, common.getProfileBlockList()); console.info("logMessage contact_insertContactBlocklist_test_6800: insert = " + batchInsertCodeTwo); sleep(sleep_one); expect(batchInsertCode > 0).assertTrue(); @@ -4756,11 +4755,11 @@ describe('ContactsTest', function() { async function query(size) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var phoneNumber = randomNum(8); condition.equalTo("phone_number", phoneNumber); try { - var resultSet = await DAHelper.query(contactBlocklistUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactBlocklistUri, resultColumns, condition); sleep(sleep_one); console.info('contact_insertContactBlocklist_test_6800 :resultSet.goToFirstRow() = ' + resultSet.goToFirstRow()); @@ -4781,14 +4780,14 @@ describe('ContactsTest', function() { */ it("contact_removeContactBlocklist_test_6900", 0, async function(done) { console.info("--------logMessage contact_removeContactBlocklist_test_6900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var batchInsertCode = await DAHelper.insert(contactBlocklistUri, common.getProfileBlockList()); + var batchInsertCode = await dataShareHelper.insert(contactBlocklistUri, common.getProfileBlockList()); console.info("logMessage contact_removeContactBlocklist_test_6900: batchInsertCode = " + batchInsertCode); - var batchInsertCodeOne = await DAHelper.insert(contactBlocklistUri, common.getProfileBlockList()); + var batchInsertCodeOne = await dataShareHelper.insert(contactBlocklistUri, common.getProfileBlockList()); console.info("logMessage contact_removeContactBlocklist_test_6900: insert = " + batchInsertCodeOne); - var batchInsertCodeTwo = await DAHelper.insert(contactBlocklistUri, common.getProfileBlockList()); + var batchInsertCodeTwo = await dataShareHelper.insert(contactBlocklistUri, common.getProfileBlockList()); console.info("logMessage contact_removeContactBlocklist_test_6900: insert = " + batchInsertCodeTwo); sleep(sleep_one); expect(batchInsertCode > 0).assertTrue(); @@ -4802,11 +4801,11 @@ describe('ContactsTest', function() { async function query(size) { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var phoneNumber = randomNum(8); condition.equalTo("phone_number", phoneNumber); try { - var resultSet = await DAHelper.query(contactBlocklistUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactBlocklistUri, resultColumns, condition); console.info('contact_removeContactBlocklist_test_6900 : resultSet = ' + resultSet); expect(resultSet.rowCount == size).assertEqual(true); resultSet.close(); @@ -4823,32 +4822,32 @@ describe('ContactsTest', function() { */ it("contact_insertGroup_test_7000", 0, async function(done) { console.info("------logMessage contact_insertGroup_test_7000 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = { "display_name" : "xiaocai", }; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insertGroup_test_7000: rawContactId = " + rawContactId); await insertData(rawContactId, "group_membership", 1, ""); var insertRawContactValuesOne = { "display_name" : "xiaotian", }; - var rawContactIdOne = await DAHelper.insert(rawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, insertRawContactValuesOne); console.info("logMessage contact_insertGroup_test_7000: rawContactId = " + rawContactIdOne); await insertData(rawContactIdOne, "group_membership", 1, ""); var insertRawContactValuesTwo = { "display_name" : "xiaoli", }; - var rawContactIdTwo = await DAHelper.insert(rawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(rawContactUri, insertRawContactValuesTwo); console.info("logMessage contact_insertGroup_test_7000: rawContactId = " + rawContactIdTwo); await insertData(rawContactIdTwo, "group_membership", 1, ""); sleep(sleep_one); await queryThreeGroup( - "contact_insertGroup_test_7000", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 1); + "contact_insertGroup_test_7000", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, 1); await deleteRawContact("contact_insertGroup_test_7000"); done(); } catch (error) { @@ -4857,19 +4856,19 @@ describe('ContactsTest', function() { } }); - async function queryThreeGroup(tag, DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo, groupId) + async function queryThreeGroup(tag, dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo, groupId) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryThreeGroup start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryThreeGroup start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactIdOne.toString()); condition.or(); condition.equalTo("id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -4891,10 +4890,10 @@ describe('ContactsTest', function() { */ it("contact_insert_test_7100", 0, async function(done) { console.info("---------logMessage contact_insert_test_7100 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(groupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(groupUri, common.getProfileGroup()); console.info("logMessage contact_insert_test_7100: groupId = " + groupId); expect(groupId > 0).assertTrue(); var map = common.getProfileGroupMap(); @@ -4915,33 +4914,33 @@ describe('ContactsTest', function() { */ it("contact_delete_test_7200", 0, async function(done) { console.info("------logMessage contact_delete_test_7200 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = { "display_name" : "xiaocai", }; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_delete_test_7200: rawContactId = " + rawContactId); await insertData(rawContactId, "group_membership", 1, ""); var insertRawContactValuesOne = { "display_name" : "xiaotian", }; - var rawContactIdOne = await DAHelper.insert(rawContactUri, insertRawContactValuesOne); + var rawContactIdOne = await dataShareHelper.insert(rawContactUri, insertRawContactValuesOne); console.info("logMessage contact_delete_test_7200: rawContactId = " + rawContactIdOne); await insertData(rawContactIdOne, "group_membership", 1, ""); var insertRawContactValuesTwo = { "display_name" : "xiaoli", }; - var rawContactIdTwo = await DAHelper.insert(rawContactUri, insertRawContactValuesTwo); + var rawContactIdTwo = await dataShareHelper.insert(rawContactUri, insertRawContactValuesTwo); console.info("logMessage contact_delete_test_7200: rawContactId = " + rawContactIdTwo); await insertData(rawContactIdTwo, "group_membership", 1, ""); sleep(sleep_one); await deleteAll(contactDataUri, "contact_delete_test_7200"); sleep(sleep_one); - await queryZeroGroup("contact_delete_test_7200", DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo); + await queryZeroGroup("contact_delete_test_7200", dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo); await deleteRawContact("contact_delete_test_7200"); done(); } catch (error) { @@ -4950,20 +4949,20 @@ describe('ContactsTest', function() { } }); - async function queryZeroGroup(tag, DAHelper, rawContactId, rawContactIdOne, rawContactIdTwo) + async function queryZeroGroup(tag, dataShareHelper, rawContactId, rawContactIdOne, rawContactIdTwo) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryZeroGroup start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryZeroGroup start ! dataShareHelper = ' + dataShareHelper); var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactIdOne.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactIdTwo.toString()); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); console.info(tag + ': queryZeroGroup! resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == 0).assertEqual(true); resultSet.close(); @@ -4979,10 +4978,10 @@ describe('ContactsTest', function() { */ it("contact_delete_test_7300", 0, async function(done) { console.info("---------logMessage contact_delete_test_7300 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(groupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(groupUri, common.getProfileGroup()); console.info("logMessage contact_delete_test_7300: groupId = " + groupId); expect(groupId > 0).assertTrue(); var map = common.getProfileGroupMap(); @@ -5003,10 +5002,10 @@ describe('ContactsTest', function() { */ it("contact_delete_test_7400", 0, async function(done) { console.info("------logMessage contact_Delete_test_7400 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var rawContactId = await DAHelper.insert(rawContactUri, common.getProfileRawContact()); + var rawContactId = await dataShareHelper.insert(rawContactUri, common.getProfileRawContact()); sleep(sleep_one); console.info('logMessage contact_Delete_test_7400: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -5017,9 +5016,9 @@ describe('ContactsTest', function() { await deleteAll(rawContactUri, "contact_Delete_test_7400"); sleep(sleep_one); await contactsQuery(map, "contact_Delete_test_7400", rawContactUri); - var conditionAll = new ohos_data_ability.DataAbilityPredicates(); + var conditionAll = new dataShare.DataSharePredicates(); conditionAll.greaterThan("id", "0"); - var code = await DAHelper.delete(deletedUri, conditionAll); + var code = await dataShareHelper.delete(deletedUri, conditionAll); console.info('contact_Delete_test_7400 : Completely delete code = ' + code); expect(code == 0).assertTrue(); done(); @@ -5036,19 +5035,19 @@ describe('ContactsTest', function() { */ it("contact_delete_test_7500", 0, async function(done) { console.info("------logMessage contact_delete_test_7500 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_delete_test_7500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactDataValues = common.getProfileContactData(); contactDataValues["raw_contact_id"] = rawContactId; - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues); console.info('logMessage contact_delete_test_7500: contactDataId = ' + contactDataId); expect(contactDataId > 0).assertTrue(); await deleteAll(contactDataUri, "contact_delete_test_7500"); @@ -5071,32 +5070,32 @@ describe('ContactsTest', function() { */ it("contact_insertDataAll_test_7600", 0, async function(done) { console.info("------logMessage contact_insertDataAll_test_7600 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insertDataAll_test_7600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactdata1 = await insertData(rawContactId, "name", "xiaocai", ""); - await queryAlldata("contact_insertDataAll_test_7600", DAHelper, rawContactId, contactdata1, "xiaocai"); + await queryAlldata("contact_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdata1, "xiaocai"); var contactdata2 = await insertData(rawContactId, "phone", "6500", ""); - await queryAlldata("contact_insertDataAll_test_7600", DAHelper, rawContactId, contactdata2, "6500"); + await queryAlldata("contact_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdata2, "6500"); var contactdatd3 = await insertData(rawContactId, "organization", "TTTTT", "Deve"); - await queryAlldata("contact_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd3, "TTTTT"); + await queryAlldata("contact_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd3, "TTTTT"); var contactdatd4 = await insertData(rawContactId, "nickname", "xxxxcai", ""); - await queryAlldata("contact_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd4, "xxxxcai"); + await queryAlldata("contact_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd4, "xxxxcai"); var contactdatd5 = await insertData(rawContactId, "email", "111@fox.com", ""); - await queryAlldata("contact_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd5, "111@fox.com"); + await queryAlldata("contact_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd5, "111@fox.com"); var contactdatd6 = await insertData(rawContactId, "postal_address", "dddd", ""); - await queryAlldata("contact_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd6, "dddd"); + await queryAlldata("contact_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd6, "dddd"); var contactdatd7 = await insertData(rawContactId, "note", "caicai", ""); - await queryAlldata("contact_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd7, "caicai"); + await queryAlldata("contact_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd7, "caicai"); var contactdatd8 = await insertData(rawContactId, "im", "999999999", ""); - await queryAlldata("contact_insertDataAll_test_7600", DAHelper, rawContactId, contactdatd8, "999999999"); + await queryAlldata("contact_insertDataAll_test_7600", dataShareHelper, rawContactId, contactdatd8, "999999999"); sleep(sleep_one); await deleteRawContact("contact_insertDataAll_test_7600"); await deleteAll(contactDataUri, "contact_insertDataAll_test_7600"); @@ -5107,13 +5106,13 @@ describe('ContactsTest', function() { } }); - async function queryAlldata(tag, DAHelper, rawContactId, contactdata, values) + async function queryAlldata(tag, dataShareHelper, rawContactId, contactdata, values) { var resultColumns = [ "raw_contact_id", "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", contactdata.toString()); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -5140,43 +5139,43 @@ describe('ContactsTest', function() { */ it("contact_insertDataAll_test_7700", 0, async function(done) { console.info("------logMessage contact_insertDataAll_test_7700 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertRawContactValues = { "display_name" : "xiaocai", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insertDataAll_test_7700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactdata1 = await insertData(rawContactId, "name", "xiaocai", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdata1, "xiaocai"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdata1, "xiaocai"); var contactdata2 = await insertData(rawContactId, "phone", "6500", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdata2, "6500"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdata2, "6500"); var contactdatd3 = await insertData(rawContactId, "organization", "TTTTT", "Deve"); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd3, "TTTTT"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd3, "TTTTT"); var contactdatd4 = await insertData(rawContactId, "nickname", "xxxxcai", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd4, "xxxxcai"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd4, "xxxxcai"); var contactdatd5 = await insertData(rawContactId, "email", "111@fox.com", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd5, "111@fox.com"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd5, "111@fox.com"); var contactdatd6 = await insertData(rawContactId, "postal_address", "dddd", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd6, "dddd"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd6, "dddd"); var contactdatd7 = await insertData(rawContactId, "note", "caicai", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd7, "caicai"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd7, "caicai"); var contactdatd8 = await insertData(rawContactId, "im", "999999999", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd8, "999999999"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd8, "999999999"); var contactdatd9 = await insertData(rawContactId, "contact_event", "1125", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd9, "1125"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd9, "1125"); var contactdatd10 = await insertData(rawContactId, "website", "wwww.xxx.com", ""); await queryAlldata( - "contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd10, "wwww.xxx.com"); + "contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd10, "wwww.xxx.com"); var contactdatd11 = await insertData(rawContactId, "relation", "xiaobai", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd11, "xiaobai"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd11, "xiaobai"); var contactdatd12 = await insertData(rawContactId, "group_membership", 1, ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd12, 1); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd12, 1); var contactdatd13 = await insertData(rawContactId, "contact_misc", "5678", ""); - await queryAlldata("contact_insertDataAll_test_7700", DAHelper, rawContactId, contactdatd13, "5678"); + await queryAlldata("contact_insertDataAll_test_7700", dataShareHelper, rawContactId, contactdatd13, "5678"); sleep(sleep_one); await deleteRawContact("contact_insertDataAll_test_7700"); await deleteAll(contactDataUri, "contact_insertDataAll_test_7700"); @@ -5194,31 +5193,31 @@ describe('ContactsTest', function() { */ it("contact_insertDataUpdateMore_test_7800", 0, async function(done) { console.info("------logMessage contact_insertDataUpdateMore_test_7800 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xiaocai"}; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_insertDataUpdateMore_test_7800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await insertData(rawContactId, "name", "xiaotian", ""); var insertRawContactValues1 = {"display_name" : "xiaotian"}; - var rawContactId1 = await DAHelper.insert(rawContactUri, insertRawContactValues1); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, insertRawContactValues1); console.info("logMessage contact_insertDataUpdateMore_test_7800: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); await insertData(rawContactId, "name", "xiaotian", ""); var updateValues = {"detail_info" : "xiaocai7800"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactId1.toString()) - var updataCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updataCode = await dataShareHelper.update(contactDataUri, updateValues, condition); console.info('logMessage contact_insertDataUpdateMore_test_7800: updataCode = ' + updataCode); sleep(sleep_one); await insertDataUpdateMoreQuery( - "contact_insertDataUpdateMore_test_7800", DAHelper, rawContactId, rawContactId1); + "contact_insertDataUpdateMore_test_7800", dataShareHelper, rawContactId, rawContactId1); await deleteRawContact("contact_insertDataUpdateMore_test_7800"); await deleteAll(contactDataUri, "contact_insertDataUpdateMore_test_7800"); done(); @@ -5228,15 +5227,15 @@ describe('ContactsTest', function() { } }); - async function insertDataUpdateMoreQuery(tag, DAHelper, rawContactId, rawContactId1) + async function insertDataUpdateMoreQuery(tag, dataShareHelper, rawContactId, rawContactId1) { var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); condition.or(); condition.equalTo("raw_contact_id", rawContactId1.toString()) try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -5259,32 +5258,32 @@ describe('ContactsTest', function() { */ it("contact_deleterestore_test_7900", 0, async function(done) { console.info("------logMessage contact_deleterestore_test_7900 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xaioli7900"}; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage contact_deleterestore_test_7900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); sleep(sleep_one); - var condition1 = new ohos_data_ability.DataAbilityPredicates(); + var condition1 = new dataShare.DataSharePredicates(); condition1.equalTo("id", rawContactId.toString()); - var deleteCode = await DAHelper.delete(rawContactUri, condition1); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition1); console.info("contact_deleterestore_test_7900 " + ': deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); sleep(sleep_one); - var condition2 = new ohos_data_ability.DataAbilityPredicates(); + var condition2 = new dataShare.DataSharePredicates(); condition2.equalTo("id", rawContactId.toString()); var updatevalue = {"is_deleted" : 0}; - var updateCode = await DAHelper.update(rawContactUri, updatevalue, condition2); + var updateCode = await dataShareHelper.update(rawContactUri, updatevalue, condition2); console.info('contact_deleterestore_test_7900 : update = ' + updateCode); sleep(sleep_one); - var condition3 = new ohos_data_ability.DataAbilityPredicates(); + var condition3 = new dataShare.DataSharePredicates(); condition3.equalTo("id", rawContactId.toString()); - var code = await DAHelper.delete(deleted_raw_contact_record, condition3); + var code = await dataShareHelper.delete(deleted_raw_contact_record, condition3); console.info('contact_deleterestore_test_7900 : record code = ' + code); var map = new Map(); map.set("id", rawContactId.toString()); @@ -5305,11 +5304,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_updateData_test_8000", 0, async function(done) { console.info("------logMessage abnormal_contact_updateData_test_8000 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xaioli8000"}; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage abnormal_contact_updateData_test_8000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); sleep(sleep_one); @@ -5317,10 +5316,10 @@ describe('ContactsTest', function() { console.info("logMessage abnormal_contact_updateData_test_8000: contactDataId = " + contactDataId); expect(contactDataId > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {"display_namess" : "xaioli80000000"}; condition.equalTo("id", contactDataId.toString()); - var code = await DAHelper.update(contactDataUri, updateValues, condition); + var code = await dataShareHelper.update(contactDataUri, updateValues, condition); console.info('abnormal_contact_updateData_test_8000 : update code = ' + code); expect(code == -1).assertTrue(); var map = new Map(); @@ -5343,11 +5342,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_favorite_test_8100", 0, async function(done) { console.info("------logMessage abnormal_contact_favorite_test_8100 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xaioli8100", "favoriteeee" : 1}; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage abnormal_contact_favorite_test_8100: rawContactId = " + rawContactId); expect(rawContactId == -1).assertTrue(); sleep(sleep_one); @@ -5365,14 +5364,14 @@ describe('ContactsTest', function() { */ it("abnormal_contact_blocklist_test_8200", 0, async function(done) { console.info("------logMessage abnormal_contact_blocklist_test_8200 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(6); try { var insertValues = { "phone_numberss" : phoneNumber, }; - var id = await DAHelper.insert(contactBlocklistUri, insertValues); + var id = await dataShareHelper.insert(contactBlocklistUri, insertValues); console.info("logMessage abnormal_contact_blocklist_test_8200: id = " + id); expect(id == -1).assertTrue(); sleep(sleep_one); @@ -5390,11 +5389,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_group_test_8300", 0, async function(done) { console.info("------logMessage abnormal_contact_group_test_8300 is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var insertRawContactValues = {"display_name" : "xaioli8100"}; - var rawContactId = await DAHelper.insert(rawContactUri, insertRawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertRawContactValues); console.info("logMessage abnormal_contact_group_test_8300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactDataValues1 = { @@ -5402,7 +5401,7 @@ describe('ContactsTest', function() { "content_typess" : "group_membership", "detail_info" : 1 }; - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues1); console.info("abnormal_contact_group_test_8300 logMessage : contactDataId " + contactDataId); expect(contactDataId == -1).assertTrue(); done(); @@ -5419,15 +5418,15 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_8400", 0, async function(done) { console.info("------------abnormal_contact_query_test_8400 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian8400"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_8400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var rawContactValues = {"display_name" : "xiaoli8400"}; - var rawContactId1 = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_8400: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); await AbnormalQuery(); @@ -5441,12 +5440,12 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); condition.or(); condition.equalTo("ids", rawContactId1.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_8400: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5464,15 +5463,15 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_8500", 0, async function(done) { console.info("------------abnormal_contact_query_test_8500 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian8500"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_8500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var rawContactValues = {"display_name" : "xiaoli8500"}; - var rawContactId1 = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_8500: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); await AbnormalQuery(); @@ -5486,10 +5485,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = [ "id", "display_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("ids", "0"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_8500: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5507,11 +5506,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_8600", 0, async function(done) { console.info("------------abnormal_contact_query_test_8600 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian8600"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_8600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalQuery(); @@ -5525,10 +5524,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = [ "id", "display_names" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_8600: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5546,11 +5545,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_8700", 0, async function(done) { console.info("------------abnormal_contact_query_test_8700 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian8700"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_8700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var dataId = await insertData(rawContactId, "group_membership", 1, ""); @@ -5567,10 +5566,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = [ "raw_contact_id" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("content_typess", "group_membership"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_8700: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5588,11 +5587,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_8800", 0, async function(done) { console.info("------------abnormal_contact_query_test_8800 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian8700", "favorite" : 1}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_8800: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalQuery(); @@ -5606,10 +5605,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_8800: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5627,11 +5626,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_8900", 0, async function(done) { console.info("------------abnormal_contact_query_test_8900 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaoyuzhou", "lastest_contacted_time" : 60}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_8900: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); await AbnormalQuery(); @@ -5645,10 +5644,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("lastest_contacted_timess", "50"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_8900: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5666,22 +5665,22 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_9000", 0, async function(done) { console.info("------------abnormal_contact_query_test_9000 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_9000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - var deleteCode = await DAHelper.delete(rawContactUri, condition); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition); console.info('abnormal_contact_query_test_9000 : deleteRawContact deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); await AbnormalQuery(); - var conditionAll = new ohos_data_ability.DataAbilityPredicates(); + var conditionAll = new dataShare.DataSharePredicates(); conditionAll.greaterThan("id", "0"); - var code = await DAHelper.delete(deletedUri, conditionAll); + var code = await dataShareHelper.delete(deletedUri, conditionAll); console.info('abnormal_contact_query_test_9000 : Completely delete code = ' + code); expect(code == 0).assertTrue(); done(); @@ -5693,10 +5692,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.orderByDesc("delete_timess"); try { - var resultSet = await DAHelper.query(deletedRawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(deletedRawContactUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_9000: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5714,11 +5713,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_9100", 0, async function(done) { console.info("------------abnormal_contact_query_test_9100 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian9100"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_9100: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var dataId = await insertData(rawContactId, "phone", "11159100", ""); @@ -5737,10 +5736,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("content_typess", "phone"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_9100: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5758,11 +5757,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_9200", 0, async function(done) { console.info("------------abnormal_contact_query_test_9200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian9100"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_query_test_9200: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var dataId = await insertData(rawContactId, "email", "fox@1.com", ""); @@ -5781,10 +5780,10 @@ describe('ContactsTest', function() { async function AbnormalQuery() { var resultColumns = [ "detail_info" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("content_typess", "email"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); expect(resultSet.goToFirstRow()).assertEqual(false); console.info('logMessage abnormal_contact_query_test_9200: goToFirstRow' + resultSet.goToFirstRow()); resultSet.close(); @@ -5802,11 +5801,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_delete_test_10000", 0, async function(done) { console.info("------------abnormal_contact_delete_test_10000 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian9300"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_delete_test_10000: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var dataId = await insertData(rawContactId, "email", "fox@1.com", ""); @@ -5814,10 +5813,10 @@ describe('ContactsTest', function() { var dataId1 = await insertData(rawContactId, "phone", "fox@2.com", ""); console.info("logMessage abnormal_contact_delete_test_10000: dataId1 = " + dataId1); - var errorUri = "dataability:///com.ohos.contactsdataability/contacts/contact_datasss"; - let condition = new ohos_data_ability.DataAbilityPredicates(); + var errorUri = "datashare:///com.ohos.contactsdataability/contacts/contact_datasss"; + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", dataId.toString()); - var deleteCode = await DAHelper.delete(errorUri, condition); + var deleteCode = await dataShareHelper.delete(errorUri, condition); console.info(' abnormal_contact_delete_test_10000 : deleteAll deleteCode = ' + deleteCode); expect(deleteCode == -1).assertTrue(); var map = new Map(); @@ -5840,11 +5839,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_delete_test_9300", 0, async function(done) { console.info("------------abnormal_contact_delete_test_9300 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian9300"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_delete_test_9300: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var dataId = await insertData(rawContactId, "email", "fox@1.com", ""); @@ -5852,10 +5851,10 @@ describe('ContactsTest', function() { var dataId1 = await insertData(rawContactId, "phone", "fox@2.com", ""); console.info("logMessage abnormal_contact_delete_test_9300: dataId1 = " + dataId1); - var errorUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contactsss"; - let condition = new ohos_data_ability.DataAbilityPredicates(); + var errorUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contactsss"; + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - var deleteCode = await DAHelper.delete(errorUri, condition); + var deleteCode = await dataShareHelper.delete(errorUri, condition); console.info(' abnormal_contact_delete_test_9300 : deleteAll deleteCode = ' + deleteCode); expect(deleteCode == -1).assertTrue(); var map = new Map(); @@ -5878,23 +5877,23 @@ describe('ContactsTest', function() { */ it("abnormal_contact_delete_test_9400", 0, async function(done) { console.info("------------abnormal_contact_delete_test_9400 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian9400"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_delete_test_9400: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var rawContactValues = {"display_name" : "xiaoli9400"}; - var rawContactId1 = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_delete_test_9400: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", rawContactId.toString()); condition.or(); condition.equalTo("ids", rawContactId1.toString()) - var deleteCode = await DAHelper.delete(rawContactUri, condition); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition); console.info('abnormal_contact_delete_test_9400 : deleteCode = ' + deleteCode); expect(deleteCode == -1).assertTrue(); await deleteRawContact("abnormal_contact_delete_test_9400"); @@ -5912,24 +5911,24 @@ describe('ContactsTest', function() { */ it("abnormal_contact_favorite_test_9500", 0, async function(done) { console.info("------------abnormal_contact_favorite_test_9500 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian9500", "favorite" : 0}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_favorite_test_9500: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var rawContactValues = {"display_name" : "xiaoli9500", "favorite" : 0}; - var rawContactId1 = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_favorite_test_9500: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var updateValues = {"favorites" : 1}; condition.equalTo("id", rawContactId.toString()); condition.or(); condition.equalTo("id", rawContactId1.toString()) - var code = await DAHelper.update(rawContactUri, updateValues, condition); + var code = await dataShareHelper.update(rawContactUri, updateValues, condition); console.info(' abnormal_contact_favorite_test_9500 : update code = ' + code); expect(code == -1).assertTrue(); await deleteRawContact("abnormal_contact_favorite_test_9500"); @@ -5947,14 +5946,14 @@ describe('ContactsTest', function() { */ it("abnormal_contact_insertblocklist_test_9600", 0, async function(done) { console.info("------------abnormal_contact_insertblocklist_test_9600 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = { "display_name" : "xiaotian9600", }; var phoneNumber = randomNum(12); - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_insertblocklist_test_9600: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var dataId = await insertData(rawContactId, "phone", phoneNumber, ""); @@ -5962,14 +5961,14 @@ describe('ContactsTest', function() { var rawContactValues = { "display_name" : "xiaoli9600", }; - var rawContactId1 = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_insertblocklist_test_9600: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var dataId1 = await insertData(rawContactId1, "phone", phoneNumber, ""); console.info("logMessage abnormal_contact_insertblocklist_test_9600: dataId1 = " + dataId1); var blocklist = {"phone_numbers" : phoneNumber}; - var code = await DAHelper.insert(contactBlocklistUri, blocklist); + var code = await dataShareHelper.insert(contactBlocklistUri, blocklist); expect(code == -1).assertTrue(); await deleteRawContact("abnormal_contact_insertblocklist_test_9600"); await deleteAll(contactDataUri, "abnormal_contact_insertblocklist_test_9600"); @@ -5987,11 +5986,11 @@ describe('ContactsTest', function() { */ it("abnormal_contact_insertGroup_test_9700", 0, async function(done) { console.info("------------abnormal_contact_insertGroup_test_9700 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { var rawContactValues = {"display_name" : "xiaotian9700"}; - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_insertGroup_test_9700: rawContactId = " + rawContactId); expect(rawContactId > 0).assertTrue(); var contactDataValues1 = { @@ -5999,11 +5998,11 @@ describe('ContactsTest', function() { "content_typess" : "group_membership", "detail_info" : 1 }; - var contactDataId = await DAHelper.insert(contactDataUri, contactDataValues1); + var contactDataId = await dataShareHelper.insert(contactDataUri, contactDataValues1); console.info("abnormal_contact_insertGroup_test_9700 logMessage : contactDataId " + contactDataId); expect(contactDataId == -1).assertTrue(); var rawContactValues = {"display_name" : "xiaoli9700"}; - var rawContactId1 = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId1 = await dataShareHelper.insert(rawContactUri, rawContactValues); console.info("logMessage abnormal_contact_insertGroup_test_9700: rawContactId1 = " + rawContactId1); expect(rawContactId1 > 0).assertTrue(); var contactDataValues2 = { @@ -6011,7 +6010,7 @@ describe('ContactsTest', function() { "content_typess" : "group_membership", "detail_info" : 1 }; - var contactDataId1 = await DAHelper.insert(contactDataUri, contactDataValues2); + var contactDataId1 = await dataShareHelper.insert(contactDataUri, contactDataValues2); console.info("abnormal_contact_insertGroup_test_9700 logMessage : contactDataId1 " + contactDataId1); expect(contactDataId1 == -1).assertTrue(); await deleteRawContact("abnormal_contact_insertGroup_test_9700"); @@ -6029,12 +6028,12 @@ describe('ContactsTest', function() { */ it("abnormal_contact_pinyinquery_test_9800", 0, async function(done) { console.info("--------logMessage abnormal_contact_pinyinquery_test_9800 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "李bp玉成욱"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage abnormal_contact_pinyinquery_test_9800 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -6053,10 +6052,10 @@ describe('ContactsTest', function() { async function query() { var resultColumns = [ "search_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("raw_contact_id", rawContactId.toString()); try { - var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(searchContactUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -6082,12 +6081,12 @@ describe('ContactsTest', function() { */ it("abnormal_contact_query_test_9900", 0, async function(done) { console.info("--------logMessage abnormal_contact_query_test_9900 is starting!-------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = {"display_name" : "键盘"}; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(sleep_one); console.info('logMessage abnormal_contact_query_test_9900 rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); @@ -6106,10 +6105,10 @@ describe('ContactsTest', function() { async function query() { var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.like("search_namesss", "%jp%"); try { - var resultSet = await DAHelper.query(searchContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(searchContactUri, resultColumns, condition); console.info( ' abnormal_contact_query_test_9900 :resultSet.goToFirstRow() = ' + resultSet.goToFirstRow()); expect(resultSet.goToFirstRow() == false).assertTrue(); @@ -6123,21 +6122,21 @@ describe('ContactsTest', function() { afterAll(async function() { var tag = "Contacts_test_start_deleted"; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - let DAHelperContact = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': start ! DAHelperContact = ' + DAHelperContact); - var deleteBlockList = await DAHelperContact.delete(contactBlocklistUri, condition); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); + var deleteBlockList = await dataShareHelper.delete(contactBlocklistUri, condition); console.info(tag + " : logMessage : deleteBlockList = " + deleteBlockList); - var deletedGroup = await DAHelperContact.delete(groupUri, condition); + var deletedGroup = await dataShareHelper.delete(groupUri, condition); console.info(tag + " : logMessage : deletedGroup = " + deletedGroup); - var dataDeletedCode = await DAHelperContact.delete(contactDataUri, condition); + var dataDeletedCode = await dataShareHelper.delete(contactDataUri, condition); sleep(sleep_two); console.info(tag + " : logMessage : dataDeletedCode = " + dataDeletedCode); - var rawContactDeleted = await DAHelperContact.delete(rawContactUri, condition); + var rawContactDeleted = await dataShareHelper.delete(rawContactUri, condition); sleep(sleep_two); console.info(tag + " : logMessage : rawContactDeleted = " + rawContactDeleted); - var deleted = await DAHelperContact.delete(deletedUri, condition); + var deleted = await dataShareHelper.delete(deletedUri, condition); sleep(sleep_two); console.info(tag + " : logMessage : deleted = " + deleted); }); diff --git a/jstest/Groups_test.js b/jstest/Groups_test.js index 7a1906d..00be054 100644 --- a/jstest/Groups_test.js +++ b/jstest/Groups_test.js @@ -13,12 +13,11 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const groupUri = "dataability:///com.ohos.contactsdataability/contacts/groups"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const groupUri = "datashare:///com.ohos.contactsdataability/contacts/groups"; import common from './common.js'; describe('GroupsTest', function() { @@ -28,13 +27,13 @@ describe('GroupsTest', function() { async function groupsQuery(map, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': groupsQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': groupsQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - var resultSet = await DAHelper.query(groupUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(groupUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -55,13 +54,13 @@ describe('GroupsTest', function() { async function queryIdForDelete(map, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': queryIdForDelete start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': queryIdForDelete start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - var resultSet = await DAHelper.query(groupUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(groupUri, resultColumns, condition); expect(resultSet.goToFirstRow() == false).assertTrue(); console.info(tag + " :logMessage queryIdForDelete: goToFirstRow " + resultSet.goToFirstRow()); resultSet.close(); @@ -72,10 +71,10 @@ describe('GroupsTest', function() { async function deleteAll(uri, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(uri, condition); + var deleteCode = await dataShareHelper.delete(uri, condition); console.info(tag + ': deleteAll deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); } @@ -87,10 +86,10 @@ describe('GroupsTest', function() { */ it("group_insert_test_100", 0, async function(done) { console.info("---------logMessage group_insert_test_100 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(groupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(groupUri, common.getProfileGroup()); console.info("logMessage group_insert_test_100: groupId = " + groupId); expect(groupId > 0).assertTrue(); var map = common.getProfileGroupMap(); @@ -111,10 +110,10 @@ describe('GroupsTest', function() { */ it("group_update_test_500", 0, async function(done) { console.info("---------logMessage group_update_test_500 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(groupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(groupUri, common.getProfileGroup()); console.info("logMessage group_update_test_500: groupId = " + groupId); expect(groupId > 0).assertTrue(); await GroupUpdate(); @@ -127,10 +126,10 @@ describe('GroupsTest', function() { async function GroupUpdate() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", groupId.toString()); try { - var updateCode = await DAHelper.update(groupUri, common.getProfileUpdateGroup(), condition); + var updateCode = await dataShareHelper.update(groupUri, common.getProfileUpdateGroup(), condition); console.info("logMessage group_update_test_500: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); var map = common.getProfileUpdateGroupMap(); @@ -150,10 +149,10 @@ describe('GroupsTest', function() { */ it("group_delete_test_200", 0, async function(done) { console.info("---------logMessage group_delete_test_200 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(groupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(groupUri, common.getProfileGroup()); console.info("logMessage group_delete_test_200: groupId = " + groupId); expect(groupId > 0).assertTrue(); await GroupDelete(); @@ -164,10 +163,10 @@ describe('GroupsTest', function() { } async function GroupDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", groupId.toString()); try { - var deleteCode = await DAHelper.delete(groupUri, condition); + var deleteCode = await dataShareHelper.delete(groupUri, condition); console.info("logMessage group_delete_test_200 : deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); var map = new Map(); @@ -187,10 +186,10 @@ describe('GroupsTest', function() { */ it("group_query_test_300", 0, async function(done) { console.info("------------logMessage group_query_test_300 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(groupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(groupUri, common.getProfileGroup()); console.info("logMessage group_query_test_300: groupId = " + groupId); expect(groupId > 0).assertTrue(); var map = common.getProfileGroupMap(); @@ -212,14 +211,14 @@ describe('GroupsTest', function() { it("group_query_test_400", 0, async function(done) { console.info("------------logMessage group_query_test_400 is starting!-----------"); console.info("---------logMessage getDbHelper start!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_CONTACTS); - var groupUri = "dataability:///com.ohos.contactsdataability/contacts/groups"; + var groupUri = "datashare:///com.ohos.contactsdataability/contacts/groups"; var insertValues = {"group_name" : "ManagerSecondGroup"}; try { - var groupId = await DAHelper.insert(groupUri, insertValues); + var groupId = await dataShareHelper.insert(groupUri, insertValues); console.info("logMessage group_query_test_400: groupId = " + groupId); expect(groupId > 0).assertTrue(); await GroupQuery(); @@ -233,10 +232,10 @@ describe('GroupsTest', function() { async function GroupQuery() { var resultColumns = [ "id", "group_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var resultSet = await DAHelper.query(groupUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(groupUri, resultColumns, condition); console.info("logMessage group_query_test_400: resultSet.rowCount = " + resultSet.rowCount); expect(resultSet.rowCount == 1).assertTrue(); resultSet.close(); @@ -254,11 +253,11 @@ describe('GroupsTest', function() { */ it("abnormal_group_insert_test_600", 0, async function(done) { console.info("---------logMessage abnormal_group_insert_test_600 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - const errorUri = "dataability:///com.ohos.contactsdataability/contacts/groupssss"; + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + const errorUri = "datashare:///com.ohos.contactsdataability/contacts/groupssss"; try { - var groupId = await DAHelper.insert(errorUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(errorUri, common.getProfileGroup()); console.info("logMessage abnormal_group_insert_test_600: groupId = " + groupId); expect(groupId == -1).assertTrue(); done(); @@ -275,10 +274,10 @@ describe('GroupsTest', function() { */ it("abnormal_group_update_test_700", 0, async function(done) { console.info("---------logMessage abnormal_group_update_test_700 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(groupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(groupUri, common.getProfileGroup()); console.info("logMessage abnormal_group_update_test_700: groupId = " + groupId); expect(groupId > 0).assertTrue(); await GroupUpdate(); @@ -291,11 +290,11 @@ describe('GroupsTest', function() { async function GroupUpdate() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", groupId.toString()); var updateValue = { "group_notesss" : "6666" } try { - var updateCode = await DAHelper.update(groupUri, updateValue, condition); + var updateCode = await dataShareHelper.update(groupUri, updateValue, condition); console.info("logMessage abnormal_group_update_test_700: updateCode = " + updateCode); expect(updateCode == -1).assertTrue(); var map = common.getProfileUpdateGroupMap(); @@ -315,10 +314,10 @@ describe('GroupsTest', function() { */ it("abnormal_group_delete_test_800", 0, async function(done) { console.info("---------logMessage abnormal_group_delete_test_800 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var groupId = await DAHelper.insert(groupUri, common.getProfileGroup()); + var groupId = await dataShareHelper.insert(groupUri, common.getProfileGroup()); console.info("logMessage abnormal_group_delete_test_800: groupId = " + groupId); expect(groupId > 0).assertTrue(); await GroupDelete(); @@ -330,10 +329,10 @@ describe('GroupsTest', function() { } async function GroupDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("idss", groupId.toString()); try { - var deleteCode = await DAHelper.delete(groupUri, condition); + var deleteCode = await dataShareHelper.delete(groupUri, condition); console.info("logMessage abnormal_group_delete_test_800 : deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); var map = common.getProfileUpdateGroupMap(); @@ -353,15 +352,15 @@ describe('GroupsTest', function() { */ it("abnormal_group_query_test_900", 0, async function(done) { console.info("------------logMessage abnormal_group_query_test_900 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertValues = {"group_name" : "PersonnelDepartment"}; try { - var groupId = await DAHelper.insert(groupUri, insertValues); + var groupId = await dataShareHelper.insert(groupUri, insertValues); console.info("logMessage abnormal_group_query_test_900: groupId = " + groupId); expect(groupId > 0).assertTrue(); - await GroupQuery(DAHelper); + await GroupQuery(dataShareHelper); await deleteAll(groupUri, "abnormal_group_query_test_900"); done(); } catch (error) { @@ -369,13 +368,13 @@ describe('GroupsTest', function() { done(); } - async function GroupQuery(DAHelper) + async function GroupQuery(dataShareHelper) { var resultColumns = [ "id", "group_namesss" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", groupId.toString()); try { - var resultSet = await DAHelper.query(groupUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(groupUri, resultColumns, condition); console.info('abnormal_group_query_test_900 resultSet.goToFirstRow() = ' + resultSet.goToFirstRow()); expect(resultSet.goToFirstRow() == false).assertTrue(); resultSet.close(); @@ -393,8 +392,8 @@ describe('GroupsTest', function() { */ it("group_insert_test_1000", 0, async function(done) { console.info("------------logMessage group_insert_test_1000 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertValuesOne = {"group_name" : "test1000"}; var insertValuesTwo = {"group_name" : "test1000"}; @@ -404,10 +403,10 @@ describe('GroupsTest', function() { array[1] = insertValuesTwo; array[array_two] = insertValuesThree; try { - var code = await DAHelper.batchInsert(groupUri, array); + var code = await dataShareHelper.batchInsert(groupUri, array); console.info("logMessage group_insert_test_1000: batchInsert code = " + code); expect(code == 0).assertTrue(); - await GroupQuery(DAHelper); + await GroupQuery(dataShareHelper); await deleteAll(groupUri, "group_insert_test_1000"); done(); } catch (error) { @@ -415,14 +414,14 @@ describe('GroupsTest', function() { done(); } - async function GroupQuery(DAHelper) + async function GroupQuery(dataShareHelper) { var groupSize = 3; var resultColumns = [ "id", "group_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("group_name", "test1000"); try { - var resultSet = await DAHelper.query(groupUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(groupUri, resultColumns, condition); console.info('group_insert_test_1000 resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == groupSize).assertTrue(); resultSet.close(); @@ -440,8 +439,8 @@ describe('GroupsTest', function() { */ it("group_delete_test_1100", 0, async function(done) { console.info("------------logMessage group_delete_test_1100 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertValuesOne = {"group_name" : "test1100"}; var insertValuesTwo = {"group_name" : "test1100"}; @@ -451,25 +450,25 @@ describe('GroupsTest', function() { array[1] = insertValuesTwo; array[array_two] = insertValuesThree; try { - var code = await DAHelper.batchInsert(groupUri, array); + var code = await dataShareHelper.batchInsert(groupUri, array); console.info("logMessage group_delete_test_1100: batchInsert code = " + code); expect(code == 0).assertTrue(); await deleteAll(groupUri, "group_delete_test_1100"); - await GroupQuery(DAHelper); + await GroupQuery(dataShareHelper); done(); } catch (error) { console.info("logMessage group_delete_test_1100: group insert error = " + error); done(); } - async function GroupQuery(DAHelper) + async function GroupQuery(dataShareHelper) { var groupSize = 0; var resultColumns = [ "id", "group_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("group_name", "test1100"); try { - var resultSet = await DAHelper.query(groupUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(groupUri, resultColumns, condition); console.info('group_delete_test_1100 resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == groupSize).assertTrue(); resultSet.close(); @@ -487,8 +486,8 @@ describe('GroupsTest', function() { */ it("group_update_test_1200", 0, async function(done) { console.info("------------logMessage group_update_test_1200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertValuesOne = {"group_name" : "test1200"}; var insertValuesTwo = {"group_name" : "test1200"}; @@ -498,11 +497,11 @@ describe('GroupsTest', function() { array[1] = insertValuesTwo; array[array_two] = insertValuesThree; try { - var code = await DAHelper.batchInsert(groupUri, array); + var code = await dataShareHelper.batchInsert(groupUri, array); console.info("logMessage group_update_test_1200: batchInsert code = " + code); expect(code == 0).assertTrue(); - await GroupUpdateThree(DAHelper); - await GroupQuery(DAHelper); + await GroupUpdateThree(dataShareHelper); + await GroupQuery(dataShareHelper); await deleteAll(groupUri, "group_update_test_1200"); done(); } catch (error) { @@ -510,14 +509,14 @@ describe('GroupsTest', function() { done(); } - async function GroupQuery(DAHelper) + async function GroupQuery(dataShareHelper) { var groupSize = 3; var resultColumns = [ "id", "group_name" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("group_name", "test120000"); try { - var resultSet = await DAHelper.query(groupUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(groupUri, resultColumns, condition); console.info("logMessage group_update_test_1200: resultSet.rowCount = " + resultSet.rowCount); expect(resultSet.rowCount == groupSize).assertTrue(); resultSet.close(); @@ -528,13 +527,13 @@ describe('GroupsTest', function() { } }); - async function GroupUpdateThree(DAHelper) + async function GroupUpdateThree(dataShareHelper) { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("group_name", "test1200"); var updateValue = { "group_name" : "test120000" } try { - var updateCode = await DAHelper.update(groupUri, updateValue, condition); + var updateCode = await dataShareHelper.update(groupUri, updateValue, condition); console.info("logMessage group_update_test_1200: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); } catch (error) { @@ -543,11 +542,11 @@ describe('GroupsTest', function() { } afterAll(async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + let condition = new dataShare.DataSharePredicates(); condition.notEqualTo("id", "0"); try { - var deleteCode = await DAHelper.delete(groupUri, condition); + var deleteCode = await dataShareHelper.delete(groupUri, condition); console.info("logMessage group_deleted : deleteCode = " + deleteCode); done(); } catch (error) { diff --git a/jstest/ObjectCallback.js b/jstest/ObjectCallback.js index 9296b71..fe74e22 100644 --- a/jstest/ObjectCallback.js +++ b/jstest/ObjectCallback.js @@ -16,11 +16,11 @@ import contactsapi from "@ohos.contact"; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index'; -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -const contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; -const groupUri = "dataability:///com.ohos.contactsdataability/contacts/groups"; -const deletedUri = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +const contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; +const groupUri = "datashare:///com.ohos.contactsdataability/contacts/groups"; +const deletedUri = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; describe('ObjectInterfaceTest', function() { function sleep(numberMillis) diff --git a/jstest/ObjectInterface_test.js b/jstest/ObjectInterface_test.js index 162ed4a..da4d32b 100644 --- a/jstest/ObjectInterface_test.js +++ b/jstest/ObjectInterface_test.js @@ -16,10 +16,10 @@ import contactsapi from "@ohos.contact"; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const groupUri = "dataability:///com.ohos.contactsdataability/contacts/groups"; -const rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -const profileRawContactUri = "dataability:///com.ohos.contactsdataability/profile/raw_contact"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const groupUri = "datashare:///com.ohos.contactsdataability/contacts/groups"; +const rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +const profileRawContactUri = "datashare:///com.ohos.contactsdataability/profile/raw_contact"; describe('ObjectInterfaceTest', function() { function sleep(numberMillis) diff --git a/jstest/Performance_test.js b/jstest/Performance_test.js index 2716e59..324719b 100644 --- a/jstest/Performance_test.js +++ b/jstest/Performance_test.js @@ -13,20 +13,19 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' -const URI_CALLLOG = "dataability:///com.ohos.calllogability"; -const calllogUri = "dataability:///com.ohos.calllogability/calls/calllog"; +const URI_CALLLOG = "datashare:///com.ohos.calllogability"; +const calllogUri = "datashare:///com.ohos.calllogability/calls/calllog"; -const URI_VOICEMAIL = "dataability:///com.ohos.voicemailability"; -const voicemailUri = "dataability:///com.ohos.voicemailability/calls/voicemail"; +const URI_VOICEMAIL = "datashare:///com.ohos.voicemailability"; +const voicemailUri = "datashare:///com.ohos.voicemailability/calls/voicemail"; -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -const contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; -const deletedUri = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +const contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; +const deletedUri = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; describe('PerformanceTest', function() { console.log(' PerformanceTest is start'); @@ -48,8 +47,8 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("raw_contact_insert_performance_test_900", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var listAddBluk = []; for (var i = 0; i < 1000; i++) { var add = {"display_name" : "xiaoli" + i, "company" : "testCompany" + i, "position" : "testPosition" + i}; @@ -57,16 +56,16 @@ describe('PerformanceTest', function() { } try { let old = new Date(); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); let now = new Date(); let usedTime = now - old; console.info('raw_contact_insert_performance_test_900 usedTime = ' + usedTime); @@ -88,16 +87,16 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("raw_contact_update_performance_test_1000", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var updateValues = {"favorite" : 1}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); try { let old = new Date(); - var updateCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(rawContactUri, updateValues, condition); let now = new Date(); let usedTime = now - old; console.info('raw_contact_update_performance_test_1000 usedTime = ' + usedTime); @@ -120,16 +119,16 @@ describe('PerformanceTest', function() { */ it("raw_contact_query_performance_test_1100", 0, async function(done) { var tag = "raw_contact_query_performance_test_1100"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); try { let old = new Date(); - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); let now = new Date(); let usedTime = now - old; console.info('raw_contact_query_performance_test_1100 usedTime = ' + usedTime); @@ -152,15 +151,15 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ 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); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('raw_contact_delete_performance_test_1200 : start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); try { let old = new Date(); - var deleteCode = await DAHelper.delete(rawContactUri, condition); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition); let now = new Date(); let usedTime = now - old; console.info('raw_contact_delete_performance_test_1200 usedTime = ' + usedTime); @@ -182,23 +181,23 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("contact_data_insert_performance_test_1300", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = { "display_name" : "xiaoli", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(1000); console.info("logMessage contact_data_insert_performance_test_1300: rawContactId = " + rawContactId); } catch (error) { console.info("logMessage contact_data_insert_performance_test_1300: raw_contact insert error = " + error); } - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - var deleteCode = await DAHelper.delete(rawContactUri, condition); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition); sleep(1000); console.info("logMessage contact_data_insert_performance_test_1300: deleteCode = " + deleteCode); @@ -209,16 +208,16 @@ describe('PerformanceTest', function() { } try { let old = new Date(); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); let now = new Date(); let usedTime = now - old; console.info('contact_data_insert_performance_test_1300 usedTime = ' + usedTime); @@ -240,14 +239,14 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("contact_data_update_performance_test_1400", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage contact_data_update_performance_test_1400 DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage contact_data_update_performance_test_1400 dataShareHelper success! dataShareHelper = ' + dataShareHelper); var updateValues = {"syn_1" : "test"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { let old = new Date(); - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); let now = new Date(); let usedTime = now - old; console.info('contact_data_update_performance_test_1400 usedTime = ' + usedTime); @@ -269,14 +268,14 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("contact_data_query_performance_test_1500", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('contact_data_query_performance_test_1500 start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('contact_data_query_performance_test_1500 start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { let old = new Date(); - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); let now = new Date(); let usedTime = now - old; console.info('contact_data_query_performance_test_1500 usedTime = ' + usedTime); @@ -299,13 +298,13 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ 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); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('contact_data_delete_performance_test_1600 : start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { let old = new Date(); - var deleteCode = await DAHelper.delete(contactDataUri, condition); + var deleteCode = await dataShareHelper.delete(contactDataUri, condition); let now = new Date(); let usedTime = now - old; console.info('contact_data_delete_performance_test_1600 usedTime = ' + usedTime); @@ -328,8 +327,8 @@ describe('PerformanceTest', function() { */ it("calllog_insert_performance_test_100", 0, async function(done) { console.info("---------logMessage calllog_insert_performance_test_100 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var listAddBluk = []; var phoneNumber = randomNum(6); for (var i = 0; i < 1000; i++) { @@ -338,16 +337,16 @@ describe('PerformanceTest', function() { } try { let old = new Date(); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); let now = new Date(); let usedTime = now - old; console.info('calllog_insert_performance_test_100 usedTime = ' + usedTime); @@ -369,14 +368,14 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("calllog_update_performance_test_200", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var updateValues = {"answer_state" : "1"}; try { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.notEqualTo("id", 0); let old = new Date(); - var updateCode = await DAHelper.update(calllogUri, updateValues, condition); + var updateCode = await dataShareHelper.update(calllogUri, updateValues, condition); let now = new Date(); let usedTime = now - old; console.info('calllog_update_performance_test_200 usedTime = ' + usedTime); @@ -398,15 +397,15 @@ describe('PerformanceTest', function() { */ it("calllog_query_performance_test_300", 0, async function(done) { var tag = "calllog_query_performance_test_300"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info(tag + ': start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.notEqualTo("id", 0); try { let old = new Date(); - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); let now = new Date(); let usedTime = now - old; console.info('calllog_query_performance_test_300 usedTime = ' + usedTime); @@ -430,12 +429,12 @@ describe('PerformanceTest', function() { */ it("calllog_delete_performance_test_400", 0, async function(done) { var tag = "calllog_delete_performance_test_400"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info(tag + ': start ! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); let old = new Date(); - var deleteCode = await DAHelper.delete(calllogUri, condition); + var deleteCode = await dataShareHelper.delete(calllogUri, condition); let now = new Date(); let usedTime = now - old; console.info('calllog_delete_performance_test_400 usedTime = ' + usedTime); @@ -454,8 +453,8 @@ describe('PerformanceTest', function() { */ it("voicemail_insert_performance_test_500", 0, async function(done) { console.info("---------logMessage voicemail_insert_performance_test_500 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var listAddBluk = []; var phoneNumber = randomNum(4); @@ -465,16 +464,16 @@ describe('PerformanceTest', function() { } try { let old = new Date(); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); let now = new Date(); let usedTime = now - old; console.info('voicemail_insert_performance_test_500 usedTime = ' + usedTime); @@ -496,14 +495,14 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("voicemail_update_performance_test_600", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var updateValues = {"origin_type" : "test"}; try { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.notEqualTo("id", 0); let old = new Date(); - var updateCode = await DAHelper.update(voicemailUri, updateValues, condition); + var updateCode = await dataShareHelper.update(voicemailUri, updateValues, condition); let now = new Date(); let usedTime = now - old; console.info('voicemail_update_performance_test_600 usedTime = ' + usedTime); @@ -526,14 +525,14 @@ describe('PerformanceTest', function() { */ it("voicemail_query_performance_test_700", 0, async function(done) { var tag = "voicemail_query_performance_test_700"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info(tag + ': start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { let old = new Date(); - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); let now = new Date(); let usedTime = now - old; console.info('voicemail_query_performance_test_700 usedTime = ' + usedTime); @@ -557,13 +556,13 @@ describe('PerformanceTest', function() { */ it("voicemail_delete_performance_test_800", 0, async function(done) { var tag = "voicemail_delete_performance_test_800"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info(tag + ': start ! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { let old = new Date(); - var deleteCode = await DAHelper.delete(voicemailUri, condition); + var deleteCode = await dataShareHelper.delete(voicemailUri, condition); let now = new Date(); let usedTime = now - old; console.info('voicemail_delete_performance_test_800 usedTime = ' + usedTime); @@ -579,24 +578,24 @@ describe('PerformanceTest', function() { }); afterAll(async function() { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('DeleteContact : start ! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('DeleteContact : start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.notEqualTo("id", "0"); try { var resultColumns = [ "id" ]; - var conditionDelete = new ohos_data_ability.DataAbilityPredicates(); + var conditionDelete = new dataShare.DataSharePredicates(); conditionDelete.greaterThan("id", "0"); var count = 0; var deleteCount = 9999; while (count < deleteCount) { - var result = await DAHelper.query(deletedUri, resultColumns, conditionDelete); + var result = await dataShareHelper.query(deletedUri, resultColumns, conditionDelete); console.info("performance : result.rowCount = " + result.rowCount); count = result.rowCount; result.close(); sleep(5000); } - var deleteCode = await DAHelper.delete(deletedUri, condition); + var deleteCode = await dataShareHelper.delete(deletedUri, condition); console.info("afterAll logMessage DeleteContact: deleteCode = " + deleteCode); } catch (error) { console.info('afterAll logMessage DeleteContact: delete error = ' + error); diff --git a/jstest/Stability_test.js b/jstest/Stability_test.js index f07e836..f2f51ee 100644 --- a/jstest/Stability_test.js +++ b/jstest/Stability_test.js @@ -13,20 +13,19 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' -const URI_CALLLOG = "dataability:///com.ohos.calllogability"; -const calllogUri = "dataability:///com.ohos.calllogability/calls/calllog"; +const URI_CALLLOG = "datashare:///com.ohos.calllogability"; +const calllogUri = "datashare:///com.ohos.calllogability/calls/calllog"; -const URI_VOICEMAIL = "dataability:///com.ohos.voicemailability"; -const voicemailUri = "dataability:///com.ohos.voicemailability/calls/voicemail"; +const URI_VOICEMAIL = "datashare:///com.ohos.voicemailability"; +const voicemailUri = "datashare:///com.ohos.voicemailability/calls/voicemail"; -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -const contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; -const deletedUri = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +const contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; +const deletedUri = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; describe('PerformanceTest', function() { console.log(' PerformanceTest is start'); @@ -47,24 +46,24 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("raw_contact_insert_stability_test_900", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var listAddBluk = []; for (var i = 0; i < 1000; i++) { var add = {"display_name" : "xiaoli" + i, "company" : "testCompany" + i, "position" : "testPosition" + i}; listAddBluk[i] = add; } try { - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(rawContactUri, listAddBluk); sleep(1000); console.info("logMessage raw_contact_insert_stability_test_900: contactDataId1 = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -82,15 +81,15 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("raw_contact_update_stability_test_1000", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var updateValues = {"favorite" : 1}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var updateCode = await DAHelper.update(rawContactUri, updateValues, condition); + var updateCode = await dataShareHelper.update(rawContactUri, updateValues, condition); sleep(1000); console.info("logMessage raw_contact_update_stability_test_1000: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -108,15 +107,15 @@ describe('PerformanceTest', function() { */ it("raw_contact_query_stability_test_1100", 0, async function(done) { var tag = "raw_contact_query_stability_test_1100"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); var resultColumns = ["id"]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var resultSet = await DAHelper.query(rawContactUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(rawContactUri, resultColumns, condition); sleep(1000); console.info(tag + ' : logMessage : rowCount' + resultSet.rowCount); expect(resultSet.rowCount == 10000).assertTrue(); @@ -134,14 +133,14 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ 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); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('raw_contact_delete_stability_test_1200 : start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); try { - var deleteCode = await DAHelper.delete(rawContactUri, condition); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition); sleep(1000); console.info("logMessage raw_contact_delete_stability_test_1200: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -158,23 +157,23 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("contact_data_insert_stability_test_1300", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var rawContactValues = { "display_name" : "xiaoli", }; try { - var rawContactId = await DAHelper.insert(rawContactUri, rawContactValues); + var rawContactId = await dataShareHelper.insert(rawContactUri, rawContactValues); sleep(1000); console.info("logMessage contact_data_insert_stability_test_1300: rawContactId = " + rawContactId); } catch (error) { console.info("logMessage contact_data_insert_stability_test_1300: raw_contact insert error = " + error); } - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", rawContactId.toString()); - var deleteCode = await DAHelper.delete(rawContactUri, condition); + var deleteCode = await dataShareHelper.delete(rawContactUri, condition); sleep(1000); console.info("logMessage contact_data_insert_stability_test_1300: deleteCode = " + deleteCode); @@ -184,16 +183,16 @@ describe('PerformanceTest', function() { listAddBluk[i] = add; } try { - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(contactDataUri, listAddBluk); sleep(2000); console.info("logMessage contact_data_insert_stability_test_1300: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -211,13 +210,13 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("contact_data_update_stability_test_1400", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage contact_data_update_stability_test_1400 DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage contact_data_update_stability_test_1400 dataShareHelper success! dataShareHelper = ' + dataShareHelper); var updateValues = {"syn_1" : "test"}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var updateCode = await DAHelper.update(contactDataUri, updateValues, condition); + var updateCode = await dataShareHelper.update(contactDataUri, updateValues, condition); sleep(2000); console.info("logMessage contact_data_update_stability_test_1400: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -234,13 +233,13 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("contact_data_query_stability_test_1500", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('contact_data_query_stability_test_1500 start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('contact_data_query_stability_test_1500 start ! dataShareHelper = ' + dataShareHelper); var resultColumns = ["id"]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var resultSet = await DAHelper.query(contactDataUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(contactDataUri, resultColumns, condition); sleep(2000); console.info(' contact_data_query_stability_test_1500 : resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == 10000).assertEqual(true); @@ -258,12 +257,12 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ 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); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('contact_data_delete_stability_test_1600 : start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var deleteCode = await DAHelper.delete(contactDataUri, condition); + var deleteCode = await dataShareHelper.delete(contactDataUri, condition); sleep(2000); console.info("logMessage contact_data_delete_stability_test_1600: deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -281,8 +280,8 @@ describe('PerformanceTest', function() { */ it("calllog_insert_stability_test_100", 0, async function(done) { console.info("---------logMessage calllog_insert_stability_test_100 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var listAddBluk = []; var phoneNumber = randomNum(6); for (var i = 0; i < 1000; i++) { @@ -290,16 +289,16 @@ describe('PerformanceTest', function() { listAddBluk[i] = add; } try { - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(calllogUri, listAddBluk); sleep(1000); console.info("logMessage calllog_insert_stability_test_100: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -317,13 +316,13 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("calllog_update_stability_test_200", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var updateValues = {"answer_state" : "1"}; try { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var updateCode = await DAHelper.update(calllogUri, updateValues, condition); + var updateCode = await dataShareHelper.update(calllogUri, updateValues, condition); sleep(1000); console.info("logMessage calllog_update_stability_test_200: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -341,14 +340,14 @@ describe('PerformanceTest', function() { */ it("calllog_query_stability_test_300", 0, async function(done) { var tag = "calllog_query_stability_test_300"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info(tag + ': start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); var resultColumns = ["id"]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.notEqualTo("id", 0); try { - let resultSet = await DAHelper.query(calllogUri, resultColumns, condition); + let resultSet = await dataShareHelper.query(calllogUri, resultColumns, condition); sleep(5000); console.info(tag + ' : logMessage : rowCount' + resultSet.rowCount); expect(resultSet.rowCount == 10000).assertTrue(); @@ -367,11 +366,11 @@ describe('PerformanceTest', function() { */ it("calllog_delete_stability_test_400", 0, async function(done) { var tag = "calllog_delete_stability_test_400"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG); - console.info(tag + ': start ! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CALLLOG); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(calllogUri, condition); + var deleteCode = await dataShareHelper.delete(calllogUri, condition); sleep(5000); console.info(tag + " : logMessage : deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -385,8 +384,8 @@ describe('PerformanceTest', function() { */ it("voicemail_insert_stability_test_500", 0, async function(done) { console.info("---------logMessage voicemail_insert_stability_test_500 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var listAddBluk = []; var phoneNumber = randomNum(4); @@ -395,16 +394,16 @@ describe('PerformanceTest', function() { listAddBluk[i] = add; } try { - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); sleep(1000); console.info("logMessage voicemail_insert_stability_test_500: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); @@ -422,13 +421,13 @@ describe('PerformanceTest', function() { * @tc.desc Function test */ it("voicemail_update_stability_test_600", 0, async function(done) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var updateValues = {"origin_type" : "test"}; try { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.notEqualTo("id", 0); - var updateCode = await DAHelper.update(voicemailUri, updateValues, condition); + var updateCode = await dataShareHelper.update(voicemailUri, updateValues, condition); sleep(1000); console.info("logMessage voicemail_update_stability_test_600: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); @@ -446,13 +445,13 @@ describe('PerformanceTest', function() { */ it("voicemail_query_stability_test_700", 0, async function(done) { var tag = "voicemail_query_stability_test_700"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info(tag + ': start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); var resultColumns = ["id"]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); sleep(1000); console.info(tag + ' : resultSet.rowCount = ' + resultSet.rowCount); expect(resultSet.rowCount == 10000).assertEqual(true); @@ -471,12 +470,12 @@ describe('PerformanceTest', function() { */ it("voicemail_delete_stability_test_800", 0, async function(done) { var tag = "voicemail_delete_stability_test_800"; - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info(tag + ': start ! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info(tag + ': start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var deleteCode = await DAHelper.delete(voicemailUri, condition); + var deleteCode = await dataShareHelper.delete(voicemailUri, condition); sleep(2000); console.info(tag + " : logMessage : deleteCode = " + deleteCode); expect(deleteCode == 0).assertTrue(); @@ -488,24 +487,24 @@ describe('PerformanceTest', function() { }); afterAll(async function() { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('Stability : start ! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('Stability : start ! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.notEqualTo("id", "0"); try { var resultColumns = [ "id" ]; - var conditionDelete = new ohos_data_ability.DataAbilityPredicates(); + var conditionDelete = new dataShare.DataSharePredicates(); conditionDelete.greaterThan("id", "0"); var count = 0; var deleteCount = 9999; while (count < deleteCount) { - var result = await DAHelper.query(deletedUri, resultColumns, conditionDelete); + var result = await dataShareHelper.query(deletedUri, resultColumns, conditionDelete); console.info("Stability : result.rowCount = " + result.rowCount); count = result.rowCount; result.close(); sleep(5000); } - var deleteCode = await DAHelper.delete(deletedUri, condition); + var deleteCode = await dataShareHelper.delete(deletedUri, condition); console.info("Stability afterAll logMessage DeleteContact: deleteCode = " + deleteCode); } catch (error) { console.info('Stability afterAll logMessage DeleteContact: delete error = ' + error); diff --git a/jstest/Voicemail_test.js b/jstest/Voicemail_test.js index 2bfd99f..a1d3515 100644 --- a/jstest/Voicemail_test.js +++ b/jstest/Voicemail_test.js @@ -13,26 +13,25 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' import common from './common.js'; -const URI_VOICEMAIL = "dataability:///com.ohos.voicemailability"; -const voicemailUri = "dataability:///com.ohos.voicemailability/calls/voicemail"; +const URI_VOICEMAIL = "datashare:///com.ohos.voicemailability"; +const voicemailUri = "datashare:///com.ohos.voicemailability/calls/voicemail"; describe('VoicemailTest', function() { console.log("----------VoicemailTest is starting!----------"); async function voicemailQuery(map, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info(tag + ':calllogInsertQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info(tag + ':calllogInsertQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); if (resultSet.rowCount > 0) { if (resultSet.goToFirstRow()) { do { @@ -53,13 +52,13 @@ describe('VoicemailTest', function() { async function voicemailQueryForDelete(map, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info(tag + ': voicemailQueryForDelete start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info(tag + ': voicemailQueryForDelete start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", map.get("id")); try { - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); expect(resultSet.goToFirstRow() == false).assertTrue(); console.info(tag + " :logMessage voicemailQueryForDelete: goToFirstRow " + resultSet.goToFirstRow()); resultSet.close(); @@ -70,13 +69,13 @@ describe('VoicemailTest', function() { async function voicemailQueryError(map, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info(tag + ': voicemailQueryError start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info(tag + ': voicemailQueryError start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("phone_number", map.get("phone_number")); try { - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); expect(resultSet.goToFirstRow() == false).assertTrue(); console.info(tag + " :logMessage voicemailQueryError: goToFirstRow " + resultSet.goToFirstRow()); resultSet.close(); @@ -87,13 +86,13 @@ describe('VoicemailTest', function() { async function voicemailQueryForBatchInsert(array, tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info(tag + ': voicemailQueryForBatchInsert start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info(tag + ': voicemailQueryForBatchInsert start ! dataShareHelper = ' + dataShareHelper); let resultColumns = common.getCallLogResultColumns(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("phone_number", array[0].get("phone_number")); try { - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); var size = array.size(); console.info(tag + ' : logMessage voicemailQueryForBatchInsert: size' + size); expect(resultSet.rowCount == size).assertEqual(true); @@ -121,10 +120,10 @@ describe('VoicemailTest', function() { async function voiceMailDelete(tag) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(voicemailUri, condition); + var deleteCode = await dataShareHelper.delete(voicemailUri, condition); console.info(tag + ': voiceMailDelete deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); } @@ -136,11 +135,11 @@ describe('VoicemailTest', function() { */ it("voicemail_insert_test_100", 0, async function(done) { console.info("---------logMessage voicemail_insert_test_100 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) try { - var voicemailId = await DAHelper.insert(voicemailUri, common.getVoiceMail()); + var voicemailId = await dataShareHelper.insert(voicemailUri, common.getVoiceMail()); console.info("logMessage voicemail_insert_test_100: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); var map = common.getVoiceMailMap(); @@ -161,13 +160,13 @@ describe('VoicemailTest', function() { */ it("voicemail_insert_test_200", 0, async function(done) { console.info("---------logMessage voicemail_insert_test_200 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) var phoneNumber = randomNum(6); var stringValue = {"phone_number" : phoneNumber, "voice_status" : 1}; try { - var voicemailId = await DAHelper.insert(voicemailUri, stringValue) + var voicemailId = await dataShareHelper.insert(voicemailUri, stringValue) console.info("logMessage voicemail_insert_test_200: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); var map = new Map(); @@ -190,13 +189,13 @@ describe('VoicemailTest', function() { */ it("voicemail_insert_test_100000", 0, async function(done) { console.info("---------logMessage voicemail_insert_test_100000 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) var phoneNumber = randomNum(6); var stringValue = {"phone_number" : phoneNumber, "voice_status" : 0}; try { - var voicemailId = await DAHelper.insert(voicemailUri, stringValue) + var voicemailId = await dataShareHelper.insert(voicemailUri, stringValue) console.info("logMessage voicemail_insert_test_100000: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); var map = new Map(); @@ -219,11 +218,11 @@ describe('VoicemailTest', function() { */ it("voicemail_update_test_1000", 0, async function(done) { console.info("------------logMessage voicemail_update_test_1000 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var voicemailId = await DAHelper.insert(voicemailUri, common.getVoiceMail()); + var voicemailId = await dataShareHelper.insert(voicemailUri, common.getVoiceMail()); console.info("logMessage voicemail_update_test_1000: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await VoicemailUpdate(); @@ -236,10 +235,10 @@ describe('VoicemailTest', function() { async function VoicemailUpdate() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); try { - var updateCode = await DAHelper.update(voicemailUri, common.getVoiceMailUpdate(), condition); + var updateCode = await dataShareHelper.update(voicemailUri, common.getVoiceMailUpdate(), condition); console.info("logMessage voicemail_update_test_1000: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); var map = common.getVoiceMailUpdateMap(); @@ -259,12 +258,12 @@ describe('VoicemailTest', function() { */ it("voicemail_update_test_900", 0, async function(done) { console.info("------------logMessage voicemail_update_test_900 is starting!----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(7); var insertValues = {"phone_number" : phoneNumber, "voice_status" : 0}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage voicemail_update_test_900: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await VoicemailUpdate(); @@ -278,10 +277,10 @@ describe('VoicemailTest', function() { async function VoicemailUpdate() { var updateValues = {"voice_status" : 1}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); try { - var updateCode = await DAHelper.update(voicemailUri, updateValues, condition); + var updateCode = await dataShareHelper.update(voicemailUri, updateValues, condition); console.info("logMessage voicemail_update_test_900: updateCode = " + updateCode); expect(updateCode == 0).assertTrue(); var map = new Map(); @@ -302,12 +301,12 @@ describe('VoicemailTest', function() { */ it("voicemail_delete_test_500", 0, async function(done) { console.info("-------------logMessage voicemail_delete_test_500 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(8); var insertValues = {"phone_number" : phoneNumber, "display_name" : "zhangming"}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage voicemail_delete_test_500: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await VoicemailDelete(); @@ -320,10 +319,10 @@ describe('VoicemailTest', function() { async function VoicemailDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); try { - var deleteCode = await DAHelper.delete(voicemailUri, condition); + var deleteCode = await dataShareHelper.delete(voicemailUri, condition); console.info('logMessage voicemail_delete_test_500: deleteCode = ' + deleteCode); expect(deleteCode == 0).assertTrue(); var map = new Map(); @@ -343,12 +342,12 @@ describe('VoicemailTest', function() { */ it("voicemail_update_test_600", 0, async function(done) { console.info("-------------logMessage voicemail_update_test_600 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(8); var insertValues1 = {"phone_number" : phoneNumber, "voice_status" : 1}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues1); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues1); console.info("logMessage voicemail_update_test_600: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await VoicemailUpdate(); @@ -362,10 +361,10 @@ describe('VoicemailTest', function() { async function VoicemailUpdate() { var updateValues = {"voice_status" : 0}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); try { - var updateCode = await DAHelper.update(voicemailUri, updateValues, condition); + var updateCode = await dataShareHelper.update(voicemailUri, updateValues, condition); console.info('logMessage voicemail_update_test_600: deleteCode = ' + updateCode); expect(updateCode == 0).assertTrue(); var map = new Map(); @@ -386,8 +385,8 @@ describe('VoicemailTest', function() { */ it("voicemail_batchInsert_test_1800", 0, async function(done) { console.info("-------------logMessage voicemail_batchInsert_test_1800 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(4); var insertValuesOne = {"phone_number" : phoneNumber, "display_name" : "xiaoming"}; var insertValuesTwo = {"phone_number" : phoneNumber, "display_name" : "xiaohei"}; @@ -401,7 +400,7 @@ describe('VoicemailTest', function() { listAddBluk[3] = insertValuesFour; listAddBluk[4] = insertValuesFive; try { - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); console.info("logMessage voicemail_batchInsert_test_1800: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); await voiceMailDelete("voicemail_batchInsert_test_1800"); @@ -419,8 +418,8 @@ describe('VoicemailTest', function() { */ it("voicemail_batchInsert_test_1700", 0, async function(done) { console.info("-------------logMessage voicemail_batchInsert_test_1700 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(3); var insertValuesOne = {"phone_number" : phoneNumber, "display_name" : "xiaoming", "voice_status" : 0}; var insertValuesTwo = {"phone_number" : phoneNumber, "display_name" : "xiaohei", "voice_status" : 1}; @@ -434,7 +433,7 @@ describe('VoicemailTest', function() { listAddBluk[3] = insertValuesFour; listAddBluk[4] = insertValuesFive; try { - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); console.info("logMessage voicemail_batchInsert_test_1700: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == 0).assertTrue(); var array = common.getVoiceMailBatchInsert(); @@ -454,12 +453,12 @@ describe('VoicemailTest', function() { */ it("voicemail_query_test_1400", 0, async function(done) { console.info("------------voicemail_query_test_1400 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(9); var insertValues = {"phone_number" : phoneNumber, "display_name" : "daming"}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage voicemail_query_test_1400: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await VoicemailQuery(); @@ -472,10 +471,10 @@ describe('VoicemailTest', function() { async function VoicemailQuery() { var resultColumns = [ "id", "display_name", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); try { - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('voicemail_query_test_1400 id = ' + resultSet.getString(0)); @@ -501,12 +500,12 @@ describe('VoicemailTest', function() { */ it("voicemail_query_test_1300", 0, async function(done) { console.info("------------voicemail_query_test_1300 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(9); var insertValues = {"phone_number" : phoneNumber, "display_name" : "xiaoming", "voice_status" : 1}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage voicemail_query_test_1300: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await VoicemailQuery(); @@ -519,12 +518,12 @@ describe('VoicemailTest', function() { async function VoicemailQuery() { var resultColumns = [ "id", "display_name", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("voice_status", "1"); condition.and(); condition.equalTo("phone_number", phoneNumber); try { - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); if (resultSet.goToFirstRow()) { do { console.info('voicemail_query_test_1300 id = ' + resultSet.getString(0)); @@ -550,12 +549,12 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_insert_test_300", 0, async function(done) { console.info("------------abnormal_voicemail_insert_test_300 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(10); var insertValues = {"phone_numbers" : phoneNumber, "display_name" : "xiaoming"}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage abnormal_voicemail_insert_test_300: voicemialId = " + voicemailId); expect(voicemailId == -1).assertTrue(); done(); @@ -572,14 +571,14 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_insert_test_400", 0, async function(done) { console.info("------------abnormal_voicemail_insert_test_400 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/calls/voicemails"; + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/calls/voicemails"; var phoneNumber = randomNum(9); var insertValues = {"phone_number" : phoneNumber, "display_name" : "xiaoming"}; try { - var voicemialId = await DAHelper.insert(errorUri, insertValues) + var voicemialId = await dataShareHelper.insert(errorUri, insertValues) console.info("logMessage abnormal_voicemail_insert_test_400: voicemialId = " + voicemialId); expect(voicemialId == -1).assertTrue(); var map = new Map(); @@ -599,12 +598,12 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_update_test_1100", 0, async function(done) { console.info("------------abnormal_voicemail_update_test_1100 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(10); var insertValues = {"phone_number" : phoneNumber}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage abnormal_voicemail_update_test_1100: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await AbnormalUpdate(); @@ -618,10 +617,10 @@ describe('VoicemailTest', function() { { var phoneNumber_Test = randomNum(15); var updateValues = {"phone_numbers" : phoneNumber_Test}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", voicemailId.toString()); try { - var updataCode = await DAHelper.update(voicemailUri, updateValues, condition); + var updataCode = await dataShareHelper.update(voicemailUri, updateValues, condition); console.info("logMessage abnormal_voicemail_update_test_1100: updataCode = " + updataCode); expect(updataCode == -1).assertTrue(); var map = new Map(); @@ -641,13 +640,13 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_update_test_1200", 0, async function(done) { console.info("------------abnormal_voicemail_update_test_1200 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/calls/voicemails"; + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/calls/voicemails"; var phoneNumber = randomNum(6); var insertValues = {"phone_number" : phoneNumber}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage abnormal_voicemail_update_test_1200: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await AbnormalUpdate(); @@ -662,10 +661,10 @@ describe('VoicemailTest', function() { { var phoneNumber_Test = randomNum(6); var updateValues = {"phone_number" : phoneNumber_Test}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); try { - var updataCode = await DAHelper.update(errorUri, updateValues, condition) + var updataCode = await dataShareHelper.update(errorUri, updateValues, condition) console.info("logMessage abnormal_voicemail_update_test_1200: updataCode = " + updataCode); expect(updataCode == -1).assertTrue(); var map = new Map(); @@ -685,12 +684,12 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_delete_test_700", 0, async function(done) { console.info("------------abnormal_voicemail_delete_test_700 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(6); var insertValues = {"phone_number" : phoneNumber}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage abnormal_voicemail_delete_test_700: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await AbnormalDelete(); @@ -703,10 +702,10 @@ describe('VoicemailTest', function() { async function AbnormalDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", voicemailId.toString()); try { - var deleteCode = await DAHelper.delete(voicemailUri, condition); + var deleteCode = await dataShareHelper.delete(voicemailUri, condition); console.info("logMessage abnormal_voicemail_delete_test_700: deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); } catch (error) { @@ -723,13 +722,13 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_delete_test_800", 0, async function(done) { console.info("------------abnormal_voicemail_delete_test_800 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); - var errorUri = "dataability:///com.ohos.calllogability/calls/voicemails"; + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + var errorUri = "datashare:///com.ohos.calllogability/calls/voicemails"; var phoneNumber = randomNum(6); var insertValues = {"phone_number" : phoneNumber}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage abnormal_voicemail_delete_test_800: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await AbnormalDelete(); @@ -742,10 +741,10 @@ describe('VoicemailTest', function() { async function AbnormalDelete() { - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); try { - var deleteCode = await DAHelper.delete(errorUri, condition); + var deleteCode = await dataShareHelper.delete(errorUri, condition); console.info("logMessage abnormal_voicemail_delete_test_800: deleteCode = " + deleteCode); expect(deleteCode == -1).assertTrue(); } catch (error) { @@ -762,12 +761,12 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_query_test_1500", 0, async function(done) { console.info("------------abnormal_voicemail_query_test_1500 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(6); var insertValues = {"phone_number" : phoneNumber}; try { - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); console.info("logMessage abnormal_voicemail_query_test_1500: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); await AbnormalQuery(); @@ -782,10 +781,10 @@ describe('VoicemailTest', function() { { var resultColumns = [ "id", "phone_number" ]; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", voicemailId.toString()); try { - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition) + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition) console.info('logMessage abnormal_voicemail_query_test_1500: goToFirstRow' + resultSet.goToFirstRow()); expect(resultSet.goToFirstRow()).assertEqual(false); resultSet.close(); @@ -803,8 +802,8 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_batchinsert_test_1900", 0, async function(done) { console.info("--------logMessage abnormal_voicemail_batchinsert_test_1900 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var phoneNumber = randomNum(9); var phoneNumber_Test = randomNum(6); var addBulk_value1 = {"phone_number" : phoneNumber, "ring_duration" : "500"}; @@ -819,7 +818,7 @@ describe('VoicemailTest', function() { listAddBluk[3] = addBulk_value4; listAddBluk[4] = addBulk_value5; try { - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk) + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk) console.info("logMessage abnormal_voicemail_batchinsert_test_1900: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == -1).assertTrue(); done(); @@ -836,10 +835,10 @@ describe('VoicemailTest', function() { */ it("voiceMail_delete_test_2000", 0, async function(done) { console.info("--------logMessage voiceMail_delete_test_2000 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var voiceMailId = await DAHelper.insert(voicemailUri, common.getVoiceMail()); + var voiceMailId = await dataShareHelper.insert(voicemailUri, common.getVoiceMail()); console.info("logMessage voiceMail_delete_test_2000: voiceMailId = " + voiceMailId); expect(voiceMailId > 0).assertTrue(); var map = common.getVoiceMailMap() @@ -853,9 +852,9 @@ describe('VoicemailTest', function() { async function executeBatch() { console.info("logMessage voiceMail_delete_test_2000: executeBatch start "); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voiceMailId.toString()); - DAHelper.executeBatch(URI_VOICEMAIL, [ { + dataShareHelper.executeBatch(URI_VOICEMAIL, [ { uri : voicemailUri, type : featureAbility.DataAbilityOperationType.TYPE_DELETE, predicates : condition, @@ -880,10 +879,10 @@ describe('VoicemailTest', function() { */ it("voiceMail_update_test_2100", 0, async function(done) { console.info("--------logMessage voiceMail_update_test_2100 is starting!------------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); try { - var voiceMailId = await DAHelper.insert(voicemailUri, common.getVoiceMail()); + var voiceMailId = await dataShareHelper.insert(voicemailUri, common.getVoiceMail()); console.info("logMessage voiceMail_update_test_2100: voiceMailId = " + voiceMailId); expect(voiceMailId > 0).assertTrue(); var map = common.getVoiceMailMap(); @@ -899,9 +898,9 @@ describe('VoicemailTest', function() { var phoneNumber = randomNum(8); var updateValues = {"phone_number" : phoneNumber}; console.info("logMessage voiceMail_update_test_2100: executeBatch start "); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voiceMailId.toString()); - DAHelper.executeBatch(URI_VOICEMAIL, [ { + dataShareHelper.executeBatch(URI_VOICEMAIL, [ { uri : voicemailUri, type : featureAbility.DataAbilityOperationType.TYPE_UPDATE, valuesBucket : updateValues, @@ -927,13 +926,13 @@ describe('VoicemailTest', function() { */ it("voicemail_insert_test_2200", 0, async function(done) { console.info("---------logMessage voicemail_insert_test_2200 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) var phoneNumber = randomNum(15); var stringValue = {"phone_number" : phoneNumber, "voice_status" : 0}; try { - var voicemailId = await DAHelper.insert(voicemailUri, stringValue) + var voicemailId = await dataShareHelper.insert(voicemailUri, stringValue) console.info("logMessage voicemail_insert_test_2200: voicemailId = " + voicemailId); expect(voicemailId > 0).assertTrue(); var map = new Map(); @@ -957,23 +956,23 @@ describe('VoicemailTest', function() { */ it("voicemail_insert_test_2300", 0, async function(done) { console.info("---------logMessage voicemail_insert_test_2300 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) var phoneNumber = randomNum(11); var stringValue = {"phone_number" : phoneNumber, "voice_status" : 0}; try { - var voicemailId = await DAHelper.insert(voicemailUri, stringValue) - var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue) - var voicemailIdTwo = await DAHelper.insert(voicemailUri, stringValue) - let condition = new ohos_data_ability.DataAbilityPredicates(); + var voicemailId = await dataShareHelper.insert(voicemailUri, stringValue) + var voicemailIdOne = await dataShareHelper.insert(voicemailUri, stringValue) + var voicemailIdTwo = await dataShareHelper.insert(voicemailUri, stringValue) + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); condition.or(); condition.equalTo("id", voicemailIdOne.toString()); - var deleteCode = await DAHelper.delete(voicemailUri, condition); + var deleteCode = await dataShareHelper.delete(voicemailUri, condition); console.info("logMessage voicemail_insert_test_2300: deleteCode = " + deleteCode); var resultColumns = []; - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); expect(resultSet.rowCount == 0).assertTrue(); resultSet.close(); await voiceMailDelete("voicemail_insert_test_2300"); @@ -992,22 +991,22 @@ describe('VoicemailTest', function() { */ it("voicemail_insert_test_2400", 0, async function(done) { console.info("---------logMessage voicemail_insert_test_2400 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) var phoneNumber_Test = randomNum(8); var stringValue = {"phone_number" : phoneNumber_Test, "voice_status" : 0}; try { - var voicemailId = await DAHelper.insert(voicemailUri, stringValue) - var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue) - var voicemailIdTwo = await DAHelper.insert(voicemailUri, stringValue) - let condition = new ohos_data_ability.DataAbilityPredicates(); + var voicemailId = await dataShareHelper.insert(voicemailUri, stringValue) + var voicemailIdOne = await dataShareHelper.insert(voicemailUri, stringValue) + var voicemailIdTwo = await dataShareHelper.insert(voicemailUri, stringValue) + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); condition.or(); condition.equalTo("id", voicemailIdOne.toString()); var phoneNumber = randomNum(13); var updateValue = {"phone_number" : phoneNumber, "voice_status" : 1}; - var updateCode = await DAHelper.update(voicemailUri, updateValue, condition); + var updateCode = await dataShareHelper.update(voicemailUri, updateValue, condition); console.info("logMessage voicemail_insert_test_2400: deleteCode = " + updateCode); var map = new Map(); @@ -1036,15 +1035,15 @@ describe('VoicemailTest', function() { */ it("voicemail_query_test_2500", 0, async function(done) { console.info("---------logMessage voicemail_query_test_2500 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) var phoneNumber = randomNum(10); var stringValue = {"phone_number" : phoneNumber, "voice_status" : 0}; try { - var voicemailId = await DAHelper.insert(voicemailUri, stringValue) - var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue) - let condition = new ohos_data_ability.DataAbilityPredicates(); + var voicemailId = await dataShareHelper.insert(voicemailUri, stringValue) + var voicemailIdOne = await dataShareHelper.insert(voicemailUri, stringValue) + let condition = new dataShare.DataSharePredicates(); condition.beginWrap(); condition.equalTo("id", voicemailId.toString()); condition.or(); @@ -1053,7 +1052,7 @@ describe('VoicemailTest', function() { condition.and(); condition.equalTo("voice_status", "0"); var resultColumns = []; - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); expect(resultSet.rowCount == 2).assertTrue(); resultSet.close(); await voiceMailDelete("voicemail_query_test_2500"); @@ -1071,19 +1070,19 @@ describe('VoicemailTest', function() { */ it("voicemail_query_test_2600", 0, async function(done) { console.info("---------logMessage voicemail_query_test_2600 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) var phoneNumber = randomNum(12); var stringValue = {"phone_number" : phoneNumber, "voice_status" : 0}; try { - var voicemailId = await DAHelper.insert(voicemailUri, stringValue); + var voicemailId = await dataShareHelper.insert(voicemailUri, stringValue); console.info('voicemail_query_test_2600 voicemailId = ' + voicemailId); - var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue); + var voicemailIdOne = await dataShareHelper.insert(voicemailUri, stringValue); console.info('voicemail_query_test_2600 voicemailIdOne = ' + voicemailIdOne); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var resultColumns = []; - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); expect(resultSet.rowCount == 2).assertTrue(); resultSet.close(); await voiceMailDelete("voicemail_query_test_2600"); @@ -1101,16 +1100,16 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_insert_test_2700", 0, async function(done) { console.info("---------logMessage abnormal_voicemail_insert_test_2700 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) try { var insertValues = {display_name : "2700name", voice_statuss : "1"}; - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); expect(voicemailId == -1).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var resultColumns = []; - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); expect(resultSet.rowCount == 0).assertTrue(); await voiceMailDelete("abnormal_voicemail_insert_test_2700"); done(); @@ -1126,17 +1125,17 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_delete_test_2800", 0, async function(done) { console.info("---------logMessage abnormal_voicemail_delete_test_2800 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) try { var insertValues = {display_name : "2800name", voice_status : "1"}; - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); expect(voicemailId > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); var updateValues = {display_name : "2800name", voice_statuss : "0"}; - var updateCode = await DAHelper.update(voicemailUri, updateValues, condition); + var updateCode = await dataShareHelper.update(voicemailUri, updateValues, condition); expect(updateCode == -1).assertTrue(); var map = new Map(); map.set("id", voicemailId.toString()); @@ -1157,17 +1156,17 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_update_test_2900", 0, async function(done) { console.info("---------logMessage abnormal_voicemail_update_test_2900 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) try { var insertValues = {display_name : "2900name", voice_status : "1"}; - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); expect(voicemailId > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("id", voicemailId.toString()); var updateValues = {display_name : "2900name", voice_statuss : "0"}; - var updateCode = await DAHelper.update(voicemailUri, updateValues, condition); + var updateCode = await dataShareHelper.update(voicemailUri, updateValues, condition); expect(updateCode == -1).assertTrue(); var map = new Map(); map.set("id", voicemailId.toString()); @@ -1188,17 +1187,17 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_update_test_3000", 0, async function(done) { console.info("---------logMessage abnormal_voicemail_update_test_3000 is starting!---------") - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); console.info('logMessage uri = ' + URI_VOICEMAIL) try { var insertValues = {display_name : "2900name", voice_status : "1"}; - var voicemailId = await DAHelper.insert(voicemailUri, insertValues); + var voicemailId = await dataShareHelper.insert(voicemailUri, insertValues); expect(voicemailId > 0).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.equalTo("ids", voicemailId.toString()); var resultColumns = []; - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); expect(resultSet.rowCount == -1).assertTrue(); resultSet.close(); await voiceMailDelete("abnormal_voicemail_update_test_3000"); @@ -1215,8 +1214,8 @@ describe('VoicemailTest', function() { */ it("abnormal_voicemail_batchInsert_test_3100", 0, async function(done) { console.info("-------------logMessage abnormal_voicemail_batchInsert_test_3100 is starting!-----------"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertValuesOne = {"voice_status" : "0", "display_name" : "xiaoming"}; var insertValuesTwo = {"voice_status" : "1", "display_name" : "xiaohei"}; @@ -1230,12 +1229,12 @@ describe('VoicemailTest', function() { listAddBluk[3] = insertValuesFour; listAddBluk[4] = insertValuesFive; try { - var batchInsertCode = await DAHelper.batchInsert(voicemailUri, listAddBluk); + var batchInsertCode = await dataShareHelper.batchInsert(voicemailUri, listAddBluk); console.info("logMessage abnormal_voicemail_batchInsert_test_3100: batchInsertCode = " + batchInsertCode); expect(batchInsertCode == -1).assertTrue(); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); var resultColumns = []; - var resultSet = await DAHelper.query(voicemailUri, resultColumns, condition); + var resultSet = await dataShareHelper.query(voicemailUri, resultColumns, condition); expect(resultSet.rowCount == 0).assertTrue(); resultSet.close(); done(); @@ -1246,11 +1245,11 @@ describe('VoicemailTest', function() { }); afterAll(async function() { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL); - console.info('voicemai afterAll logMessage get DAHelper success! DAHelper = ' + DAHelper); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_VOICEMAIL); + console.info('voicemai afterAll logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); - var deleteCode = await DAHelper.delete(voicemailUri, condition); + var deleteCode = await dataShareHelper.delete(voicemailUri, condition); console.info('voicemai afterAll logMessage deleteCode = ' + deleteCode); }); }) diff --git a/jstest/common.js b/jstest/common.js index ba89afb..27b276e 100644 --- a/jstest/common.js +++ b/jstest/common.js @@ -15,22 +15,22 @@ import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const contactUri = "dataability:///com.ohos.contactsdataability/contacts/contact"; -const rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -const contactDataUri = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; -const groupUri = "dataability:///com.ohos.contactsdataability/contacts/groups"; -const contactBlocklistUri = "dataability:///com.ohos.contactsdataability/contacts/contact_blocklist"; -const deletedRawContactUri = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; -const profileRawContactUri = "dataability:///com.ohos.contactsdataability/profile/raw_contact"; -const profilecontactUri = "dataability:///com.ohos.contactsdataability/profile/contact"; -const profileContactDataUri = "dataability:///com.ohos.contactsdataability/profile/contact_data"; -const profileGroupUri = "dataability:///com.ohos.contactsdataability/profile/groups"; -const profileBlocklistUri = "dataability:///com.ohos.contactsdataability/profile/contact_blocklist"; -const profileDeletedContactsUri = "dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const contactUri = "datashare:///com.ohos.contactsdataability/contacts/contact"; +const rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +const contactDataUri = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; +const groupUri = "datashare:///com.ohos.contactsdataability/contacts/groups"; +const contactBlocklistUri = "datashare:///com.ohos.contactsdataability/contacts/contact_blocklist"; +const deletedRawContactUri = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; +const profileRawContactUri = "datashare:///com.ohos.contactsdataability/profile/raw_contact"; +const profilecontactUri = "datashare:///com.ohos.contactsdataability/profile/contact"; +const profileContactDataUri = "datashare:///com.ohos.contactsdataability/profile/contact_data"; +const profileGroupUri = "datashare:///com.ohos.contactsdataability/profile/groups"; +const profileBlocklistUri = "datashare:///com.ohos.contactsdataability/profile/contact_blocklist"; +const profileDeletedContactsUri = "datashare:///com.ohos.contactsdataability/profile/deleted_raw_contact"; -const URI_CALLLOG = "dataability:///com.ohos.calllogability"; -const calllogUri = "dataability:///com.ohos.calllogability/calls/calllog"; +const URI_CALLLOG = "datashare:///com.ohos.calllogability"; +const calllogUri = "datashare:///com.ohos.calllogability/calls/calllog"; export default { data: {}, diff --git a/jstest/recovery_test.js b/jstest/recovery_test.js index 9939335..b1a5b10 100644 --- a/jstest/recovery_test.js +++ b/jstest/recovery_test.js @@ -13,15 +13,14 @@ * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility'; -import ohos_data_ability from '@ohos.data.dataability'; +import dataShare from '@ohos.data.dataShare'; import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'deccjsunit/index' -const URI_CONTACTS = "dataability:///com.ohos.contactsdataability"; -const rawContactUri = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; -const backup = "dataability:///com.ohos.contactsdataability/contacts/backup"; -const recover = "dataability:///com.ohos.contactsdataability/contacts/recover"; -const deletedUri = "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; +const URI_CONTACTS = "datashare:///com.ohos.contactsdataability"; +const rawContactUri = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; +const backup = "datashare:///com.ohos.contactsdataability/contacts/backup"; +const recover = "datashare:///com.ohos.contactsdataability/contacts/recover"; +const deletedUri = "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; describe('RecoveryTest', function() { function sleep(numberMillis) @@ -37,13 +36,13 @@ describe('RecoveryTest', function() { async function ContactsQuery(tag, uri, size) { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info(tag + ': ContactsQuery start ! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info(tag + ': ContactsQuery start ! dataShareHelper = ' + dataShareHelper); var resultColumns = []; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); try { - var resultSet = await DAHelper.query(uri, resultColumns, condition); + var resultSet = await dataShareHelper.query(uri, resultColumns, condition); console.info(tag + ' ContactsQuery resultSet.rowCount is = ' + resultSet.rowCount); console.info(tag + ' ContactsQuery size is = ' + size); expect(resultSet.rowCount == size).assertEqual(true); @@ -66,13 +65,13 @@ describe('RecoveryTest', function() { async function rawContactInsert(name) { console.info("------logMessage rawContactInsert is starting!-----"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + console.info('logMessage get dataShareHelper success! dataShareHelper = ' + dataShareHelper); var insertValue = { "display_name" : name, } try { - var rawContactId = await DAHelper.insert(rawContactUri, insertValue); + var rawContactId = await dataShareHelper.insert(rawContactUri, insertValue); console.info('logMessage rawContactInsert: rawContactId = ' + rawContactId); expect(rawContactId > 0).assertTrue(); } catch (error) { @@ -84,16 +83,16 @@ describe('RecoveryTest', function() { async function deleteRawContact(tag) { try { - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); - let condition = new ohos_data_ability.DataAbilityPredicates(); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); + let condition = new dataShare.DataSharePredicates(); condition.greaterThan("id", "0"); condition.and(); condition.equalTo("is_deleted", "0"); - await DAHelper.delete(rawContactUri, condition); + await dataShareHelper.delete(rawContactUri, condition); sleep(5000); - var conditionAll = new ohos_data_ability.DataAbilityPredicates(); + var conditionAll = new dataShare.DataSharePredicates(); conditionAll.greaterThan("id", "0"); - await DAHelper.delete(deletedUri, conditionAll); + await dataShareHelper.delete(deletedUri, conditionAll); } catch (error) { console.info(tag + ': deleteRawContact error = ' + error); } @@ -106,11 +105,11 @@ describe('RecoveryTest', function() { */ it("recovery_test_100", 0, async function(done) { await deleteRawContact("recovery_test_100"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); var updateValues = {}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); try { - var updateCode = await DAHelper.update(backup, updateValues, condition); + var updateCode = await dataShareHelper.update(backup, updateValues, condition); sleep(2000); console.info('logMessage recovery_test_100: updateCode = ' + updateCode); expect(updateCode == 0).assertTrue(); @@ -130,19 +129,19 @@ describe('RecoveryTest', function() { */ it("recovery_test_200", 0, async function(done) { await deleteRawContact("recovery_test_200"); - let DAHelper = featureAbility.acquireDataAbilityHelper(URI_CONTACTS); + let dataShareHelper = dataShare.createDataShareHelper(URI_CONTACTS); var updateValues = {}; - let condition = new ohos_data_ability.DataAbilityPredicates(); + let condition = new dataShare.DataSharePredicates(); rawContactInsert("liming"); rawContactInsert("xiaolilili"); sleep(2000); - var updateCode = await DAHelper.update(backup, updateValues, condition); + var updateCode = await dataShareHelper.update(backup, updateValues, condition); sleep(2000); console.info(' recovery_test_200: backup = ' + updateCode); expect(updateCode == 0).assertTrue(); sleep(1000); try { - var updateCode = await DAHelper.update(recover, updateValues, condition); + var updateCode = await dataShareHelper.update(recover, updateValues, condition); sleep(3000); console.info('logMessage recovery_test_200: recover = ' + updateCode); expect(updateCode == 0).assertTrue(); diff --git a/test/BUILD.gn b/test/BUILD.gn index fd91c12..aba3032 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -33,6 +33,7 @@ ohos_unittest("contacts_test") { "unittest/src/contactquery_test.cpp", "unittest/src/mergecontact_test.cpp", "unittest/src/performance_test.cpp", + "unittest/src/random_number_utils.cpp", "unittest/src/recovery_test.cpp", "unittest/src/stability_test.cpp", "unittest/src/voicemailability_test.cpp", @@ -65,6 +66,8 @@ ohos_unittest("contacts_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "c_utils:utilsbase", + "data_share:datashare_common", + "data_share:datashare_provider", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -72,6 +75,12 @@ ohos_unittest("contacts_test") { "relational_store:native_appdatafwk", "relational_store:native_dataability", "relational_store:native_rdb", + "relational_store:rdb_data_share_adapter", + ] + + defines = [ + "CONTACTSDATA_LOG_TAG = \"ContactsTest\"", + "LOG_DOMAIN = 0xD001F09", ] } diff --git a/test/unittest/include/base_test.h b/test/unittest/include/base_test.h index 695c8d1..aaf9367 100644 --- a/test/unittest/include/base_test.h +++ b/test/unittest/include/base_test.h @@ -21,6 +21,7 @@ #include "calllog_ability.h" #include "contacts_data_ability.h" #include "data_ability_result.h" +#include "datashare_values_bucket.h" #include "hilog_wrapper.h" #include "voicemail_ability.h" @@ -30,17 +31,17 @@ class BaseTest : public testing::Test { public: BaseTest(); ~BaseTest(); - OHOS::AppExecFwk::CallLogAbility calllogAbility; - OHOS::AppExecFwk::VoiceMailAbility voicemailAbility; - OHOS::AppExecFwk::ContactsDataAbility contactsDataAbility; - void CheckResultSet(OHOS::NativeRdb::ValuesBucket &rawContactValues, - const std::shared_ptr &resultSet, std::string testName); - void CheckData(OHOS::NativeRdb::ValuesBucket &rawContactValues, - const std::shared_ptr &resultSet, std::string &columnName, + OHOS::AbilityRuntime::CallLogAbility calllogAbility; + OHOS::AbilityRuntime::VoiceMailAbility voicemailAbility; + OHOS::AbilityRuntime::ContactsDataAbility contactsDataAbility; + void CheckResultSet(OHOS::DataShare::DataShareValuesBucket &rawContactValues, + const std::shared_ptr &resultSet, std::string testName); + void CheckData(OHOS::DataShare::DataShareValuesBucket &rawContactValues, + const std::shared_ptr &resultSet, std::string &columnName, std::string testName); - void CheckResultSetList(std::vector &valuesVector, - std::shared_ptr &resultSet, std::string testName); - OHOS::NativeRdb::ValuesBucket GetAllColumnsValues( + void CheckResultSetList(std::vector &valuesVector, + std::shared_ptr &resultSet, std::string testName); + OHOS::DataShare::DataShareValuesBucket GetAllColumnsValues( std::vector &columnsInt, std::vector &columnsStr); int ContactsRand(); void InitAbility(); diff --git a/test/unittest/include/calllogability_test.h b/test/unittest/include/calllogability_test.h index 8fb55a3..bd64b2e 100644 --- a/test/unittest/include/calllogability_test.h +++ b/test/unittest/include/calllogability_test.h @@ -22,33 +22,33 @@ namespace Contacts { namespace Test { namespace Lock { -std::mutex mtx_; +std::mutex calllogMtx_; } class CallLogAsync { public: - OHOS::NativeRdb::ValuesBucket values; - std::map result; - OHOS::NativeRdb::ValuesBucket updateValues; + OHOS::DataShare::DataShareValuesBucket values; + std::map result; + OHOS::DataShare::DataShareValuesBucket updateValues; int predicatesId; - std::vector> resultSet; + std::vector> resultSet; std::vector predicatesQueryId; int predicatesDeleteId; - CallLogAsync(OHOS::NativeRdb::ValuesBucket &values, std::map &result) + CallLogAsync(OHOS::DataShare::DataShareValuesBucket &values, std::map &result) { this->values = values; this->result = result; this->predicatesId = -1; this->predicatesDeleteId = -1; } - CallLogAsync(OHOS::NativeRdb::ValuesBucket &updateValues, int &predicatesId) + CallLogAsync(OHOS::DataShare::DataShareValuesBucket &updateValues, int &predicatesId) { this->updateValues = updateValues; this->predicatesId = predicatesId; this->predicatesDeleteId = -1; } - CallLogAsync(std::vector> resultSet, + CallLogAsync(std::vector> resultSet, std::vector predicatesQueryId) { this->resultSet = resultSet; @@ -64,30 +64,30 @@ public: } void Insert() { - OHOS::AppExecFwk::CallLogAbility calllogAbility; + OHOS::AbilityRuntime::CallLogAbility calllogAbility; OHOS::Uri callLogUri(CallLogUri::CALL_LOG); int64_t code = calllogAbility.Insert(callLogUri, this->values); int callLogId = code; EXPECT_GT(callLogId, 0); - mtx_.lock(); - this->result.insert(std::map::value_type(callLogId, this->values)); - mtx_.unlock(); + Lock::calllogMtx_.lock(); + this->result.insert(std::map::value_type(callLogId, this->values)); + Lock::calllogMtx_.unlock(); HILOG_INFO("--- VoicemailAsync Insert---%{public}s", CallLogUri::CALL_LOG); } void Update() { OHOS::Uri callLogUri(CallLogUri::CALL_LOG); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(this->predicatesId)); - OHOS::AppExecFwk::CallLogAbility calllogAbility; - int resultCode = calllogAbility.Update(callLogUri, this->updateValues, predicates); + OHOS::AbilityRuntime::CallLogAbility calllogAbility; + int resultCode = calllogAbility.Update(callLogUri, predicates, this->updateValues); EXPECT_EQ(0, resultCode); HILOG_INFO("--- VoicemailAsync Update---%{public}s", CallLogUri::CALL_LOG); } void Query() { OHOS::Uri callLogUri(CallLogUri::CALL_LOG); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; int size = this->predicatesQueryId.size(); for (int i = 0; i < size; i++) { predicates.EqualTo("id", std::to_string(this->predicatesQueryId[i])); @@ -95,22 +95,22 @@ public: predicates.Or(); } } - OHOS::AppExecFwk::CallLogAbility calllogAbility; + OHOS::AbilityRuntime::CallLogAbility calllogAbility; std::vector columns; - std::shared_ptr resultSet = - calllogAbility.Query(callLogUri, columns, predicates); - mtx_.lock(); + std::shared_ptr resultSet = + calllogAbility.Query(callLogUri, predicates, columns); + Lock::calllogMtx_.lock(); this->resultSet.push_back(resultSet); - mtx_.unlock(); + Lock::calllogMtx_.unlock(); HILOG_INFO("--- VoicemailAsync Query---%{public}s", CallLogUri::CALL_LOG); } void Delete() { OHOS::Uri callLogUri(CallLogUri::CALL_LOG); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(this->predicatesDeleteId)); - OHOS::AppExecFwk::CallLogAbility calllogAbility; + OHOS::AbilityRuntime::CallLogAbility calllogAbility; int resultCode = calllogAbility.Delete(callLogUri, predicates); EXPECT_EQ(0, resultCode); HILOG_INFO("--- VoicemailAsync Delete---%{public}s", CallLogUri::CALL_LOG); @@ -122,14 +122,14 @@ public: CalllogAbilityTest(); ~CalllogAbilityTest(); int64_t CalllogInsert(std::string phoneNumber); - int CalllogUpdate(OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates); - int CalllogDelete(OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr CalllogQuery( - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates); - OHOS::NativeRdb::ValuesBucket GetCallLogValues(int columnsStart, int columnsEnd, std::vector &columns); + int CalllogUpdate(OHOS::DataShare::DataShareValuesBucket updateValues, OHOS::DataShare::DataSharePredicates predicates); + int CalllogDelete(OHOS::DataShare::DataSharePredicates predicates); + std::shared_ptr CalllogQuery( + std::vector columns, OHOS::DataShare::DataSharePredicates predicates); + OHOS::DataShare::DataShareValuesBucket GetCallLogValues(int columnsStart, int columnsEnd, std::vector &columns); void GetAllValuesColumn(std::vector &columns); - int64_t CalllogInsertValues(OHOS::NativeRdb::ValuesBucket &values); - int64_t CalllogInsertValue(std::string displayName, OHOS::NativeRdb::ValuesBucket &values); + int64_t CalllogInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + int64_t CalllogInsertValue(std::string displayName, OHOS::DataShare::DataShareValuesBucket &values); void ClearCallLog(); }; } // namespace Test diff --git a/test/unittest/include/calllogfuzzyquery_test.h b/test/unittest/include/calllogfuzzyquery_test.h index dadb766..8594f19 100644 --- a/test/unittest/include/calllogfuzzyquery_test.h +++ b/test/unittest/include/calllogfuzzyquery_test.h @@ -24,10 +24,10 @@ class CalllogFuzzyQueryTest : public BaseTest { public: CalllogFuzzyQueryTest(); ~CalllogFuzzyQueryTest(); - std::shared_ptr CalllogQuery( - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates); - int CalllogDelete(OHOS::NativeRdb::DataAbilityPredicates predicates); - int64_t CalllogInsertValues(OHOS::NativeRdb::ValuesBucket &values); + std::shared_ptr CalllogQuery( + std::vector columns, OHOS::DataShare::DataSharePredicates predicates); + int CalllogDelete(OHOS::DataShare::DataSharePredicates predicates); + int64_t CalllogInsertValues(OHOS::DataShare::DataShareValuesBucket &values); void ClearCallLog(); }; } // namespace Test diff --git a/test/unittest/include/contactability_test.h b/test/unittest/include/contactability_test.h index 1b922a2..ae50528 100644 --- a/test/unittest/include/contactability_test.h +++ b/test/unittest/include/contactability_test.h @@ -22,33 +22,33 @@ namespace Contacts { namespace Test { namespace Lock { -std::mutex mtx_; +std::mutex contactsMtx_; } class ContactAsync { public: - OHOS::NativeRdb::ValuesBucket values; - std::map result; - OHOS::NativeRdb::ValuesBucket updateValues; + OHOS::DataShare::DataShareValuesBucket values; + std::map result; + OHOS::DataShare::DataShareValuesBucket updateValues; int predicatesId; - std::vector> resultSet; + std::vector> resultSet; std::vector predicatesQueryId; int predicatesDeleteId; - ContactAsync(OHOS::NativeRdb::ValuesBucket &values, std::map &result) + ContactAsync(OHOS::DataShare::DataShareValuesBucket &values, std::map &result) { this->values = values; this->result = result; this->predicatesId = -1; this->predicatesDeleteId = -1; } - ContactAsync(OHOS::NativeRdb::ValuesBucket &updateValues, int &predicatesId) + ContactAsync(OHOS::DataShare::DataShareValuesBucket &updateValues, int &predicatesId) { this->updateValues = updateValues; this->predicatesId = predicatesId; this->predicatesDeleteId = -1; } - ContactAsync(std::vector> resultSet, + ContactAsync(std::vector> resultSet, std::vector predicatesQueryId) { this->resultSet = resultSet; @@ -64,30 +64,30 @@ public: } void Insert() { - OHOS::AppExecFwk::ContactsDataAbility contactsDataAbility; + OHOS::AbilityRuntime::ContactsDataAbility contactsDataAbility; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); int64_t code = contactsDataAbility.Insert(uriRawContact, this->values); int rawContactId = code; EXPECT_GT(rawContactId, 0); - mtx_.lock(); - this->result.insert(std::map::value_type(rawContactId, this->values)); - mtx_.unlock(); + Lock::contactsMtx_.lock(); + this->result.insert(std::map::value_type(rawContactId, this->values)); + Lock::contactsMtx_.unlock(); HILOG_INFO("--- VoicemailAsync Insert---%{public}s", ContactsUri::RAW_CONTACT); } void Update() { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(this->predicatesId)); - OHOS::AppExecFwk::ContactsDataAbility contactsDataAbility; - int resultCode = contactsDataAbility.Update(uriRawContact, this->updateValues, predicates); + OHOS::AbilityRuntime::ContactsDataAbility contactsDataAbility; + int resultCode = contactsDataAbility.Update(uriRawContact, predicates, this->updateValues); EXPECT_EQ(0, resultCode); HILOG_INFO("--- VoicemailAsync Update---%{public}s", ContactsUri::RAW_CONTACT); } void Query() { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; int size = this->predicatesQueryId.size(); for (int i = 0; i < size; i++) { predicates.EqualTo("id", std::to_string(this->predicatesQueryId[i])); @@ -95,22 +95,22 @@ public: predicates.Or(); } } - OHOS::AppExecFwk::ContactsDataAbility contactsDataAbility; + OHOS::AbilityRuntime::ContactsDataAbility contactsDataAbility; std::vector columns; - std::shared_ptr resultSet = - contactsDataAbility.Query(uriRawContact, columns, predicates); - mtx_.lock(); + std::shared_ptr resultSet = + contactsDataAbility.Query(uriRawContact, predicates, columns); + Lock::contactsMtx_.lock(); this->resultSet.push_back(resultSet); - mtx_.unlock(); + Lock::contactsMtx_.unlock(); HILOG_INFO("--- VoicemailAsync Query---%{public}s", ContactsUri::RAW_CONTACT); } void Delete() { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(this->predicatesDeleteId)); - OHOS::AppExecFwk::ContactsDataAbility contactsDataAbility; + OHOS::AbilityRuntime::ContactsDataAbility contactsDataAbility; int resultCode = contactsDataAbility.Delete(uriRawContact, predicates); EXPECT_EQ(0, resultCode); HILOG_INFO("--- VoicemailAsync Delete---%{public}s", ContactsUri::RAW_CONTACT); @@ -123,23 +123,23 @@ public: ContactAbilityTest(); ~ContactAbilityTest(); - int64_t RawContactInsert(std::string displayName, OHOS::NativeRdb::ValuesBucket &alues); + int64_t RawContactInsert(std::string displayName, OHOS::DataShare::DataShareValuesBucket &alues); int64_t RawContactExpandInsert( - std::vector valueVector, int isFavorite, OHOS::NativeRdb::ValuesBucket &rawContactValues); + std::vector valueVector, int isFavorite, OHOS::DataShare::DataShareValuesBucket &rawContactValues); int64_t RawContactLastContactedInsert( - std::string displayName, int lastestContactedTime, OHOS::NativeRdb::ValuesBucket &rawContactValues); + std::string displayName, int lastestContactedTime, OHOS::DataShare::DataShareValuesBucket &rawContactValues); int64_t ContactDataInsert(int64_t rawContactId, std::string contentType, std::string detailInfo, - std::string position, OHOS::NativeRdb::ValuesBucket &contactDataValues); - int64_t GroupsInsert(std::string groupName, OHOS::NativeRdb::ValuesBucket &groupValues); - int64_t ContactBlocklistInsert(std::string phoneNumber, OHOS::NativeRdb::ValuesBucket &rawContactValues); - int ContactUpdate(const std::string &tableName, OHOS::NativeRdb::ValuesBucket updateValues, - OHOS::NativeRdb::DataAbilityPredicates predicates); - int ContactDelete(const std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr ContactQuery(const std::string &tableName, - std::vector &columns, OHOS::NativeRdb::DataAbilityPredicates predicates); - void QueryAndExpectResult(std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates, - OHOS::NativeRdb::ValuesBucket &values, std::string testName); - OHOS::NativeRdb::ValuesBucket GetAllColumnsValues( + std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues); + int64_t GroupsInsert(std::string groupName, OHOS::DataShare::DataShareValuesBucket &groupValues); + int64_t ContactBlocklistInsert(std::string phoneNumber, OHOS::DataShare::DataShareValuesBucket &rawContactValues); + int ContactUpdate(const std::string &tableName, OHOS::DataShare::DataShareValuesBucket updateValues, + OHOS::DataShare::DataSharePredicates predicates); + int ContactDelete(const std::string &tableName, OHOS::DataShare::DataSharePredicates predicates); + std::shared_ptr ContactQuery(const std::string &tableName, + std::vector &columns, OHOS::DataShare::DataSharePredicates predicates); + void QueryAndExpectResult(std::string &tableName, OHOS::DataShare::DataSharePredicates predicates, + OHOS::DataShare::DataShareValuesBucket &values, std::string testName); + OHOS::DataShare::DataShareValuesBucket GetAllColumnsValues( std::vector &columnsInt, std::vector &columnsStr); void GetAllRawContactColumns(std::vector &columnsInt, std::vector &columnsStr); void GetAllContactDataColumns(std::vector &columnInt, std::vector &columnStr); @@ -148,11 +148,11 @@ public: void GetDetailsContactDataColumns(std::vector &columns); void MergeColumns( std::vector &columns, std::vector &columnsInt, std::vector &columnsStr); - int64_t RawContactInsertValues(OHOS::NativeRdb::ValuesBucket &values); - int64_t ContactDataInsertValues(OHOS::NativeRdb::ValuesBucket &values); - int64_t GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &values); - int64_t ContactBlocklistInsertValues(OHOS::NativeRdb::ValuesBucket &values); - std::vector GetBatchList(int64_t rawContactId); + int64_t RawContactInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + int64_t ContactDataInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + int64_t GroupsInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + int64_t ContactBlocklistInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + std::vector GetBatchList(int64_t rawContactId); void ClearContacts(); }; } // namespace Test diff --git a/test/unittest/include/contactgroup_test.h b/test/unittest/include/contactgroup_test.h index cfaef19..d5f460a 100644 --- a/test/unittest/include/contactgroup_test.h +++ b/test/unittest/include/contactgroup_test.h @@ -24,17 +24,17 @@ class ContactGroupTest : public BaseTest { public: ContactGroupTest(); ~ContactGroupTest(); - int64_t GroupsInsert(std::string groupName, OHOS::NativeRdb::ValuesBucket &groupValues); - int ContactUpdate(const std::string &tableName, OHOS::NativeRdb::ValuesBucket updateValues, - OHOS::NativeRdb::DataAbilityPredicates predicates); - int ContactDelete(const std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr ContactQuery(const std::string &tableName, - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates); - void QueryAndExpectResult(const std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates, - OHOS::NativeRdb::ValuesBucket &values, std::string testName); - OHOS::NativeRdb::ValuesBucket GetAllColumnsValues( + int64_t GroupsInsert(std::string groupName, OHOS::DataShare::DataShareValuesBucket &groupValues); + int ContactUpdate(const std::string &tableName, OHOS::DataShare::DataShareValuesBucket updateValues, + OHOS::DataShare::DataSharePredicates predicates); + int ContactDelete(const std::string &tableName, OHOS::DataShare::DataSharePredicates predicates); + std::shared_ptr ContactQuery(const std::string &tableName, + std::vector columns, OHOS::DataShare::DataSharePredicates predicates); + void QueryAndExpectResult(const std::string &tableName, OHOS::DataShare::DataSharePredicates predicates, + OHOS::DataShare::DataShareValuesBucket &values, std::string testName); + OHOS::DataShare::DataShareValuesBucket GetAllColumnsValues( std::vector &columnsInt, std::vector &columnsStr); - int64_t GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &values); + int64_t GroupsInsertValues(OHOS::DataShare::DataShareValuesBucket &values); void GetAllGroupsColumns(std::vector &columnInt, std::vector &columnStr); void MergeColumns( std::vector &columns, std::vector &columnsInt, std::vector &columnsStr); diff --git a/test/unittest/include/contactpinyin_test.h b/test/unittest/include/contactpinyin_test.h index bf7eb60..37fe05d 100644 --- a/test/unittest/include/contactpinyin_test.h +++ b/test/unittest/include/contactpinyin_test.h @@ -24,13 +24,13 @@ class ContactPinyinTest : public BaseTest { public: ContactPinyinTest(); ~ContactPinyinTest(); - int64_t RawContactInsert(std::string displayName, OHOS::NativeRdb::ValuesBucket &alues); + int64_t RawContactInsert(std::string displayName, OHOS::DataShare::DataShareValuesBucket &alues); int64_t ContactDataInsert(int64_t rawContactId, std::string contentType, std::string detailInfo, - std::string position, OHOS::NativeRdb::ValuesBucket &contactDataValues); - std::shared_ptr ContactQuery(const std::string &tableName, - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates); - void QueryAndExpectResult(std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates, - OHOS::NativeRdb::ValuesBucket &values, std::string testName); + std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues); + std::shared_ptr ContactQuery(const std::string &tableName, + std::vector columns, OHOS::DataShare::DataSharePredicates predicates); + void QueryAndExpectResult(std::string &tableName, OHOS::DataShare::DataSharePredicates predicates, + OHOS::DataShare::DataShareValuesBucket &values, std::string testName); void ClearData(); }; } // namespace Test diff --git a/test/unittest/include/contactprofile_test.h b/test/unittest/include/contactprofile_test.h index f57c416..224a4dd 100644 --- a/test/unittest/include/contactprofile_test.h +++ b/test/unittest/include/contactprofile_test.h @@ -26,23 +26,23 @@ public: ContactProfileTest(); ~ContactProfileTest(); - int64_t RawContactInsert(std::string displayName, OHOS::NativeRdb::ValuesBucket &alues); + int64_t RawContactInsert(std::string displayName, OHOS::DataShare::DataShareValuesBucket &alues); int64_t RawContactExpandInsert( - std::vector valueVector, int isFavorite, OHOS::NativeRdb::ValuesBucket &rawContactValues); + std::vector valueVector, int isFavorite, OHOS::DataShare::DataShareValuesBucket &rawContactValues); int64_t RawContactLastContactedInsert( - std::string displayName, int lastestContactedTime, OHOS::NativeRdb::ValuesBucket &rawContactValues); + std::string displayName, int lastestContactedTime, OHOS::DataShare::DataShareValuesBucket &rawContactValues); int64_t ContactDataInsert(int64_t rawContactId, std::string contentType, std::string detailInfo, - std::string position, OHOS::NativeRdb::ValuesBucket &contactDataValues); - int64_t GroupsInsert(std::string groupName, OHOS::NativeRdb::ValuesBucket &groupValues); - int64_t ContactBlocklistInsert(std::string phoneNumber, OHOS::NativeRdb::ValuesBucket &rawContactValues); - int ContactUpdate(const std::string &tableName, OHOS::NativeRdb::ValuesBucket updateValues, - OHOS::NativeRdb::DataAbilityPredicates predicates); - int ContactDelete(const std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr ContactQuery(const std::string &tableName, - std::vector &columns, OHOS::NativeRdb::DataAbilityPredicates predicates); - void QueryAndExpectResult(std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates, - OHOS::NativeRdb::ValuesBucket &values, std::string testName); - OHOS::NativeRdb::ValuesBucket GetAllColumnsValues( + std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues); + int64_t GroupsInsert(std::string groupName, OHOS::DataShare::DataShareValuesBucket &groupValues); + int64_t ContactBlocklistInsert(std::string phoneNumber, OHOS::DataShare::DataShareValuesBucket &rawContactValues); + int ContactUpdate(const std::string &tableName, OHOS::DataShare::DataShareValuesBucket updateValues, + OHOS::DataShare::DataSharePredicates predicates); + int ContactDelete(const std::string &tableName, OHOS::DataShare::DataSharePredicates predicates); + std::shared_ptr ContactQuery(const std::string &tableName, + std::vector &columns, OHOS::DataShare::DataSharePredicates predicates); + void QueryAndExpectResult(std::string &tableName, OHOS::DataShare::DataSharePredicates predicates, + OHOS::DataShare::DataShareValuesBucket &values, std::string testName); + OHOS::DataShare::DataShareValuesBucket GetAllColumnsValues( std::vector &columnsInt, std::vector &columnsStr); void GetAllRawContactColumns(std::vector &columnsInt, std::vector &columnsStr); void GetAllContactDataColumns(std::vector &columnInt, std::vector &columnStr); @@ -51,11 +51,11 @@ public: void GetDetailsContactDataColumns(std::vector &columns); void MergeColumns( std::vector &columns, std::vector &columnsInt, std::vector &columnsStr); - int64_t RawContactInsertValues(OHOS::NativeRdb::ValuesBucket &values); - int64_t ContactDataInsertValues(OHOS::NativeRdb::ValuesBucket &values); - int64_t GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &values); - int64_t ContactBlocklistInsertValues(OHOS::NativeRdb::ValuesBucket &values); - std::vector GetBatchList(int64_t rawContactId); + int64_t RawContactInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + int64_t ContactDataInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + int64_t GroupsInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + int64_t ContactBlocklistInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + std::vector GetBatchList(int64_t rawContactId); void ClearContacts(); }; } // namespace Test diff --git a/test/unittest/include/contactquery_test.h b/test/unittest/include/contactquery_test.h index 8b1985a..d94c948 100644 --- a/test/unittest/include/contactquery_test.h +++ b/test/unittest/include/contactquery_test.h @@ -24,11 +24,11 @@ class ContactQueryTest : public BaseTest { public: ContactQueryTest(); ~ContactQueryTest(); - int64_t RawContactInsert(std::string displayName, OHOS::NativeRdb::ValuesBucket &alues); + int64_t RawContactInsert(std::string displayName, OHOS::DataShare::DataShareValuesBucket &alues); int64_t ContactDataInsert(int64_t rawContactId, std::string contentType, std::string detailInfo, - std::string position, OHOS::NativeRdb::ValuesBucket &contactDataValues); - std::shared_ptr ContactQuery(const std::string &tableName, - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates); + std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues); + std::shared_ptr ContactQuery(const std::string &tableName, + std::vector columns, OHOS::DataShare::DataSharePredicates predicates); void ClearData(); }; } // namespace Test diff --git a/test/unittest/include/mergecontact_test.h b/test/unittest/include/mergecontact_test.h index 87cb7ac..ec98c7d 100644 --- a/test/unittest/include/mergecontact_test.h +++ b/test/unittest/include/mergecontact_test.h @@ -25,12 +25,12 @@ public: int64_t RawContactInsert(std::string displayName); int64_t ContactDataInsert( int64_t rawContactId, std::string contentType, std::string detailInfo, std::string position); - std::shared_ptr ContactQuery( - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates); + std::shared_ptr ContactQuery( + std::vector columns, OHOS::DataShare::DataSharePredicates predicates); void CheckMergeResultId(std::vector ids, bool isMerge); - int GetMergeResultContactId(const std::shared_ptr resultSet); - std::vector GetMergeResultRawContactId(const std::shared_ptr resultSet); - std::vector GetMergeRawContactId(const std::shared_ptr resultSet); + int GetMergeResultContactId(const std::shared_ptr resultSet); + std::vector GetMergeResultRawContactId(const std::shared_ptr resultSet); + std::vector GetMergeRawContactId(const std::shared_ptr resultSet); void DeleteRawContact(); }; } // namespace Test diff --git a/test/unittest/include/random_number_utils.h b/test/unittest/include/random_number_utils.h index 9d6ed50..b723190 100644 --- a/test/unittest/include/random_number_utils.h +++ b/test/unittest/include/random_number_utils.h @@ -25,7 +25,7 @@ class RandomNumberUtils { public: RandomNumberUtils(); ~RandomNumberUtils(); - static std::string &Generating(std::string number); + static std::string &Generating(int number); }; } // namespace Contacts } // namespace OHOS diff --git a/test/unittest/include/test_common.h b/test/unittest/include/test_common.h index 365357d..1a0194a 100644 --- a/test/unittest/include/test_common.h +++ b/test/unittest/include/test_common.h @@ -34,60 +34,60 @@ public: class CallLogUri { public: ~CallLogUri(); - static constexpr const char *CALL_LOG = "dataability:///com.ohos.calllogability/calls/calllog"; - static constexpr const char *ERROR_URI = "dataability:///com.ohos.calllogability/calls/calllogs"; + static constexpr const char *CALL_LOG = "datashare:///com.ohos.calllogability/calls/calllog"; + static constexpr const char *ERROR_URI = "datashare:///com.ohos.calllogability/calls/calllogs"; }; class VoicemailUri { public: ~VoicemailUri(); - static constexpr const char *VOICEMAIL = "dataability:///com.ohos.voicemailability/calls/voicemail"; - static constexpr const char *ERROR_URI = "dataability:///com.ohos.voicemailability/calls/voicemails"; + static constexpr const char *VOICEMAIL = "datashare:///com.ohos.voicemailability/calls/voicemail"; + static constexpr const char *ERROR_URI = "datashare:///com.ohos.voicemailability/calls/voicemails"; }; class ContactsUri { public: ~ContactsUri(); - static constexpr const char *RAW_CONTACT = "dataability:///com.ohos.contactsdataability/contacts/raw_contact"; + static constexpr const char *RAW_CONTACT = "datashare:///com.ohos.contactsdataability/contacts/raw_contact"; static constexpr const char *DELETED_RAW_CONTACT = - "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; + "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact"; static constexpr const char *DELETED_RAW_CONTACT_RECORD = - "dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact_record"; - static constexpr const char *BLOCKLIST = "dataability:///com.ohos.contactsdataability/contacts/contact_blocklist"; - static constexpr const char *GROUPS = "dataability:///com.ohos.contactsdataability/contacts/groups"; - static constexpr const char *CONTACT_DATA = "dataability:///com.ohos.contactsdataability/contacts/contact_data"; - static constexpr const char *CONTACT = "dataability:///com.ohos.contactsdataability/contacts/contact"; - static constexpr const char *SEARCH = "dataability:///com.ohos.contactsdataability/contacts/search_contact"; - static constexpr const char *ERROR_URI = "dataability:///com.ohos.contactsdataability/contacts/raw_contacts"; - static constexpr const char *BACKUP = "dataability:///com.ohos.contactsdataability/contacts/backup"; - static constexpr const char *RECOVER = "dataability:///com.ohos.contactsdataability/contacts/recover"; - static constexpr const char *GROUPS_ERROR = "dataability:///com.ohos.contactsdataability/contacts/group"; + "datashare:///com.ohos.contactsdataability/contacts/deleted_raw_contact_record"; + static constexpr const char *BLOCKLIST = "datashare:///com.ohos.contactsdataability/contacts/contact_blocklist"; + static constexpr const char *GROUPS = "datashare:///com.ohos.contactsdataability/contacts/groups"; + static constexpr const char *CONTACT_DATA = "datashare:///com.ohos.contactsdataability/contacts/contact_data"; + static constexpr const char *CONTACT = "datashare:///com.ohos.contactsdataability/contacts/contact"; + static constexpr const char *SEARCH = "datashare:///com.ohos.contactsdataability/contacts/search_contact"; + static constexpr const char *ERROR_URI = "datashare:///com.ohos.contactsdataability/contacts/raw_contacts"; + static constexpr const char *BACKUP = "datashare:///com.ohos.contactsdataability/contacts/backup"; + static constexpr const char *RECOVER = "datashare:///com.ohos.contactsdataability/contacts/recover"; + static constexpr const char *GROUPS_ERROR = "datashare:///com.ohos.contactsdataability/contacts/group"; static constexpr const char *MERGE_LIST = - "dataability:///com.ohos.contactsdataability/contacts/raw_contact/query_merge_list"; + "datashare:///com.ohos.contactsdataability/contacts/raw_contact/query_merge_list"; static constexpr const char *AUTO_MERGE = - "dataability:///com.ohos.contactsdataability/contacts/raw_contact/auto_merge"; + "datashare:///com.ohos.contactsdataability/contacts/raw_contact/auto_merge"; static constexpr const char *MANUAL_MERGE = - "dataability:///com.ohos.contactsdataability/contacts/raw_contact/manual_merge"; + "datashare:///com.ohos.contactsdataability/contacts/raw_contact/manual_merge"; static constexpr const char *SPLIT_CONTACT = - "dataability:///com.ohos.contactsdataability/contacts/raw_contact/split_contact"; + "datashare:///com.ohos.contactsdataability/contacts/raw_contact/split_contact"; static constexpr const char *MERGE_ERROR = - "dataability:///com.ohos.contactsdataability/contacts/raw_contact/auto_mergeee"; + "datashare:///com.ohos.contactsdataability/contacts/raw_contact/auto_mergeee"; static constexpr const char *MERGE_LIST_ERROR = - "dataability:///com.ohos.contactsdataability/contacts/raw_contact/merge_lists_error"; + "datashare:///com.ohos.contactsdataability/contacts/raw_contact/merge_lists_error"; }; class ProfileUri { public: ~ProfileUri(); - static constexpr const char *RAW_CONTACT = "dataability:///com.ohos.contactsdataability/profile/raw_contact"; + static constexpr const char *RAW_CONTACT = "datashare:///com.ohos.contactsdataability/profile/raw_contact"; static constexpr const char *DELETED_RAW_CONTACT = - "dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact"; - static constexpr const char *BLOCKLIST = "dataability:///com.ohos.contactsdataability/profile/contact_blocklist"; - static constexpr const char *GROUPS = "dataability:///com.ohos.contactsdataability/profile/groups"; - static constexpr const char *CONTACT_DATA = "dataability:///com.ohos.contactsdataability/profile/contact_data"; - static constexpr const char *CONTACT = "dataability:///com.ohos.contactsdataability/profile/contact"; - static constexpr const char *SEARCH = "dataability:///com.ohos.contactsdataability/profile/search_contact"; - static constexpr const char *ERROR_URI = "dataability:///com.ohos.contactsdataability/profile/raw_contacts"; + "datashare:///com.ohos.contactsdataability/profile/deleted_raw_contact"; + static constexpr const char *BLOCKLIST = "datashare:///com.ohos.contactsdataability/profile/contact_blocklist"; + static constexpr const char *GROUPS = "datashare:///com.ohos.contactsdataability/profile/groups"; + static constexpr const char *CONTACT_DATA = "datashare:///com.ohos.contactsdataability/profile/contact_data"; + static constexpr const char *CONTACT = "datashare:///com.ohos.contactsdataability/profile/contact"; + static constexpr const char *SEARCH = "datashare:///com.ohos.contactsdataability/profile/search_contact"; + static constexpr const char *ERROR_URI = "datashare:///com.ohos.contactsdataability/profile/raw_contacts"; }; class Time { @@ -101,10 +101,9 @@ public: class DataPath { public: ~DataPath(); - static constexpr const char *RDB_PATH = "/data/accounts/account_0/appdata/com.ohos.contactsdataability/database/"; - static constexpr const char *DUMP_PATH = "/data/accounts/account_0/appdata/com.ohos.contactsdataability/files/"; + static constexpr const char *RDB_PATH = "/data/app/el2/100/database/com.ohos.contactsdataability/"; static constexpr const char *RDB_BACKUP_PATH = - "/data/accounts/account_0/appdata/com.ohos.contactsdataability/database/backup/"; + "/data/app/el2/100/database/com.ohos.contactsdataability/backup/"; }; } // namespace Test } // namespace Contacts diff --git a/test/unittest/include/voicemailability_test.h b/test/unittest/include/voicemailability_test.h index 1f6c55c..591eaa1 100644 --- a/test/unittest/include/voicemailability_test.h +++ b/test/unittest/include/voicemailability_test.h @@ -22,32 +22,33 @@ namespace Contacts { namespace Test { namespace Lock { -std::mutex mtx_; +std::mutex voicemailMtx_; } + class VoicemailAsync { public: - OHOS::NativeRdb::ValuesBucket values; - std::map result; - OHOS::NativeRdb::ValuesBucket updateValues; + OHOS::DataShare::DataShareValuesBucket values; + std::map result; + OHOS::DataShare::DataShareValuesBucket updateValues; int predicatesId; - std::vector> resultSet; + std::vector> resultSet; std::vector predicatesQueryId; int predicatesDeleteId; - VoicemailAsync(OHOS::NativeRdb::ValuesBucket &values, std::map &result) + VoicemailAsync(OHOS::DataShare::DataShareValuesBucket &values, std::map &result) { this->values = values; this->result = result; this->predicatesId = -1; this->predicatesDeleteId = -1; } - VoicemailAsync(OHOS::NativeRdb::ValuesBucket &updateValues, int &predicatesId) + VoicemailAsync(OHOS::DataShare::DataShareValuesBucket &updateValues, int &predicatesId) { this->updateValues = updateValues; this->predicatesId = predicatesId; this->predicatesDeleteId = -1; } - VoicemailAsync(std::vector> resultSet, + VoicemailAsync(std::vector> resultSet, std::vector predicatesQueryId) { this->resultSet = resultSet; @@ -63,30 +64,30 @@ public: } void Insert() { - OHOS::AppExecFwk::VoiceMailAbility voicemailAbility; + OHOS::AbilityRuntime::VoiceMailAbility voicemailAbility; OHOS::Uri voicemailUri(VoicemailUri::VOICEMAIL); int64_t code = voicemailAbility.Insert(voicemailUri, this->values); int callLogId = code; EXPECT_GT(callLogId, 0); - mtx_.lock(); - this->result.insert(std::map::value_type(callLogId, this->values)); - mtx_.unlock(); + Lock::voicemailMtx_.lock(); + this->result.insert(std::map::value_type(callLogId, this->values)); + Lock::voicemailMtx_.unlock(); HILOG_INFO("--- VoicemailAsync insert---%{public}s", VoicemailUri::VOICEMAIL); } void Update() { OHOS::Uri voicemailUri(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(this->predicatesId)); - OHOS::AppExecFwk::VoiceMailAbility voicemailAbility; - int resultCode = voicemailAbility.Update(voicemailUri, this->updateValues, predicates); + OHOS::AbilityRuntime::VoiceMailAbility voicemailAbility; + int resultCode = voicemailAbility.Update(voicemailUri, predicates, this->updateValues); EXPECT_EQ(0, resultCode); HILOG_INFO("--- VoicemailAsync Update---%{public}s", VoicemailUri::VOICEMAIL); } void Query() { OHOS::Uri voicemailUri(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; int size = this->predicatesQueryId.size(); for (int i = 0; i < size; i++) { predicates.EqualTo("id", std::to_string(this->predicatesQueryId[i])); @@ -94,22 +95,22 @@ public: predicates.Or(); } } - OHOS::AppExecFwk::VoiceMailAbility voicemailAbility; + OHOS::AbilityRuntime::VoiceMailAbility voicemailAbility; std::vector columns; - std::shared_ptr resultSet = - voicemailAbility.Query(voicemailUri, columns, predicates); - mtx_.lock(); + std::shared_ptr resultSet = + voicemailAbility.Query(voicemailUri, predicates, columns); + Lock::voicemailMtx_.lock(); this->resultSet.push_back(resultSet); - mtx_.unlock(); + Lock::voicemailMtx_.unlock(); HILOG_INFO("--- VoicemailAsync Query---%{public}s", VoicemailUri::VOICEMAIL); } void Delete() { OHOS::Uri voicemailUri(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(this->predicatesDeleteId)); - OHOS::AppExecFwk::VoiceMailAbility voicemailAbility; + OHOS::AbilityRuntime::VoiceMailAbility voicemailAbility; int resultCode = voicemailAbility.Delete(voicemailUri, predicates); HILOG_INFO("--- VoicemailAsync Delete---%{public}s", VoicemailUri::VOICEMAIL); EXPECT_EQ(0, resultCode); @@ -121,17 +122,17 @@ public: VoicemailAbilityTest(); ~VoicemailAbilityTest(); int64_t VoicemailStatusInsert(std::string phoneNumber, int status); - int VoicemailUpdate(OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates); - int VoicemailDelete(OHOS::NativeRdb::DataAbilityPredicates predicates); - std::shared_ptr VoicemailQuery( - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates); - OHOS::NativeRdb::ValuesBucket GetVoiceMailValues( + int VoicemailUpdate(OHOS::DataShare::DataShareValuesBucket updateValues, OHOS::DataShare::DataSharePredicates predicates); + int VoicemailDelete(OHOS::DataShare::DataSharePredicates predicates); + std::shared_ptr VoicemailQuery( + std::vector columns, OHOS::DataShare::DataSharePredicates predicates); + OHOS::DataShare::DataShareValuesBucket GetVoiceMailValues( int columnsStart, int columnsEnd, std::vector &columns); void GetVoiceMailValuesColumn(std::vector &columns); - int VoicemailInsertValues(OHOS::NativeRdb::ValuesBucket &values); - int64_t VoicemailInsertValue(std::string displayName, OHOS::NativeRdb::ValuesBucket &values); - void CheckResultSetBatch(OHOS::NativeRdb::DataAbilityPredicates predicates, std::vector &columns, - OHOS::NativeRdb::ValuesBucket values, std::string testName); + int VoicemailInsertValues(OHOS::DataShare::DataShareValuesBucket &values); + int64_t VoicemailInsertValue(std::string displayName, OHOS::DataShare::DataShareValuesBucket &values); + void CheckResultSetBatch(OHOS::DataShare::DataSharePredicates predicates, std::vector &columns, + OHOS::DataShare::DataShareValuesBucket values, std::string testName); void ClearVoicemail(); }; } // namespace Test diff --git a/test/unittest/src/base_test.cpp b/test/unittest/src/base_test.cpp index 2c4a834..890044d 100644 --- a/test/unittest/src/base_test.cpp +++ b/test/unittest/src/base_test.cpp @@ -17,6 +17,7 @@ #include #include +#include "rdb_utils.h" #include #include @@ -29,7 +30,6 @@ BaseTest::BaseTest() { OHOS::Contacts::ContactsPath::RDB_PATH = DataPath::RDB_PATH; OHOS::Contacts::ContactsPath::RDB_BACKUP_PATH = DataPath::RDB_BACKUP_PATH; - OHOS::Contacts::ContactsPath::DUMP_PATH = DataPath::DUMP_PATH; } BaseTest::~BaseTest() @@ -53,11 +53,14 @@ void BaseTest::InitAbility() abilityInfo->name = "AbilityClassName"; abilityInfo->type = OHOS::AppExecFwk::AbilityType::DATA; abilityInfo->isNativeAbility = true; + std::shared_ptr abilityLocalRecord = + std::make_shared(abilityInfo, nullptr); std::shared_ptr application; std::shared_ptr handler; - calllogAbility.Init(abilityInfo, application, handler, nullptr); - voicemailAbility.Init(abilityInfo, application, handler, nullptr); - contactsDataAbility.Init(abilityInfo, application, handler, nullptr); + OHOS::sptr remoteObject; + calllogAbility.Init(abilityLocalRecord, application, handler, remoteObject); + voicemailAbility.Init(abilityLocalRecord, application, handler, remoteObject); + contactsDataAbility.Init(abilityLocalRecord, application, handler, remoteObject); } /** @@ -67,8 +70,8 @@ void BaseTest::InitAbility() * @param resultSet of database * @param test name */ -void BaseTest::CheckResultSet(OHOS::NativeRdb::ValuesBucket &values, - const std::shared_ptr &resultSet, std::string testName) +void BaseTest::CheckResultSet(OHOS::DataShare::DataShareValuesBucket &values, + const std::shared_ptr &resultSet, std::string testName) { std::vector columnNames; resultSet->GetAllColumnNames(columnNames); @@ -81,23 +84,24 @@ void BaseTest::CheckResultSet(OHOS::NativeRdb::ValuesBucket &values, resultSet->Close(); } -void BaseTest::CheckData(OHOS::NativeRdb::ValuesBucket &values, - const std::shared_ptr &resultSet, std::string &columnName, +void BaseTest::CheckData(OHOS::DataShare::DataShareValuesBucket &values, + const std::shared_ptr &resultSet, std::string &columnName, std::string testName) { std::string typeValue = columnName; int columnIndex = 0; resultSet->GetColumnIndex(typeValue, columnIndex); - OHOS::NativeRdb::ColumnType columnType; - resultSet->GetColumnType(columnIndex, columnType); + OHOS::DataShare::DataType columnType; + resultSet->GetDataType(columnIndex, columnType); + OHOS::NativeRdb::ValuesBucket valuesBucket = OHOS::RdbDataShareAdapter::RdbUtils::ToValuesBucket(values); // Compare values and resultSet column value equality - if (columnType == OHOS::NativeRdb::ColumnType::TYPE_INTEGER) { + if (columnType == OHOS::DataShare::DataType::TYPE_INTEGER) { int resultSetIntValue = 0; resultSet->GetInt(columnIndex, resultSetIntValue); - if (values.HasColumn(typeValue)) { + if (valuesBucket.HasColumn(typeValue)) { int valuesIntValue = 0; OHOS::NativeRdb::ValueObject valuesObject; - values.GetObject(typeValue, valuesObject); + valuesBucket.GetObject(typeValue, valuesObject); valuesObject.GetInt(valuesIntValue); std::string tempName = testName; tempName.append("CheckResultSet columnName : %{public}s insertValue = %{public}d "); @@ -105,13 +109,13 @@ void BaseTest::CheckData(OHOS::NativeRdb::ValuesBucket &values, HILOG_INFO(tempName.c_str(), typeValue.c_str(), valuesIntValue, resultSetIntValue); EXPECT_EQ(resultSetIntValue, valuesIntValue); } - } else if (columnType == OHOS::NativeRdb::ColumnType::TYPE_STRING) { + } else if (columnType == OHOS::DataShare::DataType::TYPE_STRING) { std::string resultSetStringValue; resultSet->GetString(columnIndex, resultSetStringValue); - if (values.HasColumn(typeValue)) { + if (valuesBucket.HasColumn(typeValue)) { OHOS::NativeRdb::ValueObject valuesObject; std::string valuesStringValue; - values.GetObject(typeValue, valuesObject); + valuesBucket.GetObject(typeValue, valuesObject); valuesObject.GetString(valuesStringValue); std::string tempName = testName; tempName.append("CheckResultSet columnName : %{public}s insertValue = %{public}s "); @@ -128,15 +132,15 @@ void BaseTest::CheckData(OHOS::NativeRdb::ValuesBucket &values, * @param values of data source * @param resultSet of database */ -void BaseTest::CheckResultSetList(std::vector &valuesVector, - std::shared_ptr &resultSet, std::string testName) +void BaseTest::CheckResultSetList(std::vector &valuesVector, + std::shared_ptr &resultSet, std::string testName) { std::vector columnNames; resultSet->GetAllColumnNames(columnNames); int resultSetNum = resultSet->GoToFirstRow(); int index = 0; while (resultSetNum == OHOS::NativeRdb::E_OK) { - OHOS::NativeRdb::ValuesBucket values = valuesVector[index]; + OHOS::DataShare::DataShareValuesBucket values = valuesVector[index]; int size = columnNames.size(); for (int i = 0; i < size; i++) { CheckData(valuesVector[index], resultSet, columnNames[i], testName); diff --git a/test/unittest/src/calllogability_test.cpp b/test/unittest/src/calllogability_test.cpp index ba32c21..18a5b6e 100644 --- a/test/unittest/src/calllogability_test.cpp +++ b/test/unittest/src/calllogability_test.cpp @@ -16,6 +16,9 @@ #include "calllogability_test.h" #include "data_ability_operation_builder.h" +#include "random_number_utils.h" + +using namespace OHOS::Contacts; namespace Contacts { namespace Test { @@ -30,48 +33,48 @@ CalllogAbilityTest::~CalllogAbilityTest() int64_t CalllogAbilityTest::CalllogInsert(std::string phoneNumber) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - OHOS::NativeRdb::ValuesBucket calllogValues; - calllogValues.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket calllogValues; + calllogValues.Put("phone_number", phoneNumber); int64_t code = calllogAbility.Insert(uriCalllog, calllogValues); calllogValues.Clear(); return code; } int CalllogAbilityTest::CalllogUpdate( - OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates) + OHOS::DataShare::DataShareValuesBucket updateValues, OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - int code = calllogAbility.Update(uriCalllog, updateValues, predicates); + int code = calllogAbility.Update(uriCalllog, predicates, updateValues); return code; } -int CalllogAbilityTest::CalllogDelete(OHOS::NativeRdb::DataAbilityPredicates predicates) +int CalllogAbilityTest::CalllogDelete(OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); int code = calllogAbility.Delete(uriCalllog, predicates); return code; } -std::shared_ptr CalllogAbilityTest::CalllogQuery( - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr CalllogAbilityTest::CalllogQuery( + std::vector columns, OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - std::shared_ptr resultSet = - calllogAbility.Query(uriCalllog, columns, predicates); + std::shared_ptr resultSet = + calllogAbility.Query(uriCalllog, predicates, columns); return resultSet; } -int64_t CalllogAbilityTest::CalllogInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t CalllogAbilityTest::CalllogInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); int64_t code = calllogAbility.Insert(uriCalllog, values); return code; } -int64_t CalllogAbilityTest::CalllogInsertValue(std::string displayName, OHOS::NativeRdb::ValuesBucket &values) +int64_t CalllogAbilityTest::CalllogInsertValue(std::string displayName, OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - values.PutString("display_name", displayName); + values.Put("display_name", displayName); int64_t code = calllogAbility.Insert(uriCalllog, values); return code; } @@ -113,40 +116,41 @@ void CalllogAbilityTest::GetAllValuesColumn(std::vector &column) * @params columnsEnd column end index * @return ValuesBucket */ -OHOS::NativeRdb::ValuesBucket CalllogAbilityTest::GetCallLogValues( +OHOS::DataShare::DataShareValuesBucket CalllogAbilityTest::GetCallLogValues( int columnsStart, int columnsEnd, std::vector &columns) { std::string callLogTestStringValue = std::to_string(ContactsRand()); - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("phone_number", phoneNumber + callLogTestStringValue); - valuesBucket.PutString("display_name", "name"); - valuesBucket.PutInt("call_direction", ContactsRand()); - valuesBucket.PutString("voicemail_uri", "uri::voicemail_uri" + callLogTestStringValue); - valuesBucket.PutInt("sim_type", ContactsRand()); - valuesBucket.PutInt("is_hd", ContactsRand()); - valuesBucket.PutInt("is_read", ContactsRand()); - valuesBucket.PutInt("ring_duration", ContactsRand()); - valuesBucket.PutInt("talk_duration", ContactsRand()); - valuesBucket.PutString("format_number", "154 121" + callLogTestStringValue); - valuesBucket.PutString("quicksearch_key", "1"); - valuesBucket.PutInt("number_type", ContactsRand()); - valuesBucket.PutString("number_type_name", "numberType" + callLogTestStringValue); - valuesBucket.PutInt("begin_time", ContactsRand()); - valuesBucket.PutInt("end_time", ContactsRand()); - valuesBucket.PutInt("answer_state", ContactsRand()); - valuesBucket.PutInt("create_time", ContactsRand()); - valuesBucket.PutString("number_location", "location" + callLogTestStringValue); - valuesBucket.PutInt("photo_id", ContactsRand()); - valuesBucket.PutString("photo_uri", "uri::photo_uri" + callLogTestStringValue); - valuesBucket.PutInt("country_iso_code", ContactsRand()); - valuesBucket.PutString("extra1", "extra1" + callLogTestStringValue); - valuesBucket.PutString("extra2", "extra2" + callLogTestStringValue); - valuesBucket.PutString("extra3", "extra3" + callLogTestStringValue); - valuesBucket.PutString("extra4", "extra4" + callLogTestStringValue); - valuesBucket.PutString("extra5", "extra5" + callLogTestStringValue); - valuesBucket.PutString("extra6", "extra6" + callLogTestStringValue); + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + valuesBucket.Put("phone_number", phoneNumber + callLogTestStringValue); + valuesBucket.Put("display_name", "name"); + valuesBucket.Put("call_direction", ContactsRand()); + valuesBucket.Put("voicemail_uri", "uri::voicemail_uri" + callLogTestStringValue); + valuesBucket.Put("sim_type", ContactsRand()); + valuesBucket.Put("is_hd", ContactsRand()); + valuesBucket.Put("is_read", ContactsRand()); + valuesBucket.Put("ring_duration", ContactsRand()); + valuesBucket.Put("talk_duration", ContactsRand()); + valuesBucket.Put("format_number", "154 121" + callLogTestStringValue); + valuesBucket.Put("quicksearch_key", "1"); + valuesBucket.Put("number_type", ContactsRand()); + valuesBucket.Put("number_type_name", "numberType" + callLogTestStringValue); + valuesBucket.Put("begin_time", ContactsRand()); + valuesBucket.Put("end_time", ContactsRand()); + valuesBucket.Put("answer_state", ContactsRand()); + valuesBucket.Put("create_time", ContactsRand()); + valuesBucket.Put("number_location", "location" + callLogTestStringValue); + valuesBucket.Put("photo_id", ContactsRand()); + valuesBucket.Put("photo_uri", "uri::photo_uri" + callLogTestStringValue); + valuesBucket.Put("country_iso_code", ContactsRand()); + valuesBucket.Put("extra1", "extra1" + callLogTestStringValue); + valuesBucket.Put("extra2", "extra2" + callLogTestStringValue); + valuesBucket.Put("extra3", "extra3" + callLogTestStringValue); + valuesBucket.Put("extra4", "extra4" + callLogTestStringValue); + valuesBucket.Put("extra5", "extra5" + callLogTestStringValue); + valuesBucket.Put("extra6", "extra6" + callLogTestStringValue); std::vector columnsTemp; GetAllValuesColumn(columnsTemp); int allSize = columnsTemp.size(); @@ -154,7 +158,7 @@ OHOS::NativeRdb::ValuesBucket CalllogAbilityTest::GetCallLogValues( if (i >= columnsStart && i < columnsEnd) { columns.push_back(columnsTemp[i]); } else { - valuesBucket.Delete(columnsTemp[i]); + valuesBucket.Put(columnsTemp[i], ""); } } return valuesBucket; @@ -163,7 +167,7 @@ OHOS::NativeRdb::ValuesBucket CalllogAbilityTest::GetCallLogValues( void CalllogAbilityTest::ClearCallLog() { // clear all callLog data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = CalllogDelete(predicates); EXPECT_EQ(deleteCode, 0); @@ -181,17 +185,18 @@ HWTEST_F(CalllogAbilityTest, calllog_Insert_test_100, testing::ext::TestSize.Lev { HILOG_INFO("--- calllog_Insert_test_100 is starting! ---"); std::vector columns; - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(10); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucket.Put("phone_number", phoneNumber); columns.push_back("phone_number"); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); // query insert data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSetDeleteQuery = CalllogQuery(columns, predicates); + std::shared_ptr resultSetDeleteQuery = CalllogQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSetDeleteQuery->GetRowCount(rowCount); @@ -214,21 +219,21 @@ HWTEST_F(CalllogAbilityTest, calllog_Insert_test_200, testing::ext::TestSize.Lev std::vector columns; GetAllValuesColumn(columns); int columnsSize = 27; - OHOS::NativeRdb::ValuesBucket valuesBucket = GetCallLogValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetCallLogValues(0, columnsSize, columns); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); CheckResultSet(valuesBucket, resultSet, "calllog_Insert_test_200"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawId)); // test end delete data - int deleteCode = CalllogDelete(predicates); + int deleteCode = CalllogDelete(predicates2); EXPECT_EQ(deleteCode, 0); ClearCallLog(); } @@ -246,21 +251,22 @@ HWTEST_F(CalllogAbilityTest, calllog_Update_test_300, testing::ext::TestSize.Lev HILOG_INFO("--- calllog_Update_test_300 is starting! ---"); std::vector columns; columns.push_back("phone_number"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(12); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(12); + valuesBucket.Put("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - string phoneNumber_test = random_number_utils.Generating(10); - updateValues.PutString("phone_number", phoneNumber_test); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + std::string phoneNumber_test = randomNumberUtils.Generating(10); + updateValues.Put("phone_number", phoneNumber_test); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); int updateCode = CalllogUpdate(updateValues, predicates); EXPECT_EQ(0, updateCode); - std::shared_ptr resultSetDeleteQuery = CalllogQuery(columns, predicates); + std::shared_ptr resultSetDeleteQuery = CalllogQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSetDeleteQuery->GetRowCount(rowCount); @@ -283,24 +289,24 @@ HWTEST_F(CalllogAbilityTest, calllog_Update_test_400, testing::ext::TestSize.Lev std::vector columns; GetAllValuesColumn(columns); int columnsSize = 27; - OHOS::NativeRdb::ValuesBucket valuesBucket = GetCallLogValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetCallLogValues(0, columnsSize, columns); int rawId = CalllogInsertValues(valuesBucket); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - OHOS::NativeRdb::ValuesBucket upDateValuesBucket = GetCallLogValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket = GetCallLogValues(0, columnsSize, columns); int upDateCode = CalllogUpdate(upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); CheckResultSet(upDateValuesBucket, resultSet, "calllog_Update_test_400"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawId)); // test end delete data - int deleteCode = CalllogDelete(predicates); + int deleteCode = CalllogDelete(predicates2); EXPECT_EQ(deleteCode, 0); ClearCallLog(); } @@ -316,35 +322,36 @@ HWTEST_F(CalllogAbilityTest, calllog_Update_test_400, testing::ext::TestSize.Lev HWTEST_F(CalllogAbilityTest, calllog_Update_test_500, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_Update_test_500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(10); - valuesBucket.PutString("phone_number", phoneNumber); - valuesBucket.PutString("display_name", "testName"); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucket.Put("phone_number", phoneNumber); + valuesBucket.Put("display_name", "testName"); CalllogInsertValues(valuesBucket); CalllogInsertValues(valuesBucket); int rawCount = 2; std::vector columns; columns.push_back("ring_duration"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSetQuery = CalllogQuery(columns, predicates); + std::shared_ptr resultSetQuery = CalllogQuery(columns, predicates); int rowCurrentCount = 0; resultSetQuery->GetRowCount(rowCurrentCount); resultSetQuery->Close(); EXPECT_EQ(rowCurrentCount, rawCount); // update database current data - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("ring_duration", 500); + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("ring_duration", 500); predicates.GreaterThan("id", "0"); int updateCode = CalllogUpdate(updateValues, predicates); EXPECT_EQ(updateCode, 0); // check update data or dataBase - std::shared_ptr resultSetUpDateQuery = CalllogQuery(columns, predicates); + std::shared_ptr resultSetUpDateQuery = CalllogQuery(columns, predicates); int rowUpDateCount = 0; resultSetUpDateQuery->GetRowCount(rowUpDateCount); EXPECT_EQ(rowCurrentCount, rowUpDateCount); - std::vector upValues; + std::vector upValues; upValues.push_back(updateValues); upValues.push_back(updateValues); CheckResultSetList(upValues, resultSetUpDateQuery, "calllog_Update_test_500"); @@ -366,21 +373,22 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_600, testing::ext::TestSize.Leve columns.push_back("phone_number"); columns.push_back("display_name"); columns.push_back("id"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(10); - valuesBucket.PutString("phone_number", phoneNumber); - valuesBucket.PutString("display_name", "testName"); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucket.Put("phone_number", phoneNumber); + valuesBucket.Put("display_name", "testName"); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); // query insert data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSetDeleteQuery = CalllogQuery(columns, predicates); + std::shared_ptr resultSetDeleteQuery = CalllogQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSetDeleteQuery->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); - valuesBucket.PutInt("id", rawId); + valuesBucket.Put("id", rawId); CheckResultSet(valuesBucket, resultSetDeleteQuery, "calllog_Query_test_600"); ClearCallLog(); } @@ -397,11 +405,12 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_800, testing::ext::TestSize.Leve { HILOG_INFO("-----calllog_Query_test_800 is starting!-----"); int ringDuration = 9121215; - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(10); - valuesBucket.PutString("phone_number", phoneNumber); - valuesBucket.PutString("display_name", "testName"); - valuesBucket.PutInt("ring_duration", ringDuration); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucket.Put("phone_number", phoneNumber); + valuesBucket.Put("display_name", "testName"); + valuesBucket.Put("ring_duration", ringDuration); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); @@ -410,17 +419,17 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_800, testing::ext::TestSize.Leve columns.push_back("display_name"); columns.push_back("ring_duration"); columns.push_back("id"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); predicates.And(); predicates.EqualTo("ring_duration", std::to_string(ringDuration)); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); // add id check - valuesBucket.PutInt("id", rawId); + valuesBucket.Put("id", rawId); CheckResultSet(valuesBucket, resultSet, "calllog_Query_test_800"); ClearCallLog(); } @@ -436,10 +445,11 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_800, testing::ext::TestSize.Leve HWTEST_F(CalllogAbilityTest, calllog_Query_test_900, testing::ext::TestSize.Level1) { HILOG_INFO("-----calllog_Query_test_900 is starting!-----"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(14); - valuesBucket.PutString("phone_number", phoneNumber); - valuesBucket.PutString("display_name", "testName"); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(14); + valuesBucket.Put("phone_number", phoneNumber); + valuesBucket.Put("display_name", "testName"); CalllogInsertValues(valuesBucket); CalllogInsertValues(valuesBucket); CalllogInsertValues(valuesBucket); @@ -447,9 +457,9 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_900, testing::ext::TestSize.Leve std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); int current = 4; // resultSet count 4 int rowCount = 0; @@ -470,17 +480,18 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_900, testing::ext::TestSize.Leve HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1000, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_Delete_test_1000 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(10); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucket.Put("phone_number", phoneNumber); std::vector columns; int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); int deleteCode = CalllogDelete(predicates); EXPECT_EQ(deleteCode, 0); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -500,18 +511,19 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1000, testing::ext::TestSize.Le HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1100, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_Delete_test_1100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(10); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucket.Put("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - string phoneNumber_test = random_number_utils.Generating(11); - valuesBucketTwo.PutString("phone_number", phoneNumber_test); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + std::string phoneNumber_test = randomNumberUtils.Generating(11); + valuesBucketTwo.Put("phone_number", phoneNumber_test); int rawIdTwo = CalllogInsertValues(valuesBucketTwo); EXPECT_GT(rawIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawIdTwo)); @@ -519,7 +531,7 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1100, testing::ext::TestSize.Le EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -543,15 +555,15 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1200, testing::ext::TestSize.Le std::vector columns; GetAllValuesColumn(columns); int columnsSize = 27; - OHOS::NativeRdb::ValuesBucket valuesBucket = GetCallLogValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetCallLogValues(0, columnsSize, columns); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); int deleteCode = CalllogDelete(predicates); EXPECT_EQ(deleteCode, 0); - std::shared_ptr resultSetDeleteQuery = CalllogQuery(columns, predicates); + std::shared_ptr resultSetDeleteQuery = CalllogQuery(columns, predicates); int rowCount = 0; resultSetDeleteQuery->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -570,17 +582,21 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1200, testing::ext::TestSize.Le HWTEST_F(CalllogAbilityTest, calllog_BatchInsert_test_1300, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_BatchInsert_test_1300 is starting!---"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(14); - valuesBucket.PutString("phone_number", phoneNumber); - valuesBucket.PutInt("ring_duration", 1000); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", phoneNumber); - valuesBucketTwo.PutInt("ring_duration", 1200); - OHOS::NativeRdb::ValuesBucket valuesBucketThree; - valuesBucketThree.PutString("phone_number", phoneNumber); - valuesBucketThree.PutInt("ring_duration", 1500); - std::vector listAddValuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket; + int numberLen = 14; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(numberLen); + valuesBucket.Put("phone_number", phoneNumber); + valuesBucket.Put("ring_duration", 1000); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + std::string phoneNumber2 = randomNumberUtils.Generating(numberLen); + valuesBucketTwo.Put("phone_number", phoneNumber2); + valuesBucketTwo.Put("ring_duration", 1200); + OHOS::DataShare::DataShareValuesBucket valuesBucketThree; + std::string phoneNumber3 = randomNumberUtils.Generating(numberLen); + valuesBucketThree.Put("phone_number", phoneNumber3); + valuesBucketThree.Put("ring_duration", 1500); + std::vector listAddValuesBucket; listAddValuesBucket.push_back(valuesBucket); listAddValuesBucket.push_back(valuesBucketTwo); listAddValuesBucket.push_back(valuesBucketThree); @@ -589,29 +605,28 @@ HWTEST_F(CalllogAbilityTest, calllog_BatchInsert_test_1300, testing::ext::TestSi int batchInsertCode = calllogAbility.BatchInsert(batchInsertUri, listAddValuesBucket); EXPECT_EQ(batchInsertCode, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; std::vector columns; columns.push_back("phone_number"); columns.push_back("ring_duration"); predicates.EqualTo("phone_number", phoneNumber); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); - predicates.Clear(); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); CheckResultSet(valuesBucket, resultSet, "calllog_BatchInsert_test_1300"); - predicates.Clear(); - predicates.EqualTo("phone_number", phoneNumber); - std::shared_ptr resultSetTwo = CalllogQuery(columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("phone_number", phoneNumber2); + std::shared_ptr resultSetTwo = CalllogQuery(columns, predicates2); int rowCountTwo = 0; resultSetTwo->GetRowCount(rowCountTwo); EXPECT_EQ(1, rowCountTwo); CheckResultSet(valuesBucketTwo, resultSetTwo, "calllog_BatchInsert_test_1300"); - predicates.Clear(); - predicates.EqualTo("phone_number", phoneNumber); - std::shared_ptr resultSetThree = CalllogQuery(columns, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("phone_number", phoneNumber3); + std::shared_ptr resultSetThree = CalllogQuery(columns, predicates3); int rowCountThree = 0; resultSetThree->GetRowCount(rowCountThree); EXPECT_EQ(1, rowCountThree); @@ -630,33 +645,22 @@ HWTEST_F(CalllogAbilityTest, calllog_BatchInsert_test_1300, testing::ext::TestSi HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1400, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_Delete_test_1400 is starting!---"); - OHOS::NativeRdb::ValuesBucket valuesBucketOne; - string phoneNumber = random_number_utils.Generating(9); - valuesBucketOne.PutString("phone_number", phoneNumber); - valuesBucketOne.PutInt("ring_duration", 998); + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(9); + valuesBucketOne.Put("phone_number", phoneNumber); + valuesBucketOne.Put("ring_duration", 998); int rawIdOne = CalllogInsertValues(valuesBucketOne); EXPECT_GT(rawIdOne, 0); int rawIdTwo = CalllogInsertValues(valuesBucketOne); EXPECT_GT(rawIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr executePredicates = - std::make_shared(predicates); - std::shared_ptr uri = std::make_shared(CallLogUri::CALL_LOG); - std::shared_ptr operation = - OHOS::AppExecFwk::DataAbilityOperation::NewDeleteBuilder(uri) - ->WithPredicatesBackReference(0, 0) - ->WithPredicates(executePredicates) - ->WithInterruptionAllowed(true) - ->Build(); - std::vector> executeBatchOperations; - executeBatchOperations.push_back(operation); - InitAbility(); - std::vector> dataAbilityResult = - calllogAbility.ExecuteBatch(executeBatchOperations); - EXPECT_EQ(0, dataAbilityResult[0]->GetCount()); + int deleteCode = CalllogDelete(predicates); + EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSetInsertQuery = CalllogQuery(columns, predicates); + std::shared_ptr resultSetInsertQuery = CalllogQuery(columns, predicates); int rowCount = 0; resultSetInsertQuery->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -674,46 +678,33 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1400, testing::ext::TestSize.Le HWTEST_F(CalllogAbilityTest, calllog_Update_test_1500, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_Update_test_1500 is starting!---"); - OHOS::NativeRdb::ValuesBucket valuesBucketOne; - string phoneNumber = random_number_utils.Generating(9); - valuesBucketOne.PutString("phone_number", phoneNumber); - valuesBucketOne.PutInt("ring_duration", 998); + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(9); + valuesBucketOne.Put("phone_number", phoneNumber); + valuesBucketOne.Put("ring_duration", 998); int rawIdOne = CalllogInsertValues(valuesBucketOne); EXPECT_GT(rawIdOne, 0); int rawIdTwo = CalllogInsertValues(valuesBucketOne); EXPECT_GT(rawIdTwo, 0); - OHOS::NativeRdb::ValuesBucket calllogValues; - string phoneNumber = random_number_utils.Generating(5); - calllogValues.PutString("phone_number", phoneNumber); - OHOS::NativeRdb::DataAbilityPredicates predicates; + + OHOS::DataShare::DataShareValuesBucket calllogValues; + std::string phoneNumber2 = randomNumberUtils.Generating(5); + calllogValues.Put("phone_number", phoneNumber2); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawIdTwo)); - std::shared_ptr values = - std::make_shared(calllogValues); - std::shared_ptr executePredicates = - std::make_shared(predicates); - std::shared_ptr uri = std::make_shared(CallLogUri::CALL_LOG); - std::shared_ptr operation = - OHOS::AppExecFwk::DataAbilityOperation::NewUpdateBuilder(uri) - ->WithValuesBucket(values) - ->WithPredicatesBackReference(0, 0) - ->WithPredicates(executePredicates) - ->WithInterruptionAllowed(true) - ->Build(); - std::vector> executeBatchOperations; - executeBatchOperations.push_back(operation); - InitAbility(); - std::vector> dataAbilityResult = - calllogAbility.ExecuteBatch(executeBatchOperations); - EXPECT_EQ(0, dataAbilityResult[0]->GetCount()); + int updateCode = CalllogUpdate(calllogValues, predicates); + EXPECT_EQ(updateCode, 0); + std::vector columns; columns.push_back("phone_number"); - std::shared_ptr resultSetInsertQuery = CalllogQuery(columns, predicates); + std::shared_ptr resultSetInsertQuery = CalllogQuery(columns, predicates); int rowCount = 0; resultSetInsertQuery->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector listValue; + std::vector listValue; listValue.push_back(calllogValues); listValue.push_back(calllogValues); CheckResultSetList(listValue, resultSetInsertQuery, "calllog_Update_test_1500"); @@ -736,27 +727,28 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Insert_test_1600, testing::ext::Te OHOS::Uri errorUri(CallLogUri::ERROR_URI); std::vector columns; columns.push_back("phone_number"); - string phoneNumber = random_number_utils.Generating(6); - OHOS::NativeRdb::ValuesBucket calllogValues; - calllogValues.PutString("phone_numbers", phoneNumber); + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(6); + OHOS::DataShare::DataShareValuesBucket calllogValues; + calllogValues.Put("phone_numbers", phoneNumber); int calllogId = calllogAbility.Insert(uriCalllog, calllogValues); EXPECT_EQ(calllogId, -1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("phone_numbers", phoneNumber); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(-1, rowCount); resultSet->Close(); calllogValues.Clear(); - calllogValues.PutString("phone_number", phoneNumber); + calllogValues.Put("phone_number", phoneNumber); calllogId = calllogAbility.Insert(errorUri, calllogValues); EXPECT_EQ(calllogId, -1); calllogValues.Clear(); predicates.EqualTo("phone_number", phoneNumber); - std::shared_ptr resultSetUriError = CalllogQuery(columns, predicates); + std::shared_ptr resultSetUriError = CalllogQuery(columns, predicates); int rowCountUriError = 0; resultSetUriError->GetRowCount(rowCountUriError); EXPECT_EQ(-1, rowCountUriError); @@ -776,28 +768,29 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1700, testing::ext::Te { HILOG_INFO("--- abnormal_calllog_Update_test_1700 is starting! ---"); std::vector columns; - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(10); - valuesBucket.PutString("phone_number", phoneNumber); - valuesBucket.PutString("display_name", "abnormal_sigle"); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucket.Put("phone_number", phoneNumber); + valuesBucket.Put("display_name", "abnormal_sigle"); columns.push_back("phone_number"); columns.push_back("display_name"); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number_sha", phoneNumber); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("phone_number_sha", phoneNumber); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); int updateCode = CalllogUpdate(updateValues, predicates); EXPECT_EQ(-1, updateCode); // query insert data - std::shared_ptr resultSetInsertQuery = CalllogQuery(columns, predicates); - // resultSet count 1 + std::shared_ptr resultSetInsertQuery = CalllogQuery(columns, predicates); + // resultSet count 0, update failed will delete the calllog int rowCount = 0; resultSetInsertQuery->GetRowCount(rowCount); - EXPECT_EQ(1, rowCount); + EXPECT_EQ(0, rowCount); CheckResultSet(valuesBucket, resultSetInsertQuery, "abnormal_calllog_Update_test_1700"); ClearCallLog(); } @@ -814,27 +807,28 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1800, testing::ext::Te { HILOG_INFO("--- abnormal_calllog_Update_test_1800 is starting! ---"); std::vector columns; - OHOS::NativeRdb::ValuesBucket valuesBucketOne; - string phoneNumber = random_number_utils.Generating(10); - valuesBucketOne.PutString("phone_number", phoneNumber); - valuesBucketOne.PutInt("ring_duration", 998); + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucketOne.Put("phone_number", phoneNumber); + valuesBucketOne.Put("ring_duration", 998); int rawIdOne = CalllogInsertValues(valuesBucketOne); EXPECT_GT(rawIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - string phoneNumber_test = random_number_utils.Generating(12); - valuesBucketTwo.PutString("phone_number", phoneNumber_test); - valuesBucketTwo.PutInt("ring_duration", 999); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + std::string phoneNumber_test = randomNumberUtils.Generating(12); + valuesBucketTwo.Put("phone_number", phoneNumber_test); + valuesBucketTwo.Put("ring_duration", 999); int rawIdTwo = CalllogInsertValues(valuesBucketTwo); EXPECT_GT(rawIdTwo, 0); columns.push_back("phone_number"); columns.push_back("ring_duration"); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number", phoneNumber); - updateValues.PutInt("ring_duration", 888); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("phone_number", phoneNumber); + updateValues.Put("ring_duration", 888); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.And(); predicates.EqualTo("ring_duration_shs", "999"); @@ -842,17 +836,17 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1800, testing::ext::Te EXPECT_EQ(-1, updateCode); // query insert data - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawIdOne)); - predicates.Or(); - predicates.EqualTo("id", std::to_string(rawIdTwo)); - std::shared_ptr resultSetInsertQuery = CalllogQuery(columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawIdOne)); + predicates2.Or(); + predicates2.EqualTo("id", std::to_string(rawIdTwo)); + std::shared_ptr resultSetInsertQuery = CalllogQuery(columns, predicates2); - // resultSet count 2 + // resultSet count 0, update failed will delete the calllog int rowCount = 0; resultSetInsertQuery->GetRowCount(rowCount); - EXPECT_EQ(2, rowCount); - std::vector listValue; + EXPECT_EQ(0, rowCount); + std::vector listValue; listValue.push_back(valuesBucketOne); listValue.push_back(valuesBucketTwo); CheckResultSetList(listValue, resultSetInsertQuery, "abnormal_calllog_Update_test_1800"); @@ -873,9 +867,9 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Query_test_1900, testing::ext::Tes std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", "100000000"); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -899,10 +893,10 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Query_test_2000, testing::ext::Tes std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = - calllogAbility.Query(uriCalllogs, columns, predicates); + std::shared_ptr resultSet = + calllogAbility.Query(uriCalllogs, predicates, columns); EXPECT_EQ(resultSet, nullptr); ClearCallLog(); } @@ -924,12 +918,12 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Query_test_2100, testing::ext::Tes std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("ids", "0"); predicates.And(); predicates.LessThan("id", "20"); - std::shared_ptr resultSet = - calllogAbility.Query(uriCalllog, columns, predicates); + std::shared_ptr resultSet = + calllogAbility.Query(uriCalllog, predicates, columns); // resultSet count int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -950,7 +944,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Query_test_2200, testing::ext::Tes { HILOG_INFO("-----abnormal_calllog_Query_test_2200 is starting!-----"); OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = calllogAbility.Delete(uriCalllog, predicates); @@ -958,9 +952,9 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Query_test_2200, testing::ext::Tes std::vector columns; columns.push_back("id"); columns.push_back("phone_numbers"); - predicates.Clear(); - predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.GreaterThan("id", "0"); + std::shared_ptr resultSet = CalllogQuery(columns, predicates2); EXPECT_NE(resultSet, nullptr); ClearCallLog(); } @@ -979,25 +973,25 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Delete_test_2300, testing::ext::Te std::vector columns; GetAllValuesColumn(columns); int columnsSize = 27; - OHOS::NativeRdb::ValuesBucket valuesBucket = GetCallLogValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetCallLogValues(0, columnsSize, columns); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); CheckResultSet(valuesBucket, resultSet, "abnormal_calllog_Delete_test_2300"); - predicates.Clear(); - predicates.EqualTo("ids", std::to_string(rawId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("ids", std::to_string(rawId)); // test end delete data - int deleteCode = CalllogDelete(predicates); + int deleteCode = CalllogDelete(predicates2); EXPECT_EQ(deleteCode, -1); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSetDelete = CalllogQuery(columns, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(rawId)); + std::shared_ptr resultSetDelete = CalllogQuery(columns, predicates3); // resultSet count 1 int rowCountDelete = 0; resultSetDelete->GetRowCount(rowCountDelete); @@ -1016,24 +1010,24 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Delete_test_2300, testing::ext::Te */ HWTEST_F(CalllogAbilityTest, abnormal_calllog_BatchInsert_test_2400, testing::ext::TestSize.Level1) { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = CalllogDelete(predicates); EXPECT_EQ(deleteCode, 0); HILOG_INFO("--- abnormal_calllog_BatchInsert_test_2400 is starting! ---"); OHOS::Uri uriData(CallLogUri::CALL_LOG); - OHOS::NativeRdb::ValuesBucket calllogValues; - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket calllogValues; + std::vector listAddBluk; int batchInserCode = 0; for (int i = 0; i < 10; i++) { listAddBluk.clear(); for (int j = 10 * i + 1; j <= 10 * (i + 1); j++) { calllogValues.Clear(); if (j == 14 || j == 27 || j == 57) { - calllogValues.PutString("phone_numbers", std::to_string(j)); + calllogValues.Put("phone_numbers", std::to_string(j)); } else { - calllogValues.PutString("phone_number", std::to_string(j)); + calllogValues.Put("phone_number", std::to_string(j)); } listAddBluk.push_back(calllogValues); } @@ -1063,15 +1057,15 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_BatchInsert_test_2500, testing::ex HILOG_INFO("--- abnormal_calllog_BatchInsert_test_2500 is starting! ---"); OHOS::Uri uriData(CallLogUri::CALL_LOG); - OHOS::NativeRdb::ValuesBucket calllogValues; - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket calllogValues; + std::vector listAddBluk; int batchInserCode = 0; for (int i = 0; i < 1000; i++) { calllogValues.Clear(); if (i == 500) { - calllogValues.PutString("phone_numbers", std::to_string(i + 1)); + calllogValues.Put("phone_numbers", std::to_string(i + 1)); } else { - calllogValues.PutString("phone_number", std::to_string(i + 1)); + calllogValues.Put("phone_number", std::to_string(i + 1)); } listAddBluk.push_back(calllogValues); } @@ -1099,33 +1093,34 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_delete_test_2600, testing::ext::Te HILOG_INFO("--- abnormal_calllog_delete_test_2600 is starting! ---"); OHOS::Uri errorUriCalllogs(CallLogUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(10); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); + valuesBucket.Put("phone_number", phoneNumber); int calllogIdOne = CalllogInsertValues(valuesBucket); EXPECT_GT(calllogIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + valuesBucketTwo.Put("phone_number", phoneNumber); int calllogIdTwo = CalllogInsertValues(valuesBucketTwo); EXPECT_GT(calllogIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(calllogIdOne)); int deleteCode = CalllogDelete(predicates); EXPECT_EQ(deleteCode, -1); std::vector columns; columns.push_back("phone_number"); - std::shared_ptr resultSetOne = CalllogQuery(columns, predicates); + std::shared_ptr resultSetOne = CalllogQuery(columns, predicates); int rowCountOne = 0; resultSetOne->GetRowCount(rowCountOne); EXPECT_EQ(-1, rowCountOne); CheckResultSet(valuesBucket, resultSetOne, "abnormal_calllog_delete_test_2600"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(calllogIdTwo)); - deleteCode = calllogAbility.Delete(errorUriCalllogs, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(calllogIdTwo)); + deleteCode = calllogAbility.Delete(errorUriCalllogs, predicates2); EXPECT_EQ(deleteCode, -1); - std::shared_ptr resultSetTwo = CalllogQuery(columns, predicates); + std::shared_ptr resultSetTwo = CalllogQuery(columns, predicates2); int rowCountTwo = 0; resultSetTwo->GetRowCount(rowCountTwo); EXPECT_EQ(1, rowCountTwo); @@ -1146,42 +1141,43 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te HILOG_INFO("--- abnormal_calllog_Update_test_2700 is starting! ---"); OHOS::Uri errorUri(CallLogUri::ERROR_URI); - string phoneNumber = random_number_utils.Generating(10); + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(10); int64_t calllogIdOne = CalllogInsert(phoneNumber); EXPECT_GT(calllogIdOne, 0); int64_t calllogIdTwo = CalllogInsert(phoneNumber); EXPECT_GT(calllogIdTwo, 0); - OHOS::NativeRdb::ValuesBucket updateCalllogValues; - string phoneNumber_test = random_number_utils.Generating(6); - updateCalllogValues.PutString("phone_number", phoneNumber_test); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateCalllogValues; + std::string phoneNumber_test = randomNumberUtils.Generating(6); + updateCalllogValues.Put("phone_number", phoneNumber_test); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(calllogIdOne)); int updateCode = CalllogUpdate(updateCalllogValues, predicates); EXPECT_EQ(updateCode, -1); std::vector columns; columns.push_back("phone_number"); - predicates.Clear(); - predicates.EqualTo("phone_number", phoneNumber_test); - std::shared_ptr resultSetOne = CalllogQuery(columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("phone_number", phoneNumber_test); + std::shared_ptr resultSetOne = CalllogQuery(columns, predicates2); int rowCountOne = 0; resultSetOne->GetRowCount(rowCountOne); EXPECT_EQ(0, rowCountOne); resultSetOne->Close(); updateCalllogValues.Clear(); - updateCalllogValues.PutString("phone_number", phoneNumber_test); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(calllogIdTwo)); - updateCode = calllogAbility.Update(errorUri, updateCalllogValues, predicates); + updateCalllogValues.Put("phone_number", phoneNumber_test); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(calllogIdTwo)); + updateCode = calllogAbility.Update(errorUri, predicates3, updateCalllogValues); EXPECT_EQ(updateCode, -1); - std::shared_ptr resultSetTwo = CalllogQuery(columns, predicates); + std::shared_ptr resultSetTwo = CalllogQuery(columns, predicates3); int rowCountTwo = 0; resultSetTwo->GetRowCount(rowCountOne); EXPECT_EQ(0, rowCountTwo); - OHOS::NativeRdb::ValuesBucket oldValue; - oldValue.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket oldValue; + oldValue.Put("phone_number", phoneNumber); CheckResultSet(oldValue, resultSetTwo, "abnormal_calllog_Update_test_2700"); ClearCallLog(); } @@ -1197,15 +1193,15 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te HWTEST_F(CalllogAbilityTest, calllog_async_insert_test_2800, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_async_insert_test_2800 is staring! ---"); - std::map result; + std::map result; std::vector callLogAsyncVector; int threadNum = 6; for (int i = 0; i < threadNum; ++i) { - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::string name; name.append("asyncTest"); name.append(std::to_string(i)); - values.PutString("display_name", name); + values.Put("display_name", name); CallLogAsync *contactAsync = new CallLogAsync(values, result); std::thread asyncThread(&CallLogAsync::Insert, contactAsync); callLogAsyncVector.push_back(contactAsync); @@ -1215,11 +1211,11 @@ HWTEST_F(CalllogAbilityTest, calllog_async_insert_test_2800, testing::ext::TestS std::this_thread::sleep_for(dura); std::vector columns; columns.push_back("display_name"); - std::map::iterator it; + std::map::iterator it; for (it = result.begin(); it != result.end(); it++) { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(it->first)); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); CheckResultSet(it->second, resultSet, "calllog_async_insert_test_2800"); } for (int i = 0; i < threadNum; ++i) { @@ -1239,7 +1235,7 @@ HWTEST_F(CalllogAbilityTest, calllog_async_insert_test_2800, testing::ext::TestS HWTEST_F(CalllogAbilityTest, calllog_async_update_test_2900, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_async_update_test_2900 is staring! ---"); - OHOS::NativeRdb::ValuesBucket callValues; + OHOS::DataShare::DataShareValuesBucket callValues; std::vector callLogId; callLogId.push_back(CalllogInsertValue("async_update1", callValues)); callValues.Clear(); @@ -1253,15 +1249,15 @@ HWTEST_F(CalllogAbilityTest, calllog_async_update_test_2900, testing::ext::TestS callValues.Clear(); callLogId.push_back(CalllogInsertValue("async_update6", callValues)); callValues.Clear(); - std::vector upDateValues; - OHOS::NativeRdb::DataAbilityPredicates queryPredicates; + std::vector upDateValues; + OHOS::DataShare::DataSharePredicates queryPredicates; std::vector callLogAsyncVector; int size = callLogId.size(); for (int i = 0; i < size; ++i) { - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::string name; name.append("asyncTest"); - values.PutString("display_name", name); + values.Put("display_name", name); upDateValues.push_back(values); int id = callLogId[i]; CallLogAsync *contactAsync = new CallLogAsync(values, id); @@ -1277,7 +1273,7 @@ HWTEST_F(CalllogAbilityTest, calllog_async_update_test_2900, testing::ext::TestS std::this_thread::sleep_for(dura); std::vector columns; columns.push_back("display_name"); - std::shared_ptr resultSet = CalllogQuery(columns, queryPredicates); + std::shared_ptr resultSet = CalllogQuery(columns, queryPredicates); CheckResultSetList(upDateValues, resultSet, "calllog_async_update_test_2900"); for (int i = 0; i < size; ++i) { delete callLogAsyncVector[i]; @@ -1296,7 +1292,7 @@ HWTEST_F(CalllogAbilityTest, calllog_async_update_test_2900, testing::ext::TestS HWTEST_F(CalllogAbilityTest, calllog_async_query_test_3000, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_async_query_test_3000 is staring! ---"); - OHOS::NativeRdb::ValuesBucket callLogValues; + OHOS::DataShare::DataShareValuesBucket callLogValues; std::vector callLogId; callLogId.push_back(CalllogInsertValue("async_query1", callLogValues)); callLogValues.Clear(); @@ -1311,7 +1307,7 @@ HWTEST_F(CalllogAbilityTest, calllog_async_query_test_3000, testing::ext::TestSi callLogId.push_back(CalllogInsertValue("async_query6", callLogValues)); callLogValues.Clear(); std::vector callLogAsyncVector; - std::vector> resultSetVector; + std::vector> resultSetVector; int threadNum = 6; for (int i = 0; i < threadNum; ++i) { CallLogAsync *contactAsync = new CallLogAsync(resultSetVector, callLogId); @@ -1344,7 +1340,7 @@ HWTEST_F(CalllogAbilityTest, calllog_async_query_test_3000, testing::ext::TestSi HWTEST_F(CalllogAbilityTest, calllog_async_delete_test_3100, testing::ext::TestSize.Level1) { HILOG_INFO("--- calllog_async_delete_test_3100 is staring! ---"); - OHOS::NativeRdb::ValuesBucket callLogValues; + OHOS::DataShare::DataShareValuesBucket callLogValues; std::vector callLogId; callLogId.push_back(CalllogInsertValue("async_update1", callLogValues)); callLogValues.Clear(); @@ -1359,7 +1355,7 @@ HWTEST_F(CalllogAbilityTest, calllog_async_delete_test_3100, testing::ext::TestS callLogId.push_back(CalllogInsertValue("async_update6", callLogValues)); callLogValues.Clear(); int size = callLogId.size(); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.BeginWrap(); std::vector callLogAsyncVector; for (int i = 0; i < size; ++i) { @@ -1377,7 +1373,7 @@ HWTEST_F(CalllogAbilityTest, calllog_async_delete_test_3100, testing::ext::TestS std::chrono::milliseconds dura(Time::ASYNC_SLEEP_TIME); std::this_thread::sleep_for(dura); std::vector columns; - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); diff --git a/test/unittest/src/calllogfuzzyquery_test.cpp b/test/unittest/src/calllogfuzzyquery_test.cpp index a2493df..d5d85f9 100644 --- a/test/unittest/src/calllogfuzzyquery_test.cpp +++ b/test/unittest/src/calllogfuzzyquery_test.cpp @@ -15,6 +15,7 @@ #include "calllogfuzzyquery_test.h" +#include "random_number_utils.h" #include "test_common.h" namespace Contacts { @@ -27,23 +28,23 @@ CalllogFuzzyQueryTest::~CalllogFuzzyQueryTest() { } -int CalllogFuzzyQueryTest::CalllogDelete(OHOS::NativeRdb::DataAbilityPredicates predicates) +int CalllogFuzzyQueryTest::CalllogDelete(OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); int code = calllogAbility.Delete(uriCalllog, predicates); return code; } -std::shared_ptr CalllogFuzzyQueryTest::CalllogQuery( - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr CalllogFuzzyQueryTest::CalllogQuery( + std::vector columns, OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - std::shared_ptr resultSet = - calllogAbility.Query(uriCalllog, columns, predicates); + std::shared_ptr resultSet = + calllogAbility.Query(uriCalllog, predicates, columns); return resultSet; } -int64_t CalllogFuzzyQueryTest::CalllogInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t CalllogFuzzyQueryTest::CalllogInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); int64_t code = calllogAbility.Insert(uriCalllog, values); @@ -53,7 +54,7 @@ int64_t CalllogFuzzyQueryTest::CalllogInsertValues(OHOS::NativeRdb::ValuesBucket void CalllogFuzzyQueryTest::ClearCallLog() { // clear all callLog data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = CalllogDelete(predicates); EXPECT_EQ(deleteCode, 0); @@ -70,30 +71,31 @@ void CalllogFuzzyQueryTest::ClearCallLog() HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_100, testing::ext::TestSize.Level1) { HILOG_INFO("----calllog_Query_test_100 is starting!----"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(9); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + OHOS::Contacts::RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(9); + valuesBucket.Put("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - valuesBucket.PutInt("id", rawId); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - string phoneNumber_test = random_number_utils.Generating(10); - valuesBucketTwo.PutString("phone_number", phoneNumber_test); + valuesBucket.Put("id", rawId); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + std::string phoneNumber_test = randomNumberUtils.Generating(10); + valuesBucketTwo.Put("phone_number", phoneNumber_test); rawId = CalllogInsertValues(valuesBucketTwo); - valuesBucketTwo.PutInt("id", rawId); + valuesBucketTwo.Put("id", rawId); EXPECT_GT(rawId, 0); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("phone_number", "123%"); predicates.OrderByAsc("id"); - std::vector valuesBucketVector; + std::vector valuesBucketVector; valuesBucketVector.push_back(valuesBucket); valuesBucketVector.push_back(valuesBucketTwo); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -115,24 +117,25 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_100, testing::ext::TestSize.L HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_200, testing::ext::TestSize.Level1) { HILOG_INFO("----calllog_Query_test_200 is starting!----"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(11); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + OHOS::Contacts::RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(11); + valuesBucket.Put("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - valuesBucket.PutInt("id", rawId); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", phoneNumber); + valuesBucket.Put("id", rawId); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + valuesBucketTwo.Put("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); - valuesBucketTwo.PutInt("id", rawId); + valuesBucketTwo.Put("id", rawId); EXPECT_GT(rawId, 0); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("phone_number", "%750"); predicates.OrderByAsc("id"); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -154,25 +157,26 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_200, testing::ext::TestSize.L HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_300, testing::ext::TestSize.Level1) { HILOG_INFO("----calllog_Query_test_300 is starting!----"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(11); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + OHOS::Contacts::RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(11); + valuesBucket.Put("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - valuesBucket.PutInt("id", rawId); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", phoneNumber); + valuesBucket.Put("id", rawId); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + valuesBucketTwo.Put("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); - valuesBucketTwo.PutInt("id", rawId); + valuesBucketTwo.Put("id", rawId); EXPECT_GT(rawId, 0); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; - string phoneNumber_test = random_number_utils.Generating(17); + OHOS::DataShare::DataSharePredicates predicates; + std::string phoneNumber_test = randomNumberUtils.Generating(17); predicates.Like("phone_number", phoneNumber_test); predicates.OrderByAsc("id"); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count 0 int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -192,24 +196,25 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_300, testing::ext::TestSize.L HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_400, testing::ext::TestSize.Level1) { HILOG_INFO("----calllog_Query_test_400 is starting!----"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(11); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + OHOS::Contacts::RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(11); + valuesBucket.Put("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - valuesBucket.PutInt("id", rawId); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", phoneNumber); + valuesBucket.Put("id", rawId); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + valuesBucketTwo.Put("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); - valuesBucketTwo.PutInt("id", rawId); + valuesBucketTwo.Put("id", rawId); EXPECT_GT(rawId, 0); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("phone_number", "%37845%"); predicates.OrderByAsc("id"); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); // resultSet count 0 int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -230,27 +235,28 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_400, testing::ext::TestSize.L HWTEST_F(CalllogFuzzyQueryTest, abnormal_calllog_Query_test_500, testing::ext::TestSize.Level1) { HILOG_INFO("----abnormal_calllog_Query_test_500 is starting!----"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(11); - valuesBucket.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + OHOS::Contacts::RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(11); + valuesBucket.Put("phone_number", phoneNumber); int rawId = CalllogInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - valuesBucket.PutInt("id", rawId); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("phone_number", phoneNumber); + valuesBucket.Put("id", rawId); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + valuesBucketTwo.Put("phone_number", phoneNumber); rawId = CalllogInsertValues(valuesBucketTwo); - valuesBucketTwo.PutInt("id", rawId); + valuesBucketTwo.Put("id", rawId); EXPECT_GT(rawId, 0); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - string phoneNumber_test = random_number_utils.Generating(17); - OHOS::NativeRdb::DataAbilityPredicates predicates; + std::string phoneNumber_test = randomNumberUtils.Generating(17); + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("phone_numbers", phoneNumber_test); predicates.OrderByAsc("id"); - std::shared_ptr resultSet = CalllogQuery(columns, predicates); + std::shared_ptr resultSet = CalllogQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(-1, rowCount); diff --git a/test/unittest/src/contactability_test.cpp b/test/unittest/src/contactability_test.cpp index e1c8437..0dc0791 100644 --- a/test/unittest/src/contactability_test.cpp +++ b/test/unittest/src/contactability_test.cpp @@ -14,6 +14,7 @@ */ #include "contactability_test.h" +#include "random_number_utils.h" #include "data_ability_operation_builder.h" @@ -27,93 +28,93 @@ ContactAbilityTest::~ContactAbilityTest() { } -int64_t ContactAbilityTest::RawContactInsert(std::string displayName, OHOS::NativeRdb::ValuesBucket &rawContactValues) +int64_t ContactAbilityTest::RawContactInsert(std::string displayName, OHOS::DataShare::DataShareValuesBucket &rawContactValues) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - rawContactValues.PutString("display_name", displayName); + rawContactValues.Put("display_name", displayName); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); return code; } int64_t ContactAbilityTest::RawContactExpandInsert( - std::vector valueVector, int isFavorite, OHOS::NativeRdb::ValuesBucket &rawContactValues) + std::vector valueVector, int isFavorite, OHOS::DataShare::DataShareValuesBucket &rawContactValues) { int indexZero = 0; int indexOne = 1; int indexTwo = 2; int indexThree = 3; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - rawContactValues.PutString("display_name", valueVector[indexZero]); - rawContactValues.PutString("company", valueVector[indexOne]); - rawContactValues.PutString("position", valueVector[indexTwo]); - rawContactValues.PutInt("favorite", isFavorite); - rawContactValues.PutString("phonetic_name", valueVector[indexThree]); + rawContactValues.Put("display_name", valueVector[indexZero]); + rawContactValues.Put("company", valueVector[indexOne]); + rawContactValues.Put("position", valueVector[indexTwo]); + rawContactValues.Put("favorite", isFavorite); + rawContactValues.Put("phonetic_name", valueVector[indexThree]); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); return code; } int64_t ContactAbilityTest::RawContactLastContactedInsert( - std::string displayName, int lastestContactedTime, OHOS::NativeRdb::ValuesBucket &rawContactValues) + std::string displayName, int lastestContactedTime, OHOS::DataShare::DataShareValuesBucket &rawContactValues) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - rawContactValues.PutString("display_name", displayName); - rawContactValues.PutInt("lastest_contacted_time", lastestContactedTime); + rawContactValues.Put("display_name", displayName); + rawContactValues.Put("lastest_contacted_time", lastestContactedTime); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); return code; } int64_t ContactAbilityTest::ContactDataInsert(int64_t rawContactId, std::string contentType, std::string detailInfo, - std::string position, OHOS::NativeRdb::ValuesBucket &contactDataValues) + std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - contactDataValues.PutInt("raw_contact_id", rawContactId); - contactDataValues.PutString("content_type", contentType); - contactDataValues.PutString("detail_info", detailInfo); - contactDataValues.PutString("position", position); + contactDataValues.Put("raw_contact_id", rawContactId); + contactDataValues.Put("content_type", contentType); + contactDataValues.Put("detail_info", detailInfo); + contactDataValues.Put("position", position); int64_t code = contactsDataAbility.Insert(uriContactData, contactDataValues); return code; } -int64_t ContactAbilityTest::GroupsInsert(std::string groupName, OHOS::NativeRdb::ValuesBucket &groupValues) +int64_t ContactAbilityTest::GroupsInsert(std::string groupName, OHOS::DataShare::DataShareValuesBucket &groupValues) { OHOS::Uri uriGroups(ContactsUri::GROUPS); - groupValues.PutString("group_name", groupName); + groupValues.Put("group_name", groupName); int64_t code = contactsDataAbility.Insert(uriGroups, groupValues); return code; } int64_t ContactAbilityTest::ContactBlocklistInsert( - std::string phoneNumber, OHOS::NativeRdb::ValuesBucket &contactBlocklistValues) + std::string phoneNumber, OHOS::DataShare::DataShareValuesBucket &contactBlocklistValues) { OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST); - contactBlocklistValues.PutString("phone_number", phoneNumber); + contactBlocklistValues.Put("phone_number", phoneNumber); int64_t code = contactsDataAbility.Insert(uriBlocklist, contactBlocklistValues); return code; } -int ContactAbilityTest::ContactUpdate(const std::string &tableName, OHOS::NativeRdb::ValuesBucket updateValues, - OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactAbilityTest::ContactUpdate(const std::string &tableName, OHOS::DataShare::DataShareValuesBucket updateValues, + OHOS::DataShare::DataSharePredicates predicates) { int code = 0; if (tableName == ContactTabName::RAW_CONTACT) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - code = contactsDataAbility.Update(uriRawContact, updateValues, predicates); + code = contactsDataAbility.Update(uriRawContact, predicates, updateValues); } else if (tableName == ContactTabName::CONTACT_DATA) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - code = contactsDataAbility.Update(uriContactData, updateValues, predicates); + code = contactsDataAbility.Update(uriContactData, predicates, updateValues); } else if (tableName == ContactTabName::GROUPS) { OHOS::Uri uriGroups(ContactsUri::GROUPS); - code = contactsDataAbility.Update(uriGroups, updateValues, predicates); + code = contactsDataAbility.Update(uriGroups, predicates, updateValues); } else if (tableName == ContactTabName::CONTACT_BLOCKLIST) { OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST); - code = contactsDataAbility.Update(uriBlocklist, updateValues, predicates); + code = contactsDataAbility.Update(uriBlocklist, predicates, updateValues); } else { HILOG_ERROR("ContactsDataAbility ====>no match uri action"); } return code; } -int ContactAbilityTest::ContactDelete(const std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactAbilityTest::ContactDelete(const std::string &tableName, OHOS::DataShare::DataSharePredicates predicates) { int code = 0; if (tableName == ContactTabName::RAW_CONTACT) { @@ -140,68 +141,68 @@ int ContactAbilityTest::ContactDelete(const std::string &tableName, OHOS::Native return code; } -std::shared_ptr ContactAbilityTest::ContactQuery( - const std::string &tableName, std::vector &columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactAbilityTest::ContactQuery( + const std::string &tableName, std::vector &columns, OHOS::DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; + std::shared_ptr resultSet; if (tableName == ContactTabName::RAW_CONTACT) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriRawContact, predicates, columns); } else if (tableName == ContactTabName::CONTACT_DATA) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - resultSet = contactsDataAbility.Query(uriContactData, columns, predicates); + resultSet = contactsDataAbility.Query(uriContactData, predicates, columns); } else if (tableName == ContactTabName::CONTACT) { OHOS::Uri uriContact(ContactsUri::CONTACT); - resultSet = contactsDataAbility.Query(uriContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriContact, predicates, columns); } else if (tableName == ContactTabName::GROUPS) { OHOS::Uri uriGroups(ContactsUri::GROUPS); - resultSet = contactsDataAbility.Query(uriGroups, columns, predicates); + resultSet = contactsDataAbility.Query(uriGroups, predicates, columns); } else if (tableName == ContactTabName::CONTACT_BLOCKLIST) { OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST); - resultSet = contactsDataAbility.Query(uriBlocklist, columns, predicates); + resultSet = contactsDataAbility.Query(uriBlocklist, predicates, columns); } else if (tableName == ContactTabName::DELETED_RAW_CONTACT) { OHOS::Uri uriDeletedRawContact(ContactsUri::DELETED_RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriDeletedRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriDeletedRawContact, predicates, columns); } else if (tableName == ContactTabName::SEARCH_CONTACT) { OHOS::Uri uriSearchContact(ContactsUri::SEARCH); - resultSet = contactsDataAbility.Query(uriSearchContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriSearchContact, predicates, columns); } else { HILOG_ERROR("ContactsDataAbility ====>no match uri action"); } return resultSet; } -void ContactAbilityTest::QueryAndExpectResult(std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates, - OHOS::NativeRdb::ValuesBucket &values, std::string testName) +void ContactAbilityTest::QueryAndExpectResult(std::string &tableName, OHOS::DataShare::DataSharePredicates predicates, + OHOS::DataShare::DataShareValuesBucket &values, std::string testName) { std::vector columns; - std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); CheckResultSet(values, resultSet, testName); } -int64_t ContactAbilityTest::RawContactInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactAbilityTest::RawContactInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); int64_t code = contactsDataAbility.Insert(uriRawContact, values); return code; } -int64_t ContactAbilityTest::ContactDataInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactAbilityTest::ContactDataInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); int64_t code = contactsDataAbility.Insert(uriContactData, values); return code; } -int64_t ContactAbilityTest::GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactAbilityTest::GroupsInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriGroups(ContactsUri::GROUPS); int64_t code = contactsDataAbility.Insert(uriGroups, values); return code; } -int64_t ContactAbilityTest::ContactBlocklistInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactAbilityTest::ContactBlocklistInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriContactBolcklist(ContactsUri::BLOCKLIST); int64_t code = contactsDataAbility.Insert(uriContactBolcklist, values); @@ -339,22 +340,22 @@ void ContactAbilityTest::MergeColumns( * @params columnsEnd column end index * @return ValuesBucket */ -OHOS::NativeRdb::ValuesBucket ContactAbilityTest::GetAllColumnsValues( +OHOS::DataShare::DataShareValuesBucket ContactAbilityTest::GetAllColumnsValues( std::vector &columnsInt, std::vector &columnsStr) { - OHOS::NativeRdb::ValuesBucket valuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket; int randomInt = 0; int columnsIntSize = columnsInt.size(); for (int i = 0; i < columnsIntSize; i++) { randomInt = ContactsRand(); HILOG_INFO("rand=%{public}d", randomInt); - valuesBucket.PutInt(columnsInt[i], randomInt); + valuesBucket.Put(columnsInt[i], randomInt); } std::string randomStr = ""; int columnsStringSize = columnsStr.size(); for (int i = 0; i < columnsStringSize; i++) { randomStr = columnsStr[i] + std::to_string(ContactsRand()); - valuesBucket.PutString(columnsStr[i], randomStr); + valuesBucket.Put(columnsStr[i], randomStr); } return valuesBucket; @@ -362,7 +363,7 @@ OHOS::NativeRdb::ValuesBucket ContactAbilityTest::GetAllColumnsValues( void ContactAbilityTest::ClearContacts() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); predicates.NotEqualTo("id", "0"); predicates.And(); @@ -371,10 +372,10 @@ void ContactAbilityTest::ClearContacts() int time = 1000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ContactsUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } /* @@ -388,12 +389,12 @@ void ContactAbilityTest::ClearContacts() HWTEST_F(ContactAbilityTest, contact_Insert_test_100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Insert_test_100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("liming", values); - HILOG_INFO("contact_Insert_test_100 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contact_Insert_test_100 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; QueryAndExpectResult(rawContacts, predicates, values, "contact_Insert_test_100"); @@ -411,29 +412,28 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_100, testing::ext::TestSize.Lev HWTEST_F(ContactAbilityTest, contact_Insert_test_200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Insert_test_200 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactIdOne = RawContactInsert("xiaoqian", values); - HILOG_INFO("contact_Insert_test_200 : rawContactIdOne = %{public}lld", rawContactIdOne); + HILOG_INFO("contact_Insert_test_200 : rawContactIdOne = %{public}ld", rawContactIdOne); EXPECT_GT(rawContactIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); std::string rawContacts = ContactTabName::RAW_CONTACT; QueryAndExpectResult(rawContacts, predicates, values, "contact_Insert_test_200"); values.Clear(); int64_t rawContactIdTwo = RawContactInsert("xiaowang", values); - HILOG_INFO("contact_Insert_test_200 : rawContactIdTwo = %{public}lld", rawContactIdTwo); + HILOG_INFO("contact_Insert_test_200 : rawContactIdTwo = %{public}ld", rawContactIdTwo); EXPECT_GT(rawContactIdTwo, 0); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); QueryAndExpectResult(rawContacts, predicates, values, "contact_Insert_test_200"); - predicates.Clear(); int64_t rawContactIdThree = RawContactInsert("xiaozhou", values); - HILOG_INFO("contact_Insert_test_200 : rawContactIdThree = %{public}lld", rawContactIdThree); + HILOG_INFO("contact_Insert_test_200 : rawContactIdThree = %{public}ld", rawContactIdThree); EXPECT_GT(rawContactIdThree, 0); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; predicates.EqualTo("id", std::to_string(rawContactIdThree)); - QueryAndExpectResult(rawContacts, predicates, values, "contact_Insert_test_200"); + QueryAndExpectResult(rawContacts, predicates2, values, "contact_Insert_test_200"); ClearContacts(); } @@ -453,14 +453,14 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_300, testing::ext::TestSize.Lev std::vector columns; std::string rawContacts = ContactTabName::RAW_CONTACT; GetAllRawContactColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); // resultSet count 1 int rowCount = -1; @@ -482,17 +482,17 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_300, testing::ext::TestSize.Lev HWTEST_F(ContactAbilityTest, contact_Insert_test_400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Insert_test_400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::vector vectorValue; vectorValue.push_back("liming"); vectorValue.push_back("tiantianxaingshang"); vectorValue.push_back("Test"); vectorValue.push_back("liming||lm"); int64_t rawContactId = RawContactExpandInsert(vectorValue, 1, values); - HILOG_INFO("contact_Insert_test_400 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contact_Insert_test_400 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; QueryAndExpectResult(rawContacts, predicates, values, "contact_Insert_test_400"); @@ -512,49 +512,49 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_500, testing::ext::TestSize.Lev { HILOG_INFO("--- contact_Insert_test_500 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("ligang", rawContactValues); - HILOG_INFO("contact_Insert_test_500 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contact_Insert_test_500 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "name", "ligang", "", values); - HILOG_INFO("contact_Insert_test_500 : contactDataIdOne = %{public}lld", contactDataIdOne); + HILOG_INFO("contact_Insert_test_500 : contactDataIdOne = %{public}ld", contactDataIdOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_500"); values.Clear(); int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", values); - HILOG_INFO("contact_Insert_test_500 : contactDataIdTwo = %{public}lld", contactDataIdTwo); + HILOG_INFO("contact_Insert_test_500 : contactDataIdTwo = %{public}ld", contactDataIdTwo); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_500"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, values, "contact_Insert_test_500"); values.Clear(); int64_t contactDataIdThree = ContactDataInsert(rawContactId, "email", "8523@163.com", "", values); - HILOG_INFO("contact_Insert_test_500 : contactDataIdThree = %{public}lld", contactDataIdThree); + HILOG_INFO("contact_Insert_test_500 : contactDataIdThree = %{public}ld", contactDataIdThree); EXPECT_GT(contactDataIdThree, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_500"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + QueryAndExpectResult(contactData, predicates3, values, "contact_Insert_test_500"); values.Clear(); int64_t contactDataIdFour = ContactDataInsert(rawContactId, "phone", "188520314", "", values); - HILOG_INFO("contact_Insert_test_500 : contactDataIdFour = %{public}lld", contactDataIdFour); + HILOG_INFO("contact_Insert_test_500 : contactDataIdFour = %{public}ld", contactDataIdFour); EXPECT_GT(contactDataIdFour, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFour)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_500"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(contactDataIdFour)); + QueryAndExpectResult(contactData, predicates4, values, "contact_Insert_test_500"); values.Clear(); int64_t contactDataIdFive = ContactDataInsert(rawContactId, "nickname", "xiaogang", "", values); - HILOG_INFO("contact_Insert_test_500 : contactDataIdFive = %{public}lld", contactDataIdFive); + HILOG_INFO("contact_Insert_test_500 : contactDataIdFive = %{public}ld", contactDataIdFive); EXPECT_GT(contactDataIdFive, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFive)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_500"); + OHOS::DataShare::DataSharePredicates predicates5; + predicates5.EqualTo("id", std::to_string(contactDataIdFive)); + QueryAndExpectResult(contactData, predicates5, values, "contact_Insert_test_500"); values.Clear(); ClearContacts(); } @@ -572,50 +572,49 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_600, testing::ext::TestSize.Lev { HILOG_INFO("--- contact_Insert_test_600 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("chengshao", values); - HILOG_INFO("contact_Insert_test_600 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contact_Insert_test_600 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); values.Clear(); int64_t contactDataIdOne = ContactDataInsert(rawContactId, "postal_address", "NanJingCity", "", values); - HILOG_INFO("contact_Insert_test_600 : contactDataIdOne = %{public}lld", contactDataIdOne); + HILOG_INFO("contact_Insert_test_600 : contactDataIdOne = %{public}ld", contactDataIdOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_600"); values.Clear(); int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "group_membership", "1", "", values); - HILOG_INFO("contact_Insert_test_600 : contactDataIdTwo = %{public}lld", contactDataIdTwo); + HILOG_INFO("contact_Insert_test_600 : contactDataIdTwo = %{public}ld", contactDataIdTwo); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_600"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, values, "contact_Insert_test_600"); values.Clear(); int64_t contactDataIdThree = ContactDataInsert(rawContactId, "note", "dalao", "", values); - HILOG_INFO("contact_Insert_test_600 : contactDataIdThree = %{public}lld", contactDataIdThree); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_600"); + HILOG_INFO("contact_Insert_test_600 : contactDataIdThree = %{public}ld", contactDataIdThree); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + QueryAndExpectResult(contactData, predicates3, values, "contact_Insert_test_600"); values.Clear(); int64_t contactDataIdFour = ContactDataInsert(rawContactId, "im", "aaaa", "", values); - HILOG_INFO("contact_Insert_test_600 : contactDataIdFour = %{public}lld", contactDataIdFour); + HILOG_INFO("contact_Insert_test_600 : contactDataIdFour = %{public}ld", contactDataIdFour); EXPECT_GT(contactDataIdFour, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFour)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_600"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(contactDataIdFour)); + QueryAndExpectResult(contactData, predicates4, values, "contact_Insert_test_600"); values.Clear(); int64_t contactDataIdFive = ContactDataInsert(rawContactId, "website", "www.48236.com", "", values); - HILOG_INFO("contact_Insert_test_600 : contactDataIdFive = %{public}lld", contactDataIdFive); + HILOG_INFO("contact_Insert_test_600 : contactDataIdFive = %{public}ld", contactDataIdFive); EXPECT_GT(contactDataIdFive, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFive)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_600"); + OHOS::DataShare::DataSharePredicates predicates5; + predicates5.EqualTo("id", std::to_string(contactDataIdFive)); + QueryAndExpectResult(contactData, predicates5, values, "contact_Insert_test_600"); values.Clear(); ClearContacts(); } @@ -633,35 +632,34 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_700, testing::ext::TestSize.Lev { HILOG_INFO("--- contact_Insert_test_700 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("yanshao", values); - HILOG_INFO("contact_Insert_test_700 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contact_Insert_test_700 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); values.Clear(); int64_t contactDataIdOne = ContactDataInsert(rawContactId, "contact_event", "19960229", "", values); - HILOG_INFO("contact_Insert_test_700 : contactDataIdOne = %{public}lld", contactDataIdOne); + HILOG_INFO("contact_Insert_test_700 : contactDataIdOne = %{public}ld", contactDataIdOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_700"); values.Clear(); int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "relation", "Secretary", "", values); - HILOG_INFO("contact_Insert_test_700 : contactDataIdTwo = %{public}lld", contactDataIdTwo); + HILOG_INFO("contact_Insert_test_700 : contactDataIdTwo = %{public}ld", contactDataIdTwo); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_700"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, values, "contact_Insert_test_700"); values.Clear(); int64_t contactDataIdThree = ContactDataInsert(rawContactId, "contact_misc", "1314", "", values); - HILOG_INFO("contact_Insert_test_700 : contactDataIdThree = %{public}lld", contactDataIdThree); + HILOG_INFO("contact_Insert_test_700 : contactDataIdThree = %{public}ld", contactDataIdThree); EXPECT_GT(contactDataIdThree, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_700"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + QueryAndExpectResult(contactData, predicates3, values, "contact_Insert_test_700"); values.Clear(); ClearContacts(); } @@ -679,7 +677,7 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_700, testing::ext::TestSize.Lev HWTEST_F(ContactAbilityTest, contact_Insert_test_800, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Insert_test_800 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactId = RawContactInsert("insert_detail_contactdata", rawValuesBucket); EXPECT_GT(rawContactId, 0); @@ -688,23 +686,22 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_800, testing::ext::TestSize.Lev columnQuery.push_back("detail_info"); GetDetailsContactDataColumns(columns); - OHOS::NativeRdb::DataAbilityPredicates predicates; - OHOS::NativeRdb::ValuesBucket valuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket; std::string randomStr = ""; std::string tableName = ContactTabName::CONTACT_DATA; int columnSize = columns.size(); for (int i = 0; i < columnSize; i++) { randomStr = columns[i] + std::to_string(ContactsRand()); - valuesBucket.PutInt("raw_contact_id", rawContactId); - valuesBucket.PutString("content_type", columns[i]); - valuesBucket.PutString("detail_info", randomStr); + valuesBucket.Put("raw_contact_id", rawContactId); + valuesBucket.Put("content_type", columns[i]); + valuesBucket.Put("detail_info", randomStr); int contactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(contactDataId, 0); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataId)); - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -727,45 +724,44 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_900, testing::ext::TestSize.Lev { HILOG_INFO("--- contact_Insert_test_900 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("xiaoming", values); EXPECT_GT(rawContactId, 0); values.Clear(); int64_t contactDataIdOne = ContactDataInsert(rawContactId, "name", "xiaoming", "", values); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_900"); values.Clear(); int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", values); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_900"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, values, "contact_Insert_test_900"); values.Clear(); rawContactId = RawContactInsert("lihong", values); - HILOG_INFO("contact_Insert_test_900 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contact_Insert_test_900 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); values.Clear(); int64_t contactDataIdThree = ContactDataInsert(rawContactId, "name", "lihong", "", values); - HILOG_INFO("contact_Insert_test_900 : contactDataIdThree = %{public}lld", contactDataIdThree); + HILOG_INFO("contact_Insert_test_900 : contactDataIdThree = %{public}ld", contactDataIdThree); EXPECT_GT(contactDataIdThree, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_900"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + QueryAndExpectResult(contactData, predicates3, values, "contact_Insert_test_900"); values.Clear(); int64_t contactDataIdFour = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", values); - HILOG_INFO("contact_Insert_test_900 : contactDataIdFour = %{public}lld", contactDataIdFour); + HILOG_INFO("contact_Insert_test_900 : contactDataIdFour = %{public}ld", contactDataIdFour); EXPECT_GT(contactDataIdFour, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFour)); - QueryAndExpectResult(contactData, predicates, values, "contact_Insert_test_900"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(contactDataIdFour)); + QueryAndExpectResult(contactData, predicates4, values, "contact_Insert_test_900"); values.Clear(); ClearContacts(); } @@ -786,19 +782,19 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_1000, testing::ext::TestSize.Le std::vector columns; std::string contactData = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("feimaomao", rawContactValues); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); // type 6 is name - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(ContactDataId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); CheckResultSet(valuesBucket, resultSet, "contact_Insert_test_1000"); // resultSet count 1 int rowCount = -1; @@ -820,19 +816,19 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_1000, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_1100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_1100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::vector vectorValue; vectorValue.push_back("zhangming"); vectorValue.push_back("tiantianxaingshang"); vectorValue.push_back("Test"); vectorValue.push_back("zhangming||zm"); int64_t rawContactId = RawContactExpandInsert(vectorValue, 1, values); - HILOG_INFO("contact_Update_test_1100 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contact_Update_test_1100 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("display_name", "dongming"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("display_name", "dongming"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -840,25 +836,25 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1100, testing::ext::TestSize.Le QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_1100"); updateValues.Clear(); - updateValues.PutString("company", "XXXX"); + updateValues.Put("company", "XXXX"); updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_1100"); updateValues.Clear(); - updateValues.PutString("position", "Secretary"); + updateValues.Put("position", "Secretary"); updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_1100"); updateValues.Clear(); - updateValues.PutString("favorite", "0"); + updateValues.Put("favorite", "0"); updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_1100"); updateValues.Clear(); - updateValues.PutString("phonetic_name", "dongming||dm"); + updateValues.Put("phonetic_name", "dongming||dm"); updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_1100"); @@ -876,7 +872,7 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1100, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_1200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_1200 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactIdOne = RawContactInsert("zhangming", values); EXPECT_GT(rawContactIdOne, 0); values.Clear(); @@ -889,9 +885,9 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1200, testing::ext::TestSize.Le EXPECT_GT(rawContactIdThree, 0); values.Clear(); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("display_name", "dongming"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("display_name", "dongming"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -899,12 +895,12 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1200, testing::ext::TestSize.Le QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_1200"); updateValues.Clear(); - updateValues.PutString("display_name", std::string("laoliu")); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdThree)); - updateCode = ContactUpdate(rawContacts, updateValues, predicates); + updateValues.Put("display_name", std::string("laoliu")); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactIdThree)); + updateCode = ContactUpdate(rawContacts, updateValues, predicates2); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_1200"); + QueryAndExpectResult(rawContacts, predicates2, updateValues, "contact_Update_test_1200"); ClearContacts(); } @@ -924,20 +920,20 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1300, testing::ext::TestSize.Le std::vector columnsStr; std::string rawContacts = ContactTabName::RAW_CONTACT; GetAllRawContactColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSetOne = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSetOne = ContactQuery(rawContacts, columns, predicates); CheckResultSet(valuesBucket, resultSetOne, "contact_Update_test_1300"); - OHOS::NativeRdb::ValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int upDateCode = ContactUpdate(rawContacts, upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); // resultSet count 1 int rowCount = -1; @@ -959,26 +955,26 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1300, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_1400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_1400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("ligang", values); EXPECT_GT(rawContactId, 0); values.Clear(); - OHOS::NativeRdb::ValuesBucket valuesOne; + OHOS::DataShare::DataShareValuesBucket valuesOne; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "name", "ligang", "", valuesOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesTwo; + OHOS::DataShare::DataShareValuesBucket valuesTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", valuesTwo); EXPECT_GT(contactDataIdTwo, 0); - OHOS::NativeRdb::ValuesBucket valuesThree; + OHOS::DataShare::DataShareValuesBucket valuesThree; int64_t contactDataIdThree = ContactDataInsert(rawContactId, "email", "8523@163.com", "", valuesThree); EXPECT_GT(contactDataIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "dongming"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "dongming"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -986,21 +982,21 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1400, testing::ext::TestSize.Le QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1400"); updateValues.Clear(); - updateValues.PutString("detail_info", "vivo"); - updateValues.PutString("position", "Developer"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "vivo"); + updateValues.Put("position", "Developer"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + updateCode = ContactUpdate(contactData, updateValues, predicates2); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1400"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contact_Update_test_1400"); updateValues.Clear(); - updateValues.PutString("detail_info", "1220369@qq.com"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "1220369@qq.com"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + updateCode = ContactUpdate(contactData, updateValues, predicates3); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1400"); + QueryAndExpectResult(contactData, predicates3, updateValues, "contact_Update_test_1400"); ClearContacts(); } @@ -1016,26 +1012,26 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1400, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_1500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_1500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaomi", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueOne; + OHOS::DataShare::DataShareValuesBucket contactDataValueOne; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "phone", "1665230", "", contactDataValueOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueTwo; + OHOS::DataShare::DataShareValuesBucket contactDataValueTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "nickname", "xiaomi", "", contactDataValueTwo); EXPECT_GT(contactDataIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueThree; + OHOS::DataShare::DataShareValuesBucket contactDataValueThree; int64_t contactDataIdThree = ContactDataInsert(rawContactId, "postal_address", "BeiJingFir", "", contactDataValueThree); EXPECT_GT(contactDataIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "33996652"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "33996652"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -1044,20 +1040,20 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1500, testing::ext::TestSize.Le QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1500"); updateValues.Clear(); - updateValues.PutString("detail_info", "mimi"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "mimi"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + updateCode = ContactUpdate(contactData, updateValues, predicates2); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1500"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contact_Update_test_1500"); updateValues.Clear(); - updateValues.PutString("detail_info", "NanJIngGulou"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "NanJIngGulou"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + updateCode = ContactUpdate(contactData, updateValues, predicates3); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1500"); + QueryAndExpectResult(contactData, predicates3, updateValues, "contact_Update_test_1500"); ClearContacts(); } @@ -1073,26 +1069,26 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1500, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_1600, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_1600 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaocai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueOne; + OHOS::DataShare::DataShareValuesBucket contactDataValueOne; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "note", "dalao", "", contactDataValueOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueTwo; + OHOS::DataShare::DataShareValuesBucket contactDataValueTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "im", "aaaaaa", "", contactDataValueTwo); EXPECT_GT(contactDataIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueThree; + OHOS::DataShare::DataShareValuesBucket contactDataValueThree; int64_t contactDataIdThree = ContactDataInsert(rawContactId, "contact_event", "19820314", "", contactDataValueThree); EXPECT_GT(contactDataIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "God"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "God"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -1100,22 +1096,22 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1600, testing::ext::TestSize.Le QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1600"); updateValues.Clear(); - updateValues.PutString("detail_info", "bcade"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "bcade"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + updateCode = ContactUpdate(contactData, updateValues, predicates2); HILOG_INFO("contact_Update_test_1600: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1600"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contact_Update_test_1600"); updateValues.Clear(); - updateValues.PutString("detail_info", "19820328"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "19820328"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + updateCode = ContactUpdate(contactData, updateValues, predicates3); HILOG_INFO("contact_Update_test_1600: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1600"); + QueryAndExpectResult(contactData, predicates3, updateValues, "contact_Update_test_1600"); ClearContacts(); } @@ -1131,25 +1127,25 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1600, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_1700, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_1700 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaocai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactValuesOne; + OHOS::DataShare::DataShareValuesBucket contactValuesOne; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "website", "www.aaa.com", "", contactValuesOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactValuesTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "relation", "fuzi", "", contactValuesTwo); EXPECT_GT(contactDataIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactValuesThree; + OHOS::DataShare::DataShareValuesBucket contactValuesThree; int64_t contactDataIdThree = ContactDataInsert(rawContactId, "group_membership", "1", "", contactValuesThree); EXPECT_GT(contactDataIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "www.bbb.com"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "www.bbb.com"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -1157,22 +1153,22 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1700, testing::ext::TestSize.Le QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1700"); updateValues.Clear(); - updateValues.PutString("detail_info", "laozhang"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "laozhang"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + updateCode = ContactUpdate(contactData, updateValues, predicates2); HILOG_INFO("contact_Update_test_1700: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1700"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contact_Update_test_1700"); updateValues.Clear(); - updateValues.PutString("detail_info", "2"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "2"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + updateCode = ContactUpdate(contactData, updateValues, predicates3); HILOG_INFO("contact_Update_test_1700: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1700"); + QueryAndExpectResult(contactData, predicates3, updateValues, "contact_Update_test_1700"); ClearContacts(); } @@ -1187,17 +1183,17 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1700, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_1800, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_1800 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaocai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "contact_misc", "111", "", contactDataValues); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "222"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "222"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -1218,10 +1214,10 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1800, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_1900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_1900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("ligang", rawContactValues); EXPECT_GT(rawContactIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactValues; + OHOS::DataShare::DataShareValuesBucket contactValues; int64_t contactDataId = ContactDataInsert(rawContactIdOne, "name", "ligang", "", contactValues); EXPECT_GT(contactDataId, 0); contactValues.Clear(); @@ -1241,9 +1237,9 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1900, testing::ext::TestSize.Le contactDataId = ContactDataInsert(rawContactIdTwo, "organization", "tiantianxaingshang", "Test", contactValues); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "lixiang"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "lixiang"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactIdOne)); predicates.And(); // type 6 is phone @@ -1254,16 +1250,16 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_1900, testing::ext::TestSize.Le QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1900"); updateValues.Clear(); - updateValues.PutString("detail_info", "zhangsan"); - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactIdTwo)); - predicates.And(); + updateValues.Put("detail_info", "zhangsan"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactIdTwo)); + predicates2.And(); // type 6 is phone - predicates.EqualTo("type_id", "6"); - updateCode = ContactUpdate(contactData, updateValues, predicates); + predicates2.EqualTo("type_id", "6"); + updateCode = ContactUpdate(contactData, updateValues, predicates2); HILOG_INFO("contact_Update_test_1900: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contact_Update_test_1900"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contact_Update_test_1900"); ClearContacts(); } @@ -1283,31 +1279,29 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2000, testing::ext::TestSize.Le std::vector columns; std::string tableName = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("feimaotui", rawContactValues); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); // type_id 6 is name - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(ContactDataId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - OHOS::NativeRdb::ValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int upDateCode = ContactUpdate(tableName, upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - OHOS::NativeRdb::ValueObject value; - valuesBucket.GetObject("version", value); - int versionCode = -1; - value.GetInt(versionCode); + bool isValid = false; + int versionCode = valuesBucket.Get("version", isValid); versionCode += 1; - upDateValuesBucket.Delete("version"); - upDateValuesBucket.PutInt("version", versionCode); - std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); +// upDateValuesBucket.Delete("version"); + upDateValuesBucket.Put("version", versionCode); + std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); // resultSet count 1 int rowCount = -1; @@ -1328,7 +1322,7 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2000, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_2100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_2100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactId = RawContactInsert("update_detail_contactdata", rawValuesBucket); EXPECT_GT(rawContactId, 0); @@ -1337,9 +1331,8 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2100, testing::ext::TestSize.Le columnQuery.push_back("detail_info"); GetDetailsContactDataColumns(columns); - OHOS::NativeRdb::DataAbilityPredicates predicates; - OHOS::NativeRdb::ValuesBucket valuesBucket; - OHOS::NativeRdb::ValuesBucket upDateValuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket; + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket; std::string randomStr = ""; std::string updateStrValue = ""; @@ -1347,20 +1340,20 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2100, testing::ext::TestSize.Le int columnSize = columns.size(); for (int i = 0; i < columnSize; i++) { randomStr = columns[i] + std::to_string(ContactsRand()); - valuesBucket.PutInt("raw_contact_id", rawContactId); - valuesBucket.PutString("content_type", columns[i]); - valuesBucket.PutString("detail_info", randomStr); + valuesBucket.Put("raw_contact_id", rawContactId); + valuesBucket.Put("content_type", columns[i]); + valuesBucket.Put("detail_info", randomStr); int contactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(contactDataId, 0); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataId)); updateStrValue = "update_all" + randomStr; - upDateValuesBucket.PutString("detail_info", updateStrValue); + upDateValuesBucket.Put("detail_info", updateStrValue); int upDateCode = ContactUpdate(tableName, upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -1384,13 +1377,13 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2100, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_2200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_2200 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaozong", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -1410,7 +1403,7 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2200, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_2300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_2300 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("xiaowang", rawContactValues); EXPECT_GT(rawContactIdOne, 0); @@ -1421,9 +1414,9 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2300, testing::ext::TestSize.Le int64_t rawContactIdThree = RawContactInsert("laowei", rawContactValues); EXPECT_GT(rawContactIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); @@ -1433,15 +1426,15 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2300, testing::ext::TestSize.Le int updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdOne)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_2300"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdTwo)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_2300"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdThree)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_2300"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactIdOne)); + QueryAndExpectResult(rawContacts, predicates2, updateValues, "contact_Update_test_2300"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(rawContactIdTwo)); + QueryAndExpectResult(rawContacts, predicates3, updateValues, "contact_Update_test_2300"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(rawContactIdThree)); + QueryAndExpectResult(rawContacts, predicates4, updateValues, "contact_Update_test_2300"); ClearContacts(); } @@ -1456,7 +1449,7 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2300, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_2400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_2400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::vector vectorValue; vectorValue.push_back("zhangming"); vectorValue.push_back("tiantianxaingshang"); @@ -1465,9 +1458,9 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2400, testing::ext::TestSize.Le int64_t rawContactId = RawContactExpandInsert(vectorValue, 1, values); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -1487,7 +1480,7 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2400, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_2500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_2500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::vector vectorValue; vectorValue.push_back("zhangming"); vectorValue.push_back("tiantianxaingshang"); @@ -1512,12 +1505,12 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2500, testing::ext::TestSize.Le vectorValue.push_back("Test"); vectorValue.push_back("abiao||ab"); int64_t rawContactIdThree = RawContactExpandInsert(vectorValue, 1, values); - HILOG_INFO("contact_Update_test_2500 : rawContactIdThree = %{public}lld", rawContactIdThree); + HILOG_INFO("contact_Update_test_2500 : rawContactIdThree = %{public}ld", rawContactIdThree); EXPECT_GT(rawContactIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); @@ -1527,17 +1520,17 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2500, testing::ext::TestSize.Le int updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactId)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_2500"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactId)); + QueryAndExpectResult(rawContacts, predicates2, updateValues, "contact_Update_test_2500"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdTwo)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_2500"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(rawContactIdTwo)); + QueryAndExpectResult(rawContacts, predicates3, updateValues, "contact_Update_test_2500"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdThree)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_2500"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(rawContactIdThree)); + QueryAndExpectResult(rawContacts, predicates4, updateValues, "contact_Update_test_2500"); ClearContacts(); } @@ -1552,11 +1545,11 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_2500, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Insert_test_2600, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Insert_test_2600 is starting! ---"); - OHOS::NativeRdb::ValuesBucket blocklistValues; + OHOS::DataShare::DataShareValuesBucket blocklistValues; int64_t blocklistId = ContactBlocklistInsert("10086", blocklistValues); EXPECT_GT(blocklistId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(blocklistId)); std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST; QueryAndExpectResult(contactBlocklist, predicates, blocklistValues, "contact_Insert_test_2600"); @@ -1575,26 +1568,26 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_2700, testing::ext::TestSize.Le { HILOG_INFO("--- contact_Insert_test_2700 is starting! ---"); std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST; - OHOS::NativeRdb::ValuesBucket blocklistValues; + OHOS::DataShare::DataShareValuesBucket blocklistValues; int64_t blocklistIdOne = ContactBlocklistInsert("188520", blocklistValues); EXPECT_GT(blocklistIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(blocklistIdOne)); QueryAndExpectResult(contactBlocklist, predicates, blocklistValues, "contact_Insert_test_2700"); blocklistValues.Clear(); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; int64_t blocklistIdTwo = ContactBlocklistInsert("130269", blocklistValues); EXPECT_GT(blocklistIdTwo, 0); - predicates.EqualTo("id", std::to_string(blocklistIdTwo)); - QueryAndExpectResult(contactBlocklist, predicates, blocklistValues, "contact_Insert_test_2700"); + predicates2.EqualTo("id", std::to_string(blocklistIdTwo)); + QueryAndExpectResult(contactBlocklist, predicates2, blocklistValues, "contact_Insert_test_2700"); blocklistValues.Clear(); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates3; int64_t blocklistIdThree = ContactBlocklistInsert("772501", blocklistValues); EXPECT_GT(blocklistIdThree, 0); - predicates.EqualTo("id", std::to_string(blocklistIdThree)); - QueryAndExpectResult(contactBlocklist, predicates, blocklistValues, "contact_Insert_test_2700"); + predicates3.EqualTo("id", std::to_string(blocklistIdThree)); + QueryAndExpectResult(contactBlocklist, predicates3, blocklistValues, "contact_Insert_test_2700"); ClearContacts(); } @@ -1614,14 +1607,14 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_2800, testing::ext::TestSize.Le std::vector columns; std::string tableName = ContactTabName::CONTACT_BLOCKLIST; GetAllContactBlocklistColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int contactBlockId = ContactBlocklistInsertValues(valuesBucket); EXPECT_GT(contactBlockId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactBlockId)); - std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); // resultSet count 1 int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -1641,17 +1634,17 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_2800, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Delete_test_2900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Delete_test_2900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket blocklistValues; + OHOS::DataShare::DataShareValuesBucket blocklistValues; int64_t blocklistId = ContactBlocklistInsert("147852369", blocklistValues); EXPECT_GT(blocklistId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(blocklistId)); std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST; int deleteCode = ContactDelete(contactBlocklist, predicates); EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(contactBlocklist, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -1671,7 +1664,7 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_2900, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Delete_test_3000, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Delete_test_3000 is starting! ---"); - OHOS::NativeRdb::ValuesBucket blocklistValues; + OHOS::DataShare::DataShareValuesBucket blocklistValues; int64_t blocklistIdOne = ContactBlocklistInsert("111228855", blocklistValues); EXPECT_GT(blocklistIdOne, 0); @@ -1683,7 +1676,7 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3000, testing::ext::TestSize.Le int64_t blocklistIdThree = ContactBlocklistInsert("9933220011", blocklistValues); EXPECT_GT(blocklistIdThree, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(blocklistIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(blocklistIdTwo)); @@ -1694,7 +1687,7 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3000, testing::ext::TestSize.Le EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(contactBlocklist, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -1719,19 +1712,19 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3100, testing::ext::TestSize.Le std::vector columnsInt; std::vector columnsStr; GetAllContactBlocklistColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int contacBlockId = ContactBlocklistInsertValues(valuesBucket); EXPECT_GT(contacBlockId, 0); // test end delete data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contacBlockId)); std::string tableName = ContactTabName::CONTACT_BLOCKLIST; int deleteCode = ContactDelete(tableName, predicates); EXPECT_EQ(deleteCode, 0); MergeColumns(columns, columnsInt, columnsStr); - std::shared_ptr resultSetDeleteQuery = + std::shared_ptr resultSetDeleteQuery = ContactQuery(tableName, columns, predicates); int rowCount = -1; resultSetDeleteQuery->GetRowCount(rowCount); @@ -1750,18 +1743,18 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3100, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Insert_test_3200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Insert_test_3200 is staring! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaoli", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket groupValues; + OHOS::DataShare::DataShareValuesBucket groupValues; int64_t groupId = GroupsInsert("TestFirstGroup", groupValues); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValue; + OHOS::DataShare::DataShareValuesBucket contactDataValue; int64_t contactDataId = ContactDataInsert(rawContactId, "group_membership", std::to_string(groupId), "", contactDataValue); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataId)); std::string contactData = ContactTabName::CONTACT_DATA; QueryAndExpectResult(contactData, predicates, contactDataValue, "contact_Insert_test_3200"); @@ -1779,7 +1772,7 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_3200, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Insert_test_3300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Insert_test_3300 is staring! ---"); - OHOS::NativeRdb::ValuesBucket groupValues; + OHOS::DataShare::DataShareValuesBucket groupValues; int64_t groupIdOne = GroupsInsert("TestSecondGroup", groupValues); EXPECT_GT(groupIdOne, 0); groupValues.Clear(); @@ -1787,7 +1780,7 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_3300, testing::ext::TestSize.Le int64_t groupIdTwo = GroupsInsert("DeveloperFirstGroup", groupValues); EXPECT_GT(groupIdTwo, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("xiaoli", rawContactValues); EXPECT_GT(rawContactIdOne, 0); rawContactValues.Clear(); @@ -1795,22 +1788,22 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_3300, testing::ext::TestSize.Le int64_t rawContactIdTwo = RawContactInsert("BossCai", rawContactValues); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValuesOne; + OHOS::DataShare::DataShareValuesBucket contactDataValuesOne; int64_t contactDataIdOne = ContactDataInsert(rawContactIdOne, "group_membership", std::to_string(groupIdOne), "", contactDataValuesOne); EXPECT_GT(contactDataIdOne, 0); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, contactDataValuesOne, "contact_Insert_test_3300"); - OHOS::NativeRdb::ValuesBucket contactDataValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactDataValuesTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactIdTwo, "group_membership", std::to_string(groupIdTwo), "", contactDataValuesTwo); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, contactDataValuesTwo, "contact_Insert_test_3300"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, contactDataValuesTwo, "contact_Insert_test_3300"); ClearContacts(); } @@ -1830,14 +1823,14 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_3400, testing::ext::TestSize.Le std::vector columns; std::string group = ContactTabName::GROUPS; GetAllGroupsColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = GroupsInsertValues(valuesBucket); EXPECT_GT(rawId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSet = ContactQuery(group, columns, predicates); + std::shared_ptr resultSet = ContactQuery(group, columns, predicates); // resultSet count 1 int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -1857,31 +1850,31 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_3400, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Delete_test_3500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Delete_test_3500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket groupValues; + OHOS::DataShare::DataShareValuesBucket groupValues; int64_t groupId = GroupsInsert("CEO", groupValues); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaoli", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; int64_t contactDataId = ContactDataInsert(rawContactId, "group_membership", std::to_string(groupId), "", contactDataValues); EXPECT_GT(contactDataId, 0); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); predicates.And(); // type_id 9 is group_membership predicates.EqualTo("type_id", "9"); int deleteCode = ContactDelete(contactData, predicates); EXPECT_EQ(deleteCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataId)); std::vector columns; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates2); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -1900,16 +1893,16 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3500, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Delete_test_3600, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Delete_test_3600 is starting! ---"); - OHOS::NativeRdb::ValuesBucket groupValues; + OHOS::DataShare::DataShareValuesBucket groupValues; int64_t groupIdOne = GroupsInsert("Test", groupValues); - HILOG_INFO("contact_Delete_test_3600: groupIdOne = %{public}lld", groupIdOne); + HILOG_INFO("contact_Delete_test_3600: groupIdOne = %{public}ld", groupIdOne); EXPECT_GT(groupIdOne, 0); groupValues.Clear(); int64_t groupIdTwo = GroupsInsert("Developer", groupValues); - HILOG_INFO("contact_Delete_test_3600: groupIdTwo = %{public}lld", groupIdTwo); + HILOG_INFO("contact_Delete_test_3600: groupIdTwo = %{public}ld", groupIdTwo); EXPECT_GT(groupIdTwo, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("xiaoli", rawContactValues); EXPECT_GT(rawContactIdOne, 0); @@ -1917,7 +1910,7 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3600, testing::ext::TestSize.Le int64_t rawContactIdTwo = RawContactInsert("xiaoyuan", rawContactValues); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; int64_t contactDataIdOne = ContactDataInsert(rawContactIdOne, "group_membership", std::to_string(groupIdOne), "", contactDataValues); EXPECT_GT(contactDataIdOne, 0); @@ -1928,24 +1921,24 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3600, testing::ext::TestSize.Le EXPECT_GT(contactDataIdTwo, 0); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(contactDataIdTwo)); int deleteCode = ContactDelete(contactData, predicates); EXPECT_EQ(deleteCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdOne)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdOne)); std::vector columns; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates2); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); resultSet->Close(); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - std::shared_ptr resultSetTwo = ContactQuery(contactData, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdTwo)); + std::shared_ptr resultSetTwo = ContactQuery(contactData, columns, predicates3); int rowCountTwo = 0; resultSetTwo->GetRowCount(rowCountTwo); EXPECT_EQ(0, rowCountTwo); @@ -1969,12 +1962,12 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3700, testing::ext::TestSize.Le std::vector columnsInt; std::vector columnsStr; GetAllGroupsColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int groupId = GroupsInsertValues(valuesBucket); EXPECT_GT(groupId, 0); // test end delete data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); EXPECT_GT(groupId, 0); std::string tableName = ContactTabName::GROUPS; @@ -1982,7 +1975,7 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_3700, testing::ext::TestSize.Le EXPECT_EQ(deleteCode, 0); MergeColumns(columns, columnsInt, columnsStr); - std::shared_ptr resultSetDeleteQuery = + std::shared_ptr resultSetDeleteQuery = ContactQuery(tableName, columns, predicates); int rowCount = -1; resultSetDeleteQuery->GetRowCount(rowCount); @@ -2007,19 +2000,19 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_3800, testing::ext::TestSize.Lev columns.push_back("position"); columns.push_back("favorite"); columns.push_back("phonetic_name"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("display_name", "xiaoyuan"); - valuesBucket.PutString("company", "tiantianxiangshang"); - valuesBucket.PutString("position", "Test"); - valuesBucket.PutInt("favorite", 1); - valuesBucket.PutString("phonetic_name", "xiaoyuanxy"); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + valuesBucket.Put("display_name", "xiaoyuan"); + valuesBucket.Put("company", "tiantianxiangshang"); + valuesBucket.Put("position", "Test"); + valuesBucket.Put("favorite", 1); + valuesBucket.Put("phonetic_name", "xiaoyuanxy"); int64_t rawContactId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); // resultSet count 1 int rowCount = -1; @@ -2040,30 +2033,30 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_3800, testing::ext::TestSize.Lev HWTEST_F(ContactAbilityTest, contact_Query_test_3900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Query_test_3900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesBucketOne; - valuesBucketOne.PutString("display_name", "xiaohei"); - valuesBucketOne.PutString("company", "tiantianxiangshang"); - valuesBucketOne.PutString("position", "Test"); - valuesBucketOne.PutInt("favorite", 1); - valuesBucketOne.PutString("phonetic_name", "xiaohei||xh"); + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; + valuesBucketOne.Put("display_name", "xiaohei"); + valuesBucketOne.Put("company", "tiantianxiangshang"); + valuesBucketOne.Put("position", "Test"); + valuesBucketOne.Put("favorite", 1); + valuesBucketOne.Put("phonetic_name", "xiaohei||xh"); int64_t rawContactIdOne = RawContactInsertValues(valuesBucketOne); EXPECT_GT(rawContactIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("display_name", "xiaobai"); - valuesBucketTwo.PutString("company", "tiantianxiangshang"); - valuesBucketTwo.PutString("position", "Test"); - valuesBucketTwo.PutInt("favorite", 1); - valuesBucketTwo.PutString("phonetic_name", "xiaohei||xh"); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + valuesBucketTwo.Put("display_name", "xiaobai"); + valuesBucketTwo.Put("company", "tiantianxiangshang"); + valuesBucketTwo.Put("position", "Test"); + valuesBucketTwo.Put("favorite", 1); + valuesBucketTwo.Put("phonetic_name", "xiaohei||xh"); int64_t rawContactIdTwo = RawContactInsertValues(valuesBucketTwo); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketThr; - valuesBucketThr.PutString("display_name", "xiaocai"); - valuesBucketThr.PutString("company", "tiantianxiangshang"); - valuesBucketThr.PutString("position", "Test"); - valuesBucketThr.PutInt("favorite", 1); - valuesBucketThr.PutString("phonetic_name", "xiaohei||xh"); + OHOS::DataShare::DataShareValuesBucket valuesBucketThr; + valuesBucketThr.Put("display_name", "xiaocai"); + valuesBucketThr.Put("company", "tiantianxiangshang"); + valuesBucketThr.Put("position", "Test"); + valuesBucketThr.Put("favorite", 1); + valuesBucketThr.Put("phonetic_name", "xiaohei||xh"); int64_t rawContactIdThr = RawContactInsertValues(valuesBucketThr); EXPECT_GT(rawContactIdThr, 0); @@ -2073,15 +2066,15 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_3900, testing::ext::TestSize.Lev columns.push_back("position"); columns.push_back("favorite"); columns.push_back("phonetic_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdThr)); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); - std::vector listValue; + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::vector listValue; listValue.push_back(valuesBucketOne); listValue.push_back(valuesBucketTwo); listValue.push_back(valuesBucketThr); @@ -2101,12 +2094,12 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4000, testing::ext::TestSize.Lev { HILOG_INFO("--- contact_Query_test_4000 is starting! ---"); std::string tag("contact_Query_test_4000"); - OHOS::NativeRdb::ValuesBucket valuesBucketOne; - valuesBucketOne.PutString("display_name", "xiaohsaaei"); - valuesBucketOne.PutString("company", "tiantianxiadsjjnngshang"); - valuesBucketOne.PutString("position", "Tests"); - valuesBucketOne.PutInt("favorite", 1); - valuesBucketOne.PutString("phonetic_name", "xiaohssei||x00h"); + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; + valuesBucketOne.Put("display_name", "xiaohsaaei"); + valuesBucketOne.Put("company", "tiantianxiadsjjnngshang"); + valuesBucketOne.Put("position", "Tests"); + valuesBucketOne.Put("favorite", 1); + valuesBucketOne.Put("phonetic_name", "xiaohssei||x00h"); RawContactInsertValues(valuesBucketOne); RawContactInsertValues(valuesBucketOne); std::vector columns; @@ -2114,11 +2107,11 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4000, testing::ext::TestSize.Lev columns.push_back("display_name"); columns.push_back("company"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.EqualTo("is_deleted", "0"); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); // resultSet count int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -2142,20 +2135,20 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4100, testing::ext::TestSize.Lev std::vector columns; std::string contactData = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawContactValues; - rawContactValues.PutString("favorite", "1"); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawContactValues; + rawContactValues.Put("favorite", "1"); int64_t rawContactId = RawContactInsert("feimaomao4100", rawContactValues); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); // type 6 is name - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(ContactDataId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); CheckResultSet(valuesBucket, resultSet, "contact_Query_test_4100"); // resultSet count 1 int rowCount = -1; @@ -2177,14 +2170,14 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4200, testing::ext::TestSize.Lev { HILOG_INFO("--- contact_Query_test_4200 is starting! ---"); std::string tag("contact_Query_test_4200"); - OHOS::NativeRdb::ValuesBucket valuesBucketGroup; + OHOS::DataShare::DataShareValuesBucket valuesBucketGroup; int64_t groupId = GroupsInsert("dongshihui", valuesBucketGroup); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::ValuesBucket rawContactValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawContactValuesBucket; int64_t rawContactId = RawContactInsert("licheng", rawContactValuesBucket); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketOne; + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; int64_t contactDataId = ContactDataInsert(rawContactId, "group_membership", std::to_string(groupId), "", valuesBucketOne); EXPECT_GT(contactDataId, 0); @@ -2192,23 +2185,23 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4200, testing::ext::TestSize.Lev rawContactValuesBucket.Clear(); rawContactId = RawContactInsert("xiaoyuan", rawContactValuesBucket); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; contactDataId = ContactDataInsert(rawContactId, "group_membership", std::to_string(groupId), "", valuesBucketTwo); EXPECT_GT(contactDataId, 0); std::vector columns; columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("detail_info", std::to_string(groupId)); predicates.And(); // type_id 9 is group_membership predicates.EqualTo("type_id", "9"); std::string contactData = ContactTabName::CONTACT_DATA; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector listValue; + std::vector listValue; listValue.push_back(valuesBucketOne); listValue.push_back(valuesBucketTwo); CheckResultSetList(listValue, resultSet, "contact_Query_test_4200"); @@ -2226,12 +2219,12 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4200, testing::ext::TestSize.Lev HWTEST_F(ContactAbilityTest, contact_Query_test_4300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Query_test_4300 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("display_name", "xiaoyuan"); - valuesBucket.PutString("company", "tiantianxiangshang"); - valuesBucket.PutString("position", "Test"); - valuesBucket.PutInt("favorite", 1); - valuesBucket.PutString("phonetic_name", "xiaoyuanxy"); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + valuesBucket.Put("display_name", "xiaoyuan"); + valuesBucket.Put("company", "tiantianxiangshang"); + valuesBucket.Put("position", "Test"); + valuesBucket.Put("favorite", 1); + valuesBucket.Put("phonetic_name", "xiaoyuanxy"); int64_t rawContactId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawContactId, 0); @@ -2240,7 +2233,7 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4300, testing::ext::TestSize.Lev columns.push_back("display_name"); columns.push_back("company"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("favorite", "1"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -2248,7 +2241,7 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4300, testing::ext::TestSize.Lev predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -2268,7 +2261,7 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4300, testing::ext::TestSize.Lev HWTEST_F(ContactAbilityTest, contact_Query_test_4400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Query_test_4400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawContactValuesBucket; int64_t rawContactId = RawContactLastContactedInsert("wangwu", 60, rawContactValuesBucket); EXPECT_GT(rawContactId, 0); @@ -2276,12 +2269,12 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4400, testing::ext::TestSize.Lev columns.push_back("id"); columns.push_back("display_name"); columns.push_back("lastest_contacted_time"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("lastest_contacted_time", "60"); predicates.And(); predicates.EqualTo("is_deleted", "0"); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -2301,11 +2294,11 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4400, testing::ext::TestSize.Lev HWTEST_F(ContactAbilityTest, contact_Query_test_4500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Query_test_4500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaobai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int deleteCode = ContactDelete(rawContacts, predicates); @@ -2314,11 +2307,11 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4500, testing::ext::TestSize.Lev sleep(SLEEP_TIME); std::vector columns; columns.push_back("display_name"); - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string deletedRawContact = ContactTabName::DELETED_RAW_CONTACT; - std::shared_ptr resultSet = - ContactQuery(deletedRawContact, columns, predicates); + std::shared_ptr resultSet = + ContactQuery(deletedRawContact, columns, predicates2); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -2339,34 +2332,34 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4600, testing::ext::TestSize.Lev { HILOG_INFO("--- contact_Query_test_4600 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = ContactDelete(contactData, predicates); EXPECT_EQ(deleteCode, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("dongming", rawContactValues); EXPECT_GT(rawContactIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; int64_t contactDataId = ContactDataInsert(rawContactIdOne, "phone", "155825478", "", contactDataValues); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::ValuesBucket rawContactValuesTwo; + OHOS::DataShare::DataShareValuesBucket rawContactValuesTwo; int64_t rawContactIdTwo = RawContactInsert("xiaocai", rawContactValuesTwo); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactDataValuesTwo; contactDataId = ContactDataInsert(rawContactIdTwo, "phone", "18853269857", "", contactDataValuesTwo); EXPECT_GT(contactDataId, 0); std::vector columns; columns.push_back("detail_info"); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; // type_id 5 is phone - predicates.EqualTo("type_id", "5"); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - std::vector listValue; + predicates2.EqualTo("type_id", "5"); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates2); + std::vector listValue; listValue.push_back(contactDataValues); listValue.push_back(contactDataValuesTwo); CheckResultSetList(listValue, resultSet, "contact_Query_test_4600"); @@ -2385,12 +2378,12 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4700, testing::ext::TestSize.Lev { HILOG_INFO("--- contact_Query_test_4700 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = ContactDelete(contactData, predicates); EXPECT_EQ(deleteCode, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("dongming", rawContactValues); EXPECT_GT(rawContactIdOne, 0); rawContactValues.Clear(); @@ -2398,21 +2391,21 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4700, testing::ext::TestSize.Lev int64_t rawContactIdTwo = RawContactInsert("xiaocai", rawContactValues); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactValues; + OHOS::DataShare::DataShareValuesBucket contactValues; int64_t contactDataId = ContactDataInsert(rawContactIdOne, "email", "166@163.com", "", contactValues); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::ValuesBucket contactValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactValuesTwo; contactDataId = ContactDataInsert(rawContactIdTwo, "email", "199@163.com", "", contactValuesTwo); EXPECT_GT(contactDataId, 0); std::vector columns; columns.push_back("detail_info"); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; // type_id 1 is email - predicates.EqualTo("type_id", "1"); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - std::vector listValue; + predicates2.EqualTo("type_id", "1"); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates2); + std::vector listValue; listValue.push_back(contactValues); listValue.push_back(contactValuesTwo); CheckResultSetList(listValue, resultSet, "contact_Query_test_4700"); @@ -2432,26 +2425,26 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4800, testing::ext::TestSize.Lev HILOG_INFO("--- contact_Query_test_4800 is starting! ---"); std::string tag("contact_Query_test_4800"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("BossCai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactValues; + OHOS::DataShare::DataShareValuesBucket contactValues; int64_t contactDataId = ContactDataInsert(rawContactId, "name", "BossCai", "", contactValues); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::ValuesBucket contactValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactValuesTwo; contactDataId = ContactDataInsert(rawContactId, "organization", "happy500", "Test", contactValuesTwo); EXPECT_GT(contactDataId, 0); std::vector columns; columns.push_back("detail_info"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string contactData = ContactTabName::CONTACT_DATA; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - std::vector listValue; + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::vector listValue; listValue.push_back(contactValues); listValue.push_back(contactValuesTwo); CheckResultSetList(listValue, resultSet, "contact_Query_test_4800"); @@ -2469,12 +2462,12 @@ HWTEST_F(ContactAbilityTest, contact_Query_test_4800, testing::ext::TestSize.Lev HWTEST_F(ContactAbilityTest, contact_Delete_test_4900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Delete_test_4900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaoli", rawContactValues); - HILOG_INFO("rawContactId= %{public}lld", rawContactId); + HILOG_INFO("rawContactId= %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int deleteCode = ContactDelete(rawContacts, predicates); @@ -2485,15 +2478,15 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_4900, testing::ext::TestSize.Le columns.push_back("raw_contact_id"); columns.push_back("display_name"); std::string deletedRawContact = ContactTabName::DELETED_RAW_CONTACT; - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = - ContactQuery(deletedRawContact, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); + std::shared_ptr resultSet = + ContactQuery(deletedRawContact, columns, predicates2); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); - rawContactValues.PutInt("raw_contact_id", rawContactId); + rawContactValues.Put("raw_contact_id", rawContactId); CheckResultSet(rawContactValues, resultSet, "contact_Delete_test_4900"); ClearContacts(); } @@ -2513,12 +2506,12 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_5000, testing::ext::TestSize.Le std::vector columnsInt; std::vector columnsStr; GetAllRawContactColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawId, 0); // test end delete data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); EXPECT_GT(rawId, 0); std::string rawContacts = ContactTabName::RAW_CONTACT; @@ -2526,8 +2519,8 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_5000, testing::ext::TestSize.Le EXPECT_EQ(deleteCode, 0); std::vector columns; columns.push_back("is_deleted"); - OHOS::NativeRdb::ValuesBucket valuesBucketDelete; - valuesBucketDelete.PutInt("is_deleted", 1); + OHOS::DataShare::DataShareValuesBucket valuesBucketDelete; + valuesBucketDelete.Put("is_deleted", 1); QueryAndExpectResult(rawContacts, predicates, valuesBucketDelete, "contact_Delete_test_5000"); ClearContacts(); } @@ -2543,15 +2536,15 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_5000, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Delete_test_5100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Delete_test_5100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("siyuan", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactValue; + OHOS::DataShare::DataShareValuesBucket contactValue; int64_t contactDataId = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", contactValue); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int deleteCode = ContactDelete(rawContacts, predicates); @@ -2562,15 +2555,15 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_5100, testing::ext::TestSize.Le columns.push_back("raw_contact_id"); columns.push_back("display_name"); std::string deletedRawContact = ContactTabName::DELETED_RAW_CONTACT; - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = - ContactQuery(deletedRawContact, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); + std::shared_ptr resultSet = + ContactQuery(deletedRawContact, columns, predicates2); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); - rawContactValues.PutInt("raw_contact_id", rawContactId); + rawContactValues.Put("raw_contact_id", rawContactId); CheckResultSet(rawContactValues, resultSet, "contact_Delete_test_5100"); ClearContacts(); } @@ -2591,22 +2584,22 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_5200, testing::ext::TestSize.Le std::vector columns; std::string tableName = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("feimaotui", rawContactValues); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); // type id 6 is name - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(ContactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); int deleteCode = ContactDelete(tableName, predicates); EXPECT_EQ(deleteCode, 0); MergeColumns(columns, columnsInt, columnsStr); - std::shared_ptr resultSetDeleteQuery = + std::shared_ptr resultSetDeleteQuery = ContactQuery(tableName, columns, predicates); // resultSet count 0 int rowCount = -1; @@ -2626,11 +2619,11 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_5200, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Delete_test_5300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Delete_test_5300 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaohong", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("name_raw_contact_id", std::to_string(rawContactId)); std::string contact = ContactTabName::CONTACT; int deleteCode = ContactDelete(contact, predicates); @@ -2640,16 +2633,16 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_5300, testing::ext::TestSize.Le std::vector columns; columns.push_back("raw_contact_id"); columns.push_back("display_name"); - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string deletedRawContact = ContactTabName::DELETED_RAW_CONTACT; - std::shared_ptr resultSet = - ContactQuery(deletedRawContact, columns, predicates); + std::shared_ptr resultSet = + ContactQuery(deletedRawContact, columns, predicates2); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); - rawContactValues.PutInt("raw_contact_id", rawContactId); + rawContactValues.Put("raw_contact_id", rawContactId); CheckResultSet(rawContactValues, resultSet, "contact_Delete_test_5300"); ClearContacts(); } @@ -2666,22 +2659,22 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsert_test_5400, testing::ext::TestSi { HILOG_INFO("--- contact_BatchInsert_test_5400 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValuesOne; - rawContactValuesOne.PutString("display_name", std::string("zhangming")); - rawContactValuesOne.PutString("company", std::string("tiantainxiangzuo4200000000")); - rawContactValuesOne.PutString("position", std::string("Test")); + OHOS::DataShare::DataShareValuesBucket rawContactValuesOne; + rawContactValuesOne.Put("display_name", std::string("zhangming")); + rawContactValuesOne.Put("company", std::string("tiantainxiangzuo4200000000")); + rawContactValuesOne.Put("position", std::string("Test")); - OHOS::NativeRdb::ValuesBucket rawContactValuesTwo; - rawContactValuesTwo.PutString("display_name", std::string("ligang")); - rawContactValuesTwo.PutString("company", std::string("tiantainxiangzuo4200000000")); - rawContactValuesTwo.PutString("position", std::string("Developer")); + OHOS::DataShare::DataShareValuesBucket rawContactValuesTwo; + rawContactValuesTwo.Put("display_name", std::string("ligang")); + rawContactValuesTwo.Put("company", std::string("tiantainxiangzuo4200000000")); + rawContactValuesTwo.Put("position", std::string("Developer")); - OHOS::NativeRdb::ValuesBucket rawContactValuesThree; - rawContactValuesThree.PutString("display_name", std::string("wanghong")); - rawContactValuesThree.PutString("company", std::string("tiantainxiangzuo4200000000")); - rawContactValuesThree.PutString("position", std::string("manage")); + OHOS::DataShare::DataShareValuesBucket rawContactValuesThree; + rawContactValuesThree.Put("display_name", std::string("wanghong")); + rawContactValuesThree.Put("company", std::string("tiantainxiangzuo4200000000")); + rawContactValuesThree.Put("position", std::string("manage")); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(rawContactValuesOne); listAddBluk.push_back(rawContactValuesTwo); listAddBluk.push_back(rawContactValuesThree); @@ -2690,13 +2683,13 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsert_test_5400, testing::ext::TestSi EXPECT_EQ(batchInserCode, 0); std::string rawContacts = ContactTabName::RAW_CONTACT; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("company", "tiantainxiangzuo4200000000"); predicates.And(); predicates.EqualTo("is_deleted", "0"); predicates.OrderByAsc("id"); std::vector columns; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); int rowCount = 0; int queryCount = 3; resultSet->GetRowCount(rowCount); @@ -2719,34 +2712,34 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsert_test_5500, testing::ext::TestSi OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket rawContactValues; - rawContactValues.PutString("display_name", "zhangming"); + OHOS::DataShare::DataShareValuesBucket rawContactValues; + rawContactValues.Put("display_name", "zhangming"); int64_t rawContactId = contactsDataAbility.Insert(uriRawContact, rawContactValues); EXPECT_GT(rawContactId, 0); - std::vector listAddBluk = GetBatchList(rawContactId); + std::vector listAddBluk = GetBatchList(rawContactId); int batchInserCode = contactsDataAbility.BatchInsert(uriContactData, listAddBluk); EXPECT_EQ(batchInserCode, 0); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; // type_id 1 is email predicates.EqualTo("type_id", "1"); predicates.And(); predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::vector columns; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); int indexTwo = 2; CheckResultSet(listAddBluk[indexTwo], resultSet, "contact_BatchInsert_test_5500"); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; // type 5 is phone - predicates.EqualTo("type_id", "5"); - predicates.And(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSetFour = ContactQuery(contactData, columns, predicates); + predicates2.EqualTo("type_id", "5"); + predicates2.And(); + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); + std::shared_ptr resultSetFour = ContactQuery(contactData, columns, predicates2); int rowCountFour = 0; resultSetFour->GetRowCount(rowCountFour); EXPECT_EQ(1, rowCountFour); @@ -2755,26 +2748,26 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsert_test_5500, testing::ext::TestSi ClearContacts(); } -std::vector ContactAbilityTest::GetBatchList(int64_t rawContactId) +std::vector ContactAbilityTest::GetBatchList(int64_t rawContactId) { - OHOS::NativeRdb::ValuesBucket contactDataValuesOne; - contactDataValuesOne.PutInt("raw_contact_id", rawContactId); - contactDataValuesOne.PutString("content_type", "name"); - contactDataValuesOne.PutString("detail_info", "zhangming"); - OHOS::NativeRdb::ValuesBucket contactDataValuesTwo; - contactDataValuesTwo.PutInt("raw_contact_id", rawContactId); - contactDataValuesTwo.PutString("content_type", "organization"); - contactDataValuesTwo.PutString("detail_info", "tiantianxaingshang"); - contactDataValuesTwo.PutString("position", "Test"); - OHOS::NativeRdb::ValuesBucket contactDataValuesThree; - contactDataValuesThree.PutInt("raw_contact_id", rawContactId); - contactDataValuesThree.PutString("content_type", "email"); - contactDataValuesThree.PutString("detail_info", "199632@163.com"); - OHOS::NativeRdb::ValuesBucket contactDataValuesFour; - contactDataValuesFour.PutInt("raw_contact_id", rawContactId); - contactDataValuesFour.PutString("content_type", "phone"); - contactDataValuesFour.PutString("detail_info", "1234567898"); - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket contactDataValuesOne; + contactDataValuesOne.Put("raw_contact_id", rawContactId); + contactDataValuesOne.Put("content_type", "name"); + contactDataValuesOne.Put("detail_info", "zhangming"); + OHOS::DataShare::DataShareValuesBucket contactDataValuesTwo; + contactDataValuesTwo.Put("raw_contact_id", rawContactId); + contactDataValuesTwo.Put("content_type", "organization"); + contactDataValuesTwo.Put("detail_info", "tiantianxaingshang"); + contactDataValuesTwo.Put("position", "Test"); + OHOS::DataShare::DataShareValuesBucket contactDataValuesThree; + contactDataValuesThree.Put("raw_contact_id", rawContactId); + contactDataValuesThree.Put("content_type", "email"); + contactDataValuesThree.Put("detail_info", "199632@163.com"); + OHOS::DataShare::DataShareValuesBucket contactDataValuesFour; + contactDataValuesFour.Put("raw_contact_id", rawContactId); + contactDataValuesFour.Put("content_type", "phone"); + contactDataValuesFour.Put("detail_info", "1234567898"); + std::vector listAddBluk; listAddBluk.push_back(contactDataValuesOne); listAddBluk.push_back(contactDataValuesTwo); listAddBluk.push_back(contactDataValuesThree); @@ -2796,34 +2789,34 @@ HWTEST_F(ContactAbilityTest, contact_Delete_test_5600, testing::ext::TestSize.Le int time = 10000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactIdOne = RawContactInsert("update_detail_contactdata", rawValuesBucket); EXPECT_GT(rawContactIdOne, 0); int64_t rawContactIdTwo = RawContactInsert("update_contactdata", rawValuesBucket); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr executePredicates = - std::make_shared(predicates); + std::shared_ptr executePredicates = + std::make_shared(predicates); std::shared_ptr uri = std::make_shared(ContactsUri::RAW_CONTACT); - std::shared_ptr operation = - OHOS::AppExecFwk::DataAbilityOperation::NewDeleteBuilder(uri) + std::shared_ptr operation = + OHOS::DataShare::DataShareOperation::NewDeleteBuilder(uri) ->WithPredicatesBackReference(0, 0) ->WithPredicates(executePredicates) ->WithInterruptionAllowed(true) ->Build(); - std::vector> executeBatchOperations; + std::vector> executeBatchOperations; executeBatchOperations.push_back(operation); InitAbility(); - std::vector> dataAbilityResult = + std::vector> dataShareResult = contactsDataAbility.ExecuteBatch(executeBatchOperations); - EXPECT_EQ(0, dataAbilityResult[0]->GetCount()); + EXPECT_EQ(0, dataShareResult[0]->GetCount()); std::string tableName = ContactTabName::CONTACT_DATA; std::vector columnQuery; columnQuery.push_back("detail_info"); predicates.EqualTo("is_deleted", "0"); - std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -2843,26 +2836,26 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_5700, testing::ext::TestSize.Le HILOG_INFO("--- contact_Update_test_5700 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValuesOne; - rawContactValuesOne.PutString("display_name", "zhangmingming"); - rawContactValuesOne.PutInt("favorite", 1); - OHOS::NativeRdb::ValuesBucket rawContactValuesTwo; - rawContactValuesTwo.PutString("display_name", "yuanmoumou"); - rawContactValuesTwo.PutInt("favorite", 1); - OHOS::NativeRdb::ValuesBucket rawContactValuesThree; - rawContactValuesThree.PutString("display_name", "xiaofenren"); - rawContactValuesThree.PutInt("favorite", 1); + OHOS::DataShare::DataShareValuesBucket rawContactValuesOne; + rawContactValuesOne.Put("display_name", "zhangmingming"); + rawContactValuesOne.Put("favorite", 1); + OHOS::DataShare::DataShareValuesBucket rawContactValuesTwo; + rawContactValuesTwo.Put("display_name", "yuanmoumou"); + rawContactValuesTwo.Put("favorite", 1); + OHOS::DataShare::DataShareValuesBucket rawContactValuesThree; + rawContactValuesThree.Put("display_name", "xiaofenren"); + rawContactValuesThree.Put("favorite", 1); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(rawContactValuesOne); listAddBluk.push_back(rawContactValuesTwo); listAddBluk.push_back(rawContactValuesThree); int batchInserCode = contactsDataAbility.BatchInsert(uriRawContact, listAddBluk); HILOG_INFO("contact_Update_test_5700 : batchInserCode = %{public}d", batchInserCode); EXPECT_EQ(batchInserCode, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("display_name", "zhangmingming"); predicates.Or(); predicates.EqualTo("display_name", "yuanmoumou"); @@ -2871,13 +2864,13 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_5700, testing::ext::TestSize.Le HILOG_INFO("contact_Update_test_5700: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - predicates.Clear(); - predicates.EqualTo("display_name", "zhangmingming"); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contact_Update_test_5700"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("display_name", "zhangmingming"); + QueryAndExpectResult(rawContacts, predicates2, updateValues, "contact_Update_test_5700"); - predicates.Clear(); - predicates.EqualTo("display_name", "xiaofenren"); - QueryAndExpectResult(rawContacts, predicates, rawContactValuesThree, "contact_Update_test_5700"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("display_name", "xiaofenren"); + QueryAndExpectResult(rawContacts, predicates3, rawContactValuesThree, "contact_Update_test_5700"); ClearContacts(); } @@ -2892,42 +2885,42 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_5700, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Update_test_5800, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Update_test_5800 is starting!---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactIdOne = RawContactInsert("update_detail_contactdata", rawValuesBucket); EXPECT_GT(rawContactIdOne, 0); int64_t rawContactIdTwo = RawContactInsert("update_contactdata", rawValuesBucket); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); - std::shared_ptr values = - std::make_shared(rawValuesBucket); - std::shared_ptr executePredicates = - std::make_shared(predicates); + std::shared_ptr values = + std::make_shared(rawValuesBucket); + std::shared_ptr executePredicates = + std::make_shared(predicates); std::shared_ptr uri = std::make_shared(ContactsUri::RAW_CONTACT); - std::shared_ptr operation = - OHOS::AppExecFwk::DataAbilityOperation::NewUpdateBuilder(uri) + std::shared_ptr operation = + OHOS::DataShare::DataShareOperation::NewUpdateBuilder(uri) ->WithValuesBucket(values) ->WithPredicatesBackReference(0, 0) ->WithPredicates(executePredicates) ->WithInterruptionAllowed(true) ->Build(); - std::vector> executeBatchOperations; + std::vector> executeBatchOperations; executeBatchOperations.push_back(operation); InitAbility(); - std::vector> dataAbilityResult = + std::vector> dataShareResult = contactsDataAbility.ExecuteBatch(executeBatchOperations); - EXPECT_EQ(0, dataAbilityResult[0]->GetCount()); + EXPECT_EQ(0, dataShareResult[0]->GetCount()); std::string tableName = ContactTabName::RAW_CONTACT; std::vector columnQuery; columnQuery.push_back("display_name"); - std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector listValue; + std::vector listValue; listValue.push_back(rawValuesBucket); listValue.push_back(rawValuesBucket); CheckResultSetList(listValue, resultSet, "contact_Update_test_5800"); @@ -2946,22 +2939,23 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsertAndDelete_test_5900, testing::ex { HILOG_INFO("--- contact_BatchInsertAndDelete_test_5900 is starting! ---"); OHOS::Uri uriContactBlocklist(ContactsUri::BLOCKLIST); - OHOS::NativeRdb::ValuesBucket contactBlocklistValuesOne; - string phoneNumber = random_number_utils.Generating(9); - contactBlocklistValuesOne.PutString("phone_number", phoneNumber); - OHOS::NativeRdb::ValuesBucket contactBlocklistValuesTwo; - contactBlocklistValuesTwo.PutString("phone_number", phoneNumber); - OHOS::NativeRdb::ValuesBucket contactBlocklistValuesThree; - contactBlocklistValuesThree.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket contactBlocklistValuesOne; + OHOS::Contacts::RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(9); + contactBlocklistValuesOne.Put("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket contactBlocklistValuesTwo; + contactBlocklistValuesTwo.Put("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket contactBlocklistValuesThree; + contactBlocklistValuesThree.Put("phone_number", phoneNumber); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(contactBlocklistValuesOne); listAddBluk.push_back(contactBlocklistValuesTwo); listAddBluk.push_back(contactBlocklistValuesThree); int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlocklist, listAddBluk); EXPECT_EQ(batchInsertCode, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("phone_number", std::string(phoneNumber)); predicates.Or(); predicates.EqualTo("phone_number", std::string(phoneNumber)); @@ -2969,7 +2963,7 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsertAndDelete_test_5900, testing::ex int deleteCode = ContactDelete(contactBlocklist, predicates); EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(contactBlocklist, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -2988,7 +2982,7 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsertAndDelete_test_5900, testing::ex HWTEST_F(ContactAbilityTest, contact_BatchInsertAndDelete_test_6000, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_BatchInsertAndDelete_test_6000 is staring! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroup; + OHOS::DataShare::DataShareValuesBucket valuesGroup; int64_t groupIdOne = GroupsInsert("TestFourth", valuesGroup); EXPECT_GT(groupIdOne, 0); @@ -2997,27 +2991,27 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsertAndDelete_test_6000, testing::ex EXPECT_GT(groupIdTwo, 0); valuesGroup.Clear(); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaocheng", rawContactValues); EXPECT_GT(rawContactId, 0); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket contactDataValuesOne; - contactDataValuesOne.PutInt("raw_contact_id", rawContactId); - contactDataValuesOne.PutString("content_type", std::string("group_membership")); - contactDataValuesOne.PutString("detail_info", std::to_string(groupIdOne)); - OHOS::NativeRdb::ValuesBucket contactDataValuesTwo; - contactDataValuesTwo.PutInt("raw_contact_id", rawContactId); - contactDataValuesTwo.PutString("content_type", std::string("group_membership")); - contactDataValuesTwo.PutString("detail_info", std::to_string(groupIdTwo)); + OHOS::DataShare::DataShareValuesBucket contactDataValuesOne; + contactDataValuesOne.Put("raw_contact_id", rawContactId); + contactDataValuesOne.Put("content_type", std::string("group_membership")); + contactDataValuesOne.Put("detail_info", std::to_string(groupIdOne)); + OHOS::DataShare::DataShareValuesBucket contactDataValuesTwo; + contactDataValuesTwo.Put("raw_contact_id", rawContactId); + contactDataValuesTwo.Put("content_type", std::string("group_membership")); + contactDataValuesTwo.Put("detail_info", std::to_string(groupIdTwo)); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(contactDataValuesOne); listAddBluk.push_back(contactDataValuesTwo); int batchInserCode = contactsDataAbility.BatchInsert(uriContactData, listAddBluk); EXPECT_EQ(batchInserCode, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); predicates.And(); predicates.EqualTo("detail_info", std::to_string(groupIdOne)); @@ -3026,7 +3020,7 @@ HWTEST_F(ContactAbilityTest, contact_BatchInsertAndDelete_test_6000, testing::ex EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -3048,14 +3042,14 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_Insert_test_6100, testing::ext::Te OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); OHOS::Uri errorUri(ContactsUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket rawContactValues; - rawContactValues.PutString("display_names", "liming"); + OHOS::DataShare::DataShareValuesBucket rawContactValues; + rawContactValues.Put("display_names", "liming"); int64_t rawontactId = contactsDataAbility.Insert(uriRawContact, rawContactValues); - HILOG_INFO("abnormal_contact_Insert_test_6100 : rawontactId = %{public}lld", rawontactId); + HILOG_INFO("abnormal_contact_Insert_test_6100 : rawontactId = %{public}ld", rawontactId); EXPECT_EQ(rawontactId, -1); rawContactValues.Clear(); - rawContactValues.PutString("display_name", "liming"); + rawContactValues.Put("display_name", "liming"); rawontactId = contactsDataAbility.Insert(errorUri, rawContactValues); EXPECT_EQ(rawontactId, -1); ClearContacts(); @@ -3077,17 +3071,17 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_Insert_test_6200, testing::ext::Te std::vector columns; std::string contactData = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactId = RawContactInsert("lock_type_id", rawValuesBucket); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_EQ(ContactDataId, -1); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); // resultSet count 0 int rowCount = -1; @@ -3114,17 +3108,17 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_Insert_test_6300, testing::ext::Te std::vector columns; std::string contactData = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactId = RawContactInsert("lock_raw_contact_id", rawValuesBucket); - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_EQ(ContactDataId, -1); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); // resultSet count 0 int rowCount = -1; @@ -3146,14 +3140,14 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_Update_test_6400, testing::ext::Te { HILOG_INFO("--- abnormal_contact_Update_test_6400 is starting! ---"); OHOS::Uri errorUri(ContactsUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("zhangming", rawContactValues); - HILOG_INFO("abnormal_contact_Update_test_6400 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("abnormal_contact_Update_test_6400 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("display_names", "dongming"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("display_names", "dongming"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -3162,17 +3156,17 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_Update_test_6400, testing::ext::Te QueryAndExpectResult(rawContacts, predicates, rawContactValues, "abnormal_contact_Update_test_6400"); updateValues.Clear(); - updateValues.PutString("display_name", "dongming"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactId)); - updateCode = contactsDataAbility.Update(errorUri, updateValues, predicates); + updateValues.Put("display_name", "dongming"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactId)); + updateCode = contactsDataAbility.Update(errorUri, predicates2, updateValues); HILOG_INFO("abnormal_contact_Update_test_6400: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, -1); - QueryAndExpectResult(rawContacts, predicates, rawContactValues, "abnormal_contact_Update_test_6400"); + QueryAndExpectResult(rawContacts, predicates2, rawContactValues, "abnormal_contact_Update_test_6400"); - predicates.Clear(); - predicates.EqualTo("id", "100000"); - updateCode = ContactUpdate(rawContacts, updateValues, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", "100000"); + updateCode = ContactUpdate(rawContacts, updateValues, predicates3); HILOG_INFO("abnormal_contact_Update_test_6400: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); ClearContacts(); @@ -3189,16 +3183,16 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_Update_test_6400, testing::ext::Te HWTEST_F(ContactAbilityTest, abnormal_contact_Query_test_6500, testing::ext::TestSize.Level1) { HILOG_INFO("--- abnormal_contact_Query_test_6500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("dongming", rawContactValues); EXPECT_GT(rawContactId, 0); std::vector columns; columns.push_back("display_names"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); int rowCount = -2; resultSet->GetRowCount(rowCount); @@ -3224,10 +3218,10 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_Query_test_6600, testing::ext::Tes std::vector columns; columns.push_back("id"); columns.push_back("display_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = - contactsDataAbility.Query(errorUri, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(errorUri, predicates, columns); EXPECT_EQ(resultSet, nullptr); ClearContacts(); } @@ -3244,45 +3238,45 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_Delete_test_6700, testing::ext::Te { HILOG_INFO("-------abnormal_contact_Delete_test_6700 is starting!-------"); OHOS::Uri errorUri(ContactsUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("zhangming", values); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int deleteCode = ContactDelete(rawContacts, predicates); EXPECT_EQ(deleteCode, -1); - OHOS::NativeRdb::DataAbilityPredicates predicatesQuery; + OHOS::DataShare::DataSharePredicates predicatesQuery; predicatesQuery.EqualTo("id", std::to_string(rawContactId)); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicatesQuery); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); resultSet->Close(); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactId)); - deleteCode = contactsDataAbility.Delete(errorUri, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactId)); + deleteCode = contactsDataAbility.Delete(errorUri, predicates2); EXPECT_EQ(deleteCode, -1); - std::shared_ptr resultSetUri = + std::shared_ptr resultSetUri = ContactQuery(rawContacts, columns, predicatesQuery); int rowCountUri = 0; resultSetUri->GetRowCount(rowCountUri); EXPECT_EQ(1, rowCountUri); resultSetUri->Close(); - predicates.Clear(); - predicates.EqualTo("id", "10000000"); - deleteCode = ContactDelete(rawContacts, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", "10000000"); + deleteCode = ContactDelete(rawContacts, predicates3); EXPECT_EQ(deleteCode, -1); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactId)); - std::shared_ptr resultSetId = + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(rawContactId)); + std::shared_ptr resultSetId = ContactQuery(rawContacts, columns, predicatesQuery); int rowCountId = 0; resultSetId->GetRowCount(rowCountId); @@ -3303,8 +3297,8 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_BatchInsert_test_6800, testing::ex { HILOG_INFO("--- abnormal_contact_BatchInsert_test_6800 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValues; - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket rawContactValues; + std::vector listAddBluk; int batchInserCode = 0; for (int i = 0; i < 10; i++) { listAddBluk.clear(); @@ -3313,9 +3307,9 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_BatchInsert_test_6800, testing::ex std::string name("zhangming"); name.append(std::to_string(j)); if (j == 14 || j == 27 || j == 57) { - rawContactValues.PutString("display_names", name); + rawContactValues.Put("display_names", name); } else { - rawContactValues.PutString("display_name", name); + rawContactValues.Put("display_name", name); } listAddBluk.push_back(rawContactValues); } @@ -3328,7 +3322,7 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_BatchInsert_test_6800, testing::ex EXPECT_EQ(batchInserCode, -1); } } - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.NotEqualTo("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -3336,10 +3330,10 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_BatchInsert_test_6800, testing::ex int time = 20000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ContactsUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } /* @@ -3354,16 +3348,16 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_BatchInsert_test_6900, testing::ex { HILOG_INFO("--- abnormal_contact_BatchInsert_test_6900 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValues; - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket rawContactValues; + std::vector listAddBluk; for (int i = 0; i < 1000; i++) { rawContactValues.Clear(); std::string name("xiaoyuan"); name.append(std::to_string(i)); if (i == 500) { - rawContactValues.PutString("display_names", name); + rawContactValues.Put("display_names", name); } else { - rawContactValues.PutString("display_name", name); + rawContactValues.Put("display_name", name); } listAddBluk.push_back(rawContactValues); } @@ -3375,7 +3369,7 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_BatchInsert_test_6900, testing::ex HILOG_INFO("abnormal_contact_BatchInsert_test_6900 batch insert fail!"); EXPECT_EQ(batchInserCode, -1); } - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.NotEqualTo("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -3383,10 +3377,10 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_BatchInsert_test_6900, testing::ex int time = 20000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ContactsUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } /* @@ -3400,15 +3394,15 @@ HWTEST_F(ContactAbilityTest, abnormal_contact_BatchInsert_test_6900, testing::ex HWTEST_F(ContactAbilityTest, contact_async_insert_test_7000, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_async_insert_test_7000 is staring! ---"); - std::map result; + std::map result; std::vector contactAsyncVector; int threadNum = 6; for (int i = 0; i < threadNum; ++i) { - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::string name; name.append("asyncTest"); name.append(std::to_string(i)); - values.PutString("display_name", name); + values.Put("display_name", name); ContactAsync *contactAsync = new ContactAsync(values, result); std::thread asyncThread(&ContactAsync::Insert, contactAsync); contactAsyncVector.push_back(contactAsync); @@ -3418,11 +3412,11 @@ HWTEST_F(ContactAbilityTest, contact_async_insert_test_7000, testing::ext::TestS std::this_thread::sleep_for(dura); std::vector columns; columns.push_back("display_name"); - std::map::iterator it; + std::map::iterator it; for (it = result.begin(); it != result.end(); it++) { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(it->first)); - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(ContactTabName::RAW_CONTACT, columns, predicates); CheckResultSet(it->second, resultSet, "contact_async_insert_test_7000"); } @@ -3443,7 +3437,7 @@ HWTEST_F(ContactAbilityTest, contact_async_insert_test_7000, testing::ext::TestS HWTEST_F(ContactAbilityTest, contact_async_update_test_7100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_async_update_test_7100 is staring! ---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; std::vector rawContactId; rawContactId.push_back(RawContactInsert("async_update1", rawValuesBucket)); rawValuesBucket.Clear(); @@ -3457,15 +3451,15 @@ HWTEST_F(ContactAbilityTest, contact_async_update_test_7100, testing::ext::TestS rawValuesBucket.Clear(); rawContactId.push_back(RawContactInsert("async_update6", rawValuesBucket)); rawValuesBucket.Clear(); - std::vector upDateValues; - OHOS::NativeRdb::DataAbilityPredicates queryPredicates; + std::vector upDateValues; + OHOS::DataShare::DataSharePredicates queryPredicates; std::vector contactAsyncVector; int size = rawContactId.size(); for (int i = 0; i < size; ++i) { - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::string name; name.append("asyncTest"); - values.PutString("display_name", name); + values.Put("display_name", name); upDateValues.push_back(values); int id = rawContactId[i]; ContactAsync *contactAsync = new ContactAsync(values, id); @@ -3481,7 +3475,7 @@ HWTEST_F(ContactAbilityTest, contact_async_update_test_7100, testing::ext::TestS std::this_thread::sleep_for(dura); std::vector columns; columns.push_back("display_name"); - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(ContactTabName::RAW_CONTACT, columns, queryPredicates); CheckResultSetList(upDateValues, resultSet, "contact_async_update_test_7100"); for (int i = 0; i < size; ++i) { @@ -3501,7 +3495,7 @@ HWTEST_F(ContactAbilityTest, contact_async_update_test_7100, testing::ext::TestS HWTEST_F(ContactAbilityTest, contact_async_query_test_7200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_async_query_test_7200 is staring! ---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; std::vector rawContactId; rawContactId.push_back(RawContactInsert("async_query1", rawValuesBucket)); rawValuesBucket.Clear(); @@ -3516,7 +3510,7 @@ HWTEST_F(ContactAbilityTest, contact_async_query_test_7200, testing::ext::TestSi rawContactId.push_back(RawContactInsert("async_query6", rawValuesBucket)); rawValuesBucket.Clear(); std::vector contactAsyncVector; - std::vector> resultSetVector; + std::vector> resultSetVector; int threadNum = 6; for (int i = 0; i < threadNum; ++i) { ContactAsync *contactAsync = new ContactAsync(resultSetVector, rawContactId); @@ -3549,7 +3543,7 @@ HWTEST_F(ContactAbilityTest, contact_async_query_test_7200, testing::ext::TestSi HWTEST_F(ContactAbilityTest, contact_async_delete_test_7300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_async_delete_test_7300 is staring! ---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; std::vector rawContactId; rawContactId.push_back(RawContactInsert("async_update1", rawValuesBucket)); rawValuesBucket.Clear(); @@ -3564,7 +3558,7 @@ HWTEST_F(ContactAbilityTest, contact_async_delete_test_7300, testing::ext::TestS rawContactId.push_back(RawContactInsert("async_update6", rawValuesBucket)); rawValuesBucket.Clear(); int size = rawContactId.size(); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.BeginWrap(); std::vector contactAsyncVector; for (int i = 0; i < size; ++i) { @@ -3584,7 +3578,7 @@ HWTEST_F(ContactAbilityTest, contact_async_delete_test_7300, testing::ext::TestS std::chrono::milliseconds dura(Time::ASYNC_SLEEP_TIME); std::this_thread::sleep_for(dura); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(ContactTabName::RAW_CONTACT, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -3607,16 +3601,16 @@ HWTEST_F(ContactAbilityTest, contact_async_delete_test_7300, testing::ext::TestS HWTEST_F(ContactAbilityTest, contact_Insert_test_7400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Insert_test_7400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int size = 20000; std::string name; for (int i = 0; i < size; ++i) { name.append("l"); } int64_t rawContactId = RawContactInsert(name, values); - HILOG_INFO("contact_Insert_test_7400 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contact_Insert_test_7400 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; QueryAndExpectResult(rawContacts, predicates, values, "contact_Insert_test_7400"); @@ -3634,11 +3628,11 @@ HWTEST_F(ContactAbilityTest, contact_Insert_test_7400, testing::ext::TestSize.Le HWTEST_F(ContactAbilityTest, contact_Delete_Recover_test_7500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contact_Delete_Recover_test_7500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaohongDelete", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("name_raw_contact_id", std::to_string(rawContactId)); std::string contact = ContactTabName::CONTACT; int deleteCode = ContactDelete(contact, predicates); @@ -3647,26 +3641,26 @@ HWTEST_F(ContactAbilityTest, contact_Delete_Recover_test_7500, testing::ext::Tes std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("is_deleted", "0"); + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("is_deleted", "0"); std::string rawContacts = ContactTabName::RAW_CONTACT; - OHOS::NativeRdb::DataAbilityPredicates predicatesUpdate; + OHOS::DataShare::DataSharePredicates predicatesUpdate; predicatesUpdate.EqualTo("id", std::to_string(rawContactId)); int updateCode = ContactUpdate(rawContacts, updateValues, predicatesUpdate); HILOG_INFO("contact_Delete_Recover_test_7500 : updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - OHOS::NativeRdb::DataAbilityPredicates predicatesDelete; + OHOS::DataShare::DataSharePredicates predicatesDelete; predicatesDelete.EqualTo("raw_contact_id", std::to_string(rawContactId)); int deleteCodeOne = ContactDelete(ContactTabName::DELETED_RAW_CONTACT_RECORD, predicatesDelete); EXPECT_EQ(deleteCodeOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicatesQuery; + OHOS::DataShare::DataSharePredicates predicatesQuery; predicatesQuery.EqualTo("id", std::to_string(rawContactId)); predicatesQuery.And(); predicatesQuery.EqualTo("is_deleted", "0"); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(ContactTabName::RAW_CONTACT, columns, predicatesQuery); int rowCount = 0; resultSet->GetRowCount(rowCount); diff --git a/test/unittest/src/contactgroup_test.cpp b/test/unittest/src/contactgroup_test.cpp index 837284e..2dad7b5 100644 --- a/test/unittest/src/contactgroup_test.cpp +++ b/test/unittest/src/contactgroup_test.cpp @@ -29,44 +29,44 @@ ContactGroupTest::~ContactGroupTest() void ContactGroupTest::ClearData() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); std::string groups = "groups"; int deleteCode = ContactDelete(groups, predicates); EXPECT_EQ(deleteCode, 0); } -int64_t ContactGroupTest::GroupsInsert(std::string groupName, OHOS::NativeRdb::ValuesBucket &groupValues) +int64_t ContactGroupTest::GroupsInsert(std::string groupName, OHOS::DataShare::DataShareValuesBucket &groupValues) { OHOS::Uri uriGroups(ContactsUri::GROUPS); - groupValues.PutString("group_name", groupName); + groupValues.Put("group_name", groupName); int64_t code = contactsDataAbility.Insert(uriGroups, groupValues); return code; } -int ContactGroupTest::ContactUpdate(const std::string &tableName, OHOS::NativeRdb::ValuesBucket updateValues, - OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactGroupTest::ContactUpdate(const std::string &tableName, OHOS::DataShare::DataShareValuesBucket updateValues, + OHOS::DataShare::DataSharePredicates predicates) { int code = 0; if (tableName == ContactTabName::RAW_CONTACT) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - code = contactsDataAbility.Update(uriRawContact, updateValues, predicates); + code = contactsDataAbility.Update(uriRawContact, predicates, updateValues); } else if (tableName == ContactTabName::CONTACT_DATA) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - code = contactsDataAbility.Update(uriContactData, updateValues, predicates); + code = contactsDataAbility.Update(uriContactData, predicates, updateValues); } else if (tableName == ContactTabName::GROUPS) { OHOS::Uri uriGroups(ContactsUri::GROUPS); - code = contactsDataAbility.Update(uriGroups, updateValues, predicates); + code = contactsDataAbility.Update(uriGroups, predicates, updateValues); } else if (tableName == ContactTabName::CONTACT_BLOCKLIST) { OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST); - code = contactsDataAbility.Update(uriBlocklist, updateValues, predicates); + code = contactsDataAbility.Update(uriBlocklist, predicates, updateValues); } else { HILOG_ERROR("ContactsDataAbility ====>no match uri action"); } return code; } -int ContactGroupTest::ContactDelete(const std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactGroupTest::ContactDelete(const std::string &tableName, OHOS::DataShare::DataSharePredicates predicates) { int code = 0; if (tableName == ContactTabName::RAW_CONTACT) { @@ -90,31 +90,31 @@ int ContactGroupTest::ContactDelete(const std::string &tableName, OHOS::NativeRd return code; } -std::shared_ptr ContactGroupTest::ContactQuery( - const std::string &tableName, std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactGroupTest::ContactQuery( + const std::string &tableName, std::vector columns, OHOS::DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; + std::shared_ptr resultSet; if (tableName == ContactTabName::RAW_CONTACT) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriRawContact, predicates, columns); } else if (tableName == ContactTabName::CONTACT_DATA) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - resultSet = contactsDataAbility.Query(uriContactData, columns, predicates); + resultSet = contactsDataAbility.Query(uriContactData, predicates, columns); } else if (tableName == ContactTabName::CONTACT) { OHOS::Uri uriContact(ContactsUri::CONTACT); - resultSet = contactsDataAbility.Query(uriContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriContact, predicates, columns); } else if (tableName == ContactTabName::GROUPS) { OHOS::Uri uriGroups(ContactsUri::GROUPS); - resultSet = contactsDataAbility.Query(uriGroups, columns, predicates); + resultSet = contactsDataAbility.Query(uriGroups, predicates, columns); } else if (tableName == ContactTabName::CONTACT_BLOCKLIST) { OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST); - resultSet = contactsDataAbility.Query(uriBlocklist, columns, predicates); + resultSet = contactsDataAbility.Query(uriBlocklist, predicates, columns); } else if (tableName == ContactTabName::DELETED_RAW_CONTACT) { OHOS::Uri uriDeletedRawContact(ContactsUri::DELETED_RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriDeletedRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriDeletedRawContact, predicates, columns); } else if (tableName == ContactTabName::SEARCH_CONTACT) { OHOS::Uri uriSearchContact(ContactsUri::SEARCH); - resultSet = contactsDataAbility.Query(uriSearchContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriSearchContact, predicates, columns); } else { HILOG_ERROR("ContactsDataAbility ====>no match uri action"); } @@ -122,10 +122,10 @@ std::shared_ptr ContactGroupTest::ContactQu } void ContactGroupTest::QueryAndExpectResult(const std::string &tableName, - OHOS::NativeRdb::DataAbilityPredicates predicates, OHOS::NativeRdb::ValuesBucket &values, std::string testName) + OHOS::DataShare::DataSharePredicates predicates, OHOS::DataShare::DataShareValuesBucket &values, std::string testName) { std::vector columns; - std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); CheckResultSet(values, resultSet, testName); } @@ -159,28 +159,28 @@ void ContactGroupTest::MergeColumns( * @params columnsEnd column end index * @return ValuesBucket */ -OHOS::NativeRdb::ValuesBucket ContactGroupTest::GetAllColumnsValues( +OHOS::DataShare::DataShareValuesBucket ContactGroupTest::GetAllColumnsValues( std::vector &columnsInt, std::vector &columnsStr) { - OHOS::NativeRdb::ValuesBucket valuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket; int randomInt = 0; int columnsIntSize = columnsInt.size(); for (int i = 0; i < columnsIntSize; i++) { randomInt = ContactsRand(); HILOG_INFO("rand=%{public}d", randomInt); - valuesBucket.PutInt(columnsInt[i], randomInt); + valuesBucket.Put(columnsInt[i], randomInt); } std::string randomStr = ""; int columnsStringSize = columnsStr.size(); for (int i = 0; i < columnsStringSize; i++) { randomStr = columnsStr[i] + std::to_string(ContactsRand()); - valuesBucket.PutString(columnsStr[i], randomStr); + valuesBucket.Put(columnsStr[i], randomStr); } return valuesBucket; } -int64_t ContactGroupTest::GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactGroupTest::GroupsInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriGroups(ContactsUri::GROUPS); int64_t code = contactsDataAbility.Insert(uriGroups, values); @@ -198,12 +198,12 @@ int64_t ContactGroupTest::GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &valu HWTEST_F(ContactGroupTest, groups_Insert_test_100, testing::ext::TestSize.Level1) { HILOG_INFO("--- groups_Insert_test_100 is staring! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroup; + OHOS::DataShare::DataShareValuesBucket valuesGroup; int64_t groupId = GroupsInsert("personnel", valuesGroup); - HILOG_INFO("groups_Insert_test_100: groupId = %{public}lld", groupId); + HILOG_INFO("groups_Insert_test_100: groupId = %{public}ld", groupId); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); std::string groups = ContactTabName::GROUPS; QueryAndExpectResult(groups, predicates, valuesGroup, "groups_Insert_test_100"); @@ -221,30 +221,30 @@ HWTEST_F(ContactGroupTest, groups_Insert_test_100, testing::ext::TestSize.Level1 HWTEST_F(ContactGroupTest, groups_Insert_test_200, testing::ext::TestSize.Level1) { HILOG_INFO("--- groups_Insert_test_200 is staring! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroup; + OHOS::DataShare::DataShareValuesBucket valuesGroup; int64_t groupId = GroupsInsert("Test a set", valuesGroup); - HILOG_INFO("groups_Insert_test_200: groupId = %{public}lld", groupId); + HILOG_INFO("groups_Insert_test_200: groupId = %{public}ld", groupId); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); std::string groups = ContactTabName::GROUPS; QueryAndExpectResult(groups, predicates, valuesGroup, "groups_Insert_test_200"); valuesGroup.Clear(); groupId = GroupsInsert("Test group two", valuesGroup); - HILOG_INFO("groups_Insert_test_200: groupId = %{public}lld", groupId); + HILOG_INFO("groups_Insert_test_200: groupId = %{public}ld", groupId); EXPECT_GT(groupId, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(groupId)); - QueryAndExpectResult(groups, predicates, valuesGroup, "groups_Insert_test_200"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(groupId)); + QueryAndExpectResult(groups, predicates2, valuesGroup, "groups_Insert_test_200"); valuesGroup.Clear(); groupId = GroupsInsert("Test three groups", valuesGroup); - HILOG_INFO("groups_Insert_test_200: groupId = %{public}lld", groupId); + HILOG_INFO("groups_Insert_test_200: groupId = %{public}ld", groupId); EXPECT_GT(groupId, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(groupId)); - QueryAndExpectResult(groups, predicates, valuesGroup, "groups_Insert_test_200"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(groupId)); + QueryAndExpectResult(groups, predicates3, valuesGroup, "groups_Insert_test_200"); ClearData(); } @@ -264,14 +264,14 @@ HWTEST_F(ContactGroupTest, groups_Insert_test_300, testing::ext::TestSize.Level1 std::vector columns; std::string groups = ContactTabName::GROUPS; GetAllGroupsColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = GroupsInsertValues(valuesBucket); EXPECT_GT(rawId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); // resultSet count 1 int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -292,17 +292,17 @@ HWTEST_F(ContactGroupTest, groups_Insert_test_300, testing::ext::TestSize.Level1 HWTEST_F(ContactGroupTest, groups_Delete_test_400, testing::ext::TestSize.Level1) { HILOG_INFO("--- groups_Delete_test_400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroup; + OHOS::DataShare::DataShareValuesBucket valuesGroup; int64_t groupId = GroupsInsert("Personnel Group", valuesGroup); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); std::string groups = ContactTabName::GROUPS; int deleteCode = ContactDelete(groups, predicates); EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -320,19 +320,19 @@ HWTEST_F(ContactGroupTest, groups_Delete_test_400, testing::ext::TestSize.Level1 HWTEST_F(ContactGroupTest, groups_Delete_test_500, testing::ext::TestSize.Level1) { HILOG_INFO("--- groups_Delete_test_500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroup; + OHOS::DataShare::DataShareValuesBucket valuesGroup; int64_t groupIdOne = GroupsInsert("Personnel Group", valuesGroup); EXPECT_GT(groupIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesGroupTwo; + OHOS::DataShare::DataShareValuesBucket valuesGroupTwo; int64_t groupIdTwo = GroupsInsert("Sell one", valuesGroupTwo); EXPECT_GT(groupIdTwo, 0); - OHOS::NativeRdb::ValuesBucket valuesGroupThree; + OHOS::DataShare::DataShareValuesBucket valuesGroupThree; int64_t groupIdThree = GroupsInsert("Develop a group", valuesGroupThree); EXPECT_GT(groupIdThree, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(groupIdTwo)); @@ -342,14 +342,14 @@ HWTEST_F(ContactGroupTest, groups_Delete_test_500, testing::ext::TestSize.Level1 int deleteCode = ContactDelete(groups, predicates); HILOG_INFO("groups_Delete_test_500: deleteCode = %{public}d", deleteCode); EXPECT_EQ(deleteCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(groupIdOne)); - predicates.Or(); - predicates.EqualTo("id", std::to_string(groupIdTwo)); - predicates.Or(); - predicates.EqualTo("id", std::to_string(groupIdThree)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(groupIdOne)); + predicates2.Or(); + predicates2.EqualTo("id", std::to_string(groupIdTwo)); + predicates2.Or(); + predicates2.EqualTo("id", std::to_string(groupIdThree)); std::vector columns; - std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSet = ContactQuery(groups, columns, predicates2); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -372,12 +372,12 @@ HWTEST_F(ContactGroupTest, groups_Delete_test_600, testing::ext::TestSize.Level1 std::vector columnsInt; std::vector columnsStr; GetAllGroupsColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int groupId = GroupsInsertValues(valuesBucket); EXPECT_GT(groupId, 0); // test end delete data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); EXPECT_GT(groupId, 0); std::string groups = ContactTabName::GROUPS; @@ -385,7 +385,7 @@ HWTEST_F(ContactGroupTest, groups_Delete_test_600, testing::ext::TestSize.Level1 EXPECT_EQ(deleteCode, 0); MergeColumns(columns, columnsInt, columnsStr); - std::shared_ptr resultSetDeleteQuery = + std::shared_ptr resultSetDeleteQuery = ContactQuery(groups, columns, predicates); int rowCount = -1; resultSetDeleteQuery->GetRowCount(rowCount); @@ -404,7 +404,7 @@ HWTEST_F(ContactGroupTest, groups_Delete_test_600, testing::ext::TestSize.Level1 HWTEST_F(ContactGroupTest, groups_Query_test_700, testing::ext::TestSize.Level1) { HILOG_INFO("--- groups_Query_test_700 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroupTwo; + OHOS::DataShare::DataShareValuesBucket valuesGroupTwo; GroupsInsert("Sell one1", valuesGroupTwo); valuesGroupTwo.Clear(); GroupsInsert("Sell one2", valuesGroupTwo); @@ -418,10 +418,10 @@ HWTEST_F(ContactGroupTest, groups_Query_test_700, testing::ext::TestSize.Level1) std::vector columns; columns.push_back("id"); columns.push_back("group_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); std::string groups = ContactTabName::GROUPS; - std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); int rowCount = 0; int currentCount = 5; resultSet->GetRowCount(rowCount); @@ -440,13 +440,13 @@ HWTEST_F(ContactGroupTest, groups_Query_test_700, testing::ext::TestSize.Level1) HWTEST_F(ContactGroupTest, groups_Update_test_800, testing::ext::TestSize.Level1) { HILOG_INFO("--- groups_Update_test_800 is staring! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroup; + OHOS::DataShare::DataShareValuesBucket valuesGroup; int64_t groupId = GroupsInsert("physical education", valuesGroup); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("group_name", std::string("Language")); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("group_name", std::string("Language")); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); std::string groups = ContactTabName::GROUPS; int updateCode = ContactUpdate(groups, updateValues, predicates); @@ -466,21 +466,21 @@ HWTEST_F(ContactGroupTest, groups_Update_test_800, testing::ext::TestSize.Level1 HWTEST_F(ContactGroupTest, groups_Update_test_900, testing::ext::TestSize.Level1) { HILOG_INFO("--- groups_Update_test_900 is staring! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroupOne; + OHOS::DataShare::DataShareValuesBucket valuesGroupOne; int64_t groupIdOne = GroupsInsert("Develop a group", valuesGroupOne); EXPECT_GT(groupIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesGroupTwo; + OHOS::DataShare::DataShareValuesBucket valuesGroupTwo; int64_t groupIdTwo = GroupsInsert("Development Group 2", valuesGroupTwo); EXPECT_GT(groupIdTwo, 0); - OHOS::NativeRdb::ValuesBucket valuesGroupThree; + OHOS::DataShare::DataShareValuesBucket valuesGroupThree; int64_t groupIdThree = GroupsInsert("Development three groups", valuesGroupThree); EXPECT_GT(groupIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("group_name", std::string("Develop a group")); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("group_name", std::string("Develop a group")); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupIdOne)); std::string groups = ContactTabName::GROUPS; int updateCode = ContactUpdate(groups, updateValues, predicates); @@ -488,20 +488,20 @@ HWTEST_F(ContactGroupTest, groups_Update_test_900, testing::ext::TestSize.Level1 QueryAndExpectResult(groups, predicates, updateValues, "groups_Update_test_900"); updateValues.Clear(); - updateValues.PutString("group_name", std::string("Development Second Group")); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(groupIdTwo)); - updateCode = ContactUpdate(groups, updateValues, predicates); + updateValues.Put("group_name", std::string("Development Second Group")); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(groupIdTwo)); + updateCode = ContactUpdate(groups, updateValues, predicates2); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(groups, predicates, updateValues, "groups_Update_test_900"); + QueryAndExpectResult(groups, predicates2, updateValues, "groups_Update_test_900"); updateValues.Clear(); - updateValues.PutString("group_name", std::string("Develop three groups")); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(groupIdThree)); - updateCode = ContactUpdate(groups, updateValues, predicates); + updateValues.Put("group_name", std::string("Develop three groups")); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(groupIdThree)); + updateCode = ContactUpdate(groups, updateValues, predicates3); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(groups, predicates, updateValues, "groups_Update_test_900"); + QueryAndExpectResult(groups, predicates3, updateValues, "groups_Update_test_900"); ClearData(); } @@ -521,19 +521,19 @@ HWTEST_F(ContactGroupTest, groups_Update_test_1000, testing::ext::TestSize.Level std::vector columnsStr; std::string groups = ContactTabName::GROUPS; GetAllGroupsColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int groupId = GroupsInsertValues(valuesBucket); EXPECT_GT(groupId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); - std::shared_ptr resultSetOne = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSetOne = ContactQuery(groups, columns, predicates); CheckResultSet(valuesBucket, resultSetOne, "groups_Update_test_1000"); - OHOS::NativeRdb::ValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int upDateCode = ContactUpdate(groups, upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); // resultSet count 1 int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -554,20 +554,20 @@ HWTEST_F(ContactGroupTest, abnormal_groups_Insert_test_1100, testing::ext::TestS { OHOS::Uri uriGroups(ContactsUri::GROUPS); OHOS::Uri errorUri(ContactsUri::GROUPS_ERROR); - OHOS::NativeRdb::ValuesBucket groupValues; - groupValues.PutString("group_names", "Board of Directors"); + OHOS::DataShare::DataShareValuesBucket groupValues; + groupValues.Put("group_names", "Board of Directors"); int64_t groupId = contactsDataAbility.Insert(uriGroups, groupValues); EXPECT_EQ(groupId, -1); groupValues.Clear(); - groupValues.PutString("group_name", "Board of Directors"); + groupValues.Put("group_name", "Board of Directors"); groupId = contactsDataAbility.Insert(errorUri, groupValues); EXPECT_EQ(groupId, -1); std::vector columns; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("group_name", "Board of Directors"); std::string groups = ContactTabName::GROUPS; - std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -585,39 +585,39 @@ HWTEST_F(ContactGroupTest, abnormal_groups_Insert_test_1100, testing::ext::TestS HWTEST_F(ContactGroupTest, abnormal_groups_Delete_test_1200, testing::ext::TestSize.Level1) { OHOS::Uri errorUri(ContactsUri::GROUPS_ERROR); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t groupId = GroupsInsert("Board of Directors 2", values); - HILOG_INFO("abnormal_groups_Delete_test_1200: groupId = %{public}lld", groupId); + HILOG_INFO("abnormal_groups_Delete_test_1200: groupId = %{public}ld", groupId); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(groupId)); std::string groups = ContactTabName::GROUPS; int deleteCode = ContactDelete(groups, predicates); HILOG_INFO("abnormal_groups_Delete_test_1200: deleteCode = %{public}d", deleteCode); EXPECT_EQ(deleteCode, -1); std::vector columns; - predicates.Clear(); - predicates.EqualTo("id", std::to_string(groupId)); - std::shared_ptr resultSet = ContactQuery(groups, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(groupId)); + std::shared_ptr resultSet = ContactQuery(groups, columns, predicates2); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(groupId)); - deleteCode = contactsDataAbility.Delete(errorUri, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(groupId)); + deleteCode = contactsDataAbility.Delete(errorUri, predicates3); HILOG_INFO("abnormal_groups_Delete_test_1200: deleteCode = %{public}d", deleteCode); EXPECT_EQ(deleteCode, -1); - std::shared_ptr resultSetTwo = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSetTwo = ContactQuery(groups, columns, predicates3); int rowCountTwo = 0; resultSetTwo->GetRowCount(rowCountTwo); EXPECT_EQ(1, rowCountTwo); - predicates.Clear(); - predicates.EqualTo("id", "10000000"); - deleteCode = ContactDelete(groups, predicates); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", "10000000"); + deleteCode = ContactDelete(groups, predicates4); EXPECT_EQ(deleteCode, 0); ClearData(); } @@ -638,24 +638,24 @@ HWTEST_F(ContactGroupTest, abnormal_groups_Query_test_1300, testing::ext::TestSi std::vector columns; columns.push_back("id"); columns.push_back("group_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("ids", "0"); - std::shared_ptr resultSetOne = ContactQuery(groups, columns, predicates); + std::shared_ptr resultSetOne = ContactQuery(groups, columns, predicates); int rowCountOne = 0; resultSetOne->GetRowCount(rowCountOne); EXPECT_EQ(-1, rowCountOne); - predicates.Clear(); - predicates.EqualTo("id", "10000000"); - std::shared_ptr resultSetTwo = ContactQuery(groups, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", "10000000"); + std::shared_ptr resultSetTwo = ContactQuery(groups, columns, predicates2); int rowCountTwo = 0; resultSetTwo->GetRowCount(rowCountTwo); EXPECT_EQ(0, rowCountTwo); - predicates.Clear(); - predicates.GreaterThan("id", "0"); - std::shared_ptr resultSetThree = - contactsDataAbility.Query(errorUri, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.GreaterThan("id", "0"); + std::shared_ptr resultSetThree = + contactsDataAbility.Query(errorUri, predicates3, columns); EXPECT_EQ(resultSetThree, nullptr); ClearData(); } @@ -671,14 +671,14 @@ HWTEST_F(ContactGroupTest, abnormal_groups_Query_test_1300, testing::ext::TestSi HWTEST_F(ContactGroupTest, abnormal_groups_Update_test_1400, testing::ext::TestSize.Level1) { OHOS::Uri errorUri(ContactsUri::GROUPS_ERROR); - OHOS::NativeRdb::ValuesBucket valuesInsert; + OHOS::DataShare::DataShareValuesBucket valuesInsert; int64_t groupId = GroupsInsert("Board of Directors", valuesInsert); - HILOG_INFO("abnormal_groups_Update_test_1400: groupId = %{public}lld", groupId); + HILOG_INFO("abnormal_groups_Update_test_1400: groupId = %{public}ld", groupId); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("group_names", "Develop a group"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("group_names", "Develop a group"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); std::string groups = ContactTabName::GROUPS; int updateCode = ContactUpdate(groups, updateValues, predicates); @@ -687,15 +687,15 @@ HWTEST_F(ContactGroupTest, abnormal_groups_Update_test_1400, testing::ext::TestS QueryAndExpectResult(groups, predicates, valuesInsert, "abnormal_groups_Update_test_1400"); updateValues.Clear(); - updateValues.PutString("group_name", "Develop a group"); - updateCode = contactsDataAbility.Update(errorUri, updateValues, predicates); + updateValues.Put("group_name", "Develop a group"); + updateCode = contactsDataAbility.Update(errorUri, predicates, updateValues); HILOG_INFO("abnormal_groups_Update_test_1400: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, -1); QueryAndExpectResult(groups, predicates, valuesInsert, "abnormal_groups_Update_test_1400"); - predicates.Clear(); - predicates.EqualTo("id", "10000000"); - updateCode = ContactUpdate(groups, updateValues, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", "10000000"); + updateCode = ContactUpdate(groups, updateValues, predicates2); EXPECT_EQ(updateCode, 0); ClearData(); } diff --git a/test/unittest/src/contactpinyin_test.cpp b/test/unittest/src/contactpinyin_test.cpp index 985c52c..ec76ce8 100644 --- a/test/unittest/src/contactpinyin_test.cpp +++ b/test/unittest/src/contactpinyin_test.cpp @@ -28,68 +28,68 @@ ContactPinyinTest::~ContactPinyinTest() { } -int64_t ContactPinyinTest::RawContactInsert(std::string displayName, OHOS::NativeRdb::ValuesBucket &rawContactValues) +int64_t ContactPinyinTest::RawContactInsert(std::string displayName, OHOS::DataShare::DataShareValuesBucket &rawContactValues) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - rawContactValues.PutString("display_name", displayName); + rawContactValues.Put("display_name", displayName); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); return code; } int64_t ContactPinyinTest::ContactDataInsert(int64_t rawContactId, std::string contentType, std::string detailInfo, - std::string position, OHOS::NativeRdb::ValuesBucket &contactDataValues) + std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - contactDataValues.PutInt("raw_contact_id", rawContactId); - contactDataValues.PutString("content_type", contentType); - contactDataValues.PutString("detail_info", detailInfo); - contactDataValues.PutString("position", position); + contactDataValues.Put("raw_contact_id", rawContactId); + contactDataValues.Put("content_type", contentType); + contactDataValues.Put("detail_info", detailInfo); + contactDataValues.Put("position", position); int64_t code = contactsDataAbility.Insert(uriContactData, contactDataValues); return code; } -std::shared_ptr ContactPinyinTest::ContactQuery( - const std::string &tableName, std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactPinyinTest::ContactQuery( + const std::string &tableName, std::vector columns, OHOS::DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; + std::shared_ptr resultSet; if (tableName == ContactTabName::RAW_CONTACT) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriRawContact, predicates, columns); } else if (tableName == ContactTabName::CONTACT_DATA) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - resultSet = contactsDataAbility.Query(uriContactData, columns, predicates); + resultSet = contactsDataAbility.Query(uriContactData, predicates, columns); } else if (tableName == ContactTabName::CONTACT) { OHOS::Uri uriContact(ContactsUri::CONTACT); - resultSet = contactsDataAbility.Query(uriContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriContact, predicates, columns); } else if (tableName == ContactTabName::GROUPS) { OHOS::Uri uriGroups(ContactsUri::GROUPS); - resultSet = contactsDataAbility.Query(uriGroups, columns, predicates); + resultSet = contactsDataAbility.Query(uriGroups, predicates, columns); } else if (tableName == ContactTabName::CONTACT_BLOCKLIST) { OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST); - resultSet = contactsDataAbility.Query(uriBlocklist, columns, predicates); + resultSet = contactsDataAbility.Query(uriBlocklist, predicates, columns); } else if (tableName == ContactTabName::DELETED_RAW_CONTACT) { OHOS::Uri uriDeletedRawContact(ContactsUri::DELETED_RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriDeletedRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriDeletedRawContact, predicates, columns); } else if (tableName == ContactTabName::SEARCH_CONTACT) { OHOS::Uri uriSearchContact(ContactsUri::SEARCH); - resultSet = contactsDataAbility.Query(uriSearchContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriSearchContact, predicates, columns); } else { HILOG_ERROR("ContactsDataAbility ====>no match uri action"); } return resultSet; } -void ContactPinyinTest::QueryAndExpectResult(std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates, - OHOS::NativeRdb::ValuesBucket &values, std::string testName) +void ContactPinyinTest::QueryAndExpectResult(std::string &tableName, OHOS::DataShare::DataSharePredicates predicates, + OHOS::DataShare::DataShareValuesBucket &values, std::string testName) { std::vector columns; - std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); CheckResultSet(values, resultSet, testName); } void ContactPinyinTest::ClearData() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); predicates.NotEqualTo("id", "0"); predicates.And(); @@ -98,10 +98,10 @@ void ContactPinyinTest::ClearData() int time = 1000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ContactsUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } /* @@ -117,15 +117,15 @@ HWTEST_F(ContactPinyinTest, pinyin_conversion_Insert_test_100, testing::ext::Tes HILOG_INFO("-------pinyin_conversion_Insert_test_100 is starting!------"); std::string tag("pinyin_conversion_Insert_test_100"); OHOS::Contacts::ConstructionName::local = "zh-CN"; - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("李想", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t contactDataId = ContactDataInsert(rawContactId, "name", "李想", "", values); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string searchContact = ContactTabName::SEARCH_CONTACT; QueryAndExpectResult(searchContact, predicates, values, "pinyin_conversion_Insert_test_100"); @@ -145,15 +145,15 @@ HWTEST_F(ContactPinyinTest, pinyin_conversion_Insert_test_200, testing::ext::Tes HILOG_INFO("-------pinyin_conversion_Insert_test_200 is starting!------"); std::string tag("pinyin_conversion_Insert_test_200"); OHOS::Contacts::ConstructionName::local = "zh-CN"; - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("張三", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t contactDataId = ContactDataInsert(rawContactId, "name", "張三", "", values); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string searchContact = ContactTabName::SEARCH_CONTACT; QueryAndExpectResult(searchContact, predicates, values, "pinyin_conversion_Insert_test_200"); @@ -172,16 +172,16 @@ HWTEST_F(ContactPinyinTest, pinyin_conversion_Insert_test_300, testing::ext::Tes { HILOG_INFO("-------pinyin_conversion_Insert_test_300 is starting!------"); OHOS::Contacts::ConstructionName::local = "other"; - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("Tom", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t contactDataId = ContactDataInsert(rawContactId, "name", "Tom", "", values); - HILOG_INFO("pinyin_conversion_Insert_test_300 : contactDataId = %{public}lld", contactDataId); + HILOG_INFO("pinyin_conversion_Insert_test_300 : contactDataId = %{public}ld", contactDataId); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string searchContact = ContactTabName::SEARCH_CONTACT; QueryAndExpectResult(searchContact, predicates, values, "Tom||Tom||Tom"); @@ -200,15 +200,15 @@ HWTEST_F(ContactPinyinTest, abnormal_pinyin_conversion_Insert_test_400, testing: { HILOG_INFO("-------abnormal_pinyin_conversion_Insert_test_400 is starting!------"); OHOS::Contacts::ConstructionName::local = "zh-CN"; - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("李%^玉@成", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t contactDataId = ContactDataInsert(rawContactId, "name", "李%^玉@成", "", values); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string searchContact = ContactTabName::SEARCH_CONTACT; QueryAndExpectResult(searchContact, predicates, values, "李%^玉@成||li%^yu@cheng||l%^y@c"); @@ -227,15 +227,15 @@ HWTEST_F(ContactPinyinTest, abnormal_pinyin_conversion_Insert_test_500, testing: { HILOG_INFO("-------abnormal_pinyin_conversion_Insert_test_500 is starting!------"); OHOS::Contacts::ConstructionName::local = "zh-CN"; - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("李bp玉成욱", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t contactDataId = ContactDataInsert(rawContactId, "name", "李bp玉成욱", "", values); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string searchContact = ContactTabName::SEARCH_CONTACT; QueryAndExpectResult(searchContact, predicates, values, "李bp玉成욱||libpyucheng욱||lbpyc욱"); diff --git a/test/unittest/src/contactprofile_test.cpp b/test/unittest/src/contactprofile_test.cpp index 9e4734f..06cc340 100644 --- a/test/unittest/src/contactprofile_test.cpp +++ b/test/unittest/src/contactprofile_test.cpp @@ -16,6 +16,7 @@ #include "contactprofile_test.h" #include "data_ability_operation_builder.h" +#include "random_number_utils.h" #include "test_common.h" @@ -29,93 +30,93 @@ ContactProfileTest::~ContactProfileTest() { } -int64_t ContactProfileTest::RawContactInsert(std::string displayName, OHOS::NativeRdb::ValuesBucket &rawContactValues) +int64_t ContactProfileTest::RawContactInsert(std::string displayName, OHOS::DataShare::DataShareValuesBucket &rawContactValues) { OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - rawContactValues.PutString("display_name", displayName); + rawContactValues.Put("display_name", displayName); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); return code; } int64_t ContactProfileTest::RawContactExpandInsert( - std::vector valueVector, int isFavorite, OHOS::NativeRdb::ValuesBucket &rawContactValues) + std::vector valueVector, int isFavorite, OHOS::DataShare::DataShareValuesBucket &rawContactValues) { int indexZero = 0; int indexOne = 1; int indexTwo = 2; int indexThree = 3; OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - rawContactValues.PutString("display_name", valueVector[indexZero]); - rawContactValues.PutString("company", valueVector[indexOne]); - rawContactValues.PutString("position", valueVector[indexTwo]); - rawContactValues.PutInt("favorite", isFavorite); - rawContactValues.PutString("phonetic_name", valueVector[indexThree]); + rawContactValues.Put("display_name", valueVector[indexZero]); + rawContactValues.Put("company", valueVector[indexOne]); + rawContactValues.Put("position", valueVector[indexTwo]); + rawContactValues.Put("favorite", isFavorite); + rawContactValues.Put("phonetic_name", valueVector[indexThree]); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); return code; } int64_t ContactProfileTest::RawContactLastContactedInsert( - std::string displayName, int lastestContactedTime, OHOS::NativeRdb::ValuesBucket &rawContactValues) + std::string displayName, int lastestContactedTime, OHOS::DataShare::DataShareValuesBucket &rawContactValues) { OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - rawContactValues.PutString("display_name", displayName); - rawContactValues.PutInt("lastest_contacted_time", lastestContactedTime); + rawContactValues.Put("display_name", displayName); + rawContactValues.Put("lastest_contacted_time", lastestContactedTime); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); return code; } int64_t ContactProfileTest::ContactDataInsert(int64_t rawContactId, std::string contentType, std::string detailInfo, - std::string position, OHOS::NativeRdb::ValuesBucket &contactDataValues) + std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues) { OHOS::Uri uriContactData(ProfileUri::CONTACT_DATA); - contactDataValues.PutInt("raw_contact_id", rawContactId); - contactDataValues.PutString("content_type", contentType); - contactDataValues.PutString("detail_info", detailInfo); - contactDataValues.PutString("position", position); + contactDataValues.Put("raw_contact_id", rawContactId); + contactDataValues.Put("content_type", contentType); + contactDataValues.Put("detail_info", detailInfo); + contactDataValues.Put("position", position); int64_t code = contactsDataAbility.Insert(uriContactData, contactDataValues); return code; } -int64_t ContactProfileTest::GroupsInsert(std::string groupName, OHOS::NativeRdb::ValuesBucket &groupValues) +int64_t ContactProfileTest::GroupsInsert(std::string groupName, OHOS::DataShare::DataShareValuesBucket &groupValues) { OHOS::Uri uriGroups(ProfileUri::GROUPS); - groupValues.PutString("group_name", groupName); + groupValues.Put("group_name", groupName); int64_t code = contactsDataAbility.Insert(uriGroups, groupValues); return code; } int64_t ContactProfileTest::ContactBlocklistInsert( - std::string phoneNumber, OHOS::NativeRdb::ValuesBucket &contactBlocklistValues) + std::string phoneNumber, OHOS::DataShare::DataShareValuesBucket &contactBlocklistValues) { OHOS::Uri uriBlocklist(ProfileUri::BLOCKLIST); - contactBlocklistValues.PutString("phone_number", phoneNumber); + contactBlocklistValues.Put("phone_number", phoneNumber); int64_t code = contactsDataAbility.Insert(uriBlocklist, contactBlocklistValues); return code; } -int ContactProfileTest::ContactUpdate(const std::string &tableName, OHOS::NativeRdb::ValuesBucket updateValues, - OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactProfileTest::ContactUpdate(const std::string &tableName, OHOS::DataShare::DataShareValuesBucket updateValues, + OHOS::DataShare::DataSharePredicates predicates) { int code = 0; if (tableName == ContactTabName::RAW_CONTACT) { OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - code = contactsDataAbility.Update(uriRawContact, updateValues, predicates); + code = contactsDataAbility.Update(uriRawContact, predicates, updateValues); } else if (tableName == ContactTabName::CONTACT_DATA) { OHOS::Uri uriContactData(ProfileUri::CONTACT_DATA); - code = contactsDataAbility.Update(uriContactData, updateValues, predicates); + code = contactsDataAbility.Update(uriContactData, predicates, updateValues); } else if (tableName == ContactTabName::GROUPS) { OHOS::Uri uriGroups(ProfileUri::GROUPS); - code = contactsDataAbility.Update(uriGroups, updateValues, predicates); + code = contactsDataAbility.Update(uriGroups, predicates, updateValues); } else if (tableName == ContactTabName::CONTACT_BLOCKLIST) { OHOS::Uri uriBlocklist(ProfileUri::BLOCKLIST); - code = contactsDataAbility.Update(uriBlocklist, updateValues, predicates); + code = contactsDataAbility.Update(uriBlocklist, predicates, updateValues); } else { HILOG_ERROR("ContactsDataAbility ====>no match uri action"); } return code; } -int ContactProfileTest::ContactDelete(const std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates) +int ContactProfileTest::ContactDelete(const std::string &tableName, OHOS::DataShare::DataSharePredicates predicates) { int code = 0; if (tableName == ContactTabName::RAW_CONTACT) { @@ -139,65 +140,65 @@ int ContactProfileTest::ContactDelete(const std::string &tableName, OHOS::Native return code; } -std::shared_ptr ContactProfileTest::ContactQuery( - const std::string &tableName, std::vector &columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactProfileTest::ContactQuery( + const std::string &tableName, std::vector &columns, OHOS::DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; + std::shared_ptr resultSet; if (tableName == ContactTabName::RAW_CONTACT) { OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriRawContact, predicates, columns); } else if (tableName == ContactTabName::CONTACT_DATA) { OHOS::Uri uriContactData(ProfileUri::CONTACT_DATA); - resultSet = contactsDataAbility.Query(uriContactData, columns, predicates); + resultSet = contactsDataAbility.Query(uriContactData, predicates, columns); } else if (tableName == ContactTabName::CONTACT) { OHOS::Uri uriContact(ProfileUri::CONTACT); - resultSet = contactsDataAbility.Query(uriContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriContact, predicates, columns); } else if (tableName == ContactTabName::GROUPS) { OHOS::Uri uriGroups(ProfileUri::GROUPS); - resultSet = contactsDataAbility.Query(uriGroups, columns, predicates); + resultSet = contactsDataAbility.Query(uriGroups, predicates, columns); } else if (tableName == ContactTabName::CONTACT_BLOCKLIST) { OHOS::Uri uriBlocklist(ProfileUri::BLOCKLIST); - resultSet = contactsDataAbility.Query(uriBlocklist, columns, predicates); + resultSet = contactsDataAbility.Query(uriBlocklist, predicates, columns); } else if (tableName == ContactTabName::DELETED_RAW_CONTACT) { OHOS::Uri uriDeletedRawContact(ProfileUri::DELETED_RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriDeletedRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriDeletedRawContact, predicates, columns); } else if (tableName == ContactTabName::SEARCH_CONTACT) { OHOS::Uri uriSearchContact(ProfileUri::SEARCH); - resultSet = contactsDataAbility.Query(uriSearchContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriSearchContact, predicates, columns); } else { HILOG_ERROR("ContactsDataAbility ====>no match uri action"); } return resultSet; } -void ContactProfileTest::QueryAndExpectResult(std::string &tableName, OHOS::NativeRdb::DataAbilityPredicates predicates, - OHOS::NativeRdb::ValuesBucket &values, std::string testName) +void ContactProfileTest::QueryAndExpectResult(std::string &tableName, OHOS::DataShare::DataSharePredicates predicates, + OHOS::DataShare::DataShareValuesBucket &values, std::string testName) { std::vector columns; - std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); CheckResultSet(values, resultSet, testName); } -int64_t ContactProfileTest::RawContactInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactProfileTest::RawContactInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); return contactsDataAbility.Insert(uriRawContact, values); } -int64_t ContactProfileTest::ContactDataInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactProfileTest::ContactDataInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriContactData(ProfileUri::CONTACT_DATA); return contactsDataAbility.Insert(uriContactData, values); } -int64_t ContactProfileTest::GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactProfileTest::GroupsInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriGroups(ProfileUri::GROUPS); return contactsDataAbility.Insert(uriGroups, values); } -int64_t ContactProfileTest::ContactBlocklistInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int64_t ContactProfileTest::ContactBlocklistInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriContactBolcklist(ProfileUri::BLOCKLIST); return contactsDataAbility.Insert(uriContactBolcklist, values); @@ -334,22 +335,22 @@ void ContactProfileTest::MergeColumns( * @params columnsEnd column end index * @return ValuesBucket */ -OHOS::NativeRdb::ValuesBucket ContactProfileTest::GetAllColumnsValues( +OHOS::DataShare::DataShareValuesBucket ContactProfileTest::GetAllColumnsValues( std::vector &columnsInt, std::vector &columnsStr) { - OHOS::NativeRdb::ValuesBucket valuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket; int randomInt = 0; int columnsIntSize = columnsInt.size(); for (int i = 0; i < columnsIntSize; i++) { randomInt = ContactsRand(); HILOG_INFO("rand=%{public}d", randomInt); - valuesBucket.PutInt(columnsInt[i], randomInt); + valuesBucket.Put(columnsInt[i], randomInt); } std::string randomStr = ""; int columnsStringSize = columnsStr.size(); for (int i = 0; i < columnsStringSize; i++) { randomStr = columnsStr[i] + std::to_string(ContactsRand()); - valuesBucket.PutString(columnsStr[i], randomStr); + valuesBucket.Put(columnsStr[i], randomStr); } return valuesBucket; @@ -357,7 +358,7 @@ OHOS::NativeRdb::ValuesBucket ContactProfileTest::GetAllColumnsValues( void ContactProfileTest::ClearContacts() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); predicates.NotEqualTo("id", "0"); predicates.And(); @@ -366,10 +367,10 @@ void ContactProfileTest::ClearContacts() int time = 1000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ProfileUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } /* @@ -383,12 +384,12 @@ void ContactProfileTest::ClearContacts() HWTEST_F(ContactProfileTest, contactProfile_Insert_test_100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Insert_test_100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("liming", values); - HILOG_INFO("contactProfile_Insert_test_100 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contactProfile_Insert_test_100 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; QueryAndExpectResult(rawContacts, predicates, values, "contactProfile_Insert_test_100"); @@ -406,29 +407,28 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_100, testing::ext::TestS HWTEST_F(ContactProfileTest, contactProfile_Insert_test_200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Insert_test_200 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactIdOne = RawContactInsert("xiaoqian", values); - HILOG_INFO("contactProfile_Insert_test_200 : rawContactIdOne = %{public}lld", rawContactIdOne); + HILOG_INFO("contactProfile_Insert_test_200 : rawContactIdOne = %{public}ld", rawContactIdOne); EXPECT_GT(rawContactIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); std::string rawContacts = ContactTabName::RAW_CONTACT; QueryAndExpectResult(rawContacts, predicates, values, "contactProfile_Insert_test_200"); values.Clear(); int64_t rawContactIdTwo = RawContactInsert("xiaowang", values); - HILOG_INFO("contactProfile_Insert_test_200 : rawContactIdTwo = %{public}lld", rawContactIdTwo); + HILOG_INFO("contactProfile_Insert_test_200 : rawContactIdTwo = %{public}ld", rawContactIdTwo); EXPECT_GT(rawContactIdTwo, 0); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); QueryAndExpectResult(rawContacts, predicates, values, "contactProfile_Insert_test_200"); - predicates.Clear(); int64_t rawContactIdThree = RawContactInsert("xiaozhou", values); - HILOG_INFO("contactProfile_Insert_test_200 : rawContactIdThree = %{public}lld", rawContactIdThree); + HILOG_INFO("contactProfile_Insert_test_200 : rawContactIdThree = %{public}ld", rawContactIdThree); EXPECT_GT(rawContactIdThree, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdThree)); - QueryAndExpectResult(rawContacts, predicates, values, "contactProfile_Insert_test_200"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactIdThree)); + QueryAndExpectResult(rawContacts, predicates2, values, "contactProfile_Insert_test_200"); ClearContacts(); } @@ -448,14 +448,14 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_300, testing::ext::TestS std::vector columns; std::string rawContacts = ContactTabName::RAW_CONTACT; GetAllRawContactColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); // resultSet count 1 int rowCount = -1; @@ -477,17 +477,17 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_300, testing::ext::TestS HWTEST_F(ContactProfileTest, contactProfile_Insert_test_400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Insert_test_400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::vector vectorValue; vectorValue.push_back("liming"); vectorValue.push_back("tiantianxaingshang"); vectorValue.push_back("Test"); vectorValue.push_back("liming||lm"); int64_t rawContactId = RawContactExpandInsert(vectorValue, 1, values); - HILOG_INFO("contactProfile_Insert_test_400 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contactProfile_Insert_test_400 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; QueryAndExpectResult(rawContacts, predicates, values, "contactProfile_Insert_test_400"); @@ -507,49 +507,49 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_500, testing::ext::TestS { HILOG_INFO("--- contactProfile_Insert_test_500 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("ligang", rawContactValues); - HILOG_INFO("contactProfile_Insert_test_500 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contactProfile_Insert_test_500 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "name", "ligang", "", values); - HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdOne = %{public}lld", contactDataIdOne); + HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdOne = %{public}ld", contactDataIdOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_500"); values.Clear(); int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", values); - HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdTwo = %{public}lld", contactDataIdTwo); + HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdTwo = %{public}ld", contactDataIdTwo); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_500"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, values, "contactProfile_Insert_test_500"); values.Clear(); int64_t contactDataIdThree = ContactDataInsert(rawContactId, "email", "8523@163.com", "", values); - HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdThree = %{public}lld", contactDataIdThree); + HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdThree = %{public}ld", contactDataIdThree); EXPECT_GT(contactDataIdThree, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_500"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + QueryAndExpectResult(contactData, predicates3, values, "contactProfile_Insert_test_500"); values.Clear(); int64_t contactDataIdFour = ContactDataInsert(rawContactId, "phone", "188520314", "", values); - HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdFour = %{public}lld", contactDataIdFour); + HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdFour = %{public}ld", contactDataIdFour); EXPECT_GT(contactDataIdFour, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFour)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_500"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(contactDataIdFour)); + QueryAndExpectResult(contactData, predicates4, values, "contactProfile_Insert_test_500"); values.Clear(); int64_t contactDataIdFive = ContactDataInsert(rawContactId, "nickname", "xiaogang", "", values); - HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdFive = %{public}lld", contactDataIdFive); + HILOG_INFO("contactProfile_Insert_test_500 : contactDataIdFive = %{public}ld", contactDataIdFive); EXPECT_GT(contactDataIdFive, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFive)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_500"); + OHOS::DataShare::DataSharePredicates predicates5; + predicates5.EqualTo("id", std::to_string(contactDataIdFive)); + QueryAndExpectResult(contactData, predicates5, values, "contactProfile_Insert_test_500"); values.Clear(); ClearContacts(); } @@ -567,50 +567,49 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_600, testing::ext::TestS { HILOG_INFO("--- contactProfile_Insert_test_600 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("chengshao", values); - HILOG_INFO("contactProfile_Insert_test_600 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contactProfile_Insert_test_600 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); values.Clear(); int64_t contactDataIdOne = ContactDataInsert(rawContactId, "postal_address", "NanJingCity", "", values); - HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdOne = %{public}lld", contactDataIdOne); + HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdOne = %{public}ld", contactDataIdOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_600"); values.Clear(); int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "group_membership", "1", "", values); - HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdTwo = %{public}lld", contactDataIdTwo); + HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdTwo = %{public}ld", contactDataIdTwo); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_600"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, values, "contactProfile_Insert_test_600"); values.Clear(); int64_t contactDataIdThree = ContactDataInsert(rawContactId, "note", "dalao", "", values); - HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdThree = %{public}lld", contactDataIdThree); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_600"); + HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdThree = %{public}ld", contactDataIdThree); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + QueryAndExpectResult(contactData, predicates3, values, "contactProfile_Insert_test_600"); values.Clear(); int64_t contactDataIdFour = ContactDataInsert(rawContactId, "im", "aaaa", "", values); - HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdFour = %{public}lld", contactDataIdFour); + HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdFour = %{public}ld", contactDataIdFour); EXPECT_GT(contactDataIdFour, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFour)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_600"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(contactDataIdFour)); + QueryAndExpectResult(contactData, predicates4, values, "contactProfile_Insert_test_600"); values.Clear(); int64_t contactDataIdFive = ContactDataInsert(rawContactId, "website", "www.48236.com", "", values); - HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdFive = %{public}lld", contactDataIdFive); + HILOG_INFO("contactProfile_Insert_test_600 : contactDataIdFive = %{public}ld", contactDataIdFive); EXPECT_GT(contactDataIdFive, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFive)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_600"); + OHOS::DataShare::DataSharePredicates predicates5; + predicates5.EqualTo("id", std::to_string(contactDataIdFive)); + QueryAndExpectResult(contactData, predicates5, values, "contactProfile_Insert_test_600"); values.Clear(); ClearContacts(); } @@ -628,35 +627,34 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_700, testing::ext::TestS { HILOG_INFO("--- contactProfile_Insert_test_700 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("yanshao", values); - HILOG_INFO("contactProfile_Insert_test_700 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contactProfile_Insert_test_700 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); values.Clear(); int64_t contactDataIdOne = ContactDataInsert(rawContactId, "contactProfile_event", "19960229", "", values); - HILOG_INFO("contactProfile_Insert_test_700 : contactDataIdOne = %{public}lld", contactDataIdOne); + HILOG_INFO("contactProfile_Insert_test_700 : contactDataIdOne = %{public}ld", contactDataIdOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_700"); values.Clear(); int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "relation", "Secretary", "", values); - HILOG_INFO("contactProfile_Insert_test_700 : contactDataIdTwo = %{public}lld", contactDataIdTwo); + HILOG_INFO("contactProfile_Insert_test_700 : contactDataIdTwo = %{public}ld", contactDataIdTwo); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_700"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, values, "contactProfile_Insert_test_700"); values.Clear(); int64_t contactDataIdThree = ContactDataInsert(rawContactId, "contactProfile_misc", "1314", "", values); - HILOG_INFO("contactProfile_Insert_test_700 : contactDataIdThree = %{public}lld", contactDataIdThree); + HILOG_INFO("contactProfile_Insert_test_700 : contactDataIdThree = %{public}ld", contactDataIdThree); EXPECT_GT(contactDataIdThree, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_700"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + QueryAndExpectResult(contactData, predicates3, values, "contactProfile_Insert_test_700"); values.Clear(); ClearContacts(); } @@ -674,7 +672,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_700, testing::ext::TestS HWTEST_F(ContactProfileTest, contactProfile_Insert_test_800, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Insert_test_800 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactId = RawContactInsert("insert_detail_contactdata", rawValuesBucket); EXPECT_GT(rawContactId, 0); @@ -683,23 +681,22 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_800, testing::ext::TestS columnQuery.push_back("detail_info"); GetDetailsContactDataColumns(columns); - OHOS::NativeRdb::DataAbilityPredicates predicates; - OHOS::NativeRdb::ValuesBucket valuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket; std::string randomStr = ""; std::string tableName = ContactTabName::CONTACT_DATA; int columnSize = columns.size(); for (int i = 0; i < columnSize; i++) { randomStr = columns[i] + std::to_string(ContactsRand()); - valuesBucket.PutInt("raw_contact_id", rawContactId); - valuesBucket.PutString("content_type", columns[i]); - valuesBucket.PutString("detail_info", randomStr); + valuesBucket.Put("raw_contact_id", rawContactId); + valuesBucket.Put("content_type", columns[i]); + valuesBucket.Put("detail_info", randomStr); int contactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(contactDataId, 0); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataId)); - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -722,45 +719,44 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_900, testing::ext::TestS { HILOG_INFO("--- contactProfile_Insert_test_900 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("xiaoming", values); EXPECT_GT(rawContactId, 0); values.Clear(); int64_t contactDataIdOne = ContactDataInsert(rawContactId, "name", "xiaoming", "", values); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_900"); values.Clear(); int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", values); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_900"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, values, "contactProfile_Insert_test_900"); values.Clear(); rawContactId = RawContactInsert("lihong", values); - HILOG_INFO("contactProfile_Insert_test_900 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contactProfile_Insert_test_900 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); values.Clear(); int64_t contactDataIdThree = ContactDataInsert(rawContactId, "name", "lihong", "", values); - HILOG_INFO("contactProfile_Insert_test_900 : contactDataIdThree = %{public}lld", contactDataIdThree); + HILOG_INFO("contactProfile_Insert_test_900 : contactDataIdThree = %{public}ld", contactDataIdThree); EXPECT_GT(contactDataIdThree, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_900"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + QueryAndExpectResult(contactData, predicates3, values, "contactProfile_Insert_test_900"); values.Clear(); int64_t contactDataIdFour = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", values); - HILOG_INFO("contactProfile_Insert_test_900 : contactDataIdFour = %{public}lld", contactDataIdFour); + HILOG_INFO("contactProfile_Insert_test_900 : contactDataIdFour = %{public}ld", contactDataIdFour); EXPECT_GT(contactDataIdFour, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdFour)); - QueryAndExpectResult(contactData, predicates, values, "contactProfile_Insert_test_900"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(contactDataIdFour)); + QueryAndExpectResult(contactData, predicates4, values, "contactProfile_Insert_test_900"); values.Clear(); ClearContacts(); } @@ -781,19 +777,19 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_1000, testing::ext::Test std::vector columns; std::string contactData = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("feimaomao", rawContactValues); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); // type 6 is name - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(ContactDataId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); CheckResultSet(valuesBucket, resultSet, "contactProfile_Insert_test_1000"); // resultSet count 1 int rowCount = -1; @@ -815,19 +811,19 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_1000, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_1100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_1100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::vector vectorValue; vectorValue.push_back("zhangming"); vectorValue.push_back("tiantianxaingshang"); vectorValue.push_back("Test"); vectorValue.push_back("zhangming||zm"); int64_t rawContactId = RawContactExpandInsert(vectorValue, 1, values); - HILOG_INFO("contactProfile_Update_test_1100 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("contactProfile_Update_test_1100 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("display_name", "dongming"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("display_name", "dongming"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -835,25 +831,25 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1100, testing::ext::Test QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_1100"); updateValues.Clear(); - updateValues.PutString("company", "XXXX"); + updateValues.Put("company", "XXXX"); updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_1100"); updateValues.Clear(); - updateValues.PutString("position", "Secretary"); + updateValues.Put("position", "Secretary"); updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_1100"); updateValues.Clear(); - updateValues.PutString("favorite", "0"); + updateValues.Put("favorite", "0"); updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_1100"); updateValues.Clear(); - updateValues.PutString("phonetic_name", "dongming||dm"); + updateValues.Put("phonetic_name", "dongming||dm"); updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_1100"); @@ -871,7 +867,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1100, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_1200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_1200 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactIdOne = RawContactInsert("zhangming", values); EXPECT_GT(rawContactIdOne, 0); values.Clear(); @@ -884,9 +880,9 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1200, testing::ext::Test EXPECT_GT(rawContactIdThree, 0); values.Clear(); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("display_name", "dongming"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("display_name", "dongming"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -894,12 +890,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1200, testing::ext::Test QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_1200"); updateValues.Clear(); - updateValues.PutString("display_name", std::string("laoliu")); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdThree)); - updateCode = ContactUpdate(rawContacts, updateValues, predicates); + updateValues.Put("display_name", std::string("laoliu")); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactIdThree)); + updateCode = ContactUpdate(rawContacts, updateValues, predicates2); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_1200"); + QueryAndExpectResult(rawContacts, predicates2, updateValues, "contactProfile_Update_test_1200"); ClearContacts(); } @@ -919,20 +915,20 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1300, testing::ext::Test std::vector columnsStr; std::string rawContacts = ContactTabName::RAW_CONTACT; GetAllRawContactColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSetOne = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSetOne = ContactQuery(rawContacts, columns, predicates); CheckResultSet(valuesBucket, resultSetOne, "contactProfile_Update_test_1300"); - OHOS::NativeRdb::ValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int upDateCode = ContactUpdate(rawContacts, upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); // resultSet count 1 int rowCount = -1; @@ -954,26 +950,26 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1300, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_1400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_1400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("ligang", values); EXPECT_GT(rawContactId, 0); values.Clear(); - OHOS::NativeRdb::ValuesBucket valuesOne; + OHOS::DataShare::DataShareValuesBucket valuesOne; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "name", "ligang", "", valuesOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesTwo; + OHOS::DataShare::DataShareValuesBucket valuesTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", valuesTwo); EXPECT_GT(contactDataIdTwo, 0); - OHOS::NativeRdb::ValuesBucket valuesThree; + OHOS::DataShare::DataShareValuesBucket valuesThree; int64_t contactDataIdThree = ContactDataInsert(rawContactId, "email", "8523@163.com", "", valuesThree); EXPECT_GT(contactDataIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "dongming"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "dongming"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -981,21 +977,21 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1400, testing::ext::Test QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1400"); updateValues.Clear(); - updateValues.PutString("detail_info", "vivo"); - updateValues.PutString("position", "Developer"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "vivo"); + updateValues.Put("position", "Developer"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + updateCode = ContactUpdate(contactData, updateValues, predicates2); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1400"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contactProfile_Update_test_1400"); updateValues.Clear(); - updateValues.PutString("detail_info", "1220369@qq.com"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "1220369@qq.com"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + updateCode = ContactUpdate(contactData, updateValues, predicates3); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1400"); + QueryAndExpectResult(contactData, predicates3, updateValues, "contactProfile_Update_test_1400"); ClearContacts(); } @@ -1011,26 +1007,26 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1400, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_1500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_1500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaomi", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueOne; + OHOS::DataShare::DataShareValuesBucket contactDataValueOne; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "phone", "1665230", "", contactDataValueOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueTwo; + OHOS::DataShare::DataShareValuesBucket contactDataValueTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "nickname", "xiaomi", "", contactDataValueTwo); EXPECT_GT(contactDataIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueThree; + OHOS::DataShare::DataShareValuesBucket contactDataValueThree; int64_t contactDataIdThree = ContactDataInsert(rawContactId, "postal_address", "BeiJingFir", "", contactDataValueThree); EXPECT_GT(contactDataIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "33996652"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "33996652"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -1039,20 +1035,20 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1500, testing::ext::Test QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1500"); updateValues.Clear(); - updateValues.PutString("detail_info", "mimi"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "mimi"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + updateCode = ContactUpdate(contactData, updateValues, predicates2); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1500"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contactProfile_Update_test_1500"); updateValues.Clear(); - updateValues.PutString("detail_info", "NanJIngGulou"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "NanJIngGulou"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + updateCode = ContactUpdate(contactData, updateValues, predicates3); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1500"); + QueryAndExpectResult(contactData, predicates3, updateValues, "contactProfile_Update_test_1500"); ClearContacts(); } @@ -1068,26 +1064,26 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1500, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_1600, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_1600 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaocai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueOne; + OHOS::DataShare::DataShareValuesBucket contactDataValueOne; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "note", "dalao", "", contactDataValueOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueTwo; + OHOS::DataShare::DataShareValuesBucket contactDataValueTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "im", "aaaaaa", "", contactDataValueTwo); EXPECT_GT(contactDataIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValueThree; + OHOS::DataShare::DataShareValuesBucket contactDataValueThree; int64_t contactDataIdThree = ContactDataInsert(rawContactId, "contactProfile_event", "19820314", "", contactDataValueThree); EXPECT_GT(contactDataIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "God"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "God"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -1095,22 +1091,22 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1600, testing::ext::Test QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1600"); updateValues.Clear(); - updateValues.PutString("detail_info", "bcade"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "bcade"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + updateCode = ContactUpdate(contactData, updateValues, predicates2); HILOG_INFO("contactProfile_Update_test_1600: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1600"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contactProfile_Update_test_1600"); updateValues.Clear(); - updateValues.PutString("detail_info", "19820328"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "19820328"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + updateCode = ContactUpdate(contactData, updateValues, predicates3); HILOG_INFO("contactProfile_Update_test_1600: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1600"); + QueryAndExpectResult(contactData, predicates3, updateValues, "contactProfile_Update_test_1600"); ClearContacts(); } @@ -1126,25 +1122,25 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1600, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_1700, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_1700 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaocai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactValuesOne; + OHOS::DataShare::DataShareValuesBucket contactValuesOne; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "website", "www.aaa.com", "", contactValuesOne); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactValuesTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactId, "relation", "fuzi", "", contactValuesTwo); EXPECT_GT(contactDataIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactValuesThree; + OHOS::DataShare::DataShareValuesBucket contactValuesThree; int64_t contactDataIdThree = ContactDataInsert(rawContactId, "group_membership", "1", "", contactValuesThree); EXPECT_GT(contactDataIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "www.bbb.com"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "www.bbb.com"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -1152,22 +1148,22 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1700, testing::ext::Test QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1700"); updateValues.Clear(); - updateValues.PutString("detail_info", "laozhang"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "laozhang"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + updateCode = ContactUpdate(contactData, updateValues, predicates2); HILOG_INFO("contactProfile_Update_test_1700: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1700"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contactProfile_Update_test_1700"); updateValues.Clear(); - updateValues.PutString("detail_info", "2"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdThree)); - updateCode = ContactUpdate(contactData, updateValues, predicates); + updateValues.Put("detail_info", "2"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdThree)); + updateCode = ContactUpdate(contactData, updateValues, predicates3); HILOG_INFO("contactProfile_Update_test_1700: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1700"); + QueryAndExpectResult(contactData, predicates3, updateValues, "contactProfile_Update_test_1700"); ClearContacts(); } @@ -1182,17 +1178,17 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1700, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_1800, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_1800 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaocai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; int64_t contactDataIdOne = ContactDataInsert(rawContactId, "contactProfile_misc", "111", "", contactDataValues); EXPECT_GT(contactDataIdOne, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "222"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "222"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); std::string contactData = ContactTabName::CONTACT_DATA; int updateCode = ContactUpdate(contactData, updateValues, predicates); @@ -1213,10 +1209,10 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1800, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_1900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_1900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("ligang", rawContactValues); EXPECT_GT(rawContactIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactValues; + OHOS::DataShare::DataShareValuesBucket contactValues; int64_t contactDataId = ContactDataInsert(rawContactIdOne, "name", "ligang", "", contactValues); EXPECT_GT(contactDataId, 0); contactValues.Clear(); @@ -1236,9 +1232,9 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1900, testing::ext::Test contactDataId = ContactDataInsert(rawContactIdTwo, "organization", "tiantianxaingshang", "Test", contactValues); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("detail_info", "lixiang"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("detail_info", "lixiang"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactIdOne)); predicates.And(); // type 6 is phone @@ -1249,16 +1245,16 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_1900, testing::ext::Test QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1900"); updateValues.Clear(); - updateValues.PutString("detail_info", "zhangsan"); - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactIdTwo)); - predicates.And(); + updateValues.Put("detail_info", "zhangsan"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactIdTwo)); + predicates2.And(); // type 6 is phone - predicates.EqualTo("type_id", "6"); - updateCode = ContactUpdate(contactData, updateValues, predicates); + predicates2.EqualTo("type_id", "6"); + updateCode = ContactUpdate(contactData, updateValues, predicates2); HILOG_INFO("contactProfile_Update_test_1900: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - QueryAndExpectResult(contactData, predicates, updateValues, "contactProfile_Update_test_1900"); + QueryAndExpectResult(contactData, predicates2, updateValues, "contactProfile_Update_test_1900"); ClearContacts(); } @@ -1278,31 +1274,29 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2000, testing::ext::Test std::vector columns; std::string tableName = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("feimaotui", rawContactValues); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); // type_id 6 is name - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(ContactDataId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - OHOS::NativeRdb::ValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int upDateCode = ContactUpdate(tableName, upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - OHOS::NativeRdb::ValueObject value; - valuesBucket.GetObject("version", value); - int versionCode = -1; - value.GetInt(versionCode); + bool isValid = false; + int versionCode = valuesBucket.Get("version", isValid); versionCode += 1; - upDateValuesBucket.Delete("version"); - upDateValuesBucket.PutInt("version", versionCode); - std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); +// upDateValuesBucket.Delete("version"); + upDateValuesBucket.Put("version", versionCode); + std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); // resultSet count 1 int rowCount = -1; @@ -1323,7 +1317,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2000, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_2100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_2100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactId = RawContactInsert("update_detail_contactdata", rawValuesBucket); EXPECT_GT(rawContactId, 0); @@ -1332,9 +1326,8 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2100, testing::ext::Test columnQuery.push_back("detail_info"); GetDetailsContactDataColumns(columns); - OHOS::NativeRdb::DataAbilityPredicates predicates; - OHOS::NativeRdb::ValuesBucket valuesBucket; - OHOS::NativeRdb::ValuesBucket upDateValuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket; + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket; std::string randomStr = ""; std::string updateStrValue = ""; @@ -1342,20 +1335,20 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2100, testing::ext::Test int columnSize = columns.size(); for (int i = 0; i < columnSize; i++) { randomStr = columns[i] + std::to_string(ContactsRand()); - valuesBucket.PutInt("raw_contact_id", rawContactId); - valuesBucket.PutString("content_type", columns[i]); - valuesBucket.PutString("detail_info", randomStr); + valuesBucket.Put("raw_contact_id", rawContactId); + valuesBucket.Put("content_type", columns[i]); + valuesBucket.Put("detail_info", randomStr); int contactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(contactDataId, 0); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataId)); updateStrValue = "update_all" + randomStr; - upDateValuesBucket.PutString("detail_info", updateStrValue); + upDateValuesBucket.Put("detail_info", updateStrValue); int upDateCode = ContactUpdate(tableName, upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -1379,13 +1372,13 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2100, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_2200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_2200 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaozong", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -1405,7 +1398,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2200, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_2300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_2300 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("xiaowang", rawContactValues); EXPECT_GT(rawContactIdOne, 0); @@ -1416,9 +1409,9 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2300, testing::ext::Test int64_t rawContactIdThree = RawContactInsert("laowei", rawContactValues); EXPECT_GT(rawContactIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); @@ -1428,15 +1421,15 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2300, testing::ext::Test int updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdOne)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_2300"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdTwo)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_2300"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdThree)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_2300"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactIdOne)); + QueryAndExpectResult(rawContacts, predicates2, updateValues, "contactProfile_Update_test_2300"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(rawContactIdTwo)); + QueryAndExpectResult(rawContacts, predicates3, updateValues, "contactProfile_Update_test_2300"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(rawContactIdThree)); + QueryAndExpectResult(rawContacts, predicates4, updateValues, "contactProfile_Update_test_2300"); ClearContacts(); } @@ -1451,7 +1444,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2300, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_2400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_2400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::vector vectorValue; vectorValue.push_back("zhangming"); vectorValue.push_back("tiantianxaingshang"); @@ -1460,9 +1453,9 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2400, testing::ext::Test int64_t rawContactId = RawContactExpandInsert(vectorValue, 1, values); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -1482,7 +1475,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2400, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_2500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_2500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::vector vectorValue; vectorValue.push_back("zhangming"); vectorValue.push_back("tiantianxaingshang"); @@ -1507,12 +1500,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2500, testing::ext::Test vectorValue.push_back("Test"); vectorValue.push_back("abiao||ab"); int64_t rawContactIdThree = RawContactExpandInsert(vectorValue, 1, values); - HILOG_INFO("contactProfile_Update_test_2500 : rawContactIdThree = %{public}lld", rawContactIdThree); + HILOG_INFO("contactProfile_Update_test_2500 : rawContactIdThree = %{public}ld", rawContactIdThree); EXPECT_GT(rawContactIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); @@ -1522,17 +1515,17 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2500, testing::ext::Test int updateCode = ContactUpdate(rawContacts, updateValues, predicates); EXPECT_EQ(updateCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactId)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_2500"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactId)); + QueryAndExpectResult(rawContacts, predicates2, updateValues, "contactProfile_Update_test_2500"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdTwo)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_2500"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(rawContactIdTwo)); + QueryAndExpectResult(rawContacts, predicates3, updateValues, "contactProfile_Update_test_2500"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactIdThree)); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_2500"); + OHOS::DataShare::DataSharePredicates predicates4; + predicates4.EqualTo("id", std::to_string(rawContactIdThree)); + QueryAndExpectResult(rawContacts, predicates4, updateValues, "contactProfile_Update_test_2500"); ClearContacts(); } @@ -1547,11 +1540,11 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_2500, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Insert_test_2600, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Insert_test_2600 is starting! ---"); - OHOS::NativeRdb::ValuesBucket blocklistValues; + OHOS::DataShare::DataShareValuesBucket blocklistValues; int64_t blocklistId = ContactBlocklistInsert("10086", blocklistValues); EXPECT_GT(blocklistId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(blocklistId)); std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST; QueryAndExpectResult(contactBlocklist, predicates, blocklistValues, "contactProfile_Insert_test_2600"); @@ -1570,26 +1563,26 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_2700, testing::ext::Test { HILOG_INFO("--- contactProfile_Insert_test_2700 is starting! ---"); std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST; - OHOS::NativeRdb::ValuesBucket blocklistValues; + OHOS::DataShare::DataShareValuesBucket blocklistValues; int64_t blocklistIdOne = ContactBlocklistInsert("188520", blocklistValues); EXPECT_GT(blocklistIdOne, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(blocklistIdOne)); QueryAndExpectResult(contactBlocklist, predicates, blocklistValues, "contactProfile_Insert_test_2700"); blocklistValues.Clear(); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; int64_t blocklistIdTwo = ContactBlocklistInsert("130269", blocklistValues); EXPECT_GT(blocklistIdTwo, 0); - predicates.EqualTo("id", std::to_string(blocklistIdTwo)); - QueryAndExpectResult(contactBlocklist, predicates, blocklistValues, "contactProfile_Insert_test_2700"); + predicates2.EqualTo("id", std::to_string(blocklistIdTwo)); + QueryAndExpectResult(contactBlocklist, predicates2, blocklistValues, "contactProfile_Insert_test_2700"); blocklistValues.Clear(); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates3; int64_t blocklistIdThree = ContactBlocklistInsert("772501", blocklistValues); EXPECT_GT(blocklistIdThree, 0); - predicates.EqualTo("id", std::to_string(blocklistIdThree)); - QueryAndExpectResult(contactBlocklist, predicates, blocklistValues, "contactProfile_Insert_test_2700"); + predicates3.EqualTo("id", std::to_string(blocklistIdThree)); + QueryAndExpectResult(contactBlocklist, predicates3, blocklistValues, "contactProfile_Insert_test_2700"); ClearContacts(); } @@ -1609,14 +1602,14 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_2800, testing::ext::Test std::vector columns; std::string tableName = ContactTabName::CONTACT_BLOCKLIST; GetAllContactBlocklistColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int contactBlockId = ContactBlocklistInsertValues(valuesBucket); EXPECT_GT(contactBlockId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactBlockId)); - std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columns, predicates); // resultSet count 1 int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -1636,17 +1629,17 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_2800, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Delete_test_2900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Delete_test_2900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket blocklistValues; + OHOS::DataShare::DataShareValuesBucket blocklistValues; int64_t blocklistId = ContactBlocklistInsert("147852369", blocklistValues); EXPECT_GT(blocklistId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(blocklistId)); std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST; int deleteCode = ContactDelete(contactBlocklist, predicates); EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(contactBlocklist, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -1666,7 +1659,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_2900, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3000, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Delete_test_3000 is starting! ---"); - OHOS::NativeRdb::ValuesBucket blocklistValues; + OHOS::DataShare::DataShareValuesBucket blocklistValues; int64_t blocklistIdOne = ContactBlocklistInsert("111228855", blocklistValues); EXPECT_GT(blocklistIdOne, 0); @@ -1678,7 +1671,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3000, testing::ext::Test int64_t blocklistIdThree = ContactBlocklistInsert("9933220011", blocklistValues); EXPECT_GT(blocklistIdThree, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(blocklistIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(blocklistIdTwo)); @@ -1689,7 +1682,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3000, testing::ext::Test EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(contactBlocklist, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -1714,19 +1707,19 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3100, testing::ext::Test std::vector columnsInt; std::vector columnsStr; GetAllContactBlocklistColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int contacBlockId = ContactBlocklistInsertValues(valuesBucket); EXPECT_GT(contacBlockId, 0); // test end delete data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contacBlockId)); std::string tableName = ContactTabName::CONTACT_BLOCKLIST; int deleteCode = ContactDelete(tableName, predicates); EXPECT_EQ(deleteCode, 0); MergeColumns(columns, columnsInt, columnsStr); - std::shared_ptr resultSetDeleteQuery = + std::shared_ptr resultSetDeleteQuery = ContactQuery(tableName, columns, predicates); int rowCount = -1; resultSetDeleteQuery->GetRowCount(rowCount); @@ -1745,18 +1738,18 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3100, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Insert_test_3200, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Insert_test_3200 is staring! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaoli", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket groupValues; + OHOS::DataShare::DataShareValuesBucket groupValues; int64_t groupId = GroupsInsert("TestFirstGroup", groupValues); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValue; + OHOS::DataShare::DataShareValuesBucket contactDataValue; int64_t contactDataId = ContactDataInsert(rawContactId, "group_membership", std::to_string(groupId), "", contactDataValue); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataId)); std::string contactData = ContactTabName::CONTACT_DATA; QueryAndExpectResult(contactData, predicates, contactDataValue, "contactProfile_Insert_test_3200"); @@ -1774,7 +1767,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_3200, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Insert_test_3300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Insert_test_3300 is staring! ---"); - OHOS::NativeRdb::ValuesBucket groupValues; + OHOS::DataShare::DataShareValuesBucket groupValues; int64_t groupIdOne = GroupsInsert("TestSecondGroup", groupValues); EXPECT_GT(groupIdOne, 0); groupValues.Clear(); @@ -1782,7 +1775,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_3300, testing::ext::Test int64_t groupIdTwo = GroupsInsert("DeveloperFirstGroup", groupValues); EXPECT_GT(groupIdTwo, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("xiaoli", rawContactValues); EXPECT_GT(rawContactIdOne, 0); rawContactValues.Clear(); @@ -1790,22 +1783,22 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_3300, testing::ext::Test int64_t rawContactIdTwo = RawContactInsert("BossCai", rawContactValues); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValuesOne; + OHOS::DataShare::DataShareValuesBucket contactDataValuesOne; int64_t contactDataIdOne = ContactDataInsert(rawContactIdOne, "group_membership", std::to_string(groupIdOne), "", contactDataValuesOne); EXPECT_GT(contactDataIdOne, 0); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); QueryAndExpectResult(contactData, predicates, contactDataValuesOne, "contactProfile_Insert_test_3300"); - OHOS::NativeRdb::ValuesBucket contactDataValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactDataValuesTwo; int64_t contactDataIdTwo = ContactDataInsert(rawContactIdTwo, "group_membership", std::to_string(groupIdTwo), "", contactDataValuesTwo); EXPECT_GT(contactDataIdTwo, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - QueryAndExpectResult(contactData, predicates, contactDataValuesTwo, "contactProfile_Insert_test_3300"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdTwo)); + QueryAndExpectResult(contactData, predicates2, contactDataValuesTwo, "contactProfile_Insert_test_3300"); ClearContacts(); } @@ -1825,14 +1818,14 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_3400, testing::ext::Test std::vector columns; std::string group = ContactTabName::GROUPS; GetAllGroupsColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = GroupsInsertValues(valuesBucket); EXPECT_GT(rawId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSet = ContactQuery(group, columns, predicates); + std::shared_ptr resultSet = ContactQuery(group, columns, predicates); // resultSet count 1 int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -1852,31 +1845,31 @@ HWTEST_F(ContactProfileTest, contactProfile_Insert_test_3400, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Delete_test_3500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket groupValues; + OHOS::DataShare::DataShareValuesBucket groupValues; int64_t groupId = GroupsInsert("CEO", groupValues); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaoli", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; int64_t contactDataId = ContactDataInsert(rawContactId, "group_membership", std::to_string(groupId), "", contactDataValues); EXPECT_GT(contactDataId, 0); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); predicates.And(); // type_id 9 is group_membership predicates.EqualTo("type_id", "9"); int deleteCode = ContactDelete(contactData, predicates); EXPECT_EQ(deleteCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataId)); std::vector columns; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates2); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -1895,16 +1888,16 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3500, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3600, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Delete_test_3600 is starting! ---"); - OHOS::NativeRdb::ValuesBucket groupValues; + OHOS::DataShare::DataShareValuesBucket groupValues; int64_t groupIdOne = GroupsInsert("Test", groupValues); - HILOG_INFO("contactProfile_Delete_test_3600: groupIdOne = %{public}lld", groupIdOne); + HILOG_INFO("contactProfile_Delete_test_3600: groupIdOne = %{public}ld", groupIdOne); EXPECT_GT(groupIdOne, 0); groupValues.Clear(); int64_t groupIdTwo = GroupsInsert("Developer", groupValues); - HILOG_INFO("contactProfile_Delete_test_3600: groupIdTwo = %{public}lld", groupIdTwo); + HILOG_INFO("contactProfile_Delete_test_3600: groupIdTwo = %{public}ld", groupIdTwo); EXPECT_GT(groupIdTwo, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("xiaoli", rawContactValues); EXPECT_GT(rawContactIdOne, 0); @@ -1912,7 +1905,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3600, testing::ext::Test int64_t rawContactIdTwo = RawContactInsert("xiaoyuan", rawContactValues); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; int64_t contactDataIdOne = ContactDataInsert(rawContactIdOne, "group_membership", std::to_string(groupIdOne), "", contactDataValues); EXPECT_GT(contactDataIdOne, 0); @@ -1923,24 +1916,24 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3600, testing::ext::Test EXPECT_GT(contactDataIdTwo, 0); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(contactDataIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(contactDataIdTwo)); int deleteCode = ContactDelete(contactData, predicates); EXPECT_EQ(deleteCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdOne)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(contactDataIdOne)); std::vector columns; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates2); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); resultSet->Close(); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(contactDataIdTwo)); - std::shared_ptr resultSetTwo = ContactQuery(contactData, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(contactDataIdTwo)); + std::shared_ptr resultSetTwo = ContactQuery(contactData, columns, predicates3); int rowCountTwo = 0; resultSetTwo->GetRowCount(rowCountTwo); EXPECT_EQ(0, rowCountTwo); @@ -1964,12 +1957,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3700, testing::ext::Test std::vector columnsInt; std::vector columnsStr; GetAllGroupsColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int groupId = GroupsInsertValues(valuesBucket); EXPECT_GT(groupId, 0); // test end delete data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(groupId)); EXPECT_GT(groupId, 0); std::string tableName = ContactTabName::GROUPS; @@ -1977,7 +1970,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_3700, testing::ext::Test EXPECT_EQ(deleteCode, 0); MergeColumns(columns, columnsInt, columnsStr); - std::shared_ptr resultSetDeleteQuery = + std::shared_ptr resultSetDeleteQuery = ContactQuery(tableName, columns, predicates); int rowCount = -1; resultSetDeleteQuery->GetRowCount(rowCount); @@ -2002,19 +1995,19 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_3800, testing::ext::TestS columns.push_back("position"); columns.push_back("favorite"); columns.push_back("phonetic_name"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("display_name", "xiaoyuan"); - valuesBucket.PutString("company", "tiantianxiangshang"); - valuesBucket.PutString("position", "Test"); - valuesBucket.PutInt("favorite", 1); - valuesBucket.PutString("phonetic_name", "xiaoyuanxy"); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + valuesBucket.Put("display_name", "xiaoyuan"); + valuesBucket.Put("company", "tiantianxiangshang"); + valuesBucket.Put("position", "Test"); + valuesBucket.Put("favorite", 1); + valuesBucket.Put("phonetic_name", "xiaoyuanxy"); int64_t rawContactId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); // resultSet count 1 int rowCount = -1; @@ -2035,30 +2028,30 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_3800, testing::ext::TestS HWTEST_F(ContactProfileTest, contactProfile_Query_test_3900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Query_test_3900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesBucketOne; - valuesBucketOne.PutString("display_name", "xiaohei"); - valuesBucketOne.PutString("company", "tiantianxiangshang"); - valuesBucketOne.PutString("position", "Test"); - valuesBucketOne.PutInt("favorite", 1); - valuesBucketOne.PutString("phonetic_name", "xiaohei||xh"); + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; + valuesBucketOne.Put("display_name", "xiaohei"); + valuesBucketOne.Put("company", "tiantianxiangshang"); + valuesBucketOne.Put("position", "Test"); + valuesBucketOne.Put("favorite", 1); + valuesBucketOne.Put("phonetic_name", "xiaohei||xh"); int64_t rawContactIdOne = RawContactInsertValues(valuesBucketOne); EXPECT_GT(rawContactIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; - valuesBucketTwo.PutString("display_name", "xiaobai"); - valuesBucketTwo.PutString("company", "tiantianxiangshang"); - valuesBucketTwo.PutString("position", "Test"); - valuesBucketTwo.PutInt("favorite", 1); - valuesBucketTwo.PutString("phonetic_name", "xiaohei||xh"); + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; + valuesBucketTwo.Put("display_name", "xiaobai"); + valuesBucketTwo.Put("company", "tiantianxiangshang"); + valuesBucketTwo.Put("position", "Test"); + valuesBucketTwo.Put("favorite", 1); + valuesBucketTwo.Put("phonetic_name", "xiaohei||xh"); int64_t rawContactIdTwo = RawContactInsertValues(valuesBucketTwo); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketThr; - valuesBucketThr.PutString("display_name", "xiaocai"); - valuesBucketThr.PutString("company", "tiantianxiangshang"); - valuesBucketThr.PutString("position", "Test"); - valuesBucketThr.PutInt("favorite", 1); - valuesBucketThr.PutString("phonetic_name", "xiaohei||xh"); + OHOS::DataShare::DataShareValuesBucket valuesBucketThr; + valuesBucketThr.Put("display_name", "xiaocai"); + valuesBucketThr.Put("company", "tiantianxiangshang"); + valuesBucketThr.Put("position", "Test"); + valuesBucketThr.Put("favorite", 1); + valuesBucketThr.Put("phonetic_name", "xiaohei||xh"); int64_t rawContactIdThr = RawContactInsertValues(valuesBucketThr); EXPECT_GT(rawContactIdThr, 0); @@ -2068,15 +2061,15 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_3900, testing::ext::TestS columns.push_back("position"); columns.push_back("favorite"); columns.push_back("phonetic_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdThr)); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); - std::vector listValue; + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::vector listValue; listValue.push_back(valuesBucketOne); listValue.push_back(valuesBucketTwo); listValue.push_back(valuesBucketThr); @@ -2096,12 +2089,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4000, testing::ext::TestS { HILOG_INFO("--- contactProfile_Query_test_4000 is starting! ---"); std::string tag("contactProfile_Query_test_4000"); - OHOS::NativeRdb::ValuesBucket valuesBucketOne; - valuesBucketOne.PutString("display_name", "xiaohsaaei"); - valuesBucketOne.PutString("company", "tiantianxiadsjjnngshang"); - valuesBucketOne.PutString("position", "Tests"); - valuesBucketOne.PutInt("favorite", 1); - valuesBucketOne.PutString("phonetic_name", "xiaohssei||x00h"); + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; + valuesBucketOne.Put("display_name", "xiaohsaaei"); + valuesBucketOne.Put("company", "tiantianxiadsjjnngshang"); + valuesBucketOne.Put("position", "Tests"); + valuesBucketOne.Put("favorite", 1); + valuesBucketOne.Put("phonetic_name", "xiaohssei||x00h"); RawContactInsertValues(valuesBucketOne); RawContactInsertValues(valuesBucketOne); std::vector columns; @@ -2109,11 +2102,11 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4000, testing::ext::TestS columns.push_back("display_name"); columns.push_back("company"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.EqualTo("is_deleted", "0"); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); // resultSet count int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -2137,20 +2130,20 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4100, testing::ext::TestS std::vector columns; std::string contactData = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawContactValues; - rawContactValues.PutString("favorite", "1"); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawContactValues; + rawContactValues.Put("favorite", "1"); int64_t rawContactId = RawContactInsert("feimaomao4100", rawContactValues); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); // type 6 is name - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(ContactDataId, 0); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); CheckResultSet(valuesBucket, resultSet, "contactProfile_Query_test_4100"); // resultSet count 1 int rowCount = -1; @@ -2172,14 +2165,14 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4200, testing::ext::TestS { HILOG_INFO("--- contactProfile_Query_test_4200 is starting! ---"); std::string tag("contactProfile_Query_test_4200"); - OHOS::NativeRdb::ValuesBucket valuesBucketGroup; + OHOS::DataShare::DataShareValuesBucket valuesBucketGroup; int64_t groupId = GroupsInsert("dongshihui", valuesBucketGroup); EXPECT_GT(groupId, 0); - OHOS::NativeRdb::ValuesBucket rawContactValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawContactValuesBucket; int64_t rawContactId = RawContactInsert("licheng", rawContactValuesBucket); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketOne; + OHOS::DataShare::DataShareValuesBucket valuesBucketOne; int64_t contactDataId = ContactDataInsert(rawContactId, "group_membership", std::to_string(groupId), "", valuesBucketOne); EXPECT_GT(contactDataId, 0); @@ -2187,23 +2180,23 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4200, testing::ext::TestS rawContactValuesBucket.Clear(); rawContactId = RawContactInsert("xiaoyuan", rawContactValuesBucket); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket valuesBucketTwo; + OHOS::DataShare::DataShareValuesBucket valuesBucketTwo; contactDataId = ContactDataInsert(rawContactId, "group_membership", std::to_string(groupId), "", valuesBucketTwo); EXPECT_GT(contactDataId, 0); std::vector columns; columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("detail_info", std::to_string(groupId)); predicates.And(); // type_id 9 is group_membership predicates.EqualTo("type_id", "9"); std::string contactData = ContactTabName::CONTACT_DATA; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector listValue; + std::vector listValue; listValue.push_back(valuesBucketOne); listValue.push_back(valuesBucketTwo); CheckResultSetList(listValue, resultSet, "contactProfile_Query_test_4200"); @@ -2221,12 +2214,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4200, testing::ext::TestS HWTEST_F(ContactProfileTest, contactProfile_Query_test_4300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Query_test_4300 is starting! ---"); - OHOS::NativeRdb::ValuesBucket valuesBucket; - valuesBucket.PutString("display_name", "xiaoyuan"); - valuesBucket.PutString("company", "tiantianxiangshang"); - valuesBucket.PutString("position", "Test"); - valuesBucket.PutInt("favorite", 1); - valuesBucket.PutString("phonetic_name", "xiaoyuanxy"); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + valuesBucket.Put("display_name", "xiaoyuan"); + valuesBucket.Put("company", "tiantianxiangshang"); + valuesBucket.Put("position", "Test"); + valuesBucket.Put("favorite", 1); + valuesBucket.Put("phonetic_name", "xiaoyuanxy"); int64_t rawContactId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawContactId, 0); @@ -2235,7 +2228,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4300, testing::ext::TestS columns.push_back("display_name"); columns.push_back("company"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("favorite", "1"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -2243,7 +2236,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4300, testing::ext::TestS predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -2263,7 +2256,7 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4300, testing::ext::TestS HWTEST_F(ContactProfileTest, contactProfile_Query_test_4400, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Query_test_4400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawContactValuesBucket; int64_t rawContactId = RawContactLastContactedInsert("wangwu", 60, rawContactValuesBucket); EXPECT_GT(rawContactId, 0); @@ -2271,12 +2264,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4400, testing::ext::TestS columns.push_back("id"); columns.push_back("display_name"); columns.push_back("lastest_contacted_time"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("lastest_contacted_time", "60"); predicates.And(); predicates.EqualTo("is_deleted", "0"); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -2296,11 +2289,11 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4400, testing::ext::TestS HWTEST_F(ContactProfileTest, contactProfile_Query_test_4500, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Query_test_4500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaobai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int deleteCode = ContactDelete(rawContacts, predicates); @@ -2309,11 +2302,11 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4500, testing::ext::TestS sleep(SLEEP_TIME); std::vector columns; columns.push_back("display_name"); - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string deletedRawContact = ContactTabName::DELETED_RAW_CONTACT; - std::shared_ptr resultSet = - ContactQuery(deletedRawContact, columns, predicates); + std::shared_ptr resultSet = + ContactQuery(deletedRawContact, columns, predicates2); int rowCount = -1; resultSet->GetRowCount(rowCount); @@ -2334,34 +2327,34 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4600, testing::ext::TestS { HILOG_INFO("--- contactProfile_Query_test_4600 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = ContactDelete(contactData, predicates); EXPECT_EQ(deleteCode, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("dongming", rawContactValues); EXPECT_GT(rawContactIdOne, 0); - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; int64_t contactDataId = ContactDataInsert(rawContactIdOne, "phone", "155825478", "", contactDataValues); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::ValuesBucket rawContactValuesTwo; + OHOS::DataShare::DataShareValuesBucket rawContactValuesTwo; int64_t rawContactIdTwo = RawContactInsert("xiaocai", rawContactValuesTwo); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactDataValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactDataValuesTwo; contactDataId = ContactDataInsert(rawContactIdTwo, "phone", "18853269857", "", contactDataValuesTwo); EXPECT_GT(contactDataId, 0); std::vector columns; columns.push_back("detail_info"); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; // type_id 5 is phone - predicates.EqualTo("type_id", "5"); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - std::vector listValue; + predicates2.EqualTo("type_id", "5"); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates2); + std::vector listValue; listValue.push_back(contactDataValues); listValue.push_back(contactDataValuesTwo); CheckResultSetList(listValue, resultSet, "contactProfile_Query_test_4600"); @@ -2380,12 +2373,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4700, testing::ext::TestS { HILOG_INFO("--- contactProfile_Query_test_4700 is starting! ---"); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = ContactDelete(contactData, predicates); EXPECT_EQ(deleteCode, 0); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactIdOne = RawContactInsert("dongming", rawContactValues); EXPECT_GT(rawContactIdOne, 0); rawContactValues.Clear(); @@ -2393,21 +2386,21 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4700, testing::ext::TestS int64_t rawContactIdTwo = RawContactInsert("xiaocai", rawContactValues); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::ValuesBucket contactValues; + OHOS::DataShare::DataShareValuesBucket contactValues; int64_t contactDataId = ContactDataInsert(rawContactIdOne, "email", "166@163.com", "", contactValues); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::ValuesBucket contactValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactValuesTwo; contactDataId = ContactDataInsert(rawContactIdTwo, "email", "199@163.com", "", contactValuesTwo); EXPECT_GT(contactDataId, 0); std::vector columns; columns.push_back("detail_info"); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; // type_id 1 is email - predicates.EqualTo("type_id", "1"); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - std::vector listValue; + predicates2.EqualTo("type_id", "1"); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates2); + std::vector listValue; listValue.push_back(contactValues); listValue.push_back(contactValuesTwo); CheckResultSetList(listValue, resultSet, "contactProfile_Query_test_4700"); @@ -2427,26 +2420,26 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4800, testing::ext::TestS HILOG_INFO("--- contactProfile_Query_test_4800 is starting! ---"); std::string tag("contactProfile_Query_test_4800"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("BossCai", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactValues; + OHOS::DataShare::DataShareValuesBucket contactValues; int64_t contactDataId = ContactDataInsert(rawContactId, "name", "BossCai", "", contactValues); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::ValuesBucket contactValuesTwo; + OHOS::DataShare::DataShareValuesBucket contactValuesTwo; contactDataId = ContactDataInsert(rawContactId, "organization", "happy500", "Test", contactValuesTwo); EXPECT_GT(contactDataId, 0); std::vector columns; columns.push_back("detail_info"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string contactData = ContactTabName::CONTACT_DATA; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - std::vector listValue; + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::vector listValue; listValue.push_back(contactValues); listValue.push_back(contactValuesTwo); CheckResultSetList(listValue, resultSet, "contactProfile_Query_test_4800"); @@ -2464,12 +2457,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Query_test_4800, testing::ext::TestS HWTEST_F(ContactProfileTest, contactProfile_Delete_test_4900, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Delete_test_4900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaoli", rawContactValues); - HILOG_INFO("rawContactId= %{public}lld", rawContactId); + HILOG_INFO("rawContactId= %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int deleteCode = ContactDelete(rawContacts, predicates); @@ -2480,15 +2473,15 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_4900, testing::ext::Test columns.push_back("raw_contact_id"); columns.push_back("display_name"); std::string deletedRawContact = ContactTabName::DELETED_RAW_CONTACT; - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = - ContactQuery(deletedRawContact, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); + std::shared_ptr resultSet = + ContactQuery(deletedRawContact, columns, predicates2); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); - rawContactValues.PutInt("raw_contact_id", rawContactId); + rawContactValues.Put("raw_contact_id", rawContactId); CheckResultSet(rawContactValues, resultSet, "contactProfile_Delete_test_4900"); ClearContacts(); } @@ -2508,12 +2501,12 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5000, testing::ext::Test std::vector columnsInt; std::vector columnsStr; GetAllRawContactColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); int rawId = RawContactInsertValues(valuesBucket); EXPECT_GT(rawId, 0); // test end delete data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); EXPECT_GT(rawId, 0); std::string rawContacts = ContactTabName::RAW_CONTACT; @@ -2521,8 +2514,8 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5000, testing::ext::Test EXPECT_EQ(deleteCode, 0); std::vector columns; columns.push_back("is_deleted"); - OHOS::NativeRdb::ValuesBucket valuesBucketDelete; - valuesBucketDelete.PutInt("is_deleted", 1); + OHOS::DataShare::DataShareValuesBucket valuesBucketDelete; + valuesBucketDelete.Put("is_deleted", 1); QueryAndExpectResult(rawContacts, predicates, valuesBucketDelete, "contactProfile_Delete_test_5000"); ClearContacts(); } @@ -2538,15 +2531,15 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5000, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5100, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Delete_test_5100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("siyuan", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket contactValue; + OHOS::DataShare::DataShareValuesBucket contactValue; int64_t contactDataId = ContactDataInsert(rawContactId, "organization", "tiantianxaingshang", "Test", contactValue); EXPECT_GT(contactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int deleteCode = ContactDelete(rawContacts, predicates); @@ -2557,15 +2550,15 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5100, testing::ext::Test columns.push_back("raw_contact_id"); columns.push_back("display_name"); std::string deletedRawContact = ContactTabName::DELETED_RAW_CONTACT; - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = - ContactQuery(deletedRawContact, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); + std::shared_ptr resultSet = + ContactQuery(deletedRawContact, columns, predicates2); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); - rawContactValues.PutInt("raw_contact_id", rawContactId); + rawContactValues.Put("raw_contact_id", rawContactId); CheckResultSet(rawContactValues, resultSet, "contactProfile_Delete_test_5100"); ClearContacts(); } @@ -2586,22 +2579,22 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5200, testing::ext::Test std::vector columns; std::string tableName = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("feimaotui", rawContactValues); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); // type id 6 is name - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_GT(ContactDataId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); int deleteCode = ContactDelete(tableName, predicates); EXPECT_EQ(deleteCode, 0); MergeColumns(columns, columnsInt, columnsStr); - std::shared_ptr resultSetDeleteQuery = + std::shared_ptr resultSetDeleteQuery = ContactQuery(tableName, columns, predicates); // resultSet count 0 int rowCount = -1; @@ -2621,11 +2614,11 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5200, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5300, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Delete_test_5300 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaohong", rawContactValues); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("name_raw_contact_id", std::to_string(rawContactId)); std::string contact = ContactTabName::CONTACT; int deleteCode = ContactDelete(contact, predicates); @@ -2635,16 +2628,16 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5300, testing::ext::Test std::vector columns; columns.push_back("raw_contact_id"); columns.push_back("display_name"); - predicates.Clear(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::string deletedRawContact = ContactTabName::DELETED_RAW_CONTACT; - std::shared_ptr resultSet = - ContactQuery(deletedRawContact, columns, predicates); + std::shared_ptr resultSet = + ContactQuery(deletedRawContact, columns, predicates2); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); - rawContactValues.PutInt("raw_contact_id", rawContactId); + rawContactValues.Put("raw_contact_id", rawContactId); CheckResultSet(rawContactValues, resultSet, "contactProfile_Delete_test_5300"); ClearContacts(); } @@ -2661,22 +2654,22 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsert_test_5400, testing::ext: { HILOG_INFO("--- contactProfile_BatchInsert_test_5400 is starting! ---"); OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValuesOne; - rawContactValuesOne.PutString("display_name", std::string("zhangming")); - rawContactValuesOne.PutString("company", std::string("tiantainxiangzuo4200000000")); - rawContactValuesOne.PutString("position", std::string("Test")); + OHOS::DataShare::DataShareValuesBucket rawContactValuesOne; + rawContactValuesOne.Put("display_name", std::string("zhangming")); + rawContactValuesOne.Put("company", std::string("tiantainxiangzuo4200000000")); + rawContactValuesOne.Put("position", std::string("Test")); - OHOS::NativeRdb::ValuesBucket rawContactValuesTwo; - rawContactValuesTwo.PutString("display_name", std::string("ligang")); - rawContactValuesTwo.PutString("company", std::string("tiantainxiangzuo4200000000")); - rawContactValuesTwo.PutString("position", std::string("Developer")); + OHOS::DataShare::DataShareValuesBucket rawContactValuesTwo; + rawContactValuesTwo.Put("display_name", std::string("ligang")); + rawContactValuesTwo.Put("company", std::string("tiantainxiangzuo4200000000")); + rawContactValuesTwo.Put("position", std::string("Developer")); - OHOS::NativeRdb::ValuesBucket rawContactValuesThree; - rawContactValuesThree.PutString("display_name", std::string("wanghong")); - rawContactValuesThree.PutString("company", std::string("tiantainxiangzuo4200000000")); - rawContactValuesThree.PutString("position", std::string("manage")); + OHOS::DataShare::DataShareValuesBucket rawContactValuesThree; + rawContactValuesThree.Put("display_name", std::string("wanghong")); + rawContactValuesThree.Put("company", std::string("tiantainxiangzuo4200000000")); + rawContactValuesThree.Put("position", std::string("manage")); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(rawContactValuesOne); listAddBluk.push_back(rawContactValuesTwo); listAddBluk.push_back(rawContactValuesThree); @@ -2685,13 +2678,13 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsert_test_5400, testing::ext: EXPECT_EQ(batchInserCode, 0); std::string rawContacts = ContactTabName::RAW_CONTACT; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("company", "tiantainxiangzuo4200000000"); predicates.And(); predicates.EqualTo("is_deleted", "0"); predicates.OrderByAsc("id"); std::vector columns; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); int rowCount = 0; int queryCount = 3; resultSet->GetRowCount(rowCount); @@ -2713,34 +2706,34 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsert_test_5500, testing::ext: HILOG_INFO("--- contactProfile_BatchInsert_test_5500 is starting! ---"); OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); OHOS::Uri uriContactData(ProfileUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket rawContactValues; - rawContactValues.PutString("display_name", "zhangming"); + OHOS::DataShare::DataShareValuesBucket rawContactValues; + rawContactValues.Put("display_name", "zhangming"); int64_t rawContactId = contactsDataAbility.Insert(uriRawContact, rawContactValues); EXPECT_GT(rawContactId, 0); - std::vector listAddBluk = GetBatchList(rawContactId); + std::vector listAddBluk = GetBatchList(rawContactId); int batchInserCode = contactsDataAbility.BatchInsert(uriContactData, listAddBluk); EXPECT_EQ(batchInserCode, 0); std::string contactData = ContactTabName::CONTACT_DATA; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; // type_id 1 is email predicates.EqualTo("type_id", "1"); predicates.And(); predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); std::vector columns; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); int indexTwo = 2; CheckResultSet(listAddBluk[indexTwo], resultSet, "contactProfile_BatchInsert_test_5500"); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; // type 5 is phone - predicates.EqualTo("type_id", "5"); - predicates.And(); - predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSetFour = ContactQuery(contactData, columns, predicates); + predicates2.EqualTo("type_id", "5"); + predicates2.And(); + predicates2.EqualTo("raw_contact_id", std::to_string(rawContactId)); + std::shared_ptr resultSetFour = ContactQuery(contactData, columns, predicates2); int rowCountFour = 0; resultSetFour->GetRowCount(rowCountFour); EXPECT_EQ(1, rowCountFour); @@ -2749,26 +2742,26 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsert_test_5500, testing::ext: ClearContacts(); } -std::vector ContactProfileTest::GetBatchList(int64_t rawContactId) +std::vector ContactProfileTest::GetBatchList(int64_t rawContactId) { - OHOS::NativeRdb::ValuesBucket contactDataValuesOne; - contactDataValuesOne.PutInt("raw_contact_id", rawContactId); - contactDataValuesOne.PutString("content_type", "name"); - contactDataValuesOne.PutString("detail_info", "zhangming"); - OHOS::NativeRdb::ValuesBucket contactDataValuesTwo; - contactDataValuesTwo.PutInt("raw_contact_id", rawContactId); - contactDataValuesTwo.PutString("content_type", "organization"); - contactDataValuesTwo.PutString("detail_info", "tiantianxaingshang"); - contactDataValuesTwo.PutString("position", "Test"); - OHOS::NativeRdb::ValuesBucket contactDataValuesThree; - contactDataValuesThree.PutInt("raw_contact_id", rawContactId); - contactDataValuesThree.PutString("content_type", "email"); - contactDataValuesThree.PutString("detail_info", "199632@163.com"); - OHOS::NativeRdb::ValuesBucket contactDataValuesFour; - contactDataValuesFour.PutInt("raw_contact_id", rawContactId); - contactDataValuesFour.PutString("content_type", "phone"); - contactDataValuesFour.PutString("detail_info", "1234567898"); - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket contactDataValuesOne; + contactDataValuesOne.Put("raw_contact_id", rawContactId); + contactDataValuesOne.Put("content_type", "name"); + contactDataValuesOne.Put("detail_info", "zhangming"); + OHOS::DataShare::DataShareValuesBucket contactDataValuesTwo; + contactDataValuesTwo.Put("raw_contact_id", rawContactId); + contactDataValuesTwo.Put("content_type", "organization"); + contactDataValuesTwo.Put("detail_info", "tiantianxaingshang"); + contactDataValuesTwo.Put("position", "Test"); + OHOS::DataShare::DataShareValuesBucket contactDataValuesThree; + contactDataValuesThree.Put("raw_contact_id", rawContactId); + contactDataValuesThree.Put("content_type", "email"); + contactDataValuesThree.Put("detail_info", "199632@163.com"); + OHOS::DataShare::DataShareValuesBucket contactDataValuesFour; + contactDataValuesFour.Put("raw_contact_id", rawContactId); + contactDataValuesFour.Put("content_type", "phone"); + contactDataValuesFour.Put("detail_info", "1234567898"); + std::vector listAddBluk; listAddBluk.push_back(contactDataValuesOne); listAddBluk.push_back(contactDataValuesTwo); listAddBluk.push_back(contactDataValuesThree); @@ -2790,34 +2783,34 @@ HWTEST_F(ContactProfileTest, contactProfile_Delete_test_5600, testing::ext::Test int time = 10000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactIdOne = RawContactInsert("update_detail_contactdata", rawValuesBucket); EXPECT_GT(rawContactIdOne, 0); int64_t rawContactIdTwo = RawContactInsert("update_contactdata", rawValuesBucket); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr executePredicates = - std::make_shared(predicates); + std::shared_ptr executePredicates = + std::make_shared(predicates); std::shared_ptr uri = std::make_shared(ProfileUri::RAW_CONTACT); - std::shared_ptr operation = - OHOS::AppExecFwk::DataAbilityOperation::NewDeleteBuilder(uri) + std::shared_ptr operation = + OHOS::DataShare::DataShareOperation::NewDeleteBuilder(uri) ->WithPredicatesBackReference(0, 0) ->WithPredicates(executePredicates) ->WithInterruptionAllowed(true) ->Build(); - std::vector> executeBatchOperations; + std::vector> executeBatchOperations; executeBatchOperations.push_back(operation); InitAbility(); - std::vector> dataAbilityResult = + std::vector> dataShareResult = contactsDataAbility.ExecuteBatch(executeBatchOperations); - EXPECT_EQ(0, dataAbilityResult[0]->GetCount()); + EXPECT_EQ(0, dataShareResult[0]->GetCount()); std::string tableName = ContactTabName::CONTACT_DATA; std::vector columnQuery; columnQuery.push_back("detail_info"); predicates.EqualTo("is_deleted", "0"); - std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -2837,26 +2830,26 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_5700, testing::ext::Test HILOG_INFO("--- contactProfile_Update_test_5700 is starting! ---"); OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValuesOne; - rawContactValuesOne.PutString("display_name", "zhangmingming"); - rawContactValuesOne.PutInt("favorite", 1); - OHOS::NativeRdb::ValuesBucket rawContactValuesTwo; - rawContactValuesTwo.PutString("display_name", "yuanmoumou"); - rawContactValuesTwo.PutInt("favorite", 1); - OHOS::NativeRdb::ValuesBucket rawContactValuesThree; - rawContactValuesThree.PutString("display_name", "xiaofenren"); - rawContactValuesThree.PutInt("favorite", 1); + OHOS::DataShare::DataShareValuesBucket rawContactValuesOne; + rawContactValuesOne.Put("display_name", "zhangmingming"); + rawContactValuesOne.Put("favorite", 1); + OHOS::DataShare::DataShareValuesBucket rawContactValuesTwo; + rawContactValuesTwo.Put("display_name", "yuanmoumou"); + rawContactValuesTwo.Put("favorite", 1); + OHOS::DataShare::DataShareValuesBucket rawContactValuesThree; + rawContactValuesThree.Put("display_name", "xiaofenren"); + rawContactValuesThree.Put("favorite", 1); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(rawContactValuesOne); listAddBluk.push_back(rawContactValuesTwo); listAddBluk.push_back(rawContactValuesThree); int batchInserCode = contactsDataAbility.BatchInsert(uriRawContact, listAddBluk); HILOG_INFO("contactProfile_Update_test_5700 : batchInserCode = %{public}d", batchInserCode); EXPECT_EQ(batchInserCode, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("display_name", "zhangmingming"); predicates.Or(); predicates.EqualTo("display_name", "yuanmoumou"); @@ -2865,13 +2858,13 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_5700, testing::ext::Test HILOG_INFO("contactProfile_Update_test_5700: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - predicates.Clear(); - predicates.EqualTo("display_name", "zhangmingming"); - QueryAndExpectResult(rawContacts, predicates, updateValues, "contactProfile_Update_test_5700"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("display_name", "zhangmingming"); + QueryAndExpectResult(rawContacts, predicates2, updateValues, "contactProfile_Update_test_5700"); - predicates.Clear(); - predicates.EqualTo("display_name", "xiaofenren"); - QueryAndExpectResult(rawContacts, predicates, rawContactValuesThree, "contactProfile_Update_test_5700"); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("display_name", "xiaofenren"); + QueryAndExpectResult(rawContacts, predicates3, rawContactValuesThree, "contactProfile_Update_test_5700"); ClearContacts(); } @@ -2886,42 +2879,42 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_5700, testing::ext::Test HWTEST_F(ContactProfileTest, contactProfile_Update_test_5800, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_Update_test_5800 is starting!---"); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactIdOne = RawContactInsert("update_detail_contactdata", rawValuesBucket); EXPECT_GT(rawContactIdOne, 0); int64_t rawContactIdTwo = RawContactInsert("update_contactdata", rawValuesBucket); EXPECT_GT(rawContactIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawContactIdTwo)); - std::shared_ptr values = - std::make_shared(rawValuesBucket); - std::shared_ptr executePredicates = - std::make_shared(predicates); + std::shared_ptr values = + std::make_shared(rawValuesBucket); + std::shared_ptr executePredicates = + std::make_shared(predicates); std::shared_ptr uri = std::make_shared(ProfileUri::RAW_CONTACT); - std::shared_ptr operation = - OHOS::AppExecFwk::DataAbilityOperation::NewUpdateBuilder(uri) + std::shared_ptr operation = + OHOS::DataShare::DataShareOperation::NewUpdateBuilder(uri) ->WithValuesBucket(values) ->WithPredicatesBackReference(0, 0) ->WithPredicates(executePredicates) ->WithInterruptionAllowed(true) ->Build(); - std::vector> executeBatchOperations; + std::vector> executeBatchOperations; executeBatchOperations.push_back(operation); InitAbility(); - std::vector> dataAbilityResult = + std::vector> dataShareResult = contactsDataAbility.ExecuteBatch(executeBatchOperations); - EXPECT_EQ(0, dataAbilityResult[0]->GetCount()); + EXPECT_EQ(0, dataShareResult[0]->GetCount()); std::string tableName = ContactTabName::RAW_CONTACT; std::vector columnQuery; columnQuery.push_back("display_name"); - std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); + std::shared_ptr resultSet = ContactQuery(tableName, columnQuery, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector listValue; + std::vector listValue; listValue.push_back(rawValuesBucket); listValue.push_back(rawValuesBucket); CheckResultSetList(listValue, resultSet, "contactProfile_Update_test_5800"); @@ -2940,22 +2933,23 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsertAndDelete_test_5900, test { HILOG_INFO("--- contactProfile_BatchInsertAndDelete_test_5900 is starting! ---"); OHOS::Uri uriContactBlocklist(ProfileUri::BLOCKLIST); - OHOS::NativeRdb::ValuesBucket contactBlocklistValuesOne; - string phoneNumber = random_number_utils.Generating(9); - contactBlocklistValuesOne.PutString("phone_number", phoneNumber); - OHOS::NativeRdb::ValuesBucket contactBlocklistValuesTwo; - contactBlocklistValuesTwo.PutString("phone_number", phoneNumber); - OHOS::NativeRdb::ValuesBucket contactBlocklistValuesThree; - contactBlocklistValuesThree.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket contactBlocklistValuesOne; + OHOS::Contacts::RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(9); + contactBlocklistValuesOne.Put("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket contactBlocklistValuesTwo; + contactBlocklistValuesTwo.Put("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket contactBlocklistValuesThree; + contactBlocklistValuesThree.Put("phone_number", phoneNumber); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(contactBlocklistValuesOne); listAddBluk.push_back(contactBlocklistValuesTwo); listAddBluk.push_back(contactBlocklistValuesThree); int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlocklist, listAddBluk); EXPECT_EQ(batchInsertCode, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("phone_number", std::string(phoneNumber)); predicates.Or(); predicates.EqualTo("phone_number", std::string(phoneNumber)); @@ -2963,7 +2957,7 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsertAndDelete_test_5900, test int deleteCode = ContactDelete(contactBlocklist, predicates); EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(contactBlocklist, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); @@ -2982,7 +2976,7 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsertAndDelete_test_5900, test HWTEST_F(ContactProfileTest, contactProfile_BatchInsertAndDelete_test_6000, testing::ext::TestSize.Level1) { HILOG_INFO("--- contactProfile_BatchInsertAndDelete_test_6000 is staring! ---"); - OHOS::NativeRdb::ValuesBucket valuesGroup; + OHOS::DataShare::DataShareValuesBucket valuesGroup; int64_t groupIdOne = GroupsInsert("TestFourth", valuesGroup); EXPECT_GT(groupIdOne, 0); @@ -2991,27 +2985,27 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsertAndDelete_test_6000, test EXPECT_GT(groupIdTwo, 0); valuesGroup.Clear(); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("xiaocheng", rawContactValues); EXPECT_GT(rawContactId, 0); OHOS::Uri uriContactData(ProfileUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket contactDataValuesOne; - contactDataValuesOne.PutInt("raw_contact_id", rawContactId); - contactDataValuesOne.PutString("content_type", std::string("group_membership")); - contactDataValuesOne.PutString("detail_info", std::to_string(groupIdOne)); - OHOS::NativeRdb::ValuesBucket contactDataValuesTwo; - contactDataValuesTwo.PutInt("raw_contact_id", rawContactId); - contactDataValuesTwo.PutString("content_type", std::string("group_membership")); - contactDataValuesTwo.PutString("detail_info", std::to_string(groupIdTwo)); + OHOS::DataShare::DataShareValuesBucket contactDataValuesOne; + contactDataValuesOne.Put("raw_contact_id", rawContactId); + contactDataValuesOne.Put("content_type", std::string("group_membership")); + contactDataValuesOne.Put("detail_info", std::to_string(groupIdOne)); + OHOS::DataShare::DataShareValuesBucket contactDataValuesTwo; + contactDataValuesTwo.Put("raw_contact_id", rawContactId); + contactDataValuesTwo.Put("content_type", std::string("group_membership")); + contactDataValuesTwo.Put("detail_info", std::to_string(groupIdTwo)); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(contactDataValuesOne); listAddBluk.push_back(contactDataValuesTwo); int batchInserCode = contactsDataAbility.BatchInsert(uriContactData, listAddBluk); EXPECT_EQ(batchInserCode, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); predicates.And(); predicates.EqualTo("detail_info", std::to_string(groupIdOne)); @@ -3020,7 +3014,7 @@ HWTEST_F(ContactProfileTest, contactProfile_BatchInsertAndDelete_test_6000, test EXPECT_EQ(deleteCode, 0); std::vector columns; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -3042,14 +3036,14 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_Insert_test_6100, testing:: OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); OHOS::Uri errorUri(ProfileUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket rawContactValues; - rawContactValues.PutString("display_names", "liming"); + OHOS::DataShare::DataShareValuesBucket rawContactValues; + rawContactValues.Put("display_names", "liming"); int64_t rawontactId = contactsDataAbility.Insert(uriRawContact, rawContactValues); - HILOG_INFO("abnormal_contactProfile_Insert_test_6100 : rawontactId = %{public}lld", rawontactId); + HILOG_INFO("abnormal_contactProfile_Insert_test_6100 : rawontactId = %{public}ld", rawontactId); EXPECT_EQ(rawontactId, -1); rawContactValues.Clear(); - rawContactValues.PutString("display_name", "liming"); + rawContactValues.Put("display_name", "liming"); rawontactId = contactsDataAbility.Insert(errorUri, rawContactValues); EXPECT_EQ(rawontactId, -1); ClearContacts(); @@ -3071,17 +3065,17 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_Insert_test_6200, testing:: std::vector columns; std::string contactData = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactId = RawContactInsert("lock_type_id", rawValuesBucket); - valuesBucket.PutInt("raw_contact_id", rawContactId); + valuesBucket.Put("raw_contact_id", rawContactId); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_EQ(ContactDataId, -1); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); // resultSet count 0 int rowCount = -1; @@ -3108,17 +3102,17 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_Insert_test_6300, testing:: std::vector columns; std::string contactData = ContactTabName::CONTACT_DATA; GetAllContactDataColumns(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); - OHOS::NativeRdb::ValuesBucket rawValuesBucket; + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetAllColumnsValues(columnsInt, columnsStr); + OHOS::DataShare::DataShareValuesBucket rawValuesBucket; int64_t rawContactId = RawContactInsert("lock_raw_contact_id", rawValuesBucket); - valuesBucket.PutInt("type_id", 6); + valuesBucket.Put("type_id", 6); int ContactDataId = ContactDataInsertValues(valuesBucket); EXPECT_EQ(ContactDataId, -1); MergeColumns(columns, columnsInt, columnsStr); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawContactId)); - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); // resultSet count 0 int rowCount = -1; @@ -3140,14 +3134,14 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_Update_test_6400, testing:: { HILOG_INFO("--- abnormal_contactProfile_Update_test_6400 is starting! ---"); OHOS::Uri errorUri(ProfileUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("zhangming", rawContactValues); - HILOG_INFO("abnormal_contactProfile_Update_test_6400 : rawContactId = %{public}lld", rawContactId); + HILOG_INFO("abnormal_contactProfile_Update_test_6400 : rawContactId = %{public}ld", rawContactId); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("display_names", "dongming"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("display_names", "dongming"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int updateCode = ContactUpdate(rawContacts, updateValues, predicates); @@ -3156,17 +3150,17 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_Update_test_6400, testing:: QueryAndExpectResult(rawContacts, predicates, rawContactValues, "abnormal_contactProfile_Update_test_6400"); updateValues.Clear(); - updateValues.PutString("display_name", "dongming"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactId)); - updateCode = contactsDataAbility.Update(errorUri, updateValues, predicates); + updateValues.Put("display_name", "dongming"); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactId)); + updateCode = contactsDataAbility.Update(errorUri, predicates2, updateValues); HILOG_INFO("abnormal_contactProfile_Update_test_6400: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, -1); - QueryAndExpectResult(rawContacts, predicates, rawContactValues, "abnormal_contactProfile_Update_test_6400"); + QueryAndExpectResult(rawContacts, predicates2, rawContactValues, "abnormal_contactProfile_Update_test_6400"); - predicates.Clear(); - predicates.EqualTo("id", "100000"); - updateCode = ContactUpdate(rawContacts, updateValues, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", "100000"); + updateCode = ContactUpdate(rawContacts, updateValues, predicates3); HILOG_INFO("abnormal_contactProfile_Update_test_6400: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); ClearContacts(); @@ -3183,16 +3177,16 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_Update_test_6400, testing:: HWTEST_F(ContactProfileTest, abnormal_contactProfile_Query_test_6500, testing::ext::TestSize.Level1) { HILOG_INFO("--- abnormal_contactProfile_Query_test_6500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; int64_t rawContactId = RawContactInsert("dongming", rawContactValues); EXPECT_GT(rawContactId, 0); std::vector columns; columns.push_back("display_names"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; - std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicates); int rowCount = -2; resultSet->GetRowCount(rowCount); @@ -3218,10 +3212,10 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_Query_test_6600, testing::e std::vector columns; columns.push_back("id"); columns.push_back("display_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = - contactsDataAbility.Query(errorUri, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(errorUri, predicates, columns); EXPECT_EQ(resultSet, nullptr); ClearContacts(); } @@ -3238,45 +3232,43 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_Delete_test_6700, testing:: { HILOG_INFO("-------abnormal_contactProfile_Delete_test_6700 is starting!-------"); OHOS::Uri errorUri(ProfileUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; int64_t rawContactId = RawContactInsert("zhangming", values); EXPECT_GT(rawContactId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(rawContactId)); std::string rawContacts = ContactTabName::RAW_CONTACT; int deleteCode = ContactDelete(rawContacts, predicates); EXPECT_EQ(deleteCode, -1); - OHOS::NativeRdb::DataAbilityPredicates predicatesQuery; + OHOS::DataShare::DataSharePredicates predicatesQuery; predicatesQuery.EqualTo("id", std::to_string(rawContactId)); std::vector columns; - std::shared_ptr resultSet = + std::shared_ptr resultSet = ContactQuery(rawContacts, columns, predicatesQuery); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); resultSet->Close(); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactId)); - deleteCode = contactsDataAbility.Delete(errorUri, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawContactId)); + deleteCode = contactsDataAbility.Delete(errorUri, predicates2); EXPECT_EQ(deleteCode, -1); - std::shared_ptr resultSetUri = + std::shared_ptr resultSetUri = ContactQuery(rawContacts, columns, predicatesQuery); int rowCountUri = 0; resultSetUri->GetRowCount(rowCountUri); EXPECT_EQ(1, rowCountUri); resultSetUri->Close(); - predicates.Clear(); - predicates.EqualTo("id", "10000000"); - deleteCode = ContactDelete(rawContacts, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", "10000000"); + deleteCode = ContactDelete(rawContacts, predicates3); EXPECT_EQ(deleteCode, -1); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawContactId)); - std::shared_ptr resultSetId = + std::shared_ptr resultSetId = ContactQuery(rawContacts, columns, predicatesQuery); int rowCountId = 0; resultSetId->GetRowCount(rowCountId); @@ -3297,8 +3289,8 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_BatchInsert_test_6800, test { HILOG_INFO("--- abnormal_contactProfile_BatchInsert_test_6800 is starting! ---"); OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValues; - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket rawContactValues; + std::vector listAddBluk; int batchInserCode = 0; for (int i = 0; i < 10; i++) { listAddBluk.clear(); @@ -3307,9 +3299,9 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_BatchInsert_test_6800, test std::string name("zhangming"); name.append(std::to_string(j)); if (j == 14 || j == 27 || j == 57) { - rawContactValues.PutString("display_names", name); + rawContactValues.Put("display_names", name); } else { - rawContactValues.PutString("display_name", name); + rawContactValues.Put("display_name", name); } listAddBluk.push_back(rawContactValues); } @@ -3322,7 +3314,7 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_BatchInsert_test_6800, test EXPECT_EQ(batchInserCode, -1); } } - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.NotEqualTo("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -3330,10 +3322,10 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_BatchInsert_test_6800, test int time = 20000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ProfileUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } /* @@ -3348,16 +3340,16 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_BatchInsert_test_6900, test { HILOG_INFO("--- abnormal_contactProfile_BatchInsert_test_6900 is starting! ---"); OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValues; - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket rawContactValues; + std::vector listAddBluk; for (int i = 0; i < 1000; i++) { rawContactValues.Clear(); std::string name("xiaoyuan"); name.append(std::to_string(i)); if (i == 500) { - rawContactValues.PutString("display_names", name); + rawContactValues.Put("display_names", name); } else { - rawContactValues.PutString("display_name", name); + rawContactValues.Put("display_name", name); } listAddBluk.push_back(rawContactValues); } @@ -3369,7 +3361,7 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_BatchInsert_test_6900, test HILOG_ERROR("abnormal_contactProfile_BatchInsert_test_6900 batch insert fail!"); EXPECT_EQ(batchInserCode, -1); } - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.NotEqualTo("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -3377,10 +3369,10 @@ HWTEST_F(ContactProfileTest, abnormal_contactProfile_BatchInsert_test_6900, test int time = 20000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ProfileUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } } // namespace Test } // namespace Contacts \ No newline at end of file diff --git a/test/unittest/src/contactquery_test.cpp b/test/unittest/src/contactquery_test.cpp index 188d0ef..35de8ea 100644 --- a/test/unittest/src/contactquery_test.cpp +++ b/test/unittest/src/contactquery_test.cpp @@ -28,51 +28,51 @@ ContactQueryTest::~ContactQueryTest() { } -int64_t ContactQueryTest::RawContactInsert(std::string displayName, OHOS::NativeRdb::ValuesBucket &rawContactValues) +int64_t ContactQueryTest::RawContactInsert(std::string displayName, OHOS::DataShare::DataShareValuesBucket &rawContactValues) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - rawContactValues.PutString("display_name", displayName); + rawContactValues.Put("display_name", displayName); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); return code; } int64_t ContactQueryTest::ContactDataInsert(int64_t rawContactId, std::string contentType, std::string detailInfo, - std::string position, OHOS::NativeRdb::ValuesBucket &contactDataValues) + std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - contactDataValues.PutInt("raw_contact_id", rawContactId); - contactDataValues.PutString("content_type", contentType); - contactDataValues.PutString("detail_info", detailInfo); - contactDataValues.PutString("position", position); + contactDataValues.Put("raw_contact_id", rawContactId); + contactDataValues.Put("content_type", contentType); + contactDataValues.Put("detail_info", detailInfo); + contactDataValues.Put("position", position); int64_t code = contactsDataAbility.Insert(uriContactData, contactDataValues); return code; } -std::shared_ptr ContactQueryTest::ContactQuery( - const std::string &tableName, std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr ContactQueryTest::ContactQuery( + const std::string &tableName, std::vector columns, OHOS::DataShare::DataSharePredicates predicates) { - std::shared_ptr resultSet; + std::shared_ptr resultSet; if (tableName == ContactTabName::RAW_CONTACT) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriRawContact, predicates, columns); } else if (tableName == ContactTabName::CONTACT_DATA) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - resultSet = contactsDataAbility.Query(uriContactData, columns, predicates); + resultSet = contactsDataAbility.Query(uriContactData, predicates, columns); } else if (tableName == ContactTabName::CONTACT) { OHOS::Uri uriContact(ContactsUri::CONTACT); - resultSet = contactsDataAbility.Query(uriContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriContact, predicates, columns); } else if (tableName == ContactTabName::GROUPS) { OHOS::Uri uriGroups(ContactsUri::GROUPS); - resultSet = contactsDataAbility.Query(uriGroups, columns, predicates); + resultSet = contactsDataAbility.Query(uriGroups, predicates, columns); } else if (tableName == ContactTabName::CONTACT_BLOCKLIST) { OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST); - resultSet = contactsDataAbility.Query(uriBlocklist, columns, predicates); + resultSet = contactsDataAbility.Query(uriBlocklist, predicates, columns); } else if (tableName == ContactTabName::DELETED_RAW_CONTACT) { OHOS::Uri uriDeletedRawContact(ContactsUri::RAW_CONTACT); - resultSet = contactsDataAbility.Query(uriDeletedRawContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriDeletedRawContact, predicates, columns); } else if (tableName == ContactTabName::SEARCH_CONTACT) { OHOS::Uri uriSearchContact(ContactsUri::SEARCH); - resultSet = contactsDataAbility.Query(uriSearchContact, columns, predicates); + resultSet = contactsDataAbility.Query(uriSearchContact, predicates, columns); } else { HILOG_ERROR("ContactsDataAbility ====>no match uri action"); } @@ -81,7 +81,7 @@ std::shared_ptr ContactQueryTest::ContactQu void ContactQueryTest::ClearData() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); predicates.NotEqualTo("id", "0"); predicates.And(); @@ -90,10 +90,10 @@ void ContactQueryTest::ClearData() int time = 2000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ContactsUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } /* @@ -110,15 +110,15 @@ HWTEST_F(ContactQueryTest, contact_data_Insert_test_100, testing::ext::TestSize. { HILOG_INFO("-----contact_data_Insert_test_100-----"); OHOS::Contacts::ConstructionName::local = "zh-CN"; - OHOS::NativeRdb::ValuesBucket values; - OHOS::NativeRdb::ValuesBucket valuesOne; - OHOS::NativeRdb::ValuesBucket valuesTwo; - OHOS::NativeRdb::ValuesBucket valuesThree; - OHOS::NativeRdb::ValuesBucket valuesFour; - OHOS::NativeRdb::ValuesBucket valuesFive; - OHOS::NativeRdb::ValuesBucket valuesSix; - OHOS::NativeRdb::ValuesBucket valuesSeven; - OHOS::NativeRdb::ValuesBucket valuesEight; + OHOS::DataShare::DataShareValuesBucket values; + OHOS::DataShare::DataShareValuesBucket valuesOne; + OHOS::DataShare::DataShareValuesBucket valuesTwo; + OHOS::DataShare::DataShareValuesBucket valuesThree; + OHOS::DataShare::DataShareValuesBucket valuesFour; + OHOS::DataShare::DataShareValuesBucket valuesFive; + OHOS::DataShare::DataShareValuesBucket valuesSix; + OHOS::DataShare::DataShareValuesBucket valuesSeven; + OHOS::DataShare::DataShareValuesBucket valuesEight; std::string searchContact = ContactTabName::SEARCH_CONTACT; int64_t rawContactId = RawContactInsert("买键盘", values); EXPECT_GT(rawContactId, 0); @@ -165,13 +165,13 @@ HWTEST_F(ContactQueryTest, query_by_name_test_200, testing::ext::TestSize.Level1 std::string tag("query_by_name_test_200"); std::vector columns; columns.push_back("display_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("display_name", "%买%"); std::string searchContact = ContactTabName::SEARCH_CONTACT; - std::shared_ptr resultSet = ContactQuery(searchContact, columns, predicates); + std::shared_ptr resultSet = ContactQuery(searchContact, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("display_name", "买键盘"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("display_name", "买键盘"); CheckResultSet(values, resultSet, "query_by_name_test_200"); ClearData(); } @@ -192,13 +192,13 @@ HWTEST_F(ContactQueryTest, query_by_pinyin_test_300, testing::ext::TestSize.Leve std::vector columns; columns.push_back("id"); columns.push_back("search_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("search_name", "%mai%"); std::string searchContact = ContactTabName::SEARCH_CONTACT; - std::shared_ptr resultSet = ContactQuery(searchContact, columns, predicates); + std::shared_ptr resultSet = ContactQuery(searchContact, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("search_name", "买键盘||maijianpan||mjp"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("search_name", "买键盘||maijianpan||mjp"); CheckResultSet(values, resultSet, "query_by_pinyin_test_300"); ClearData(); } @@ -219,13 +219,13 @@ HWTEST_F(ContactQueryTest, query_by_pinyin_test_400, testing::ext::TestSize.Leve std::vector columns; columns.push_back("id"); columns.push_back("search_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("search_name", "%mjp%"); std::string searchContact = ContactTabName::SEARCH_CONTACT; - std::shared_ptr resultSet = ContactQuery(searchContact, columns, predicates); + std::shared_ptr resultSet = ContactQuery(searchContact, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("search_name", "买键盘||maijianpan||mjp"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("search_name", "买键盘||maijianpan||mjp"); CheckResultSet(values, resultSet, "query_by_pinyin_test_400"); ClearData(); } @@ -246,16 +246,16 @@ HWTEST_F(ContactQueryTest, query_by_company_test_500, testing::ext::TestSize.Lev std::vector columns; columns.push_back("detail_info"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("detail_info", "%天天向上%"); predicates.And(); predicates.EqualTo("type_id", "4"); std::string contactData = "contact_data"; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "你好天天向上hsk"); - values.PutString("position", "安全测试"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "你好天天向上hsk"); + values.Put("position", "安全测试"); CheckResultSet(values, resultSet, "query_by_company_test_500"); ClearData(); } @@ -276,16 +276,16 @@ HWTEST_F(ContactQueryTest, query_by_position_test_600, testing::ext::TestSize.Le std::vector columns; columns.push_back("detail_info"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("position", "%测试%"); predicates.And(); predicates.EqualTo("type_id", "4"); std::string contactData = "contact_data"; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "你好天天向上hsk"); - values.PutString("position", "安全测试"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "你好天天向上hsk"); + values.Put("position", "安全测试"); CheckResultSet(values, resultSet, "query_by_position_test_600"); ClearData(); } @@ -305,15 +305,15 @@ HWTEST_F(ContactQueryTest, query_by_phone_test_700, testing::ext::TestSize.Level std::string tag("query_by_phone_test_700"); std::vector columns; columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("detail_info", "1855250%"); predicates.And(); predicates.EqualTo("type_id", "5"); std::string contactData = "contact_data"; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "18552504058"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "18552504058"); CheckResultSet(values, resultSet, "query_by_phone_test_700"); ClearData(); } @@ -333,15 +333,15 @@ HWTEST_F(ContactQueryTest, query_by_nick_name_test_800, testing::ext::TestSize.L std::string tag("query_by_nick_name_test_800"); std::vector columns; columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("detail_info", "%买%"); predicates.And(); predicates.EqualTo("type_id", "3"); std::string contactData = "contact_data"; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "买键盘"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "买键盘"); CheckResultSet(values, resultSet, "query_by_nick_name_test_800"); ClearData(); } @@ -361,17 +361,17 @@ HWTEST_F(ContactQueryTest, query_by_email_test_900, testing::ext::TestSize.Level std::string tag("query_by_email_test_900"); std::vector columns; columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("detail_info", "166%"); predicates.And(); predicates.EqualTo("type_id", "1"); predicates.And(); predicates.EqualTo("is_deleted", "0"); std::string contactData = "contact_data"; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "1667894561@163.com"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "1667894561@163.com"); CheckResultSet(values, resultSet, "query_by_email_test_900"); ClearData(); } @@ -391,15 +391,15 @@ HWTEST_F(ContactQueryTest, query_by_address_test_1000, testing::ext::TestSize.Le std::string tag("query_by_address_test_1000"); std::vector columns; columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("detail_info", "%南京%"); predicates.And(); predicates.EqualTo("type_id", "7"); std::string contactData = "contact_data"; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "南京市"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "南京市"); CheckResultSet(values, resultSet, "query_by_address_test_1000"); ClearData(); } @@ -419,15 +419,15 @@ HWTEST_F(ContactQueryTest, query_by_note_test_1100, testing::ext::TestSize.Level std::string tag("query_by_note_test_1100"); std::vector columns; columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("detail_info", "%mjava%"); predicates.And(); predicates.EqualTo("type_id", "10"); std::string contactData = "contact_data"; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "LanguagemjavaC++"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "LanguagemjavaC++"); CheckResultSet(values, resultSet, "query_by_note_test_1100"); ClearData(); } @@ -449,15 +449,15 @@ HWTEST_F(ContactQueryTest, query_by_aim_test_1200, testing::ext::TestSize.Level1 columns.push_back("id"); columns.push_back("raw_contact_id"); columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("detail_info", "144%"); predicates.And(); predicates.EqualTo("type_id", "2"); std::string contactData = "contact_data"; - std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); + std::shared_ptr resultSet = ContactQuery(contactData, columns, predicates); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "14487956@1.com"); + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "14487956@1.com"); CheckResultSet(values, resultSet, "query_by_aim_test_1200"); ClearData(); } @@ -478,10 +478,10 @@ HWTEST_F(ContactQueryTest, abnormal_contact_Query_test_1300, testing::ext::TestS std::vector columns; columns.push_back("id"); columns.push_back("search_name"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.Like("search_namesss", "%mjp%"); std::string searchContact = ContactTabName::SEARCH_CONTACT; - std::shared_ptr resultSet = ContactQuery(searchContact, columns, predicates); + std::shared_ptr resultSet = ContactQuery(searchContact, columns, predicates); // resultSet count 1 int rowCount = 0; resultSet->GetRowCount(rowCount); diff --git a/test/unittest/src/mergecontact_test.cpp b/test/unittest/src/mergecontact_test.cpp index 859259b..aebdc19 100644 --- a/test/unittest/src/mergecontact_test.cpp +++ b/test/unittest/src/mergecontact_test.cpp @@ -25,7 +25,7 @@ namespace Contacts { namespace Test { void MergeContactTest::DeleteRawContact() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); predicates.NotEqualTo("id", "0"); predicates.And(); @@ -34,10 +34,10 @@ void MergeContactTest::DeleteRawContact() int time = Time::SLEEP_TIME_MERGE_DELETE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ContactsUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates2); } void MergeContactTest::CheckMergeResultId(std::vector ids, bool merge) @@ -47,9 +47,9 @@ void MergeContactTest::CheckMergeResultId(std::vector ids, bool merge) for (int i = 0; i < mergeIdSize; i++) { std::vector columns; columns.push_back("contact_id"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(ids[i])); - std::shared_ptr resultOne = ContactQuery(columns, predicates); + std::shared_ptr resultOne = ContactQuery(columns, predicates); int contactIdOne = GetMergeResultContactId(resultOne); resultIdVector.push_back(contactIdOne); } @@ -58,15 +58,15 @@ void MergeContactTest::CheckMergeResultId(std::vector ids, bool merge) for (int i = 1; i < size; i++) { if (merge) { EXPECT_EQ(contactId, resultIdVector[i]); - HILOG_INFO("merge contact_id = %{public}lld, contact_idTwo %{public}lld", contactId, resultIdVector[i]); + HILOG_INFO("merge contact_id = %{public}ld, contact_idTwo %{public}ld", contactId, resultIdVector[i]); } else { EXPECT_NE(contactId, resultIdVector[i]); - HILOG_INFO("split contact_id = %{public}lld", resultIdVector[i]); + HILOG_INFO("split contact_id = %{public}ld", resultIdVector[i]); } } } -int MergeContactTest::GetMergeResultContactId(const std::shared_ptr resultSet) +int MergeContactTest::GetMergeResultContactId(const std::shared_ptr resultSet) { std::vector columnNames; resultSet->GetAllColumnNames(columnNames); @@ -82,7 +82,7 @@ int MergeContactTest::GetMergeResultContactId(const std::shared_ptr MergeContactTest::GetMergeResultRawContactId( - const std::shared_ptr resultSet) + const std::shared_ptr resultSet) { std::vector rawContactIdVector; std::vector columnNames; @@ -102,7 +102,7 @@ std::vector MergeContactTest::GetMergeResultRawContactId( } std::vector MergeContactTest::GetMergeRawContactId( - const std::shared_ptr resultSet) + const std::shared_ptr resultSet) { std::vector rawContactIdVector; std::vector columnNames; @@ -121,20 +121,20 @@ std::vector MergeContactTest::GetMergeRawContactId( return rawContactIdVector; } -std::shared_ptr MergeContactTest::ContactQuery( - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr MergeContactTest::ContactQuery( + std::vector columns, OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uri(ContactsUri::RAW_CONTACT); - std::shared_ptr resultSet = - contactsDataAbility.Query(uri, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(uri, predicates, columns); return resultSet; } int64_t MergeContactTest::RawContactInsert(std::string displayName) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValues; - rawContactValues.PutString("display_name", displayName); + OHOS::DataShare::DataShareValuesBucket rawContactValues; + rawContactValues.Put("display_name", displayName); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); rawContactValues.Clear(); return code; @@ -144,11 +144,11 @@ int64_t MergeContactTest::ContactDataInsert( int64_t rawContactId, std::string contentType, std::string detailInfo, std::string position) { OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket contactDataValues; - contactDataValues.PutInt("raw_contact_id", rawContactId); - contactDataValues.PutString("content_type", contentType); - contactDataValues.PutString("detail_info", detailInfo); - contactDataValues.PutString("position", position); + OHOS::DataShare::DataShareValuesBucket contactDataValues; + contactDataValues.Put("raw_contact_id", rawContactId); + contactDataValues.Put("content_type", contentType); + contactDataValues.Put("detail_info", detailInfo); + contactDataValues.Put("position", position); int64_t code = contactsDataAbility.Insert(uriContactData, contactDataValues); contactDataValues.Clear(); return code; @@ -175,20 +175,20 @@ HWTEST_F(MergeContactTest, merge_Query_test_100, testing::ext::TestSize.Level1) EXPECT_GT(rawOne, 0); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaowuww", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Query_test_100 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("merge_Query_test_100 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaowuww"); EXPECT_GT(rawTwo, 0); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaowuww", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "1234567", ""); - HILOG_INFO("merge_Query_test_100 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Query_test_100 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriQueryMergeList(ContactsUri::MERGE_LIST); std::vector columns; - OHOS::NativeRdb::DataAbilityPredicates predicates; - std::shared_ptr resultSet = - contactsDataAbility.Query(uriQueryMergeList, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates; + std::shared_ptr resultSet = + contactsDataAbility.Query(uriQueryMergeList, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); @@ -211,17 +211,17 @@ HWTEST_F(MergeContactTest, merge_Update_test_200, testing::ext::TestSize.Level1) HILOG_INFO("--- merge_Update_test_200 Add is starting! ---"); int64_t rawOne = RawContactInsert("xiaochenc"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaochenc", ""); - HILOG_INFO("merge_Update_test_200 : = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_200 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaochenc"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaochenc", ""); - HILOG_INFO("merge_Update_test_200 : = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_200 : = %{public}ld", dataIdTwo); int time = 2000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -245,26 +245,25 @@ HWTEST_F(MergeContactTest, merge_Update_test_300, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("xiaomingmm"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaomingmm", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_300 : = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_300 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaomingmm"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaomingmm", ""); - HILOG_INFO("merge_Update_test_300 : = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_300 : = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); value.Clear(); - predicates.Clear(); std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriManualMerge, value, predicates); + ret = contactsDataAbility.Update(uriManualMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -288,18 +287,18 @@ HWTEST_F(MergeContactTest, merge_Update_test_400, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("xiaohong"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaohong", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_400 : = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_400 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaohong"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaohong", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_400 : = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_400 : = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -323,18 +322,18 @@ HWTEST_F(MergeContactTest, merge_Update_test_500, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("xiaozhang"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaozhang", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_500 : = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_500 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaozhang"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaozhang", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "1234567", ""); - HILOG_INFO("merge_Update_test_500 : = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_500 : = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -343,12 +342,11 @@ HWTEST_F(MergeContactTest, merge_Update_test_500, testing::ext::TestSize.Level1) OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); value.Clear(); - predicates.Clear(); std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriManualMerge, value, predicates); + ret = contactsDataAbility.Update(uriManualMerge, predicates, value); EXPECT_EQ(ret, 0); CheckMergeResultId(resultIdVector, true); DeleteRawContact(); @@ -369,19 +367,19 @@ HWTEST_F(MergeContactTest, merge_Update_test_600, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("xiaozhou"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaozhou", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_600 dataIdOne_1 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_600 dataIdOne_1 = %{public}ld", dataIdOne); dataIdOne = ContactDataInsert(rawOne, "phone", "1234567", ""); - HILOG_INFO("merge_Update_test_600 dataIdOne_2 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_600 dataIdOne_2 = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaozhou"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaozhou", ""); - HILOG_INFO("merge_Update_test_600 : = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_600 : = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -390,12 +388,11 @@ HWTEST_F(MergeContactTest, merge_Update_test_600, testing::ext::TestSize.Level1) OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); value.Clear(); - predicates.Clear(); std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriManualMerge, value, predicates); + ret = contactsDataAbility.Update(uriManualMerge, predicates, value); EXPECT_EQ(ret, 0); CheckMergeResultId(resultIdVector, true); DeleteRawContact(); @@ -416,22 +413,22 @@ HWTEST_F(MergeContactTest, merge_Update_test_700, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("xiaobai"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaobai", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_700 dataIdOne_1 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_700 dataIdOne_1 = %{public}ld", dataIdOne); dataIdOne = ContactDataInsert(rawOne, "phone", "1234567", ""); - HILOG_INFO("merge_Update_test_700 dataIdOne_2 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_700 dataIdOne_2 = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaobai"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaobai", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_700 dataIdTwo_1 = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_700 dataIdTwo_1 = %{public}ld", dataIdTwo); dataIdTwo = ContactDataInsert(rawTwo, "phone", "1234567", ""); - HILOG_INFO("merge_Update_test_700 dataIdTwo_2 = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_700 dataIdTwo_2 = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -455,22 +452,22 @@ HWTEST_F(MergeContactTest, merge_Update_test_800, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("xiaomi"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaomi", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_800 dataIdOne_1 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_800 dataIdOne_1 = %{public}ld", dataIdOne); dataIdOne = ContactDataInsert(rawOne, "phone", "1234567", ""); - HILOG_INFO("merge_Update_test_800 dataIdOne_2 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_800 dataIdOne_2 = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaomi"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaomi", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_800 dataIdTwo_1 = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_800 dataIdTwo_1 = %{public}ld", dataIdTwo); dataIdTwo = ContactDataInsert(rawTwo, "phone", "12345678", ""); - HILOG_INFO("merge_Update_test_800 dataIdTwo_2 = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_800 dataIdTwo_2 = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -479,12 +476,11 @@ HWTEST_F(MergeContactTest, merge_Update_test_800, testing::ext::TestSize.Level1) OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); value.Clear(); - predicates.Clear(); std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriManualMerge, value, predicates); + ret = contactsDataAbility.Update(uriManualMerge, predicates, value); EXPECT_EQ(ret, 0); CheckMergeResultId(resultIdVector, true); DeleteRawContact(); @@ -505,29 +501,28 @@ HWTEST_F(MergeContactTest, merge_Update_test_900, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("daniu"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "daniu", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_900 dataIdOne_1 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_900 dataIdOne_1 = %{public}ld", dataIdOne); dataIdOne = ContactDataInsert(rawOne, "phone", "1234567", ""); - HILOG_INFO("merge_Update_test_900 dataIdOne_2 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_900 dataIdOne_2 = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("daniu"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "daniu", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_900 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_900 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); value.Clear(); - predicates.Clear(); std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriManualMerge, value, predicates); + ret = contactsDataAbility.Update(uriManualMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -551,29 +546,28 @@ HWTEST_F(MergeContactTest, merge_Update_test_1000, testing::ext::TestSize.Level1 int64_t rawOne = RawContactInsert("mazi"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "mazi", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_1000 dataIdOne_1 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_1000 dataIdOne_1 = %{public}ld", dataIdOne); dataIdOne = ContactDataInsert(rawOne, "phone", "1234567", ""); - HILOG_INFO("merge_Update_test_1000 dataIdOne_2 = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_1000 dataIdOne_2 = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("mazi"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "mazi", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456789", ""); - HILOG_INFO("merge_Update_test_1000 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_1000 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); value.Clear(); - predicates.Clear(); std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriManualMerge, value, predicates); + ret = contactsDataAbility.Update(uriManualMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -595,24 +589,23 @@ HWTEST_F(MergeContactTest, abnormal_merge_Update_test_1100, testing::ext::TestSi HILOG_INFO("--- abnormal_merge_Update_test_1100 Add is starting! ---"); int64_t rawOne = RawContactInsert("xiaocai"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaocai", ""); - HILOG_INFO("abnormal_merge_Update_test_1100 : = %{public}lld", dataIdOne); + HILOG_INFO("abnormal_merge_Update_test_1100 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaocai"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaocai", ""); - HILOG_INFO("abnormal_merge_Update_test_1100 : = %{public}lld", dataIdTwo); + HILOG_INFO("abnormal_merge_Update_test_1100 : = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket valueOne; - OHOS::NativeRdb::DataAbilityPredicates predicates; - contactsDataAbility.Update(uriAutoMerge, valueOne, predicates); + OHOS::DataShare::DataShareValuesBucket valueOne; + OHOS::DataShare::DataSharePredicates predicates; + contactsDataAbility.Update(uriAutoMerge, predicates, valueOne); OHOS::Uri uriSplitContact(ContactsUri::SPLIT_CONTACT); - OHOS::NativeRdb::ValuesBucket valueTwo; - predicates.Clear(); + OHOS::DataShare::DataShareValuesBucket valueTwo; std::vector ids; ids.push_back("-1"); predicates.In("raw_contact_id", ids); - int ret = contactsDataAbility.Update(uriSplitContact, valueTwo, predicates); + int ret = contactsDataAbility.Update(uriSplitContact, predicates, valueTwo); EXPECT_EQ(ret, -1); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -634,22 +627,22 @@ HWTEST_F(MergeContactTest, merge_Update_test_1200, testing::ext::TestSize.Level1 int64_t rawOne = RawContactInsert("xiaoliu"); int64_t dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); dataIdOne = ContactDataInsert(rawOne, "name", "xiaoliu", ""); - HILOG_INFO("merge_Update_test_1200 : = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_1200 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaoliu"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaoliu", ""); - HILOG_INFO("merge_Update_test_1200 : = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_1200 : = %{public}ld", dataIdTwo); int64_t rawThree = RawContactInsert("xiaoliu"); int64_t dataIdThree = ContactDataInsert(rawThree, "phone", "123456", ""); dataIdThree = ContactDataInsert(rawThree, "name", "xiaoliu", ""); - HILOG_INFO("merge_Update_test_1200 : = %{public}lld", dataIdThree); + HILOG_INFO("merge_Update_test_1200 : = %{public}ld", dataIdThree); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector ids; ids.push_back(std::to_string(rawOne)); @@ -678,27 +671,27 @@ HWTEST_F(MergeContactTest, merge_Update_test_1300, testing::ext::TestSize.Level1 int64_t rawOne = RawContactInsert("xiaohua"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaohua", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_1300 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_1300 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaohua"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaohua", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); - HILOG_INFO("merge_Update_test_1300 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_1300 dataIdTwo = %{public}ld", dataIdTwo); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "dayuy"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "dayuy"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawTwo)); predicates.And(); predicates.EqualTo("type_id", "6"); - contactsDataAbility.Update(uriContactData, values, predicates); + contactsDataAbility.Update(uriContactData, predicates, values); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); values.Clear(); - predicates.Clear(); - int ret = contactsDataAbility.Update(uriAutoMerge, values, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates2, values); EXPECT_EQ(ret, -1); std::vector ids; ids.push_back(std::to_string(rawOne)); @@ -725,36 +718,35 @@ HWTEST_F(MergeContactTest, merge_Update_test_1400, testing::ext::TestSize.Level1 int64_t rawOne = RawContactInsert("xiaobei"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaobei", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "17612345689", ""); - HILOG_INFO("merge_Update_test_1400 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_1400 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaobei"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaobei", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "17612345689", ""); - HILOG_INFO("merge_Update_test_1400 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_1400 dataIdTwo = %{public}ld", dataIdTwo); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket values; - values.PutString("detail_info", "18355421566"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket values; + values.Put("detail_info", "18355421566"); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("raw_contact_id", std::to_string(rawTwo)); predicates.And(); predicates.EqualTo("type_id", "5"); - contactsDataAbility.Update(uriContactData, values, predicates); + contactsDataAbility.Update(uriContactData, predicates, values); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); values.Clear(); - predicates.Clear(); - int ret = contactsDataAbility.Update(uriAutoMerge, values, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates2, values); EXPECT_EQ(ret, -1); OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); values.Clear(); - predicates.Clear(); std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); - predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriManualMerge, values, predicates); + predicates2.In("raw_contact_id", ids); + ret = contactsDataAbility.Update(uriManualMerge, predicates2, values); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -777,18 +769,18 @@ HWTEST_F(MergeContactTest, merge_Update_test_1500, testing::ext::TestSize.Level1 HILOG_INFO("--- merge_Update_test_1500 Add is starting! ---"); int64_t rawOne = RawContactInsert("xiaolil"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaolil", ""); - HILOG_INFO("merge_Update_test_1500 : = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_1500 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaoli"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaolil", ""); - HILOG_INFO("merge_Update_test_1500 : = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_1500 : = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); int ret; OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket valueOne; - OHOS::NativeRdb::DataAbilityPredicates predicates; - ret = contactsDataAbility.Update(uriAutoMerge, valueOne, predicates); + OHOS::DataShare::DataShareValuesBucket valueOne; + OHOS::DataShare::DataSharePredicates predicates; + ret = contactsDataAbility.Update(uriAutoMerge, predicates, valueOne); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -796,11 +788,11 @@ HWTEST_F(MergeContactTest, merge_Update_test_1500, testing::ext::TestSize.Level1 CheckMergeResultId(resultIdVector, true); OHOS::Uri uriSplitContact(ContactsUri::SPLIT_CONTACT); - OHOS::NativeRdb::ValuesBucket valueTwo; + OHOS::DataShare::DataShareValuesBucket valueTwo; std::vector ids; ids.push_back(std::to_string(rawOne)); predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriSplitContact, valueTwo, predicates); + ret = contactsDataAbility.Update(uriSplitContact, predicates, valueTwo); EXPECT_EQ(ret, 0); CheckMergeResultId(resultIdVector, false); DeleteRawContact(); @@ -822,20 +814,20 @@ HWTEST_F(MergeContactTest, abnormal_merge_Query_test_1600, testing::ext::TestSiz EXPECT_GT(rawOne, 0); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaoma", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("abnormal_merge_Query_test_1600 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("abnormal_merge_Query_test_1600 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaoma"); EXPECT_GT(rawTwo, 0); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaoma", ""); dataIdOne = ContactDataInsert(rawTwo, "phone", "1234567", ""); - HILOG_INFO("abnormal_merge_Query_test_1600 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("abnormal_merge_Query_test_1600 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriQueryMergeList(ContactsUri::MERGE_LIST_ERROR); std::vector columns; - OHOS::NativeRdb::DataAbilityPredicates predicates; - std::shared_ptr resultSet = - contactsDataAbility.Query(uriQueryMergeList, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates; + std::shared_ptr resultSet = + contactsDataAbility.Query(uriQueryMergeList, predicates, columns); EXPECT_EQ(resultSet, nullptr); DeleteRawContact(); } @@ -857,14 +849,14 @@ HWTEST_F(MergeContactTest, abnormal_merge_Update_test_1700, testing::ext::TestSi int64_t rawTwo = RawContactInsert("xiaoqian"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaoqian", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); - HILOG_INFO("abnormal_merge_Update_test_1700 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("abnormal_merge_Update_test_1700 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::MERGE_ERROR); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); std::vector ids; ids.push_back(std::to_string(rawOne)); @@ -876,7 +868,6 @@ HWTEST_F(MergeContactTest, abnormal_merge_Update_test_1700, testing::ext::TestSi HILOG_INFO("ret : %{public}d ", ret); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - predicates.Clear(); predicates.EqualTo("id", std::to_string(rawOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(rawTwo)); @@ -899,18 +890,18 @@ HWTEST_F(MergeContactTest, abnormal_merge_Update_test_1800, testing::ext::TestSi int64_t rawOne = RawContactInsert("xiaosun"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaosun", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("abnormal_merge_Update_test_1800 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("abnormal_merge_Update_test_1800 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaomei"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaomei", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); - HILOG_INFO("abnormal_merge_Update_test_1800 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("abnormal_merge_Update_test_1800 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); HILOG_INFO("ret : %{public}d ", ret); std::vector ids; @@ -936,28 +927,27 @@ HWTEST_F(MergeContactTest, abnormal_merge_Update_test_1900, testing::ext::TestSi HILOG_INFO("--- abnormal_merge_Update_test_1900 Add is starting! ---"); int64_t rawOne = RawContactInsert("bob2300"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "bob2300", ""); - HILOG_INFO("abnormal_merge_Update_test_1900 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("abnormal_merge_Update_test_1900 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("lileibob2300"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "lileibob2300", ""); - HILOG_INFO("abnormal_merge_Update_test_1900 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("abnormal_merge_Update_test_1900 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - OHOS::NativeRdb::ValuesBucket values; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket values; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - int ret = contactsDataAbility.Update(uriAutoMerge, values, predicates); + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, values); EXPECT_EQ(ret, -1); std::this_thread::sleep_for(dura); OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); values.Clear(); - predicates.Clear(); std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); predicates.In("raw_contact_id", ids); - ret = contactsDataAbility.Update(uriManualMerge, values, predicates); + ret = contactsDataAbility.Update(uriManualMerge, predicates, values); EXPECT_EQ(ret, -1); DeleteRawContact(); } @@ -976,18 +966,18 @@ HWTEST_F(MergeContactTest, abnormal_merge_Update_test_2000, testing::ext::TestSi int64_t rawOne = RawContactInsert("xiaowang"); EXPECT_GT(rawOne, 0); int64_t dataIdOne = ContactDataInsert(rawOne, "nameee", "xiaowang", ""); - HILOG_INFO("abnormal_merge_Update_test_2000 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("abnormal_merge_Update_test_2000 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaowang"); EXPECT_GT(rawOne, 0); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaowang", ""); - HILOG_INFO("abnormal_merge_Update_test_2000 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("abnormal_merge_Update_test_2000 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int ret = contactsDataAbility.Update(uriAutoMerge, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int ret = contactsDataAbility.Update(uriAutoMerge, predicates, value); EXPECT_EQ(ret, -1); std::vector ids; ids.push_back(std::to_string(rawOne)); @@ -999,7 +989,6 @@ HWTEST_F(MergeContactTest, abnormal_merge_Update_test_2000, testing::ext::TestSi HILOG_INFO("ret : %{public}d ", ret); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - predicates.Clear(); predicates.EqualTo("id", std::to_string(dataIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(dataIdTwo)); @@ -1020,23 +1009,22 @@ HWTEST_F(MergeContactTest, abnormal_merge_Update_test_2100, testing::ext::TestSi HILOG_INFO("--- abnormal_merge_Update_test_2100 Add is starting! ---"); int64_t rawOne = RawContactInsert("xiaocheng"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaocheng", ""); - HILOG_INFO("abnormal_merge_Update_test_2100 : = %{public}lld", dataIdOne); + HILOG_INFO("abnormal_merge_Update_test_2100 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaocheng"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaocheng", ""); - HILOG_INFO("abnormal_merge_Update_test_2100 : = %{public}lld", dataIdTwo); + HILOG_INFO("abnormal_merge_Update_test_2100 : = %{public}ld", dataIdTwo); std::chrono::milliseconds dura(Time::SLEEP_TIME_MERGE); std::this_thread::sleep_for(dura); OHOS::Uri uriAutoMerge(ContactsUri::AUTO_MERGE); - OHOS::NativeRdb::ValuesBucket valueOne; - OHOS::NativeRdb::DataAbilityPredicates predicates; - contactsDataAbility.Update(uriAutoMerge, valueOne, predicates); + OHOS::DataShare::DataShareValuesBucket valueOne; + OHOS::DataShare::DataSharePredicates predicates; + contactsDataAbility.Update(uriAutoMerge, predicates, valueOne); OHOS::Uri uriSplitContact(ContactsUri::SPLIT_CONTACT); - OHOS::NativeRdb::ValuesBucket valueTwo; - predicates.Clear(); + OHOS::DataShare::DataShareValuesBucket valueTwo; std::vector ids; ids.push_back("0"); predicates.In("raw_contact_id", ids); - int ret = contactsDataAbility.Update(uriSplitContact, valueTwo, predicates); + int ret = contactsDataAbility.Update(uriSplitContact, predicates, valueTwo); EXPECT_EQ(ret, -1); std::vector resultIdVector; @@ -1059,27 +1047,27 @@ HWTEST_F(MergeContactTest, merge_Update_test_2200, testing::ext::TestSize.Level1 int64_t rawOne = RawContactInsert("xiaocai"); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaocai", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "1234567", ""); - HILOG_INFO("merge_Update_test_2200 : = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_2200 : = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaocai"); int64_t dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaocai", ""); - HILOG_INFO("merge_Update_test_2200 : = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_2200 : = %{public}ld", dataIdTwo); int64_t rawThree = RawContactInsert("xiaocai"); int64_t dataIdThree = ContactDataInsert(rawThree, "phone", "12345678", ""); dataIdThree = ContactDataInsert(rawThree, "name", "xiaocai", ""); - HILOG_INFO("merge_Update_test_2200 : = %{public}lld", dataIdThree); + HILOG_INFO("merge_Update_test_2200 : = %{public}ld", dataIdThree); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); ids.push_back(std::to_string(rawThree)); predicates.In("raw_contact_id", ids); - int ret = contactsDataAbility.Update(uriManualMerge, value, predicates); + int ret = contactsDataAbility.Update(uriManualMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); @@ -1104,16 +1092,16 @@ HWTEST_F(MergeContactTest, merge_Query_test_2300, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("xsiaowuwwwww"); EXPECT_GT(rawOne, 0); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xsiaowuwwwww", ""); - HILOG_INFO("merge_Query_test_2300 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("merge_Query_test_2300 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xsiaowuwwwww"); EXPECT_GT(rawTwo, 0); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xsiaowuwwwww", ""); - HILOG_INFO("merge_Query_test_2300 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Query_test_2300 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); std::vector columns; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.BeginWrap(); predicates.EqualTo("id", std::to_string(rawOne)); predicates.Or(); @@ -1124,8 +1112,8 @@ HWTEST_F(MergeContactTest, merge_Query_test_2300, testing::ext::TestSize.Level1) predicates.And(); predicates.EqualTo("is_deleted", "0"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriRawContact, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(uriRawContact, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); @@ -1150,19 +1138,19 @@ HWTEST_F(MergeContactTest, merge_Query_test_2400, testing::ext::TestSize.Level1) int64_t rawOne = RawContactInsert("jackxsiaowuwwwww"); EXPECT_GT(rawOne, 0); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "jackxsiaowuwwwww", ""); - HILOG_INFO("merge_Query_test_2400 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("merge_Query_test_2400 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xsiaowuwwwww"); EXPECT_GT(rawTwo, 0); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xsiaowuwwwww", ""); - HILOG_INFO("merge_Query_test_2400 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Query_test_2400 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriQueryMergeList(ContactsUri::MERGE_LIST); std::vector columns; - OHOS::NativeRdb::DataAbilityPredicates predicates; - std::shared_ptr resultSet = - contactsDataAbility.Query(uriQueryMergeList, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates; + std::shared_ptr resultSet = + contactsDataAbility.Query(uriQueryMergeList, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -1185,17 +1173,17 @@ HWTEST_F(MergeContactTest, merge_Query_test_2500, testing::ext::TestSize.Level1) EXPECT_GT(rawOne, 0); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "xiaowuwwl", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456", ""); - HILOG_INFO("merge_Query_test_2500 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("merge_Query_test_2500 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("xiaowuww"); EXPECT_GT(rawTwo, 0); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "xiaowuwwl", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "123456", ""); - HILOG_INFO("merge_Query_test_2500 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Query_test_2500 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); std::vector columns; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.BeginWrap(); predicates.EqualTo("id", std::to_string(rawOne)); predicates.Or(); @@ -1206,8 +1194,8 @@ HWTEST_F(MergeContactTest, merge_Query_test_2500, testing::ext::TestSize.Level1) predicates.And(); predicates.EqualTo("is_deleted", "0"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriRawContact, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(uriRawContact, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); @@ -1233,20 +1221,20 @@ HWTEST_F(MergeContactTest, merge_Query_test_2600, testing::ext::TestSize.Level1) EXPECT_GT(rawOne, 0); int64_t dataIdOne = ContactDataInsert(rawOne, "name", "cxiaowuwwl", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456565454", ""); - HILOG_INFO("merge_Query_test_2600 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("merge_Query_test_2600 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("nxiaowuww"); EXPECT_GT(rawTwo, 0); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "nxiaowuwwl", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "1234564488", ""); - HILOG_INFO("merge_Query_test_2600 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Query_test_2600 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriQueryMergeList(ContactsUri::MERGE_LIST); std::vector columns; - OHOS::NativeRdb::DataAbilityPredicates predicates; - std::shared_ptr resultSet = - contactsDataAbility.Query(uriQueryMergeList, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates; + std::shared_ptr resultSet = + contactsDataAbility.Query(uriQueryMergeList, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -1270,24 +1258,24 @@ HWTEST_F(MergeContactTest, merge_Update_test_2700, testing::ext::TestSize.Level1 int64_t dataIdOne = ContactDataInsert(rawOne, "name", "jack12345", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "123456565454", ""); dataIdOne = ContactDataInsert(rawOne, "phone", "1234565654546", ""); - HILOG_INFO("merge_Update_test_2700 dataIdOne = %{public}lld", dataIdOne); + HILOG_INFO("merge_Update_test_2700 dataIdOne = %{public}ld", dataIdOne); int64_t rawTwo = RawContactInsert("jack12345"); EXPECT_GT(rawTwo, 0); int64_t dataIdTwo = ContactDataInsert(rawTwo, "name", "jack12345", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "1234564488", ""); dataIdTwo = ContactDataInsert(rawTwo, "phone", "12345644888", ""); - HILOG_INFO("merge_Update_test_2700 dataIdTwo = %{public}lld", dataIdTwo); + HILOG_INFO("merge_Update_test_2700 dataIdTwo = %{public}ld", dataIdTwo); int time = Time::SLEEP_TIME_MERGE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); OHOS::Uri uriManualMerge(ContactsUri::MANUAL_MERGE); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; std::vector ids; ids.push_back(std::to_string(rawOne)); ids.push_back(std::to_string(rawTwo)); predicates.In("raw_contact_id", ids); - int ret = contactsDataAbility.Update(uriManualMerge, value, predicates); + int ret = contactsDataAbility.Update(uriManualMerge, predicates, value); EXPECT_EQ(ret, 0); std::vector resultIdVector; resultIdVector.push_back(rawOne); diff --git a/test/unittest/src/performance_test.cpp b/test/unittest/src/performance_test.cpp index 0dabd18..dd911a9 100644 --- a/test/unittest/src/performance_test.cpp +++ b/test/unittest/src/performance_test.cpp @@ -44,13 +44,12 @@ int PerformanceTest::CalcTime(int64_t startTime, int64_t endTime) void PerformanceTest::DeleteContact() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); predicates.NotEqualTo("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); contactsDataAbility.Delete(uriRawContact, predicates); - predicates.Clear(); int count = 0; int deleteCount = 9999; std::vector columns; @@ -59,17 +58,18 @@ void PerformanceTest::DeleteContact() int time = Time::SLEEP_TIME_MERGE_DELETE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriRawContactComplete, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + std::shared_ptr resultSet = + contactsDataAbility.Query(uriRawContactComplete, predicates2, columns); resultSet->GetRowCount(count); resultSet->Close(); } int time = Time::SLEEP_TIME_MERGE_DELETE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates3); } /* @@ -84,14 +84,14 @@ HWTEST_F(PerformanceTest, raw_contact_insert_performance_test_900, testing::ext: { HILOG_INFO("--- raw_contact_insert_performance_test_900 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - std::vector values; + std::vector values; for (int i = 0; i < 10000; i++) { - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; std::string name("xiaoyan"); name.append(std::to_string(i + 1)); - rawContactValues.PutString("display_name", name); - rawContactValues.PutString("company", "company"); - rawContactValues.PutString("position", "position"); + rawContactValues.Put("display_name", name); + rawContactValues.Put("company", "company"); + rawContactValues.Put("position", "position"); values.push_back(rawContactValues); } HILOG_INFO("raw_contact_insert_performance_test_900 start! "); @@ -120,9 +120,9 @@ HWTEST_F(PerformanceTest, raw_contact_update_performance_test_1000, testing::ext { HILOG_INFO("--- raw_contact_update_performance_test_1000 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -130,7 +130,7 @@ HWTEST_F(PerformanceTest, raw_contact_update_performance_test_1000, testing::ext int64_t startTime, endTime; int elaps; startTime = GetCurrentTime(); - int updateCode = contactsDataAbility.Update(uriRawContact, updateValues, predicates); + int updateCode = contactsDataAbility.Update(uriRawContact, predicates, updateValues); endTime = GetCurrentTime(); elaps = CalcTime(startTime, endTime); HILOG_INFO("raw_contact_update_performance_test_1000 : time is %{public}d", elaps); @@ -155,7 +155,7 @@ HWTEST_F(PerformanceTest, raw_contact_query_performance_test_1100, testing::ext: columns.push_back("display_name"); columns.push_back("company"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -163,8 +163,8 @@ HWTEST_F(PerformanceTest, raw_contact_query_performance_test_1100, testing::ext: int64_t startTime, endTime; int elaps; startTime = GetCurrentTime(); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriRawContact, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(uriRawContact, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_GT(rowCount, 9999); @@ -187,7 +187,7 @@ HWTEST_F(PerformanceTest, raw_contact_delete_performance_test_1200, testing::ext { HILOG_INFO("--- raw_contact_delete_performance_test_1200 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -215,27 +215,27 @@ HWTEST_F(PerformanceTest, raw_contact_delete_performance_test_1200, testing::ext HWTEST_F(PerformanceTest, contact_data_insert_performance_test_1300, testing::ext::TestSize.Level1) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; std::string rawName("xiaoyan"); - rawContactValues.PutString("display_name", rawName); - rawContactValues.PutString("company", "company"); - rawContactValues.PutString("position", "position"); + rawContactValues.Put("display_name", rawName); + rawContactValues.Put("company", "company"); + rawContactValues.Put("position", "position"); int rawContactId = contactsDataAbility.Insert(uriRawContact, rawContactValues); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.NotEqualTo("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); contactsDataAbility.Delete(uriRawContact, predicates); HILOG_INFO("--- contact_data_insert_performance_test_1300 is starting! ---"); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - std::vector values; + std::vector values; for (int i = 0; i < 10000; i++) { - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; std::string name("xiaoyan"); name.append(std::to_string(i + 1)); - contactDataValues.PutInt("raw_contact_id", rawContactId); - contactDataValues.PutString("content_type", "name"); - contactDataValues.PutString("detail_info", name); + contactDataValues.Put("raw_contact_id", rawContactId); + contactDataValues.Put("content_type", "name"); + contactDataValues.Put("detail_info", name); values.push_back(contactDataValues); } HILOG_INFO("contact_data_insert_performance_test_1300 start! "); @@ -262,14 +262,14 @@ HWTEST_F(PerformanceTest, contact_data_update_performance_test_1400, testing::ex { HILOG_INFO("--- contact_data_update_performance_test_1400 is starting! ---"); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("syn_1", "test"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("syn_1", "test"); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int64_t startTime, endTime; int elaps; startTime = GetCurrentTime(); - int updateCode = contactsDataAbility.Update(uriContactData, updateValues, predicates); + int updateCode = contactsDataAbility.Update(uriContactData, predicates, updateValues); endTime = GetCurrentTime(); elaps = CalcTime(startTime, endTime); HILOG_INFO("contact_data_update_performance_test_1400 : time is %{public}d", elaps); @@ -292,13 +292,13 @@ HWTEST_F(PerformanceTest, contact_data_query_performance_test_1500, testing::ext std::vector columns; columns.push_back("raw_contact_id"); columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int64_t startTime, endTime; int elaps; startTime = GetCurrentTime(); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriContactData, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(uriContactData, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_GT(rowCount, 9999); @@ -321,7 +321,7 @@ HWTEST_F(PerformanceTest, contact_data_delete_performance_test_1600, testing::ex { HILOG_INFO("--- contact_data_delete_performance_test_1600 is starting! ---"); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int64_t startTime, endTime; int elaps; @@ -345,15 +345,15 @@ HWTEST_F(PerformanceTest, contact_data_delete_performance_test_1600, testing::ex HWTEST_F(PerformanceTest, calllog_insert_performance_test_100, testing::ext::TestSize.Level1) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - OHOS::NativeRdb::DataAbilityPredicates predicatesOne; + OHOS::DataShare::DataSharePredicates predicatesOne; predicatesOne.GreaterThan("id", "0"); HILOG_INFO("calllog_insert_performance_test_100 deleted start! "); calllogAbility.Delete(uriCalllog, predicatesOne); HILOG_INFO("--- calllog_insert_performance_test_100 is starting! ---"); - std::vector values; + std::vector values; for (int i = 0; i < 10000; i++) { - OHOS::NativeRdb::ValuesBucket calllogValues; - calllogValues.PutString("phone_number", std::to_string(i + 1)); + OHOS::DataShare::DataShareValuesBucket calllogValues; + calllogValues.Put("phone_number", std::to_string(i + 1)); values.push_back(calllogValues); } int64_t startTime, endTime; @@ -379,14 +379,14 @@ HWTEST_F(PerformanceTest, calllog_update_performance_test_200, testing::ext::Tes { HILOG_INFO("--- calllog_update_performance_test_200 is starting! ---"); OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("answer_state", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("answer_state", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int64_t startTime, endTime; int elaps; startTime = GetCurrentTime(); - int updateCode = calllogAbility.Update(uriCalllog, updateValues, predicates); + int updateCode = calllogAbility.Update(uriCalllog, predicates, updateValues); endTime = GetCurrentTime(); elaps = CalcTime(startTime, endTime); ASSERT_LE(elaps, TIME_USEC_CALL_LOG_UPDATE); @@ -409,13 +409,13 @@ HWTEST_F(PerformanceTest, calllog_query_performance_test_300, testing::ext::Test std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int64_t startTime, endTime; int elaps; startTime = GetCurrentTime(); - std::shared_ptr resultSet = - calllogAbility.Query(uriCalllog, columns, predicates); + std::shared_ptr resultSet = + calllogAbility.Query(uriCalllog, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_GT(rowCount, 9999); @@ -438,7 +438,7 @@ HWTEST_F(PerformanceTest, calllog_delete_performance_test_400, testing::ext::Tes { HILOG_INFO("--- calllog_delete_performance_test_400 is starting! ---"); OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int64_t startTime, endTime; int elaps; @@ -462,15 +462,15 @@ HWTEST_F(PerformanceTest, calllog_delete_performance_test_400, testing::ext::Tes HWTEST_F(PerformanceTest, voicemail_insert_performance_test_500, testing::ext::TestSize.Level1) { OHOS::Uri uriVoiceMail(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::DataAbilityPredicates predicatesOne; + OHOS::DataShare::DataSharePredicates predicatesOne; predicatesOne.GreaterThan("id", "0"); HILOG_INFO("voicemail_insert_performance_test_500 deleted start! "); voicemailAbility.Delete(uriVoiceMail, predicatesOne); HILOG_INFO("--- voicemail_insert_performance_test_500 is starting! ---"); - std::vector values; + std::vector values; for (int i = 0; i < 10000; i++) { - OHOS::NativeRdb::ValuesBucket voicemailValues; - voicemailValues.PutString("phone_number", std::to_string(i + 1)); + OHOS::DataShare::DataShareValuesBucket voicemailValues; + voicemailValues.Put("phone_number", std::to_string(i + 1)); values.push_back(voicemailValues); } HILOG_INFO("voicemail_insert_performance_test_500 start! "); @@ -497,14 +497,14 @@ HWTEST_F(PerformanceTest, voicemail_update_performance_test_600, testing::ext::T { HILOG_INFO("--- voicemail_update_performance_test_600 is starting! ---"); OHOS::Uri uriVoiceMail(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("origin_type", "origin"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("origin_type", "origin"); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int64_t startTime, endTime; int elaps; startTime = GetCurrentTime(); - int updateCode = voicemailAbility.Update(uriVoiceMail, updateValues, predicates); + int updateCode = voicemailAbility.Update(uriVoiceMail, predicates, updateValues); endTime = GetCurrentTime(); elaps = CalcTime(startTime, endTime); HILOG_INFO("voicemail_update_performance_test_600 : time is %{public}d", elaps); @@ -528,14 +528,14 @@ HWTEST_F(PerformanceTest, voicemail_query_performance_test_700, testing::ext::Te std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); HILOG_INFO("voicemail_query_performance_test_700 start! "); int64_t startTime, endTime; int elaps; startTime = GetCurrentTime(); - std::shared_ptr resultSet = - voicemailAbility.Query(uriVoiceMail, columns, predicates); + std::shared_ptr resultSet = + voicemailAbility.Query(uriVoiceMail, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_GT(rowCount, 9999); @@ -558,7 +558,7 @@ HWTEST_F(PerformanceTest, voicemail_delete_performance_test_800, testing::ext::T { HILOG_INFO("--- voicemail_delete_performance_test_800 is starting! ---"); OHOS::Uri uriVoiceMail(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); HILOG_INFO("voicemail_delete_performance_test_800 start! "); int64_t startTime, endTime; diff --git a/test/unittest/src/random_number_utils.cpp b/test/unittest/src/random_number_utils.cpp index c8e0716..bcc6885 100644 --- a/test/unittest/src/random_number_utils.cpp +++ b/test/unittest/src/random_number_utils.cpp @@ -25,14 +25,11 @@ RandomNumberUtils::~RandomNumberUtils() { } -string RandomNumberUtils::Generating(std::int number) +std::string &RandomNumberUtils::Generating(int number) { - string phoneNumber = nullptr; - if (number == nullptr) { - return 0; - } + std::string phoneNumber = ""; for (int i = 0; i < number; i++) { - phoneNumber += to_string(rand()%10); + phoneNumber += std::to_string(rand() % 10); } return phoneNumber; } diff --git a/test/unittest/src/recovery_test.cpp b/test/unittest/src/recovery_test.cpp index c65410d..e7f11b2 100644 --- a/test/unittest/src/recovery_test.cpp +++ b/test/unittest/src/recovery_test.cpp @@ -22,8 +22,8 @@ namespace Contacts { namespace Test { void RecoveryTest::ClearData() { - OHOS::AppExecFwk::ContactsDataAbility contactsDataAbility; - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::AbilityRuntime::ContactsDataAbility contactsDataAbility; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); predicates.NotEqualTo("id", "0"); predicates.And(); @@ -33,18 +33,18 @@ void RecoveryTest::ClearData() int time = 3000; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); + OHOS::DataShare::DataSharePredicates predicates2; OHOS::Uri uriRawContactComplete(ContactsUri::DELETED_RAW_CONTACT); - predicates.NotEqualTo("id", "0"); - int code = contactsDataAbility.Delete(uriRawContactComplete, predicates); + predicates2.NotEqualTo("id", "0"); + int code = contactsDataAbility.Delete(uriRawContactComplete, predicates2); HILOG_INFO("RecoveryTest ClearData code is %{public}d", code); } int64_t RecoveryTest::RawContactInsert(std::string displayName) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValues; - rawContactValues.PutString("display_name", displayName); + OHOS::DataShare::DataShareValuesBucket rawContactValues; + rawContactValues.Put("display_name", displayName); int64_t code = contactsDataAbility.Insert(uriRawContact, rawContactValues); rawContactValues.Clear(); return code; @@ -89,9 +89,9 @@ HWTEST_F(RecoveryTest, recovery_test_200, testing::ext::TestSize.Level1) RawContactInsert("xiaolilili"); // backup OHOS::Uri uriRawContactBackUp(ContactsUri::BACKUP); - OHOS::NativeRdb::ValuesBucket value; - OHOS::NativeRdb::DataAbilityPredicates predicates; - int retCode = contactsDataAbility.Update(uriRawContactBackUp, value, predicates); + OHOS::DataShare::DataShareValuesBucket value; + OHOS::DataShare::DataSharePredicates predicates; + int retCode = contactsDataAbility.Update(uriRawContactBackUp, predicates, value); EXPECT_EQ(0, retCode); RawContactInsert("xiaobaibaibai"); @@ -99,19 +99,19 @@ HWTEST_F(RecoveryTest, recovery_test_200, testing::ext::TestSize.Level1) OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); std::vector columns; predicates.EqualTo("is_deleted", "0"); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriRawContact, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(uriRawContact, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); resultSet->Close(); EXPECT_EQ(4, rowCount); OHOS::Uri uriRawContactRecover(ContactsUri::RECOVER); - int retCodeRecover = contactsDataAbility.Update(uriRawContactRecover, value, predicates); + int retCodeRecover = contactsDataAbility.Update(uriRawContactRecover, predicates, value); EXPECT_EQ(0, retCodeRecover); - std::shared_ptr resultSetRecover = - contactsDataAbility.Query(uriRawContact, columns, predicates); + std::shared_ptr resultSetRecover = + contactsDataAbility.Query(uriRawContact, predicates, columns); int rowCountRecover = 0; resultSetRecover->GetRowCount(rowCountRecover); resultSetRecover->Close(); diff --git a/test/unittest/src/stability_test.cpp b/test/unittest/src/stability_test.cpp index 138ead1..3da208c 100644 --- a/test/unittest/src/stability_test.cpp +++ b/test/unittest/src/stability_test.cpp @@ -31,13 +31,12 @@ StabilityTest::~StabilityTest() void StabilityTest::DeleteContact() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); predicates.NotEqualTo("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); contactsDataAbility.Delete(uriRawContact, predicates); - predicates.Clear(); int count = 0; int deleteCount = 9999; std::vector columns; @@ -46,17 +45,18 @@ void StabilityTest::DeleteContact() int time = Time::SLEEP_TIME_MERGE_DELETE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriRawContactComplete, columns, predicates); + OHOS::DataShare::DataSharePredicates predicates2; + std::shared_ptr resultSet = + contactsDataAbility.Query(uriRawContactComplete, predicates2, columns); resultSet->GetRowCount(count); resultSet->Close(); } int time = Time::SLEEP_TIME_MERGE_DELETE; std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); - predicates.Clear(); - predicates.NotEqualTo("id", "0"); - contactsDataAbility.Delete(uriRawContactComplete, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.NotEqualTo("id", "0"); + contactsDataAbility.Delete(uriRawContactComplete, predicates3); } /* @@ -71,14 +71,14 @@ HWTEST_F(StabilityTest, raw_contact_insert_performance_test_900, testing::ext::T { HILOG_INFO("--- raw_contact_insert_performance_test_900 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - std::vector values; + std::vector values; for (int i = 0; i < 10000; i++) { - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; std::string name("小严"); name.append(std::to_string(i + 1)); - rawContactValues.PutString("display_name", name); - rawContactValues.PutString("company", "company"); - rawContactValues.PutString("position", "position"); + rawContactValues.Put("display_name", name); + rawContactValues.Put("company", "company"); + rawContactValues.Put("position", "position"); values.push_back(rawContactValues); } int batchInsertCode = contactsDataAbility.BatchInsert(uriRawContact, values); @@ -97,13 +97,13 @@ HWTEST_F(StabilityTest, raw_contact_update_performance_test_1000, testing::ext:: { HILOG_INFO("--- raw_contact_update_performance_test_1000 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("favorite", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("favorite", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); - int updateCode = contactsDataAbility.Update(uriRawContact, updateValues, predicates); + int updateCode = contactsDataAbility.Update(uriRawContact, predicates, updateValues); EXPECT_EQ(updateCode, 0); } @@ -124,12 +124,12 @@ HWTEST_F(StabilityTest, raw_contact_query_performance_test_1100, testing::ext::T columns.push_back("display_name"); columns.push_back("company"); columns.push_back("position"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriRawContact, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(uriRawContact, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_GT(rowCount, 9999); @@ -148,7 +148,7 @@ HWTEST_F(StabilityTest, raw_contact_delete_performance_test_1200, testing::ext:: { HILOG_INFO("--- raw_contact_delete_performance_test_1200 is starting! ---"); OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); @@ -168,26 +168,26 @@ HWTEST_F(StabilityTest, raw_contact_delete_performance_test_1200, testing::ext:: HWTEST_F(StabilityTest, contact_data_insert_performance_test_1300, testing::ext::TestSize.Level1) { OHOS::Uri uriRawContact(ContactsUri::RAW_CONTACT); - OHOS::NativeRdb::ValuesBucket rawContactValues; + OHOS::DataShare::DataShareValuesBucket rawContactValues; std::string rawName("xiaoyan"); - rawContactValues.PutString("display_name", rawName); - rawContactValues.PutString("company", "company"); - rawContactValues.PutString("position", "position"); + rawContactValues.Put("display_name", rawName); + rawContactValues.Put("company", "company"); + rawContactValues.Put("position", "position"); int rawContactId = contactsDataAbility.Insert(uriRawContact, rawContactValues); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.NotEqualTo("id", "0"); predicates.And(); predicates.EqualTo("is_deleted", "0"); contactsDataAbility.Delete(uriRawContact, predicates); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - std::vector values; + std::vector values; for (int i = 0; i < 10000; i++) { - OHOS::NativeRdb::ValuesBucket contactDataValues; + OHOS::DataShare::DataShareValuesBucket contactDataValues; std::string name("xiaoyan"); name.append(std::to_string(i + 1)); - contactDataValues.PutInt("raw_contact_id", rawContactId); - contactDataValues.PutString("content_type", "name"); - contactDataValues.PutString("detail_info", name); + contactDataValues.Put("raw_contact_id", rawContactId); + contactDataValues.Put("content_type", "name"); + contactDataValues.Put("detail_info", name); values.push_back(contactDataValues); } int batchInsertCode = contactsDataAbility.BatchInsert(uriContactData, values); @@ -206,11 +206,11 @@ HWTEST_F(StabilityTest, contact_data_update_performance_test_1400, testing::ext: { HILOG_INFO("--- contact_data_update_performance_test_1400 is starting! ---"); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("syn_1", "test"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("syn_1", "test"); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - int updateCode = contactsDataAbility.Update(uriContactData, updateValues, predicates); + int updateCode = contactsDataAbility.Update(uriContactData, predicates, updateValues); EXPECT_EQ(updateCode, 0); } @@ -229,10 +229,10 @@ HWTEST_F(StabilityTest, contact_data_query_performance_test_1500, testing::ext:: std::vector columns; columns.push_back("raw_contact_id"); columns.push_back("detail_info"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = - contactsDataAbility.Query(uriContactData, columns, predicates); + std::shared_ptr resultSet = + contactsDataAbility.Query(uriContactData, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_GT(rowCount, 9999); @@ -251,7 +251,7 @@ HWTEST_F(StabilityTest, contact_data_delete_performance_test_1600, testing::ext: { HILOG_INFO("--- contact_data_delete_performance_test_1600 is starting! ---"); OHOS::Uri uriContactData(ContactsUri::CONTACT_DATA); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = contactsDataAbility.Delete(uriContactData, predicates); EXPECT_EQ(deleteCode, 0); @@ -268,15 +268,15 @@ HWTEST_F(StabilityTest, contact_data_delete_performance_test_1600, testing::ext: HWTEST_F(StabilityTest, calllog_insert_performance_test_100, testing::ext::TestSize.Level1) { OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - OHOS::NativeRdb::DataAbilityPredicates predicatesOne; + OHOS::DataShare::DataSharePredicates predicatesOne; predicatesOne.GreaterThan("id", "0"); HILOG_INFO("calllog_insert_performance_test_100 deleted start! "); calllogAbility.Delete(uriCalllog, predicatesOne); HILOG_INFO("--- calllog_insert_performance_test_100 is starting! ---"); - std::vector values; + std::vector values; for (int i = 0; i < 10000; i++) { - OHOS::NativeRdb::ValuesBucket calllogValues; - calllogValues.PutString("phone_number", std::to_string(i + 1)); + OHOS::DataShare::DataShareValuesBucket calllogValues; + calllogValues.Put("phone_number", std::to_string(i + 1)); values.push_back(calllogValues); } int batchInsertCode = calllogAbility.BatchInsert(uriCalllog, values); @@ -295,11 +295,11 @@ HWTEST_F(StabilityTest, calllog_update_performance_test_200, testing::ext::TestS { HILOG_INFO("--- calllog_update_performance_test_200 is starting! ---"); OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("answer_state", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("answer_state", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - int updateCode = calllogAbility.Update(uriCalllog, updateValues, predicates); + int updateCode = calllogAbility.Update(uriCalllog, predicates, updateValues); HILOG_INFO("calllog_update_performance_test_200 : updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); } @@ -319,10 +319,10 @@ HWTEST_F(StabilityTest, calllog_query_performance_test_300, testing::ext::TestSi std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = - calllogAbility.Query(uriCalllog, columns, predicates); + std::shared_ptr resultSet = + calllogAbility.Query(uriCalllog, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_GT(rowCount, 9999); @@ -341,7 +341,7 @@ HWTEST_F(StabilityTest, calllog_delete_performance_test_400, testing::ext::TestS { HILOG_INFO("--- calllog_delete_performance_test_400 is starting! ---"); OHOS::Uri uriCalllog(CallLogUri::CALL_LOG); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = calllogAbility.Delete(uriCalllog, predicates); EXPECT_EQ(deleteCode, 0); @@ -358,15 +358,15 @@ HWTEST_F(StabilityTest, calllog_delete_performance_test_400, testing::ext::TestS HWTEST_F(StabilityTest, voicemail_insert_performance_test_500, testing::ext::TestSize.Level1) { OHOS::Uri uriVoiceMail(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::DataAbilityPredicates predicatesOne; + OHOS::DataShare::DataSharePredicates predicatesOne; predicatesOne.GreaterThan("id", "0"); HILOG_INFO("voicemail_insert_performance_test_500 deleted start! "); voicemailAbility.Delete(uriVoiceMail, predicatesOne); HILOG_INFO("--- voicemail_insert_performance_test_500 is starting! ---"); - std::vector values; + std::vector values; for (int i = 0; i < 10000; i++) { - OHOS::NativeRdb::ValuesBucket voicemailValues; - voicemailValues.PutString("phone_number", std::to_string(i + 1)); + OHOS::DataShare::DataShareValuesBucket voicemailValues; + voicemailValues.Put("phone_number", std::to_string(i + 1)); values.push_back(voicemailValues); } int batchInsertCode = voicemailAbility.BatchInsert(uriVoiceMail, values); @@ -385,11 +385,11 @@ HWTEST_F(StabilityTest, voicemail_update_performance_test_600, testing::ext::Tes { HILOG_INFO("--- voicemail_update_performance_test_600 is starting! ---"); OHOS::Uri uriVoiceMail(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("origin_type", "origin"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("origin_type", "origin"); + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - int updateCode = voicemailAbility.Update(uriVoiceMail, updateValues, predicates); + int updateCode = voicemailAbility.Update(uriVoiceMail, predicates, updateValues); EXPECT_EQ(updateCode, 0); } @@ -408,10 +408,10 @@ HWTEST_F(StabilityTest, voicemail_query_performance_test_700, testing::ext::Test std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = - voicemailAbility.Query(uriVoiceMail, columns, predicates); + std::shared_ptr resultSet = + voicemailAbility.Query(uriVoiceMail, predicates, columns); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_GT(rowCount, 9999); @@ -430,7 +430,7 @@ HWTEST_F(StabilityTest, voicemail_delete_performance_test_800, testing::ext::Tes { HILOG_INFO("--- voicemail_delete_performance_test_800 is starting! ---"); OHOS::Uri uriVoiceMail(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = voicemailAbility.Delete(uriVoiceMail, predicates); EXPECT_EQ(deleteCode, 0); diff --git a/test/unittest/src/voicemailability_test.cpp b/test/unittest/src/voicemailability_test.cpp index ba53ddd..38f07e0 100644 --- a/test/unittest/src/voicemailability_test.cpp +++ b/test/unittest/src/voicemailability_test.cpp @@ -16,6 +16,9 @@ #include "voicemailability_test.h" #include "data_ability_operation_builder.h" +#include "random_number_utils.h" + +using namespace OHOS::Contacts; namespace Contacts { namespace Test { @@ -30,48 +33,48 @@ VoicemailAbilityTest::~VoicemailAbilityTest() int64_t VoicemailAbilityTest::VoicemailStatusInsert(std::string phoneNumber, int status) { OHOS::Uri uriVoicemail(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::ValuesBucket voicemailValues; - voicemailValues.PutString("phone_number", phoneNumber); - voicemailValues.PutInt("voice_status", status); + OHOS::DataShare::DataShareValuesBucket voicemailValues; + voicemailValues.Put("phone_number", phoneNumber); + voicemailValues.Put("voice_status", status); int64_t code = voicemailAbility.Insert(uriVoicemail, voicemailValues); return code; } int VoicemailAbilityTest::VoicemailUpdate( - OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates) + OHOS::DataShare::DataShareValuesBucket updateValues, OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uriVoicemail(VoicemailUri::VOICEMAIL); - int code = voicemailAbility.Update(uriVoicemail, updateValues, predicates); + int code = voicemailAbility.Update(uriVoicemail, predicates, updateValues); return code; } -int VoicemailAbilityTest::VoicemailDelete(OHOS::NativeRdb::DataAbilityPredicates predicates) +int VoicemailAbilityTest::VoicemailDelete(OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uriVoicemail(VoicemailUri::VOICEMAIL); int code = voicemailAbility.Delete(uriVoicemail, predicates); return code; } -std::shared_ptr VoicemailAbilityTest::VoicemailQuery( - std::vector columns, OHOS::NativeRdb::DataAbilityPredicates predicates) +std::shared_ptr VoicemailAbilityTest::VoicemailQuery( + std::vector columns, OHOS::DataShare::DataSharePredicates predicates) { OHOS::Uri uriVoicemail(VoicemailUri::VOICEMAIL); - std::shared_ptr resultSet = - voicemailAbility.Query(uriVoicemail, columns, predicates); + std::shared_ptr resultSet = + voicemailAbility.Query(uriVoicemail, predicates, columns); return resultSet; } -void VoicemailAbilityTest::CheckResultSetBatch(OHOS::NativeRdb::DataAbilityPredicates predicates, - std::vector &columns, OHOS::NativeRdb::ValuesBucket values, std::string testName) +void VoicemailAbilityTest::CheckResultSetBatch(OHOS::DataShare::DataSharePredicates predicates, + std::vector &columns, OHOS::DataShare::DataShareValuesBucket values, std::string testName) { - std::shared_ptr resultSet = VoicemailQuery(columns, predicates); + std::shared_ptr resultSet = VoicemailQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); CheckResultSet(values, resultSet, testName); } -int VoicemailAbilityTest::VoicemailInsertValues(OHOS::NativeRdb::ValuesBucket &values) +int VoicemailAbilityTest::VoicemailInsertValues(OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriVoicemail(VoicemailUri::VOICEMAIL); int64_t code = voicemailAbility.Insert(uriVoicemail, values); @@ -79,30 +82,31 @@ int VoicemailAbilityTest::VoicemailInsertValues(OHOS::NativeRdb::ValuesBucket &v return result; } -int64_t VoicemailAbilityTest::VoicemailInsertValue(std::string displayName, OHOS::NativeRdb::ValuesBucket &values) +int64_t VoicemailAbilityTest::VoicemailInsertValue(std::string displayName, OHOS::DataShare::DataShareValuesBucket &values) { OHOS::Uri uriVoicemail(VoicemailUri::VOICEMAIL); - values.PutString("display_name", displayName); + values.Put("display_name", displayName); int64_t code = voicemailAbility.Insert(uriVoicemail, values); return code; } -OHOS::NativeRdb::ValuesBucket VoicemailAbilityTest::GetVoiceMailValues( +OHOS::DataShare::DataShareValuesBucket VoicemailAbilityTest::GetVoiceMailValues( int columnsStart, int columnsEnd, std::vector &columns) { std::string voiceMailTestStringValue = std::to_string(ContactsRand()); - OHOS::NativeRdb::ValuesBucket valuesBucket; - string phoneNumber = random_number_utils.Generating(8); - valuesBucket.PutString("phone_number", phoneNumber + voiceMailTestStringValue); - valuesBucket.PutString("quicksearch_key", "dfquicksearch_key" + voiceMailTestStringValue); - valuesBucket.PutString("display_name", "dfName" + voiceMailTestStringValue); - valuesBucket.PutString("voicemail_uri", "dfUri::voicemail_uri" + voiceMailTestStringValue); - valuesBucket.PutInt("voicemail_type", ContactsRand()); - valuesBucket.PutInt("voice_file_size", ContactsRand()); - valuesBucket.PutInt("voice_duration", ContactsRand()); - valuesBucket.PutInt("voice_status", ContactsRand()); - valuesBucket.PutString("origin_type", "origin_type" + voiceMailTestStringValue); - valuesBucket.PutInt("create_time", ContactsRand()); + OHOS::DataShare::DataShareValuesBucket valuesBucket; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(8); + valuesBucket.Put("phone_number", phoneNumber + voiceMailTestStringValue); + valuesBucket.Put("quicksearch_key", "dfquicksearch_key" + voiceMailTestStringValue); + valuesBucket.Put("display_name", "dfName" + voiceMailTestStringValue); + valuesBucket.Put("voicemail_uri", "dfUri::voicemail_uri" + voiceMailTestStringValue); + valuesBucket.Put("voicemail_type", ContactsRand()); + valuesBucket.Put("voice_file_size", ContactsRand()); + valuesBucket.Put("voice_duration", ContactsRand()); + valuesBucket.Put("voice_status", ContactsRand()); + valuesBucket.Put("origin_type", "origin_type" + voiceMailTestStringValue); + valuesBucket.Put("create_time", ContactsRand()); std::vector columnsTemp; GetVoiceMailValuesColumn(columnsTemp); int allSize = columnsTemp.size(); @@ -110,7 +114,7 @@ OHOS::NativeRdb::ValuesBucket VoicemailAbilityTest::GetVoiceMailValues( if (i >= columnsStart && i < columnsEnd) { columns.push_back(columnsTemp[i]); } else { - valuesBucket.Delete(columnsTemp[i]); + valuesBucket.Put(columnsTemp[i], ""); } } return valuesBucket; @@ -132,7 +136,7 @@ void VoicemailAbilityTest::GetVoiceMailValuesColumn(std::vector &co void VoicemailAbilityTest::ClearVoicemail() { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = VoicemailDelete(predicates); EXPECT_EQ(0, deleteCode); @@ -149,20 +153,21 @@ void VoicemailAbilityTest::ClearVoicemail() HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_100, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Insert_test_100 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(6); - values.PutString("phone_number", phoneNumber); - values.PutInt("voice_status", 1); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(6); + values.Put("phone_number", phoneNumber); + values.Put("voice_status", 1); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Insert_test_100 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("phone_number"); columns.push_back("voice_status"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -181,18 +186,19 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_100, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_200, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Insert_test_200 is staring! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(6); - values.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(6); + values.Put("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Insert_test_200 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("phone_number"); columns.push_back("id"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -214,23 +220,23 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_300, testing::ext::TestSize std::vector columns; GetVoiceMailValuesColumn(columns); int columnsSize = 10; - OHOS::NativeRdb::ValuesBucket valuesBucket = GetVoiceMailValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetVoiceMailValues(0, columnsSize, columns); int rawId = VoicemailInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - std::shared_ptr resultSet = VoicemailQuery(columns, predicates); + std::shared_ptr resultSet = VoicemailQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); CheckResultSet(valuesBucket, resultSet, "voicemail_Insert_test_300"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawId)); // test end delete data - int deleteCode = VoicemailDelete(predicates); + int deleteCode = VoicemailDelete(predicates2); EXPECT_EQ(deleteCode, 0); ClearVoicemail(); } @@ -246,27 +252,28 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_300, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_400, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Update_test_400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(4); - values.PutString("phone_number", phoneNumber); - values.PutInt("voice_status", 1); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(4); + values.Put("phone_number", phoneNumber); + values.Put("voice_status", 1); int voicemailId = VoicemailInsertValues(values); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("voice_status", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("voice_status", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); EXPECT_EQ(updateCode, 0); - predicates.Clear(); - predicates.EqualTo("voice_status", "0"); - predicates.And(); - predicates.EqualTo("id", std::to_string(voicemailId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("voice_status", "0"); + predicates2.And(); + predicates2.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("voice_status"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -285,25 +292,26 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_400, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_500, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Delete_test_500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(6); - values.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(6); + values.Put("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Delete_test_500 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); int deleteCode = VoicemailDelete(predicates); HILOG_INFO("voicemail_Delete_test_500: deleteCode = %{public}d", deleteCode); EXPECT_EQ(deleteCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(voicemailId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("phone_number"); columns.push_back("id"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -323,26 +331,27 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_500, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_600, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Delete_test_600 is staring! ---"); - OHOS::NativeRdb::ValuesBucket valuesOne; - string phoneNumber = random_number_utils.Generating(7); - valuesOne.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesOne; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(7); + valuesOne.Put("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(valuesOne); HILOG_INFO("voicemail_Delete_test_600 : voicemailIdOne = %{public}d", voicemailIdOne); EXPECT_GT(voicemailIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesTwo; - valuesTwo.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesTwo; + valuesTwo.Put("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(valuesTwo); HILOG_INFO("voicemail_Delete_test_600 : voicemailIdTwo = %{public}d", voicemailIdTwo); EXPECT_GT(voicemailIdTwo, 0); - OHOS::NativeRdb::ValuesBucket valuesThree; - valuesThree.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesThree; + valuesThree.Put("phone_number", phoneNumber); int voicemailIdThree = VoicemailInsertValues(valuesThree); HILOG_INFO("voicemail_Delete_test_600 : voicemailIdThree = %{public}d", voicemailIdThree); EXPECT_GT(voicemailIdThree, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(voicemailIdThree)); @@ -353,15 +362,15 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_600, testing::ext::TestSize std::vector columns; columns.push_back("phone_number"); columns.push_back("id"); - valuesTwo.PutInt("id", voicemailIdTwo); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(voicemailIdOne)); - predicates.Or(); - predicates.EqualTo("id", std::to_string(voicemailIdTwo)); - predicates.Or(); - predicates.EqualTo("id", std::to_string(voicemailIdThree)); - predicates.OrderByAsc("id"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + valuesTwo.Put("id", voicemailIdTwo); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(voicemailIdOne)); + predicates2.Or(); + predicates2.EqualTo("id", std::to_string(voicemailIdTwo)); + predicates2.Or(); + predicates2.EqualTo("id", std::to_string(voicemailIdThree)); + predicates2.OrderByAsc("id"); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -384,17 +393,17 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_700, testing::ext::TestSize std::vector columns; GetVoiceMailValuesColumn(columns); int columnsSize = 10; - OHOS::NativeRdb::ValuesBucket valuesBucket = GetVoiceMailValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetVoiceMailValues(0, columnsSize, columns); int rawId = VoicemailInsertValues(valuesBucket); EXPECT_GT(rawId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); // test end delete data int deleteCode = VoicemailDelete(predicates); EXPECT_EQ(deleteCode, 0); - std::shared_ptr resultSetDeleteQuery = VoicemailQuery(columns, predicates); + std::shared_ptr resultSetDeleteQuery = VoicemailQuery(columns, predicates); // resultSet count 0 int rowCount = 0; resultSetDeleteQuery->GetRowCount(rowCount); @@ -415,34 +424,35 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_700, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_800, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Delete_test_800 is starting!---"); - OHOS::NativeRdb::ValuesBucket voicemailValues; - string phoneNumber = random_number_utils.Generating(6); - voicemailValues.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket voicemailValues; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(6); + voicemailValues.Put("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(voicemailValues); EXPECT_GT(voicemailIdOne, 0); - voicemailValues.PutString("phone_number", phoneNumber); + voicemailValues.Put("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(voicemailValues); EXPECT_GT(voicemailIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr executePredicates = - std::make_shared(predicates); + std::shared_ptr executePredicates = + std::make_shared(predicates); std::shared_ptr uri = std::make_shared(VoicemailUri::VOICEMAIL); - std::shared_ptr operation = - OHOS::AppExecFwk::DataAbilityOperation::NewDeleteBuilder(uri) + std::shared_ptr operation = + OHOS::DataShare::DataShareOperation::NewDeleteBuilder(uri) ->WithPredicatesBackReference(0, 0) ->WithPredicates(executePredicates) ->WithInterruptionAllowed(true) ->Build(); - std::vector> executeBatchOperations; + std::vector> executeBatchOperations; executeBatchOperations.push_back(operation); InitAbility(); - std::vector> dataAbilityResult = + std::vector> dataShareResult = voicemailAbility.ExecuteBatch(executeBatchOperations); - EXPECT_EQ(0, dataAbilityResult[0]->GetCount()); + EXPECT_EQ(0, dataShareResult[0]->GetCount()); std::vector columns; - std::shared_ptr resultSetInsertQuery = VoicemailQuery(columns, predicates); + std::shared_ptr resultSetInsertQuery = VoicemailQuery(columns, predicates); int rowCount = 0; resultSetInsertQuery->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -461,28 +471,29 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_800, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_900, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Update_test_900 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(9); - values.PutString("phone_number", phoneNumber); - values.PutInt("voice_status", 0); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(9); + values.Put("phone_number", phoneNumber); + values.Put("voice_status", 0); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Update_test_900 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("voice_status", 1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("voice_status", 1); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); EXPECT_EQ(updateCode, 0); - updateValues.PutString("phone_number", phoneNumber); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(voicemailId)); + updateValues.Put("phone_number", phoneNumber); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("phone_number"); columns.push_back("voice_status"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -501,27 +512,28 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_900, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1000, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Update_test_1000 is staring! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(5); - values.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(5); + values.Put("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Update_test_1000 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - string phoneNumber_test = random_number_utils.Generating(11); - updateValues.PutString("phone_number", std::string(phoneNumber_test)); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + std::string phoneNumber_test = randomNumberUtils.Generating(11); + updateValues.Put("phone_number", std::string(phoneNumber_test)); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); HILOG_INFO("voicemail_Update_test_1000: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, 0); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(voicemailId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("phone_number"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -540,50 +552,51 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1000, testing::ext::TestSiz HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1100, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Update_test_1100 is staring! ---"); - OHOS::NativeRdb::ValuesBucket valuesOne; - string phoneNumber = random_number_utils.Generating(9); - valuesOne.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesOne; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(9); + valuesOne.Put("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(valuesOne); EXPECT_GT(voicemailIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesTwo; - valuesTwo.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesTwo; + valuesTwo.Put("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(valuesTwo); EXPECT_GT(voicemailIdTwo, 0); - OHOS::NativeRdb::ValuesBucket valuesThree; - valuesThree.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket valuesThree; + valuesThree.Put("phone_number", phoneNumber); int voicemailIdThree = VoicemailInsertValues(valuesThree); EXPECT_GT(voicemailIdThree, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - string phoneNumber_test = random_number_utils.Generating(8); - updateValues.PutString("phone_number", std::string(phoneNumber_test)); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + std::string phoneNumber_test = randomNumberUtils.Generating(8); + updateValues.Put("phone_number", std::string(phoneNumber_test)); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailIdOne)); int updateCode = VoicemailUpdate(updateValues, predicates); EXPECT_EQ(updateCode, 0); - OHOS::NativeRdb::ValuesBucket updateValuesTwo; - string phoneNumber_test_name = random_number_utils.Generating(7); - updateValuesTwo.PutString("phone_number", std::string(phoneNumber_test_name)); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(voicemailIdTwo)); - updateCode = VoicemailUpdate(updateValuesTwo, predicates); + OHOS::DataShare::DataShareValuesBucket updateValuesTwo; + std::string phoneNumber_test_name = randomNumberUtils.Generating(7); + updateValuesTwo.Put("phone_number", std::string(phoneNumber_test_name)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(voicemailIdTwo)); + updateCode = VoicemailUpdate(updateValuesTwo, predicates2); EXPECT_EQ(updateCode, 0); std::vector columns; columns.push_back("phone_number"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(voicemailIdOne)); - predicates.Or(); - predicates.EqualTo("id", std::to_string(voicemailIdTwo)); - predicates.OrderByAsc("id"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + OHOS::DataShare::DataSharePredicates predicates3; + predicates3.EqualTo("id", std::to_string(voicemailIdOne)); + predicates3.Or(); + predicates3.EqualTo("id", std::to_string(voicemailIdTwo)); + predicates3.OrderByAsc("id"); + std::shared_ptr result = VoicemailQuery(columns, predicates3); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector valuesVector; + std::vector valuesVector; valuesVector.push_back(updateValues); valuesVector.push_back(updateValuesTwo); CheckResultSetList(valuesVector, result, "voicemail_Update_test_1100"); @@ -604,25 +617,25 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1200, testing::ext::TestSiz std::vector columns; GetVoiceMailValuesColumn(columns); int columnsSize = 10; - OHOS::NativeRdb::ValuesBucket valuesBucket = GetVoiceMailValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket valuesBucket = GetVoiceMailValues(0, columnsSize, columns); int rawId = VoicemailInsertValues(valuesBucket); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(rawId)); - OHOS::NativeRdb::ValuesBucket upDateValuesBucket = GetVoiceMailValues(0, columnsSize, columns); + OHOS::DataShare::DataShareValuesBucket upDateValuesBucket = GetVoiceMailValues(0, columnsSize, columns); int upDateCode = VoicemailUpdate(upDateValuesBucket, predicates); EXPECT_EQ(upDateCode, 0); - std::shared_ptr resultSet = VoicemailQuery(columns, predicates); + std::shared_ptr resultSet = VoicemailQuery(columns, predicates); // resultSet count 1 int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); CheckResultSet(upDateValuesBucket, resultSet, "voicemail_Update_test_1200"); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(rawId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(rawId)); // test end delete data - int deleteCode = VoicemailDelete(predicates); + int deleteCode = VoicemailDelete(predicates2); EXPECT_EQ(deleteCode, 0); HILOG_INFO("-----voicemail_Update_test_1200 is edn!-----"); ClearVoicemail(); @@ -639,43 +652,44 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1200, testing::ext::TestSiz HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1300, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Update_test_1300 is starting!---"); - OHOS::NativeRdb::ValuesBucket voicemailValues; - string phoneNumber = random_number_utils.Generating(6); - voicemailValues.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket voicemailValues; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(6); + voicemailValues.Put("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(voicemailValues); EXPECT_GT(voicemailIdOne, 0); - voicemailValues.PutString("phone_number", phoneNumber); + voicemailValues.Put("phone_number", phoneNumber); int voicemailIdTwo = VoicemailInsertValues(voicemailValues); EXPECT_GT(voicemailIdTwo, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(voicemailIdTwo)); - std::shared_ptr values = - std::make_shared(voicemailValues); - std::shared_ptr executePredicates = - std::make_shared(predicates); + std::shared_ptr values = + std::make_shared(voicemailValues); + std::shared_ptr executePredicates = + std::make_shared(predicates); std::shared_ptr uri = std::make_shared(VoicemailUri::VOICEMAIL); - std::shared_ptr operation = - OHOS::AppExecFwk::DataAbilityOperation::NewUpdateBuilder(uri) + std::shared_ptr operation = + OHOS::DataShare::DataShareOperation::NewUpdateBuilder(uri) ->WithValuesBucket(values) ->WithPredicatesBackReference(0, 0) ->WithPredicates(executePredicates) ->WithInterruptionAllowed(true) ->Build(); - std::vector> executeBatchOperations; + std::vector> executeBatchOperations; executeBatchOperations.push_back(operation); InitAbility(); - std::vector> dataAbilityResult = + std::vector> dataShareResult = voicemailAbility.ExecuteBatch(executeBatchOperations); - EXPECT_EQ(0, dataAbilityResult[0]->GetCount()); + EXPECT_EQ(0, dataShareResult[0]->GetCount()); std::vector columns; columns.push_back("phone_number"); - std::shared_ptr resultSetInsertQuery = VoicemailQuery(columns, predicates); + std::shared_ptr resultSetInsertQuery = VoicemailQuery(columns, predicates); int rowCount = 0; resultSetInsertQuery->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector listValue; + std::vector listValue; listValue.push_back(voicemailValues); listValue.push_back(voicemailValues); CheckResultSetList(listValue, resultSetInsertQuery, "voicemail_Update_test_1300"); @@ -693,24 +707,25 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1300, testing::ext::TestSiz HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1400, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Query_test_1400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(9); - values.PutString("phone_number", phoneNumber); - values.PutInt("voice_status", 1); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(9); + values.Put("phone_number", phoneNumber); + values.Put("voice_status", 1); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Query_test_1400 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); - values.PutInt("id", voicemailId); + values.Put("id", voicemailId); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); columns.push_back("voice_status"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("voice_status", "1"); predicates.And(); predicates.EqualTo("id", std::to_string(voicemailId)); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -729,18 +744,19 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1400, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1500, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Query_test_1500 is staring! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(5); - values.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(5); + values.Put("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("voicemail_Query_test_1500 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -759,16 +775,17 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1500, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1600, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Query_test_1600 is staring! ---"); - OHOS::NativeRdb::ValuesBucket values; - string phoneNumber = random_number_utils.Generating(5); - values.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket values; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(5); + values.Put("phone_number", phoneNumber); int voicemailIdOne = VoicemailInsertValues(values); HILOG_INFO("voicemail_Query_test_1600 : voicemailIdOne = %{public}d", voicemailIdOne); EXPECT_GT(voicemailIdOne, 0); - OHOS::NativeRdb::ValuesBucket valuesTwo; - string phoneNumber_test = random_number_utils.Generating(6); - valuesTwo.PutString("phone_number", phoneNumber_test); + OHOS::DataShare::DataShareValuesBucket valuesTwo; + std::string phoneNumber_test = randomNumberUtils.Generating(6); + valuesTwo.Put("phone_number", phoneNumber_test); int voicemailIdTwo = VoicemailInsertValues(valuesTwo); HILOG_INFO("voicemail_Query_test_1600 : voicemailIdTwo = %{public}d", voicemailIdTwo); EXPECT_GT(voicemailIdTwo, 0); @@ -776,16 +793,16 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1600, testing::ext::TestSize std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailIdOne)); predicates.Or(); predicates.EqualTo("id", std::to_string(voicemailIdTwo)); predicates.OrderByAsc("id"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector valuesVector; + std::vector valuesVector; valuesVector.push_back(values); valuesVector.push_back(valuesTwo); CheckResultSetList(valuesVector, result, "voicemail_Query_test_1600"); @@ -807,9 +824,9 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1700, testing::ext::TestSize std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); result->Close(); @@ -829,26 +846,27 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1800, testing::ext::Te HILOG_INFO("--- voicemail_BatchInsert_test_1800 is starting! ---"); OHOS::Uri uriData(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::ValuesBucket voicemailValuesOne; - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - voicemailValuesOne.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesOne.PutInt("voice_status", 1); - OHOS::NativeRdb::ValuesBucket voicemailValuesTwo; - voicemailValuesTwo.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesTwo.PutInt("voice_status", 0); - OHOS::NativeRdb::ValuesBucket voicemailValuesThree; - voicemailValuesThree.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesThree.PutInt("voice_status", 0); + OHOS::DataShare::DataShareValuesBucket voicemailValuesOne; + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + voicemailValuesOne.Put("phone_number", std::string(phoneNumber)); + voicemailValuesOne.Put("voice_status", 1); + OHOS::DataShare::DataShareValuesBucket voicemailValuesTwo; + voicemailValuesTwo.Put("phone_number", std::string(phoneNumber)); + voicemailValuesTwo.Put("voice_status", 0); + OHOS::DataShare::DataShareValuesBucket voicemailValuesThree; + voicemailValuesThree.Put("phone_number", std::string(phoneNumber)); + voicemailValuesThree.Put("voice_status", 0); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(voicemailValuesOne); listAddBluk.push_back(voicemailValuesTwo); listAddBluk.push_back(voicemailValuesThree); int batchInsertCode = voicemailAbility.BatchInsert(uriData, listAddBluk); EXPECT_EQ(batchInsertCode, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("phone_number", phoneNumber); predicates.Or(); predicates.EqualTo("phone_number", phoneNumber); @@ -856,11 +874,11 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1800, testing::ext::Te std::vector columns; columns.push_back("phone_number"); columns.push_back("voice_status"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(2, rowCount); - std::vector listValue; + std::vector listValue; listValue.push_back(voicemailValuesOne); listValue.push_back(voicemailValuesThree); CheckResultSetList(listValue, result, "voicemail_BatchInsert_test_1800"); @@ -879,24 +897,25 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1900, testing::ext::Te { HILOG_INFO("--- voicemail_BatchInsert_test_1900 is staring! ---"); OHOS::Uri uriData(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::ValuesBucket voicemailValuesOne; - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - voicemailValuesOne.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesOne.PutString("display_name", std::string("xiaoming")); - OHOS::NativeRdb::ValuesBucket voicemailValuesTwo; - voicemailValuesTwo.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesTwo.PutString("display_name", std::string("xiaozi")); - OHOS::NativeRdb::ValuesBucket voicemailValuesThree; - voicemailValuesThree.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesThree.PutString("display_name", std::string("xiaozhi")); - OHOS::NativeRdb::ValuesBucket voicemailValuesFour; - voicemailValuesFour.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesFour.PutString("display_name", std::string("xiaohei")); - OHOS::NativeRdb::ValuesBucket voicemailValuesFive; - voicemailValuesFive.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesFive.PutString("display_name", std::string("xiaohong")); - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket voicemailValuesOne; + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + voicemailValuesOne.Put("phone_number", std::string(phoneNumber)); + voicemailValuesOne.Put("display_name", std::string("xiaoming")); + OHOS::DataShare::DataShareValuesBucket voicemailValuesTwo; + voicemailValuesTwo.Put("phone_number", std::string(phoneNumber)); + voicemailValuesTwo.Put("display_name", std::string("xiaozi")); + OHOS::DataShare::DataShareValuesBucket voicemailValuesThree; + voicemailValuesThree.Put("phone_number", std::string(phoneNumber)); + voicemailValuesThree.Put("display_name", std::string("xiaozhi")); + OHOS::DataShare::DataShareValuesBucket voicemailValuesFour; + voicemailValuesFour.Put("phone_number", std::string(phoneNumber)); + voicemailValuesFour.Put("display_name", std::string("xiaohei")); + OHOS::DataShare::DataShareValuesBucket voicemailValuesFive; + voicemailValuesFive.Put("phone_number", std::string(phoneNumber)); + voicemailValuesFive.Put("display_name", std::string("xiaohong")); + std::vector listAddBluk; listAddBluk.push_back(voicemailValuesOne); listAddBluk.push_back(voicemailValuesTwo); listAddBluk.push_back(voicemailValuesThree); @@ -910,17 +929,12 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1900, testing::ext::Te columns.push_back("phone_number"); columns.push_back("display_name"); for (int i = 0; i < size; i++) { - OHOS::NativeRdb::DataAbilityPredicates predicates; - std::string name; - OHOS::NativeRdb::ValueObject value; - listAddBluk[i].GetObject("display_name", value); - value.GetString(name); + OHOS::DataShare::DataSharePredicates predicates; + bool isValid = false; + std::string name = listAddBluk[i].Get("display_name", isValid); predicates.EqualTo("display_name", name); predicates.And(); - std::string phoneNumber; - OHOS::NativeRdb::ValueObject phoneNumberValue; - listAddBluk[i].GetObject("phone_number", phoneNumberValue); - phoneNumberValue.GetString(phoneNumber); + std::string phoneNumber = listAddBluk[i].Get("phone_number", isValid); predicates.EqualTo("phone_number", phoneNumber); CheckResultSetBatch(predicates, columns, listAddBluk[i], "voicemail_BatchInsert_test_1900"); } @@ -940,19 +954,20 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Insert_test_2000, testing::ext HILOG_INFO("--- abnormal_voicemail_Insert_test_2000 is starting! ---"); OHOS::Uri uriVoicemail(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::ValuesBucket voicemailValues; - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - voicemailValues.PutString("phone_numbers", phoneNumber); + OHOS::DataShare::DataShareValuesBucket voicemailValues; + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + voicemailValues.Put("phone_numbers", phoneNumber); int64_t voicemailId = voicemailAbility.Insert(uriVoicemail, voicemailValues); - HILOG_INFO("abnormal_voicemail_Insert_test_2000: voicemailId = %{public}lld", voicemailId); + HILOG_INFO("abnormal_voicemail_Insert_test_2000: voicemailId = %{public}ld", voicemailId); EXPECT_EQ(voicemailId, -1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("phone_number", phoneNumber); std::vector columns; columns.push_back("phone_number"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -973,21 +988,21 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Insert_test_2100, testing::ext HILOG_INFO("--- abnormal_voicemail_Insert_test_2100 is starting! ---"); OHOS::Uri errorUriVoicemails(VoicemailUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket voicemailValues; - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - voicemailValues.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket voicemailValues; + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + voicemailValues.Put("phone_number", phoneNumber); int64_t voicemailId = voicemailAbility.Insert(errorUriVoicemails, voicemailValues); - HILOG_INFO("abnormal_voicemail_Insert_test_2100: voicemailId = %{public}lld", voicemailId); + HILOG_INFO("abnormal_voicemail_Insert_test_2100: voicemailId = %{public}ld", voicemailId); EXPECT_EQ(voicemailId, -1); - OHOS::NativeRdb::DataAbilityPredicates predicates; - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - predicates.EqualTo("phone_number", phoneNumber); + OHOS::DataShare::DataSharePredicates predicates; + std::string phoneNumber2 = randomNumberUtils.Generating(number); + predicates.EqualTo("phone_number", phoneNumber2); std::vector columns; columns.push_back("phone_number"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -1007,27 +1022,28 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2200, testing::ext { HILOG_INFO("--- abnormal_voicemail_Update_test_2200 is starting! ---"); int64_t voicemailId = VoicemailStatusInsert("123456", 1); - HILOG_INFO("abnormal_voicemail_Update_test_2200: voicemailId = %{public}lld", voicemailId); + HILOG_INFO("abnormal_voicemail_Update_test_2200: voicemailId = %{public}ld", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("voice_status", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("voice_status", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); HILOG_INFO("abnormal_voicemail_Update_test_2200 : updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, -1); - predicates.Clear(); - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - predicates.EqualTo("phone_number", phoneNumber); - predicates.And(); - predicates.EqualTo("voice_status", "0"); + OHOS::DataShare::DataSharePredicates predicates2; + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + predicates2.EqualTo("phone_number", phoneNumber); + predicates2.And(); + predicates2.EqualTo("voice_status", "0"); std::vector columns; columns.push_back("phone_number"); columns.push_back("voice_status"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -1046,24 +1062,25 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2200, testing::ext HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Delete_test_2300, testing::ext::TestSize.Level1) { HILOG_INFO("--- abnormal_voicemail_Delete_test_2300 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - std::int number = 8; - string phoneNumber = random_number_utils.Generating(number); - values.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket values; + int number = 8; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + values.Put("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("abnormal_voicemail_Delete_test_2300 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(voicemailId)); int deleteCode = VoicemailDelete(predicates); HILOG_INFO("abnormal_voicemail_Delete_test_2300: deleteCode = %{public}d", deleteCode); EXPECT_EQ(deleteCode, -1); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(voicemailId)); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("phone_number"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -1082,16 +1099,17 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Delete_test_2300, testing::ext HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Delete_test_2400, testing::ext::TestSize.Level1) { HILOG_INFO("--- abnormal_voicemail_Delete_test_2400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - values.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket values; + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + values.Put("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("abnormal_voicemail_Delete_test_2400 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); OHOS::Uri uriVoicemails(VoicemailUri::ERROR_URI); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); int deleteCode = voicemailAbility.Delete(uriVoicemails, predicates); HILOG_INFO("abnormal_voicemail_Delete_test_2400: deleteCode = %{public}d", deleteCode); @@ -1099,7 +1117,7 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Delete_test_2400, testing::ext std::vector columns; columns.push_back("phone_number"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -1119,27 +1137,28 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2500, testing::ext { HILOG_INFO("--- abnormal_voicemail_Update_test_2500 is starting! ---"); int64_t voicemailId = VoicemailStatusInsert("123456", 1); - HILOG_INFO("abnormal_voicemail_Update_test_2500: voicemailId = %{public}lld", voicemailId); + HILOG_INFO("abnormal_voicemail_Update_test_2500: voicemailId = %{public}ld", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("voice_status", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("voice_status", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); HILOG_INFO("abnormal_voicemail_Update_test_2500 : updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, -1); - predicates.Clear(); - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - predicates.EqualTo("phone_number", phoneNumber); - predicates.And(); - predicates.EqualTo("voice_status", "0"); + OHOS::DataShare::DataSharePredicates predicates2; + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + predicates2.EqualTo("phone_number", phoneNumber); + predicates2.And(); + predicates2.EqualTo("voice_status", "0"); std::vector columns; columns.push_back("phone_number"); columns.push_back("voice_status"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(0, rowCount); @@ -1158,17 +1177,18 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2500, testing::ext HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2600, testing::ext::TestSize.Level1) { HILOG_INFO("--- abnormal_voicemail_Update_test_2600 is staring! ---"); - OHOS::NativeRdb::ValuesBucket values; - std::int number = 11; - string phoneNumber = random_number_utils.Generating(number); - values.PutString("phone_number", phoneNumber); + OHOS::DataShare::DataShareValuesBucket values; + int number = 11; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + values.Put("phone_number", phoneNumber); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("abnormal_voicemail_Update_test_2600 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutString("phone_number", std::string(phoneNumber)); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("phone_number", std::string(phoneNumber)); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("ids", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); HILOG_INFO("abnormal_voicemail_Update_test_2600: updateCode = %{public}d", updateCode); @@ -1187,27 +1207,28 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2600, testing::ext HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2700, testing::ext::TestSize.Level1) { HILOG_INFO("--- abnormal_voicemail_Update_test_2700 is staring! ---"); - OHOS::NativeRdb::ValuesBucket values; - std::int number_test = 6; - string phoneNumber_test = random_number_utils.Generating(number_test); - values.PutString("phone_number", phoneNumber_test); + OHOS::DataShare::DataShareValuesBucket values; + int number_test = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber_test = randomNumberUtils.Generating(number_test); + values.Put("phone_number", phoneNumber_test); int voicemailId = VoicemailInsertValues(values); HILOG_INFO("abnormal_voicemail_Update_test_2700 : voicemailId = %{public}d", voicemailId); EXPECT_GT(voicemailId, 0); OHOS::Uri uriVoicemails(VoicemailUri::ERROR_URI); - OHOS::NativeRdb::ValuesBucket updateValues; - std::int number = 11; - string phoneNumber = random_number_utils.Generating(number); - updateValues.PutString("phone_number", std::string(phoneNumber)); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + int number = 11; + std::string phoneNumber = randomNumberUtils.Generating(number); + updateValues.Put("phone_number", std::string(phoneNumber)); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); - int updateCode = voicemailAbility.Update(uriVoicemails, updateValues, predicates); + int updateCode = voicemailAbility.Update(uriVoicemails, predicates, updateValues); HILOG_INFO("abnormal_voicemail_Update_test_2700: updateCode = %{public}d", updateCode); EXPECT_EQ(updateCode, -1); std::vector columns; columns.push_back("phone_number"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -1230,9 +1251,9 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Query_test_2800, testing::ext: columns.push_back("id"); columns.push_back("phone_numbers"); columns.push_back("voice_status"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("voice_status", "1"); - std::shared_ptr resultSet = VoicemailQuery(columns, predicates); + std::shared_ptr resultSet = VoicemailQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(-1, rowCount); @@ -1254,9 +1275,9 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Query_test_2900, testing::ext: std::vector columns; columns.push_back("id"); columns.push_back("phone_numbers"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = VoicemailQuery(columns, predicates); + std::shared_ptr resultSet = VoicemailQuery(columns, predicates); int rowCount = -1; resultSet->GetRowCount(rowCount); EXPECT_EQ(-1, rowCount); @@ -1278,9 +1299,9 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Query_test_3000, testing::ext: std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", "10000000"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); result->Close(); @@ -1303,10 +1324,10 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Query_test_3100, testing::ext: std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); - std::shared_ptr resultSet = - voicemailAbility.Query(errorUri, columns, predicates); + std::shared_ptr resultSet = + voicemailAbility.Query(errorUri, predicates, columns); EXPECT_EQ(resultSet, nullptr); ClearVoicemail(); } @@ -1323,28 +1344,29 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3200, testing { HILOG_INFO("--- abnormal_voicemail_BatchInsert_test_3200 is starting! ---"); OHOS::Uri uriData(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::ValuesBucket voicemailValuesOne; - std::int number = 15; - string phoneNumber = random_number_utils.Generating(number); - std::int number_test = 6; - string phoneNumber_test = random_number_utils.Generating(number_test); - voicemailValuesOne.PutString("phone_number", std::string(phoneNumber)); - voicemailValuesOne.PutInt("voice_status", 1); - OHOS::NativeRdb::ValuesBucket voicemailValuesTwo; - voicemailValuesTwo.PutString("phone_numbers", std::string(phoneNumber_test)); - voicemailValuesTwo.PutInt("voice_statuss", 0); - OHOS::NativeRdb::ValuesBucket voicemailValuesThree; - voicemailValuesThree.PutString("phone_number", std::string(phoneNumber_test)); - voicemailValuesThree.PutInt("voice_status", 0); + OHOS::DataShare::DataShareValuesBucket voicemailValuesOne; + int number = 15; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + int number_test = 6; + std::string phoneNumber_test = randomNumberUtils.Generating(number_test); + voicemailValuesOne.Put("phone_number", std::string(phoneNumber)); + voicemailValuesOne.Put("voice_status", 1); + OHOS::DataShare::DataShareValuesBucket voicemailValuesTwo; + voicemailValuesTwo.Put("phone_numbers", std::string(phoneNumber_test)); + voicemailValuesTwo.Put("voice_statuss", 0); + OHOS::DataShare::DataShareValuesBucket voicemailValuesThree; + voicemailValuesThree.Put("phone_number", std::string(phoneNumber_test)); + voicemailValuesThree.Put("voice_status", 0); - std::vector listAddBluk; + std::vector listAddBluk; listAddBluk.push_back(voicemailValuesOne); listAddBluk.push_back(voicemailValuesTwo); listAddBluk.push_back(voicemailValuesThree); int batchInsertCode = voicemailAbility.BatchInsert(uriData, listAddBluk); EXPECT_EQ(batchInsertCode, -1); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("phone_number", phoneNumber); predicates.Or(); predicates.EqualTo("phone_numbers", phoneNumber_test); @@ -1355,7 +1377,7 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3200, testing columns.push_back("phone_number"); columns.push_back("phone_numbers"); columns.push_back("voice_status"); - std::shared_ptr resultSet = VoicemailQuery(columns, predicates); + std::shared_ptr resultSet = VoicemailQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(-1, rowCount); @@ -1375,20 +1397,20 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3300, testing { HILOG_INFO("--- abnormal_voicemail_BatchInsert_test_3300 is starting! ---"); OHOS::Uri uriData(VoicemailUri::VOICEMAIL); - OHOS::NativeRdb::ValuesBucket voicemailValues; - std::vector listAddBluk; + OHOS::DataShare::DataShareValuesBucket voicemailValues; + std::vector listAddBluk; int batchInserCode = 0; for (int i = 0; i < 10; i++) { listAddBluk.clear(); for (int j = 10 * i + 1; j <= 10 * (i + 1); j++) { voicemailValues.Clear(); - voicemailValues.PutString("phone_number", std::to_string(j)); + voicemailValues.Put("phone_number", std::to_string(j)); std::string name("zhangsan"); name.append(std::to_string(j)); if (j == 14 || j == 27 || j == 57) { - voicemailValues.PutString("display_names", name); + voicemailValues.Put("display_names", name); } else { - voicemailValues.PutString("display_name", name); + voicemailValues.Put("display_name", name); } listAddBluk.push_back(voicemailValues); } @@ -1402,7 +1424,7 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3300, testing } } // clear data - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.GreaterThan("id", "0"); int deleteCode = VoicemailDelete(predicates); EXPECT_EQ(0, deleteCode); @@ -1420,20 +1442,21 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3300, testing HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_3400, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Insert_test_3400 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - std::int number = 6; - string phoneNumber = random_number_utils.Generating(number); - values.PutString("phone_number", phoneNumber); - values.PutInt("voice_status", 0); + OHOS::DataShare::DataShareValuesBucket values; + int number = 6; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + values.Put("phone_number", phoneNumber); + values.Put("voice_status", 0); int voicemailId = VoicemailInsertValues(values); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("phone_number"); columns.push_back("voice_status"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -1453,29 +1476,29 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_3400, testing::ext::TestSiz HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_3500, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Update_test_3500 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - std::int number = 9; - string phoneNumber = random_number_utils.Generating(number); - values.PutString("phone_number", phoneNumber); - values.PutInt("voice_status", 1); + OHOS::DataShare::DataShareValuesBucket values; + int number = 9; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + values.Put("phone_number", phoneNumber); + values.Put("voice_status", 1); int voicemailId = VoicemailInsertValues(values); EXPECT_GT(voicemailId, 0); - OHOS::NativeRdb::ValuesBucket updateValues; - updateValues.PutInt("voice_status", 0); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataShareValuesBucket updateValues; + updateValues.Put("voice_status", 0); + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(voicemailId)); int updateCode = VoicemailUpdate(updateValues, predicates); EXPECT_EQ(updateCode, 0); - std::int number = 9; - string phoneNumber = random_number_utils.Generating(number); - updateValues.PutString("phone_number", phoneNumber); - predicates.Clear(); - predicates.EqualTo("id", std::to_string(voicemailId)); + std::string phoneNumber2 = randomNumberUtils.Generating(number); + updateValues.Put("phone_number", phoneNumber2); + OHOS::DataShare::DataSharePredicates predicates2; + predicates2.EqualTo("id", std::to_string(voicemailId)); std::vector columns; columns.push_back("phone_number"); columns.push_back("voice_status"); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates2); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -1494,24 +1517,25 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_3500, testing::ext::TestSiz HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_3600, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_Query_test_3600 is starting! ---"); - OHOS::NativeRdb::ValuesBucket values; - std::int number = 9; - string phoneNumber = random_number_utils.Generating(number); - values.PutString("phone_number", phoneNumber); - values.PutInt("voice_status", 0); + OHOS::DataShare::DataShareValuesBucket values; + int number = 9; + RandomNumberUtils randomNumberUtils; + std::string phoneNumber = randomNumberUtils.Generating(number); + values.Put("phone_number", phoneNumber); + values.Put("voice_status", 0); int voicemailId = VoicemailInsertValues(values); EXPECT_GT(voicemailId, 0); - values.PutInt("id", voicemailId); + values.Put("id", voicemailId); std::vector columns; columns.push_back("id"); columns.push_back("phone_number"); columns.push_back("voice_status"); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("voice_status", "0"); predicates.And(); predicates.EqualTo("id", std::to_string(voicemailId)); - std::shared_ptr result = VoicemailQuery(columns, predicates); + std::shared_ptr result = VoicemailQuery(columns, predicates); int rowCount = 0; result->GetRowCount(rowCount); EXPECT_EQ(1, rowCount); @@ -1530,15 +1554,15 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_3600, testing::ext::TestSize HWTEST_F(VoicemailAbilityTest, voicemail_async_insert_test_3700, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_async_insert_test_3700 is staring! ---"); - std::map result; + std::map result; std::vector voicemailAsyncVector; int threadNum = 6; for (int i = 0; i < threadNum; ++i) { - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::string name; name.append("asyncTest"); name.append(std::to_string(i)); - values.PutString("display_name", name); + values.Put("display_name", name); VoicemailAsync *contactAsync = new VoicemailAsync(values, result); std::thread asyncThread(&VoicemailAsync::Insert, contactAsync); voicemailAsyncVector.push_back(contactAsync); @@ -1548,11 +1572,11 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_insert_test_3700, testing::ext::T std::this_thread::sleep_for(dura); std::vector columns; columns.push_back("display_name"); - std::map::iterator it; + std::map::iterator it; for (it = result.begin(); it != result.end(); it++) { - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.EqualTo("id", std::to_string(it->first)); - std::shared_ptr resultSet = VoicemailQuery(columns, predicates); + std::shared_ptr resultSet = VoicemailQuery(columns, predicates); CheckResultSet(it->second, resultSet, "voicemail_async_insert_test_3700"); } for (int i = 0; i < threadNum; ++i) { @@ -1572,7 +1596,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_insert_test_3700, testing::ext::T HWTEST_F(VoicemailAbilityTest, voicemail_async_update_test_3800, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_async_update_test_3800 is staring! ---"); - OHOS::NativeRdb::ValuesBucket voicemailValues; + OHOS::DataShare::DataShareValuesBucket voicemailValues; std::vector voicemailId; voicemailId.push_back(VoicemailInsertValue("async_update1", voicemailValues)); voicemailValues.Clear(); @@ -1586,15 +1610,15 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_update_test_3800, testing::ext::T voicemailValues.Clear(); voicemailId.push_back(VoicemailInsertValue("async_update6", voicemailValues)); voicemailValues.Clear(); - std::vector upDateValues; - OHOS::NativeRdb::DataAbilityPredicates queryPredicates; + std::vector upDateValues; + OHOS::DataShare::DataSharePredicates queryPredicates; std::vector voicemailAsyncVector; int size = voicemailId.size(); for (int i = 0; i < size; ++i) { - OHOS::NativeRdb::ValuesBucket values; + OHOS::DataShare::DataShareValuesBucket values; std::string name; name.append("asyncTest"); - values.PutString("display_name", name); + values.Put("display_name", name); upDateValues.push_back(values); int id = voicemailId[i]; VoicemailAsync *contactAsync = new VoicemailAsync(values, id); @@ -1610,7 +1634,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_update_test_3800, testing::ext::T std::this_thread::sleep_for(dura); std::vector columns; columns.push_back("display_name"); - std::shared_ptr resultSet = VoicemailQuery(columns, queryPredicates); + std::shared_ptr resultSet = VoicemailQuery(columns, queryPredicates); CheckResultSetList(upDateValues, resultSet, "voicemail_async_update_test_3800"); for (int i = 0; i < size; ++i) { delete voicemailAsyncVector[i]; @@ -1629,7 +1653,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_update_test_3800, testing::ext::T HWTEST_F(VoicemailAbilityTest, voicemail_async_query_test_3900, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_async_query_test_4000 is staring! ---"); - OHOS::NativeRdb::ValuesBucket voicemailValues; + OHOS::DataShare::DataShareValuesBucket voicemailValues; std::vector voicemailId; voicemailId.push_back(VoicemailInsertValue("async_query1", voicemailValues)); voicemailValues.Clear(); @@ -1644,7 +1668,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_query_test_3900, testing::ext::Te voicemailId.push_back(VoicemailInsertValue("async_query6", voicemailValues)); voicemailValues.Clear(); std::vector voicemailAsyncVector; - std::vector> resultSetVector; + std::vector> resultSetVector; int threadNum = 6; for (int i = 0; i < threadNum; ++i) { VoicemailAsync *contactAsync = new VoicemailAsync(resultSetVector, voicemailId); @@ -1677,7 +1701,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_query_test_3900, testing::ext::Te HWTEST_F(VoicemailAbilityTest, voicemail_async_delete_test_4000, testing::ext::TestSize.Level1) { HILOG_INFO("--- voicemail_async_delete_test_4000 is staring! ---"); - OHOS::NativeRdb::ValuesBucket voicemailValues; + OHOS::DataShare::DataShareValuesBucket voicemailValues; std::vector voicemailId; voicemailId.push_back(VoicemailInsertValue("async_update1", voicemailValues)); voicemailValues.Clear(); @@ -1692,7 +1716,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_delete_test_4000, testing::ext::T voicemailId.push_back(VoicemailInsertValue("async_update6", voicemailValues)); voicemailValues.Clear(); int size = voicemailId.size(); - OHOS::NativeRdb::DataAbilityPredicates predicates; + OHOS::DataShare::DataSharePredicates predicates; predicates.BeginWrap(); std::vector voicemailAsyncVector; for (int i = 0; i < size; ++i) { @@ -1710,7 +1734,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_async_delete_test_4000, testing::ext::T std::chrono::milliseconds dura(Time::ASYNC_SLEEP_TIME); std::this_thread::sleep_for(dura); std::vector columns; - std::shared_ptr resultSet = VoicemailQuery(columns, predicates); + std::shared_ptr resultSet = VoicemailQuery(columns, predicates); int rowCount = 0; resultSet->GetRowCount(rowCount); EXPECT_EQ(0, rowCount);