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

switch to stage mode

Browse Source 
Signed-off-by: ohos-lsw <lishiwei6@huawei.com>
This commit is contained in:
ohos-lsw
2023-01-09 15:07:59 +08:00
parent 4c043c5fb9
commit 8cce2ee604
86 changed files with 7019 additions and 6406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppScope/app.json
+13
View File
@@ -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
}
}
AppScope/resources/base/element/string.json
+8
View File
@@ -0,0 +1,8 @@
{
"string":[
{
"name": "app_name",
"value": "ContactsData"
}
]
}
BUILD.gn
+36 -3
View File
@@ -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 = [
README_zh.md
+152 -165
View File
@@ -9,8 +9,8 @@
## 简介<a name="section1166054159366"></a>
联系人数据库应用是每一个用户管理联系人数据库的不可缺少的一个信息管理应用，
它的内容对于用户管理者来说是至关重要的，所以联系人数据库应该能够为每一个
用户的管理提供充足的信息和快捷查询手段，大大方便用户合理的管理联系人数据库信息。
它的内容对于用户管理者来说是至关重要的，所以联系人数据库应该能够为每一个
用户的管理提供充足的信息和快捷查询手段，大大方便用户合理的管理联系人数据库信息。
## 架构图<a name="section1619419895966"></a>
@@ -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 |
## 相关仓<a name="section1371113476307"></a>
系统应用
ability/common/include/common.h
+3 -3
View File
@@ -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]("
ability/common/utils/include/contacts_json_utils.h
+1 -1
View File
@@ -18,11 +18,11 @@
#include <string>
#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 {
ability/common/utils/include/contacts_path.h
-1
View File
@@ -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
ability/common/utils/include/predicates_convert.h
+2 -2
View File
@@ -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);
};
ability/common/utils/include/sql_analyzer.h
+1 -1
View File
@@ -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);
ability/common/utils/src/contacts_path.cpp
-1
View File
@@ -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)
ability/common/utils/src/predicates_convert.cpp
+3 -6
View File
@@ -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;
}
ability/common/utils/src/sql_analyzer.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ SqlAnalyzer::~SqlAnalyzer()
{
}
bool SqlAnalyzer::CheckValuesBucket(const NativeRdb::ValuesBucket &value)
bool SqlAnalyzer::CheckValuesBucket(const OHOS::NativeRdb::ValuesBucket &value)
{
std::map<std::string, NativeRdb::ValueObject> valuesMap;
value.GetAll(valuesMap);
ability/merge/include/merger_contacts.h
+2 -2
View File
@@ -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<OHOS::NativeRdb::RdbStore>, std::set<int>);
int ContactMerge(std::shared_ptr<OHOS::NativeRdb::RdbStore>);
int ReContactMerge(std::shared_ptr<OHOS::NativeRdb::RdbStore>, const OHOS::NativeRdb::DataAbilityPredicates &);
int ReContactMerge(std::shared_ptr<OHOS::NativeRdb::RdbStore>, const DataShare::DataSharePredicates &);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> SelectCandidate(std::shared_ptr<OHOS::NativeRdb::RdbStore>);
private:
ability/merge/src/merger_contacts.cpp
+1 -1
View File
@@ -430,7 +430,7 @@ std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> MergerContacts::SelectCandi
* @return The result returned by the ManualMerge operation
*/
int MergerContacts::ReContactMerge(
std::shared_ptr<OHOS::NativeRdb::RdbStore> store, const OHOS::NativeRdb::DataAbilityPredicates &predicates)
std::shared_ptr<OHOS::NativeRdb::RdbStore> store, const DataShare::DataSharePredicates &predicates)
{
HILOG_INFO("MergerContacts::ReContactMerge is starting");
std::vector<std::string> whereArgs = predicates.GetWhereArgs();
config.json
-66
View File
@@ -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++"
}
]
}
}
contacts/BUILD.gn
+3 -1
View File
@@ -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",
contacts/include/contacts_api.h
+20 -19
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
int GetRawIdByResultSet(const std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::AppExecFwk::DataAbilityHelper> GetDataAbilityHelper(napi_env env);
void HolderPredicates(const Holder &holder, NativeRdb::DataAbilityPredicates &predicates);
std::shared_ptr<DataShare::DataShareHelper> GetDataShareHelper(napi_env env, napi_callback_info info);
void HolderPredicates(const Holder &holder, DataShare::DataSharePredicates &predicates);
void HoldersStructure(std::map<std::string, std::string> &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<NativeRdb::ValuesBucket> &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<DataShare::DataShareValuesBucket> &valueContactData);
std::vector<std::string> 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);
contacts/include/contacts_build.h
+22 -22
View File
@@ -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<NativeRdb::ValuesBucket> &valueContact,
std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetContactData(napi_env env, napi_value object, std::vector<DataShare::DataShareValuesBucket> &valueContact,
std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb::ValuesBucket> &valueContactData);
Contacts &contacts, int typeId, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
private:
void TypeSwitchSplit(int typeId, Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void TypeSwitchSplit(int typeId, Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb::ValuesBucket> &valueContact);
void BuildValueContactData(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketEmail(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketEvent(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketGroup(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketImAddress(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketPortrait(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketPhoneNumber(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketPostalAddress(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketRelation(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketSipAddress(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketWebsite(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketName(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketNickName(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketNote(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void GetValuesBucketOrganization(Contacts &contacts, std::vector<NativeRdb::ValuesBucket> &valueContactData);
void BuildValueContact(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContact);
void BuildValueContactData(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketEmail(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketEvent(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketGroup(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketImAddress(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketPortrait(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketPhoneNumber(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketPostalAddress(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketRelation(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketSipAddress(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketWebsite(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketName(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketNickName(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketNote(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
void GetValuesBucketOrganization(Contacts &contacts, std::vector<DataShare::DataShareValuesBucket> &valueContactData);
};
} // namespace ContactsApi
} // namespace OHOS
contacts/include/contacts_control.h
+29 -29
View File
@@ -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<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::ValuesBucket rawContactValues);
int ContactDataInsert(std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
std::vector<OHOS::NativeRdb::ValuesBucket> contactsDataValues);
int RawContactUpdate(std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates);
int ContactDataUpdate(std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates);
int ContactDelete(std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::DataAbilityPredicates predicates);
int ContactDataDelete(std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::DataAbilityPredicates predicates);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> ContactQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> ContactDataQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> GroupsQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> MyCardQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> HolderQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates);
int64_t RawContactInsert(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
DataShare::DataShareValuesBucket rawContactValues);
int ContactDataInsert(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
std::vector<DataShare::DataShareValuesBucket> contactsDataValues);
int RawContactUpdate(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
DataShare::DataShareValuesBucket updateValues, DataShare::DataSharePredicates predicates);
int ContactDataUpdate(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
DataShare::DataShareValuesBucket updateValues, DataShare::DataSharePredicates predicates);
int ContactDelete(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
DataShare::DataSharePredicates predicates);
int ContactDataDelete(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
DataShare::DataSharePredicates predicates);
std::shared_ptr<DataShare::DataShareResultSet> ContactQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates);
std::shared_ptr<DataShare::DataShareResultSet> ContactDataQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates);
std::shared_ptr<DataShare::DataShareResultSet> GroupsQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates);
std::shared_ptr<DataShare::DataShareResultSet> MyCardQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates);
std::shared_ptr<DataShare::DataShareResultSet> HolderQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates);
};
} // namespace ContactsApi
} // namespace OHOS
contacts/include/contacts_napi_common.h
+13 -10
View File
@@ -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<std::string> columns;
// condition
NativeRdb::DataAbilityPredicates predicates;
DataShare::DataSharePredicates predicates;
// delete contact predicates for update contact
NativeRdb::DataAbilityPredicates deletePredicates;
DataShare::DataSharePredicates deletePredicates;
// update
std::vector<NativeRdb::ValuesBucket> valueUpdateContact;
std::vector<DataShare::DataShareValuesBucket> valueUpdateContact;
// insert
std::vector<NativeRdb::ValuesBucket> valueContact;
std::vector<DataShare::DataShareValuesBucket> valueContact;
// insertContactData
std::vector<NativeRdb::ValuesBucket> valueContactData;
// dataAbilityHelper
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper;
std::vector<DataShare::DataShareValuesBucket> valueContactData;
// dataShareHelper
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper;
// operation result
int resultData;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
std::shared_ptr<DataShare::DataShareResultSet> resultSet;
};
} // namespace ContactsApi
} // namespace OHOS
contacts/include/result_convert.h
+21 -21
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
napi_value ResultSetToHolder(napi_env env, std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
napi_value ResultSetToGroup(napi_env env, std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
napi_value ResultSetToObject(napi_env env, std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
napi_env env, std::string &contentKey, std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
napi_value ResultSetToHolder(napi_env env, std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
napi_value ResultSetToGroup(napi_env env, std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
napi_value ResultSetToObject(napi_env env, std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
napi_value ConvertContactArray(
napi_env env, std::map<int, napi_value> &resultSetMap, std::map<int, std::string> &quickSearchMap);
void PutQuickSearchKey(napi_env env, std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet,
void PutQuickSearchKey(napi_env env, std::shared_ptr<DataShare::DataShareResultSet> &resultSet,
std::map<int, std::string> &quickSearchMap, int contactsIdValue);
void ConvertContactObject(
napi_env env, napi_value napiObject, std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
napi_env env, napi_value napiObject, std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
napi_value GetResultMapValue(napi_env env, std::map<int, napi_value> &resultSetMap, int &contactsId);
void ConvertEmail(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertName(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertUri(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertEvent(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertGroup(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertImAddress(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertPhoneNumber(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertPostalAddress(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertRelation(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertSipAddress(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertWebsite(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertNickName(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertNote(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
void ConvertOrganization(napi_env env, napi_value napiObject, int &typeId,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
napi_value CreateNapiStringValue(napi_env env, const std::string key);
bool IsEmpty(std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet);
bool IsEmpty(std::shared_ptr<DataShare::DataShareResultSet> &resultSet);
};
} // namespace ContactsApi
} // namespace OHOS
contacts/src/contacts_api.cpp
+118 -87
View File
@@ -17,11 +17,7 @@
#include <mutex>
#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<OHOS::AppExecFwk::DataAbilityHelper> GetDataAbilityHelper(napi_env env)
std::shared_ptr<DataShare::DataShareHelper> 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<void **>(&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<OHOS::Uri> uriPtr = std::make_shared<OHOS::Uri>("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<DataShare::DataShareHelper> 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<OHOS::AppExecFwk::DataAbilityHelper> 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<std::string, std::string> &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<std::string, std::string> 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<std::string, std::string> 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<NativeRdb::ValuesBucket> &valueContactData)
DataShare::DataSharePredicates BuildQueryContactData(napi_env env, napi_value &contactObject, napi_value &attrObject,
std::vector<DataShare::DataShareValuesBucket> &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<std::string> fields;
fields.push_back("raw_contact_id");
if (contact.id != 0) {
@@ -506,7 +529,7 @@ std::vector<std::string> BuildUpdateContactColumns()
return columns;
}
int GetRawIdByResultSet(const std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
int GetRawIdByResultSet(const std::shared_ptr<DataShare::DataShareResultSet> &resultSet)
{
if (resultSet == nullptr) {
return -1;
@@ -524,18 +547,18 @@ int GetRawIdByResultSet(const std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSe
void BuildUpdateContactConvertParams(napi_env env, napi_value &contact, napi_value &attr, ExecuteHelper *executeHelper)
{
executeHelper->valueContactData.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<NativeRdb::ValuesBucket> value = executeHelper->valueContactData;
executeHelper->dataShareHelper, (executeHelper->valueContact)[0]);
std::vector<DataShare::DataShareValuesBucket> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = contactsControl.ContactDataQuery(
executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates);
std::shared_ptr<DataShare::DataShareResultSet> resultSet = contactsControl.ContactDataQuery(
executeHelper->dataShareHelper, executeHelper->columns, executeHelper->predicates);
int rawId = GetRawIdByResultSet(resultSet);
std::vector<NativeRdb::ValuesBucket> value = executeHelper->valueContactData;
std::vector<DataShare::DataShareValuesBucket> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = contactsControl.ContactQuery(
executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates);
std::shared_ptr<DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = contactsControl.MyCardQuery(
executeHelper->dataAbilityHelper, executeHelper->columns, executeHelper->predicates);
std::shared_ptr<DataShare::DataShareResultSet> 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;
contacts/src/contacts_build.cpp
+103 -103
View File
@@ -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<NativeRdb::ValuesBucket> &valueContact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
std::vector<DataShare::DataShareValuesBucket> &valueContact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb::ValuesBucket> &valueContact)
void ContactsBuild::BuildValueContact(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::BuildValueContactData(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &valueContactData)
{
GetValuesBucketEmail(contact, valueContactData);
GetValuesBucketEvent(contact, valueContactData);
@@ -90,7 +90,7 @@ void ContactsBuild::BuildValueContactData(Contacts &contact, std::vector<NativeR
}
void ContactsBuild::BuildValueContactDataByType(
Contacts &contact, int typeId, std::vector<NativeRdb::ValuesBucket> &valueContactData)
Contacts &contact, int typeId, std::vector<DataShare::DataShareValuesBucket> &valueContactData)
{
switch (typeId) {
case EMAIL:
@@ -121,7 +121,7 @@ void ContactsBuild::BuildValueContactDataByType(
}
void ContactsBuild::TypeSwitchSplit(
int typeId, Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
int typeId, Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketEmail(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRd
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketEvent(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketEvent(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRd
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketGroup(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketGroup(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRd
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketImAddress(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketImAddress(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<Nati
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketPortrait(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketPortrait(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<Nativ
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketPhoneNumber(
Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb::ValuesBucket> &valueContactData)
Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketRelation(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<Nativ
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketSipAddress(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketSipAddress(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<Nat
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketWebsite(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketWebsite(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<Native
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketName(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketName(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketNickName(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketNickName(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<Nativ
* @param contact Conditions for establish ValuesBucket operation
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketNote(Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
void ContactsBuild::GetValuesBucketNote(Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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<NativeRdb
* @param valueContactData Conditions for establish ValuesBucket operation
*/
void ContactsBuild::GetValuesBucketOrganization(
Contacts &contact, std::vector<NativeRdb::ValuesBucket> &valueContactData)
Contacts &contact, std::vector<DataShare::DataShareValuesBucket> &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);
}
}
contacts/src/contacts_control.cpp
+54 -54
View File
@@ -27,112 +27,112 @@ ContactsControl::~ContactsControl()
{
}
int64_t ContactsControl::RawContactInsert(std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::ValuesBucket rawContactValues)
int64_t ContactsControl::RawContactInsert(std::shared_ptr<DataShare::DataShareHelper> 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<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
std::vector<OHOS::NativeRdb::ValuesBucket> contactDataValues)
int ContactsControl::ContactDataInsert(std::shared_ptr<DataShare::DataShareHelper> dataShareHelper,
std::vector<DataShare::DataShareValuesBucket> 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<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::DataAbilityPredicates predicates)
int ContactsControl::ContactDataDelete(std::shared_ptr<DataShare::DataShareHelper> 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<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates)
int ContactsControl::RawContactUpdate(std::shared_ptr<DataShare::DataShareHelper> 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<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::ValuesBucket updateValues, OHOS::NativeRdb::DataAbilityPredicates predicates)
int ContactsControl::ContactDataUpdate(std::shared_ptr<DataShare::DataShareHelper> 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<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper,
OHOS::NativeRdb::DataAbilityPredicates predicates)
int ContactsControl::ContactDelete(std::shared_ptr<DataShare::DataShareHelper> 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<OHOS::NativeRdb::AbsSharedResultSet> ContactsControl::HolderQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<DataShare::DataShareResultSet> ContactsControl::HolderQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates)
{
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
OHOS::Uri uriContact("dataability:///com.ohos.contactsdataability/contacts/account");
resultSet = dataAbilityHelper->Query(uriContact, columns, predicates);
std::shared_ptr<DataShare::DataShareResultSet> resultSet;
OHOS::Uri uriContact("datashare:///com.ohos.contactsdataability/contacts/account");
resultSet = dataShareHelper->Query(uriContact, predicates, columns);
return resultSet;
}
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> ContactsControl::ContactQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<DataShare::DataShareResultSet> ContactsControl::ContactQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates)
{
HILOG_INFO("ContactsControl::ContactQuery is start");
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
OHOS::Uri uriContact("dataability:///com.ohos.contactsdataability/contacts/contact_data");
resultSet = dataAbilityHelper->Query(uriContact, columns, predicates);
std::shared_ptr<DataShare::DataShareResultSet> resultSet;
OHOS::Uri uriContact("datashare:///com.ohos.contactsdataability/contacts/contact_data");
resultSet = dataShareHelper->Query(uriContact, predicates, columns);
return resultSet;
}
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> ContactsControl::ContactDataQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<DataShare::DataShareResultSet> ContactsControl::ContactDataQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates)
{
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
OHOS::Uri uriContactData("dataability:///com.ohos.contactsdataability/contacts/contact_data");
resultSet = dataAbilityHelper->Query(uriContactData, columns, predicates);
std::shared_ptr<DataShare::DataShareResultSet> resultSet;
OHOS::Uri uriContactData("datashare:///com.ohos.contactsdataability/contacts/contact_data");
resultSet = dataShareHelper->Query(uriContactData, predicates, columns);
return resultSet;
}
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> ContactsControl::GroupsQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<DataShare::DataShareResultSet> ContactsControl::GroupsQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates)
{
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
OHOS::Uri uriGroups("dataability:///com.ohos.contactsdataability/contacts/groups");
resultSet = dataAbilityHelper->Query(uriGroups, columns, predicates);
std::shared_ptr<DataShare::DataShareResultSet> resultSet;
OHOS::Uri uriGroups("datashare:///com.ohos.contactsdataability/contacts/groups");
resultSet = dataShareHelper->Query(uriGroups, predicates, columns);
return resultSet;
}
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> ContactsControl::MyCardQuery(
std::shared_ptr<OHOS::AppExecFwk::DataAbilityHelper> dataAbilityHelper, std::vector<std::string> columns,
OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<DataShare::DataShareResultSet> ContactsControl::MyCardQuery(
std::shared_ptr<DataShare::DataShareHelper> dataShareHelper, std::vector<std::string> columns,
DataShare::DataSharePredicates predicates)
{
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
OHOS::Uri uriProfileContact("dataability:///com.ohos.contactsdataability/profile/contact_data");
resultSet = dataAbilityHelper->Query(uriProfileContact, columns, predicates);
std::shared_ptr<DataShare::DataShareResultSet> resultSet;
OHOS::Uri uriProfileContact("datashare:///com.ohos.contactsdataability/profile/contact_data");
resultSet = dataShareHelper->Query(uriProfileContact, predicates, columns);
return resultSet;
}
} // namespace ContactsApi
contacts/src/result_convert.cpp
+28 -28
View File
@@ -36,7 +36,7 @@ ResultConvert::~ResultConvert()
* @return The result returned by convert operation
*/
napi_value ResultConvert::ResultSetToObject(
napi_env env, std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet,
void ResultConvert::PutQuickSearchKey(napi_env env, std::shared_ptr<DataShare::DataShareResultSet> &resultSet,
std::map<int, std::string> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
bool ResultConvert::IsEmpty(std::shared_ptr<DataShare::DataShareResultSet> &resultSet)
{
if (resultSet == nullptr) {
HILOG_ERROR("ResultSetToHolder resultSet is nullptr");
@@ -161,7 +161,7 @@ bool ResultConvert::IsEmpty(std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet>
}
napi_value ResultConvert::ResultSetToHolder(
napi_env env, std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, std::string &contentKey, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet)
napi_env env, napi_value napiObject, int &typeId, std::shared_ptr<DataShare::DataShareResultSet> &resultSet)
{
if (typeId == ORGANIZATION) {
const std::string organization = "organization";
dataBusiness/calllog/include/calllog_ability.h
+17 -15
View File
@@ -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<NativeRdb::ValuesBucket> &values) override;
virtual ~CallLogAbility() override;
static CallLogAbility* Create();
sptr<IRemoteObject> 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<DataShare::DataShareValuesBucket> &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<NativeRdb::AbsSharedResultSet> Query(const Uri &uri,
const std::vector<std::string> &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<DataShare::DataShareResultSet> Query(const Uri &uri,
const DataShare::DataSharePredicates &predicates, std::vector<std::string> &columns) override;
private:
static std::shared_ptr<Contacts::CallLogDataBase> callLogDataBase_;
static std::map<std::string, int> 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
dataBusiness/calllog/include/calllog_database.h
+3 -2
View File
@@ -18,13 +18,14 @@
#include <pthread.h>
#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"
dataBusiness/calllog/src/calllog_ability.cpp
+65 -38
View File
@@ -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<std::string, int> 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<IRemoteObject> 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<DataShare::ContactsDataShareStubImpl> remoteObject = new (std::nothrow) DataShare::ContactsDataShareStubImpl(
std::static_pointer_cast<CallLogAbility>(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<NativeRdb::ValuesBucket> &values)
int CallLogAbility::BatchInsert(const Uri &uri, const std::vector<DataShare::DataShareValuesBucket> &values)
{
int rowRet = Contacts::RDB_EXECUTE_FAIL;
unsigned int size = values.size();
@@ -189,8 +207,9 @@ int CallLogAbility::BatchInsert(const Uri &uri, const std::vector<NativeRdb::Val
int count = 0;
for (unsigned int i = 0; i < size; i++) {
++count;
OHOS::NativeRdb::ValuesBucket rawContactValues = values[i];
int code = InsertExecute(uri, rawContactValues);
DataShare::DataShareValuesBucket rawContactValues = values[i];
OHOS::NativeRdb::ValuesBucket value = RdbDataShareAdapter::RdbUtils::ToValuesBucket(rawContactValues);
int code = InsertExecute(uri, value);
if (code == Contacts::RDB_EXECUTE_FAIL) {
callLogDataBase_->RollBack();
g_mutex.unlock();
@@ -226,10 +245,11 @@ int CallLogAbility::BatchInsert(const Uri &uri, const std::vector<NativeRdb::Val
* @return Update database results code
*/
int CallLogAbility::Update(
const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates)
const Uri &uri, const DataShare::DataSharePredicates &predicates, 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;
@@ -240,13 +260,13 @@ int CallLogAbility::Update(
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);
ret = callLogDataBase_->UpdateCallLog(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<NativeRdb::AbsSharedResultSet> CallLogAbility::Query(
const Uri &uri, const std::vector<std::string> &columns, const NativeRdb::DataAbilityPredicates &predicates)
std::shared_ptr<DataShare::DataShareResultSet> CallLogAbility::Query(
const Uri &uri, const DataShare::DataSharePredicates &predicates, std::vector<std::string> &columns)
{
HILOG_INFO("ContactsDataAbility ====>Query start");
HILOG_INFO("CallLogAbility ====>Query start");
callLogDataBase_ = Contacts::CallLogDataBase::GetInstance();
Contacts::PredicatesConvert predicatesConvert;
std::shared_ptr<NativeRdb::AbsSharedResultSet> result;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> sharedPtrResult = std::move(result);
HILOG_INFO("ContactsDataAbility ====>Query end");
if (!isUriMatch) {
return nullptr;
}
auto queryResultSet = RdbDataShareAdapter::RdbUtils::ToResultSetBridge(result);
std::shared_ptr<DataShare::DataShareResultSet> sharedPtrResult =
std::make_shared<DataShare::DataShareResultSet>(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
dataBusiness/contacts/include/contacts.h
+1 -1
View File
@@ -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"
dataBusiness/contacts/include/contacts_data_ability.h
+26 -24
View File
@@ -18,8 +18,9 @@
#include <map>
#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<NativeRdb::ValuesBucket> &values) override;
virtual ~ContactsDataAbility() override;
static ContactsDataAbility* Create();
sptr<IRemoteObject> 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<DataShare::DataShareValuesBucket> &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<NativeRdb::AbsSharedResultSet> Query(const Uri &uri,
const std::vector<std::string> &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<DataShare::DataShareResultSet> Query(const Uri &uri,
const DataShare::DataSharePredicates &predicates, std::vector<std::string> &columns) override;
private:
static std::shared_ptr<Contacts::ContactsDataBase> contactDataBase_;
static std::shared_ptr<Contacts::ProfileDatabase> profileDataBase_;
static std::map<std::string, int> 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<NativeRdb::AbsSharedResultSet> &result,
OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates, std::vector<std::string> &columnsTemp,
bool QueryExecute(std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &result,
DataShare::DataSharePredicates &dataSharePredicates, std::vector<std::string> &columnsTemp,
int &parseCode);
void QueryExecuteSwitchSplit(std::shared_ptr<NativeRdb::AbsSharedResultSet> &result,
OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates, std::vector<std::string> &columnsTemp,
bool QueryExecuteSwitchSplit(std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &result,
DataShare::DataSharePredicates &dataSharePredicates, std::vector<std::string> &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
dataBusiness/contacts/include/contacts_database.h
+4 -3
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> 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<OHOS::NativeRdb::RdbStore> &store,
dataBusiness/contacts/include/contacts_datashare_stub_impl.h
+61
View File
@@ -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<DataShareExtAbility>& 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<DataShareResultSet> Query(const Uri &uri,
const DataSharePredicates &predicates, std::vector<std::string> &columns) override;
int BatchInsert(const Uri &uri, const std::vector<DataShareValuesBucket> &values) override;
std::vector<std::string> 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<AAFwk::IDataAbilityObserver> &dataObserver) override;
bool UnregisterObserver(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver) override;
bool NotifyChange(const Uri &uri) override;
Uri NormalizeUri(const Uri &uri) override;
Uri DenormalizeUri(const Uri &uri) override;
private:
std::shared_ptr<DataShareExtAbility> GetOwner(const Uri &uri);
std::shared_ptr<DataShareExtAbility> GetContactsDataAbility();
std::shared_ptr<DataShareExtAbility> GetCallLogAbility();
std::shared_ptr<DataShareExtAbility> GetVoiceMailAbility();
private:
std::shared_ptr<DataShareExtAbility> contactsDataAbility_;
std::shared_ptr<DataShareExtAbility> callLogAbility_;
std::shared_ptr<DataShareExtAbility> voiceMailAbility_;
};
} // namespace DataShare
} // namespace OHOS
#endif // DATASHARE_STUB_IMPL_H
dataBusiness/contacts/include/contacts_type.h
+1 -1
View File
@@ -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"
dataBusiness/contacts/include/contacts_update_helper.h
+1 -1
View File
@@ -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"
dataBusiness/contacts/include/raw_contacts.h
+1 -1
View File
@@ -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"
dataBusiness/contacts/src/contacts_data_ability.cpp
+114 -70
View File
@@ -17,21 +17,24 @@
#include <mutex>
#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<std::string, int> 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> &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<IRemoteObject> ContactsDataAbility::OnConnect(const AAFwk::Want &want)
{
HILOG_INFO("ContactsDataAbility %{public}s begin.", __func__);
Extension::OnConnect(want);
sptr<DataShare::ContactsDataShareStubImpl> remoteObject = new (std::nothrow) DataShare::ContactsDataShareStubImpl(
std::static_pointer_cast<ContactsDataAbility>(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<NativeRdb::ValuesBucket> &values)
int ContactsDataAbility::BatchInsert(const Uri &uri, const std::vector<DataShare::DataShareValuesBucket> &values)
{
unsigned int size = values.size();
if (size <= 0) {
@@ -237,8 +268,9 @@ int ContactsDataAbility::BatchInsert(const Uri &uri, const std::vector<NativeRdb
int count = 0;
for (unsigned int i = 0; i < size; i++) {
++count;
OHOS::NativeRdb::ValuesBucket rawContactValues = values[i];
int rowRet = InsertExecute(code, rawContactValues);
DataShare::DataShareValuesBucket rawContactValues = values[i];
OHOS::NativeRdb::ValuesBucket value = RdbDataShareAdapter::RdbUtils::ToValuesBucket(rawContactValues);
int rowRet = InsertExecute(code, value);
if (rowRet == Contacts::OPERATION_ERROR) {
contactDataBase_->RollBack();
g_mutex.unlock();
@@ -273,10 +305,11 @@ int ContactsDataAbility::BatchInsert(const Uri &uri, const std::vector<NativeRdb
* @return Update database results code
*/
int ContactsDataAbility::Update(
const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates)
const Uri &uri, const DataShare::DataSharePredicates &predicates, 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("ContactsDataAbility CheckValuesBucket error");
return Contacts::RDB_EXECUTE_FAIL;
@@ -287,15 +320,15 @@ int ContactsDataAbility::Update(
int retCode = Contacts::RDB_EXECUTE_FAIL;
OHOS::Uri uriTemp = uri;
int code = UriParseAndSwitch(uriTemp);
OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates;
UpdateExecute(retCode, code, value, dataAbilityPredicates);
DataShare::DataSharePredicates dataSharePredicates = predicates;
UpdateExecute(retCode, code, valuesBucket, dataSharePredicates);
g_mutex.unlock();
DataBaseNotifyChange(Contacts::CONTACT_UPDATE, uri);
return retCode;
}
void ContactsDataAbility::UpdateExecute(int &retCode, int code, const NativeRdb::ValuesBucket &value,
OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates)
void ContactsDataAbility::UpdateExecute(int &retCode, int code, const OHOS::NativeRdb::ValuesBucket &value,
DataShare::DataSharePredicates &dataSharePredicates)
{
Contacts::PredicatesConvert predicatesConvert;
OHOS::NativeRdb::RdbPredicates rdbPredicates("");
@@ -306,44 +339,44 @@ void ContactsDataAbility::UpdateExecute(int &retCode, int code, const NativeRdb:
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_->UpdateRawContact(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<NativeRdb::AbsSharedResultSet> ContactsDataAbility::Query(
const Uri &uri, const std::vector<std::string> &columns, const NativeRdb::DataAbilityPredicates &predicates)
std::shared_ptr<DataShare::DataShareResultSet> ContactsDataAbility::Query(
const Uri &uri, const DataShare::DataSharePredicates &predicates, std::vector<std::string> &columns)
{
HILOG_INFO("ContactsDataAbility ====>Query start");
g_mutex.lock();
contactDataBase_ = Contacts::ContactsDataBase::GetInstance();
profileDataBase_ = Contacts::ProfileDatabase::GetInstance();
std::shared_ptr<NativeRdb::AbsSharedResultSet> result;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> result;
OHOS::Uri uriTemp = uri;
int parseCode = UriParseAndSwitch(uriTemp);
std::vector<std::string> columnsTemp = columns;
OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates;
QueryExecute(result, dataAbilityPredicates, columnsTemp, parseCode);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> 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<DataShare::DataShareResultSet> sharedPtrResult =
std::make_shared<DataShare::DataShareResultSet>(queryResultSet);
g_mutex.unlock();
HILOG_INFO("ContactsDataAbility ====>Query end");
return sharedPtrResult;
}
void ContactsDataAbility::QueryExecute(std::shared_ptr<NativeRdb::AbsSharedResultSet> &result,
OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates, std::vector<std::string> &columnsTemp,
bool ContactsDataAbility::QueryExecute(std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &result,
DataShare::DataSharePredicates &dataSharePredicates, std::vector<std::string> &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<NativeRdb::AbsSharedResultSet> &result,
OHOS::NativeRdb::DataAbilityPredicates &dataAbilityPredicates, std::vector<std::string> &columnsTemp,
bool ContactsDataAbility::QueryExecuteSwitchSplit(std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &result,
DataShare::DataSharePredicates &dataSharePredicates, std::vector<std::string> &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_ptr<NativeRdb::Abs
case Contacts::CONTACT_TYPE:
case Contacts::PROFILE_TYPE:
rdbPredicates =
predicatesConvert.ConvertPredicates(Contacts::ContactTableName::CONTACT_TYPE, dataAbilityPredicates);
predicatesConvert.ConvertPredicates(Contacts::ContactTableName::CONTACT_TYPE, dataSharePredicates);
result = contactDataBase_->Query(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
dataBusiness/contacts/src/contacts_database.cpp
+2 -2
View File
@@ -1183,7 +1183,7 @@ std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> 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<std::string> 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;
dataBusiness/contacts/src/contacts_datashare_stub_impl.cpp
+240
View File
@@ -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<DataShareExtAbility> ContactsDataShareStubImpl::GetContactsDataAbility()
{
return contactsDataAbility_;
}
std::shared_ptr<DataShareExtAbility> ContactsDataShareStubImpl::GetCallLogAbility()
{
if (callLogAbility_ == nullptr) {
callLogAbility_.reset(CallLogAbility::Create());
}
return callLogAbility_;
}
std::shared_ptr<DataShareExtAbility> ContactsDataShareStubImpl::GetVoiceMailAbility()
{
if (voiceMailAbility_ == nullptr) {
voiceMailAbility_.reset(VoiceMailAbility::Create());
}
return voiceMailAbility_;
}
std::shared_ptr<DataShareExtAbility> 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<ContactsDataShareStubImpl>(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<ContactsDataShareStubImpl>(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<ContactsDataShareStubImpl>(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<DataShareResultSet> ContactsDataShareStubImpl::Query(const Uri &uri,
const DataSharePredicates &predicates, std::vector<std::string> &columns)
{
HILOG_INFO("query begin.");
std::shared_ptr<DataShareResultSet> resultSet = nullptr;
auto client = sptr<ContactsDataShareStubImpl>(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<DataShareValuesBucket> &values)
{
HILOG_INFO("batch insert begin.");
int ret = 0;
auto client = sptr<ContactsDataShareStubImpl>(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<std::string> ContactsDataShareStubImpl::GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter)
{
HILOG_INFO("GetFileTypes not supported");
std::vector<std::string> 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<AAFwk::IDataAbilityObserver> &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<AAFwk::IDataAbilityObserver> &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
dataBusiness/contacts/src/contacts_type.cpp
-1
View File
@@ -94,7 +94,6 @@ int ContactsType::LookupTypeId(std::shared_ptr<OHOS::NativeRdb::RdbStore> rdbSto
std::unique_ptr<OHOS::NativeRdb::AbsSharedResultSet> 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;
dataBusiness/voicemail/include/voicemail_ability.h
+17 -15
View File
@@ -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<NativeRdb::ValuesBucket> &values) override;
virtual ~VoiceMailAbility() override;
static VoiceMailAbility* Create();
sptr<IRemoteObject> 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<DataShare::DataShareValuesBucket> &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<NativeRdb::AbsSharedResultSet> Query(const Uri &uri,
const std::vector<std::string> &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<DataShare::DataShareResultSet> Query(const Uri &uri,
const DataShare::DataSharePredicates &predicates, std::vector<std::string> &columns) override;
private:
static std::shared_ptr<Contacts::VoiceMailDataBase> voiceMailDataBase_;
static std::map<std::string, int> 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
dataBusiness/voicemail/include/voicemail_database.h
+1 -1
View File
@@ -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"
dataBusiness/voicemail/src/voicemail_ability.cpp
+66 -40
View File
@@ -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<std::string, int> 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<IRemoteObject> 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<DataShare::ContactsDataShareStubImpl> remoteObject = new (std::nothrow) DataShare::ContactsDataShareStubImpl(
std::static_pointer_cast<VoiceMailAbility>(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<NativeRdb::ValuesBucket> &values)
int VoiceMailAbility::BatchInsert(const Uri &uri, const std::vector<DataShare::DataShareValuesBucket> &values)
{
unsigned int size = values.size();
if (size <= 0) {
@@ -194,8 +211,9 @@ int VoiceMailAbility::BatchInsert(const Uri &uri, const std::vector<NativeRdb::V
int count = 0;
for (unsigned int i = 0; i < size; i++) {
++count;
OHOS::NativeRdb::ValuesBucket rawContactValues = values[i];
int code = InsertExecute(uri, rawContactValues);
DataShare::DataShareValuesBucket rawContactValues = values[i];
OHOS::NativeRdb::ValuesBucket value = RdbDataShareAdapter::RdbUtils::ToValuesBucket(rawContactValues);
int code = InsertExecute(uri, value);
if (code == Contacts::OPERATION_ERROR) {
voiceMailDataBase_->RollBack();
g_mutex.unlock();
@@ -231,10 +249,11 @@ int VoiceMailAbility::BatchInsert(const Uri &uri, const std::vector<NativeRdb::V
* @return Update database results code
*/
int VoiceMailAbility::Update(
const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates)
const Uri &uri, const DataShare::DataSharePredicates &predicates, 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;
@@ -245,18 +264,18 @@ int VoiceMailAbility::Update(
int ret = Contacts::RDB_EXECUTE_FAIL;
OHOS::Uri uriTemp = uri;
int code = UriParse(uriTemp);
OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates;
DataShare::DataSharePredicates dataSharePredicates = predicates;
OHOS::NativeRdb::RdbPredicates rdbPredicates("");
switch (code) {
case Contacts::VOICEMAIL:
rdbPredicates =
predicatesConvert.ConvertPredicates(Contacts::CallsTableName::VOICEMAIL, dataAbilityPredicates);
ret = voiceMailDataBase_->UpdateVoiceMail(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<NativeRdb::AbsSharedResultSet> VoiceMailAbility::Query(
const Uri &uri, const std::vector<std::string> &columns, const NativeRdb::DataAbilityPredicates &predicates)
std::shared_ptr<DataShare::DataShareResultSet> VoiceMailAbility::Query(
const Uri &uri, const DataShare::DataSharePredicates &predicates, std::vector<std::string> &columns)
{
HILOG_ERROR("VoiceMailAbility ====>Query start");
voiceMailDataBase_ = Contacts::VoiceMailDataBase::GetInstance();
Contacts::PredicatesConvert predicatesConvert;
OHOS::Uri uriTemp = uri;
int parseCode = UriParse(uriTemp);
std::shared_ptr<NativeRdb::AbsSharedResultSet> result;
OHOS::NativeRdb::DataAbilityPredicates dataAbilityPredicates = predicates;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> result;
DataShare::DataSharePredicates dataSharePredicates = predicates;
OHOS::NativeRdb::RdbPredicates rdbPredicates("");
std::vector<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> sharedPtrResult = std::move(result);
if (!isUriMatch) {
return nullptr;
}
auto queryResultSet = RdbDataShareAdapter::RdbUtils::ToResultSetBridge(result);
std::shared_ptr<DataShare::DataShareResultSet> sharedPtrResult =
std::make_shared<DataShare::DataShareResultSet>(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
entry/src/main/ets/Application/ContactsDataAbilityStage.ts
+30
View File
@@ -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")
}
}
entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts
+60
View File
@@ -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] <<Provider>> DataShareExtAbility onCreate, want:' + want.abilityName);
}
getFileTypes(uri: string, mimeTypeFilter: string) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [getFileTypes] enter');
}
insert(uri, value, callback) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [insert] enter');
}
update(uri, value, predicates, callback) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [update] enter');
}
delete(uri, predicates, callback) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [delete] enter');
}
query(uri, columns, predicates, callback) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [query] enter');
}
getType(uri: string) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [getType] enter');
}
batchInsert(uri: string, valueBuckets, callback) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [batchInsert] enter');
}
normalizeUri(uri: string) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [normalizeUri] enter');
}
denormalizeUri(uri: string) {
console.info('[ttt] [ContactsDataShare] <<Provider>> [denormalizeUri] enter');
}
};
entry/src/main/ets/common/utils/LogUtils.ts
+40
View File
@@ -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;
entry/src/main/module.json
+61
View File
@@ -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++"
}
]
}
}
entry/src/main/resources/base/element/string.json
+8
View File
@@ -0,0 +1,8 @@
{
"string":[
{
"name": "app_name",
"value": "ContactsData"
}
]
}
jstest/Calllog_test.js
+172 -173
View File
@@ -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);
});
jstest/ContactCard_test.js
+765 -766
View File
File diff suppressed because it is too large Load Diff
jstest/ContactMerge_test.js
+291 -292
View File
File diff suppressed because it is too large Load Diff
jstest/Contacts_test.js
+877 -878
View File
File diff suppressed because it is too large Load Diff
jstest/Groups_test.js
+85 -86
View File
@@ -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) {
jstest/ObjectCallback.js
+5 -5
View File
@@ -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)
jstest/ObjectInterface_test.js
+4 -4
View File
@@ -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)
jstest/Performance_test.js
+114 -115
View File
@@ -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);
jstest/Stability_test.js
+114 -115
View File
@@ -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);
jstest/Voicemail_test.js
+173 -174
View File
@@ -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);
});
})
jstest/common.js
+15 -15
View File
@@ -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: {},
jstest/recovery_test.js
+25 -26
View File
@@ -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();
test/BUILD.gn
+9
View File
@@ -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",
]
}
test/unittest/include/base_test.h
+11 -10
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet, std::string testName);
void CheckData(OHOS::NativeRdb::ValuesBucket &rawContactValues,
const std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &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<OHOS::DataShare::DataShareResultSet> &resultSet, std::string testName);
void CheckData(OHOS::DataShare::DataShareValuesBucket &rawContactValues,
const std::shared_ptr<OHOS::DataShare::DataShareResultSet> &resultSet, std::string &columnName,
std::string testName);
void CheckResultSetList(std::vector<OHOS::NativeRdb::ValuesBucket> &valuesVector,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet, std::string testName);
OHOS::NativeRdb::ValuesBucket GetAllColumnsValues(
void CheckResultSetList(std::vector<OHOS::DataShare::DataShareValuesBucket> &valuesVector,
std::shared_ptr<OHOS::DataShare::DataShareResultSet> &resultSet, std::string testName);
OHOS::DataShare::DataShareValuesBucket GetAllColumnsValues(
std::vector<std::string> &columnsInt, std::vector<std::string> &columnsStr);
int ContactsRand();
void InitAbility();
test/unittest/include/calllogability_test.h
+30 -30
View File
@@ -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<int, OHOS::NativeRdb::ValuesBucket> result;
OHOS::NativeRdb::ValuesBucket updateValues;
OHOS::DataShare::DataShareValuesBucket values;
std::map<int, OHOS::DataShare::DataShareValuesBucket> result;
OHOS::DataShare::DataShareValuesBucket updateValues;
int predicatesId;
std::vector<std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet>> resultSet;
std::vector<std::shared_ptr<OHOS::DataShare::DataShareResultSet>> resultSet;
std::vector<int64_t> predicatesQueryId;
int predicatesDeleteId;
CallLogAsync(OHOS::NativeRdb::ValuesBucket &values, std::map<int, OHOS::NativeRdb::ValuesBucket> &result)
CallLogAsync(OHOS::DataShare::DataShareValuesBucket &values, std::map<int, OHOS::DataShare::DataShareValuesBucket> &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<std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet>> resultSet,
CallLogAsync(std::vector<std::shared_ptr<OHOS::DataShare::DataShareResultSet>> resultSet,
std::vector<int64_t> 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<int, OHOS::NativeRdb::ValuesBucket>::value_type(callLogId, this->values));
mtx_.unlock();
Lock::calllogMtx_.lock();
this->result.insert(std::map<int, OHOS::DataShare::DataShareValuesBucket>::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<std::string> columns;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
calllogAbility.Query(callLogUri, columns, predicates);
mtx_.lock();
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> CalllogQuery(
std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates);
OHOS::NativeRdb::ValuesBucket GetCallLogValues(int columnsStart, int columnsEnd, std::vector<std::string> &columns);
int CalllogUpdate(OHOS::DataShare::DataShareValuesBucket updateValues, OHOS::DataShare::DataSharePredicates predicates);
int CalllogDelete(OHOS::DataShare::DataSharePredicates predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> CalllogQuery(
std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates);
OHOS::DataShare::DataShareValuesBucket GetCallLogValues(int columnsStart, int columnsEnd, std::vector<std::string> &columns);
void GetAllValuesColumn(std::vector<std::string> &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
test/unittest/include/calllogfuzzyquery_test.h
+4 -4
View File
@@ -24,10 +24,10 @@ class CalllogFuzzyQueryTest : public BaseTest {
public:
CalllogFuzzyQueryTest();
~CalllogFuzzyQueryTest();
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> CalllogQuery(
std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates);
int CalllogDelete(OHOS::NativeRdb::DataAbilityPredicates predicates);
int64_t CalllogInsertValues(OHOS::NativeRdb::ValuesBucket &values);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> CalllogQuery(
std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates);
int CalllogDelete(OHOS::DataShare::DataSharePredicates predicates);
int64_t CalllogInsertValues(OHOS::DataShare::DataShareValuesBucket &values);
void ClearCallLog();
};
} // namespace Test
test/unittest/include/contactability_test.h
+42 -42
View File
@@ -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<int, OHOS::NativeRdb::ValuesBucket> result;
OHOS::NativeRdb::ValuesBucket updateValues;
OHOS::DataShare::DataShareValuesBucket values;
std::map<int, OHOS::DataShare::DataShareValuesBucket> result;
OHOS::DataShare::DataShareValuesBucket updateValues;
int predicatesId;
std::vector<std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet>> resultSet;
std::vector<std::shared_ptr<OHOS::DataShare::DataShareResultSet>> resultSet;
std::vector<int64_t> predicatesQueryId;
int predicatesDeleteId;
ContactAsync(OHOS::NativeRdb::ValuesBucket &values, std::map<int, OHOS::NativeRdb::ValuesBucket> &result)
ContactAsync(OHOS::DataShare::DataShareValuesBucket &values, std::map<int, OHOS::DataShare::DataShareValuesBucket> &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<std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet>> resultSet,
ContactAsync(std::vector<std::shared_ptr<OHOS::DataShare::DataShareResultSet>> resultSet,
std::vector<int64_t> 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<int, OHOS::NativeRdb::ValuesBucket>::value_type(rawContactId, this->values));
mtx_.unlock();
Lock::contactsMtx_.lock();
this->result.insert(std::map<int, OHOS::DataShare::DataShareValuesBucket>::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<std::string> columns;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriRawContact, columns, predicates);
mtx_.lock();
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> valueVector, int isFavorite, OHOS::NativeRdb::ValuesBucket &rawContactValues);
std::vector<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> &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<OHOS::DataShare::DataShareResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> &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<std::string> &columnsInt, std::vector<std::string> &columnsStr);
void GetAllRawContactColumns(std::vector<std::string> &columnsInt, std::vector<std::string> &columnsStr);
void GetAllContactDataColumns(std::vector<std::string> &columnInt, std::vector<std::string> &columnStr);
@@ -148,11 +148,11 @@ public:
void GetDetailsContactDataColumns(std::vector<std::string> &columns);
void MergeColumns(
std::vector<std::string> &columns, std::vector<std::string> &columnsInt, std::vector<std::string> &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<OHOS::NativeRdb::ValuesBucket> 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<OHOS::DataShare::DataShareValuesBucket> GetBatchList(int64_t rawContactId);
void ClearContacts();
};
} // namespace Test
test/unittest/include/contactgroup_test.h
+10 -10
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> 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<OHOS::DataShare::DataShareResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> 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<std::string> &columnsInt, std::vector<std::string> &columnsStr);
int64_t GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &values);
int64_t GroupsInsertValues(OHOS::DataShare::DataShareValuesBucket &values);
void GetAllGroupsColumns(std::vector<std::string> &columnInt, std::vector<std::string> &columnStr);
void MergeColumns(
std::vector<std::string> &columns, std::vector<std::string> &columnsInt, std::vector<std::string> &columnsStr);
test/unittest/include/contactpinyin_test.h
+6 -6
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> 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<OHOS::DataShare::DataShareResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> 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
test/unittest/include/contactprofile_test.h
+19 -19
View File
@@ -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<std::string> valueVector, int isFavorite, OHOS::NativeRdb::ValuesBucket &rawContactValues);
std::vector<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> &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<OHOS::DataShare::DataShareResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> &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<std::string> &columnsInt, std::vector<std::string> &columnsStr);
void GetAllRawContactColumns(std::vector<std::string> &columnsInt, std::vector<std::string> &columnsStr);
void GetAllContactDataColumns(std::vector<std::string> &columnInt, std::vector<std::string> &columnStr);
@@ -51,11 +51,11 @@ public:
void GetDetailsContactDataColumns(std::vector<std::string> &columns);
void MergeColumns(
std::vector<std::string> &columns, std::vector<std::string> &columnsInt, std::vector<std::string> &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<OHOS::NativeRdb::ValuesBucket> 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<OHOS::DataShare::DataShareValuesBucket> GetBatchList(int64_t rawContactId);
void ClearContacts();
};
} // namespace Test
test/unittest/include/contactquery_test.h
+4 -4
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates);
std::string position, OHOS::DataShare::DataShareValuesBucket &contactDataValues);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> ContactQuery(const std::string &tableName,
std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates);
void ClearData();
};
} // namespace Test
test/unittest/include/mergecontact_test.h
+5 -5
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> ContactQuery(
std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> ContactQuery(
std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates);
void CheckMergeResultId(std::vector<int64_t> ids, bool isMerge);
int GetMergeResultContactId(const std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet);
std::vector<int> GetMergeResultRawContactId(const std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet);
std::vector<int> GetMergeRawContactId(const std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet);
int GetMergeResultContactId(const std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSet);
std::vector<int> GetMergeResultRawContactId(const std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSet);
std::vector<int> GetMergeRawContactId(const std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSet);
void DeleteRawContact();
};
} // namespace Test
test/unittest/include/random_number_utils.h
+1 -1
View File
@@ -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
test/unittest/include/test_common.h
+32 -33
View File
@@ -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
test/unittest/include/voicemailability_test.h
+33 -32
View File
@@ -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<int, OHOS::NativeRdb::ValuesBucket> result;
OHOS::NativeRdb::ValuesBucket updateValues;
OHOS::DataShare::DataShareValuesBucket values;
std::map<int, OHOS::DataShare::DataShareValuesBucket> result;
OHOS::DataShare::DataShareValuesBucket updateValues;
int predicatesId;
std::vector<std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet>> resultSet;
std::vector<std::shared_ptr<OHOS::DataShare::DataShareResultSet>> resultSet;
std::vector<int64_t> predicatesQueryId;
int predicatesDeleteId;
VoicemailAsync(OHOS::NativeRdb::ValuesBucket &values, std::map<int, OHOS::NativeRdb::ValuesBucket> &result)
VoicemailAsync(OHOS::DataShare::DataShareValuesBucket &values, std::map<int, OHOS::DataShare::DataShareValuesBucket> &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<std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet>> resultSet,
VoicemailAsync(std::vector<std::shared_ptr<OHOS::DataShare::DataShareResultSet>> resultSet,
std::vector<int64_t> 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<int, OHOS::NativeRdb::ValuesBucket>::value_type(callLogId, this->values));
mtx_.unlock();
Lock::voicemailMtx_.lock();
this->result.insert(std::map<int, OHOS::DataShare::DataShareValuesBucket>::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<std::string> columns;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
voicemailAbility.Query(voicemailUri, columns, predicates);
mtx_.lock();
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> VoicemailQuery(
std::vector<std::string> 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<OHOS::DataShare::DataShareResultSet> VoicemailQuery(
std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates);
OHOS::DataShare::DataShareValuesBucket GetVoiceMailValues(
int columnsStart, int columnsEnd, std::vector<std::string> &columns);
void GetVoiceMailValuesColumn(std::vector<std::string> &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<std::string> &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<std::string> &columns,
OHOS::DataShare::DataShareValuesBucket values, std::string testName);
void ClearVoicemail();
};
} // namespace Test
test/unittest/src/base_test.cpp
+23 -19
View File
@@ -17,6 +17,7 @@
#include <cstdio>
#include <fcntl.h>
#include "rdb_utils.h"
#include <sys/stat.h>
#include <sys/types.h>
@@ -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<OHOS::AppExecFwk::AbilityLocalRecord> abilityLocalRecord =
std::make_shared<OHOS::AppExecFwk::AbilityLocalRecord>(abilityInfo, nullptr);
std::shared_ptr<OHOS::AppExecFwk::OHOSApplication> application;
std::shared_ptr<OHOS::AppExecFwk::AbilityHandler> handler;
calllogAbility.Init(abilityInfo, application, handler, nullptr);
voicemailAbility.Init(abilityInfo, application, handler, nullptr);
contactsDataAbility.Init(abilityInfo, application, handler, nullptr);
OHOS::sptr<IRemoteObject> 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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet, std::string testName)
void BaseTest::CheckResultSet(OHOS::DataShare::DataShareValuesBucket &values,
const std::shared_ptr<OHOS::DataShare::DataShareResultSet> &resultSet, std::string testName)
{
std::vector<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> &resultSet, std::string &columnName,
void BaseTest::CheckData(OHOS::DataShare::DataShareValuesBucket &values,
const std::shared_ptr<OHOS::DataShare::DataShareResultSet> &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<OHOS::NativeRdb::ValuesBucket> &valuesVector,
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> &resultSet, std::string testName)
void BaseTest::CheckResultSetList(std::vector<OHOS::DataShare::DataShareValuesBucket> &valuesVector,
std::shared_ptr<OHOS::DataShare::DataShareResultSet> &resultSet, std::string testName)
{
std::vector<std::string> 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);
test/unittest/src/calllogability_test.cpp
+293 -297
View File
File diff suppressed because it is too large Load Diff
test/unittest/src/calllogfuzzyquery_test.cpp
+62 -56
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> CalllogFuzzyQueryTest::CalllogQuery(
std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<OHOS::DataShare::DataShareResultSet> CalllogFuzzyQueryTest::CalllogQuery(
std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates)
{
OHOS::Uri uriCalllog(CallLogUri::CALL_LOG);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
calllogAbility.Query(uriCalllog, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::ValuesBucket> valuesBucketVector;
std::vector<OHOS::DataShare::DataShareValuesBucket> valuesBucketVector;
valuesBucketVector.push_back(valuesBucket);
valuesBucketVector.push_back(valuesBucketTwo);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = CalllogQuery(columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = CalllogQuery(columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = CalllogQuery(columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = CalllogQuery(columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = CalllogQuery(columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSet = CalllogQuery(columns, predicates);
int rowCount = 0;
resultSet->GetRowCount(rowCount);
EXPECT_EQ(-1, rowCount);
test/unittest/src/contactability_test.cpp
+697 -703
View File
File diff suppressed because it is too large Load Diff
test/unittest/src/contactgroup_test.cpp
+126 -126
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> ContactGroupTest::ContactQuery(
const std::string &tableName, std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<OHOS::DataShare::DataShareResultSet> ContactGroupTest::ContactQuery(
const std::string &tableName, std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates)
{
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> 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<std::string> columns;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(tableName, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> &columnsInt, std::vector<std::string> &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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columns;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columns;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columnsInt;
std::vector<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSetDeleteQuery =
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSetOne = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columns;
OHOS::NativeRdb::DataAbilityPredicates predicates;
OHOS::DataShare::DataSharePredicates predicates;
predicates.EqualTo("group_name", "Board of Directors");
std::string groups = ContactTabName::GROUPS;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columns;
predicates.Clear();
predicates.EqualTo("id", std::to_string(groupId));
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(groups, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates2;
predicates2.EqualTo("id", std::to_string(groupId));
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSetTwo = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSetOne = ContactQuery(groups, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSetOne = ContactQuery(groups, columns, predicates);
int rowCountOne = 0;
resultSetOne->GetRowCount(rowCountOne);
EXPECT_EQ(-1, rowCountOne);
predicates.Clear();
predicates.EqualTo("id", "10000000");
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSetTwo = ContactQuery(groups, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates2;
predicates2.EqualTo("id", "10000000");
std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSetTwo = ContactQuery(groups, columns, predicates2);
int rowCountTwo = 0;
resultSetTwo->GetRowCount(rowCountTwo);
EXPECT_EQ(0, rowCountTwo);
predicates.Clear();
predicates.GreaterThan("id", "0");
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSetThree =
contactsDataAbility.Query(errorUri, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates3;
predicates3.GreaterThan("id", "0");
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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();
}
test/unittest/src/contactpinyin_test.cpp
+40 -40
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> ContactPinyinTest::ContactQuery(
const std::string &tableName, std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<OHOS::DataShare::DataShareResultSet> ContactPinyinTest::ContactQuery(
const std::string &tableName, std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates)
{
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columns;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(tableName, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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욱");
test/unittest/src/contactprofile_test.cpp
+668 -676
View File
File diff suppressed because it is too large Load Diff
test/unittest/src/contactquery_test.cpp
+78 -78
View File
@@ -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<OHOS::NativeRdb::AbsSharedResultSet> ContactQueryTest::ContactQuery(
const std::string &tableName, std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<OHOS::DataShare::DataShareResultSet> ContactQueryTest::ContactQuery(
const std::string &tableName, std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates)
{
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(searchContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(searchContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(searchContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(contactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(contactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(contactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(contactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(contactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(contactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(contactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(contactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet = ContactQuery(searchContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSet = ContactQuery(searchContact, columns, predicates);
// resultSet count 1
int rowCount = 0;
resultSet->GetRowCount(rowCount);
test/unittest/src/mergecontact_test.cpp
+186 -198
View File
@@ -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<int64_t> ids, bool merge)
@@ -47,9 +47,9 @@ void MergeContactTest::CheckMergeResultId(std::vector<int64_t> ids, bool merge)
for (int i = 0; i < mergeIdSize; i++) {
std::vector<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultOne = ContactQuery(columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultOne = ContactQuery(columns, predicates);
int contactIdOne = GetMergeResultContactId(resultOne);
resultIdVector.push_back(contactIdOne);
}
@@ -58,15 +58,15 @@ void MergeContactTest::CheckMergeResultId(std::vector<int64_t> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet)
int MergeContactTest::GetMergeResultContactId(const std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSet)
{
std::vector<std::string> columnNames;
resultSet->GetAllColumnNames(columnNames);
@@ -82,7 +82,7 @@ int MergeContactTest::GetMergeResultContactId(const std::shared_ptr<OHOS::Native
}
std::vector<int> MergeContactTest::GetMergeResultRawContactId(
const std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet)
const std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSet)
{
std::vector<int> rawContactIdVector;
std::vector<std::string> columnNames;
@@ -102,7 +102,7 @@ std::vector<int> MergeContactTest::GetMergeResultRawContactId(
}
std::vector<int> MergeContactTest::GetMergeRawContactId(
const std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet)
const std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSet)
{
std::vector<int> rawContactIdVector;
std::vector<std::string> columnNames;
@@ -121,20 +121,20 @@ std::vector<int> MergeContactTest::GetMergeRawContactId(
return rawContactIdVector;
}
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> MergeContactTest::ContactQuery(
std::vector<std::string> columns, OHOS::NativeRdb::DataAbilityPredicates predicates)
std::shared_ptr<OHOS::DataShare::DataShareResultSet> MergeContactTest::ContactQuery(
std::vector<std::string> columns, OHOS::DataShare::DataSharePredicates predicates)
{
OHOS::Uri uri(ContactsUri::RAW_CONTACT);
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uri, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columns;
OHOS::NativeRdb::DataAbilityPredicates predicates;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriQueryMergeList, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<int64_t> 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<std::string> 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<int64_t> 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<int64_t> 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<int64_t> 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<std::string> 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<int64_t> 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<std::string> 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<int64_t> 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<int64_t> 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<std::string> 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<std::string> 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<int64_t> 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<std::string> 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<int64_t> 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<std::string> 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<int64_t> 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<std::string> 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<std::string> 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<std::string> 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<int64_t> 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<int64_t> 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<std::string> 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<std::string> columns;
OHOS::NativeRdb::DataAbilityPredicates predicates;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriQueryMergeList, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<std::string> 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<std::string> 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<std::string> 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<std::string> 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<int64_t> 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<std::string> 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<int64_t> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriRawContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columns;
OHOS::NativeRdb::DataAbilityPredicates predicates;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriQueryMergeList, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriRawContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> columns;
OHOS::NativeRdb::DataAbilityPredicates predicates;
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriQueryMergeList, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<std::string> 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<int64_t> resultIdVector;
resultIdVector.push_back(rawOne);
test/unittest/src/performance_test.cpp
+62 -62
View File
@@ -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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriRawContactComplete, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates2;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::ValuesBucket> values;
std::vector<OHOS::DataShare::DataShareValuesBucket> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriRawContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::ValuesBucket> values;
std::vector<OHOS::DataShare::DataShareValuesBucket> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriContactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::ValuesBucket> values;
std::vector<OHOS::DataShare::DataShareValuesBucket> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
calllogAbility.Query(uriCalllog, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::ValuesBucket> values;
std::vector<OHOS::DataShare::DataShareValuesBucket> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
voicemailAbility.Query(uriVoiceMail, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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;
test/unittest/src/random_number_utils.cpp
+3 -6
View File
@@ -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;
}
test/unittest/src/recovery_test.cpp
+15 -15
View File
@@ -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<std::string> columns;
predicates.EqualTo("is_deleted", "0");
std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriRawContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSetRecover =
contactsDataAbility.Query(uriRawContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultSetRecover =
contactsDataAbility.Query(uriRawContact, predicates, columns);
int rowCountRecover = 0;
resultSetRecover->GetRowCount(rowCountRecover);
resultSetRecover->Close();
test/unittest/src/stability_test.cpp
+62 -62
View File
@@ -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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriRawContactComplete, columns, predicates);
OHOS::DataShare::DataSharePredicates predicates2;
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::ValuesBucket> values;
std::vector<OHOS::DataShare::DataShareValuesBucket> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriRawContact, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::ValuesBucket> values;
std::vector<OHOS::DataShare::DataShareValuesBucket> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
contactsDataAbility.Query(uriContactData, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::ValuesBucket> values;
std::vector<OHOS::DataShare::DataShareValuesBucket> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
calllogAbility.Query(uriCalllog, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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<OHOS::NativeRdb::ValuesBucket> values;
std::vector<OHOS::DataShare::DataShareValuesBucket> 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<std::string> 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<OHOS::NativeRdb::AbsSharedResultSet> resultSet =
voicemailAbility.Query(uriVoiceMail, columns, predicates);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> 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);
test/unittest/src/voicemailability_test.cpp
+405 -381
View File
File diff suppressed because it is too large Load Diff