diff --git a/account/OsAccountTest_js/src/main/config.json b/account/OsAccountTest_js/src/main/config.json index 92730f17deebfa1fdd9d9bbd4e28b4e48e391666..f9f58e46dea2c4c2e12c1c69c3c2a64dca5de850 100755 --- a/account/OsAccountTest_js/src/main/config.json +++ b/account/OsAccountTest_js/src/main/config.json @@ -23,13 +23,6 @@ "moduleName": "entry", "moduleType": "entry" }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS" - } - ], "reqPermissions": [ { "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS", diff --git a/account/OsAccountTest_js/src/main/js/default/test/OsAccount.test.js b/account/OsAccountTest_js/src/main/js/default/test/OsAccount.test.js index d8f2bf28264fe9c0da768e51af6e8316886c5860..66f1e0ced7c9332c6f02d2671936818b8affe9b5 100755 --- a/account/OsAccountTest_js/src/main/js/default/test/OsAccount.test.js +++ b/account/OsAccountTest_js/src/main/js/default/test/OsAccount.test.js @@ -84,7 +84,8 @@ describe('AccountTest', function () { it('account_queryOsAccountDistributedInfo_test002', 0, function () { const accountAbility = account.getDistributedAccountAbility() accountAbility.queryOsAccountDistributedInfo(function (data) { - expect(data.name).assertEqual('anonymous') + expect(data.name).assertEqual('anonymous') + expect(data.scalableData).assertEqual(null) }); }) diff --git a/account/appaccount/actsaccountpressure/BUILD.gn b/account/appaccount/actsaccountpressure/BUILD.gn deleted file mode 100644 index a0f36d00ad5e1d0a2e0cb74aa586ef4bb7ccb640..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2021 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("//test/xts/tools/build/suite.gni") - -ohos_js_hap_suite("ActsAccountPressure") { - hap_profile = "./entry/src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAccountPressure" -} -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "./entry/src/main/js/default" -} -ohos_resources("hjs_demo_resources") { - sources = [ "./entry/src/main/js/resources" ] - hap_profile = "./entry/src/main/config.json" -} diff --git a/account/appaccount/actsaccountpressure/Test.json b/account/appaccount/actsaccountpressure/Test.json deleted file mode 100644 index 6a464d872c47147d07907e0b2936041da9cc4b2e..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/Test.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "1500000", - "package": "com.example.actsaccountpressure", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAccountPressure.hap", - "ActsAccountSceneAppAccess.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/account/appaccount/actsaccountpressure/entry/src/main/config.json b/account/appaccount/actsaccountpressure/entry/src/main/config.json deleted file mode 100644 index a0910dafefb4a0ee9208b0ab4b1cda7fe4508a0e..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/config.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "app": { - "bundleName": "com.example.actsaccountpressure", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.actsaccountpressure", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - }, - { - "availableScope": [], - "grantMode": "user_grant", - "name": "ohos.permission.DISTRIBUTED_DATASYNC" - } - ], - "reqPermissions": [ - { - "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", - "reason": "ceshi" - }, - { - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", - "reason": "ceshi" - }, - { - "name": "ohos.permission.DISTRIBUTED_DATASYNC", - "reason": "ceshi" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - } - ], - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.example.actsaccountpressure.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "visible": true, - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} \ No newline at end of file diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/default/app.js b/account/appaccount/actsaccountpressure/entry/src/main/js/default/app.js deleted file mode 100644 index c158442201abb1888ae8fb1d57f150c5ec26c36b..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/default/app.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2021 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/default/i18n/en-US.json b/account/appaccount/actsaccountpressure/entry/src/main/js/default/i18n/en-US.json deleted file mode 100644 index e63c70d978a3a53be988388c87182f81785e170c..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - } -} \ No newline at end of file diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/default/i18n/zh-CN.json b/account/appaccount/actsaccountpressure/entry/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index de6ee5748322f44942c1b003319d8e66c837675f..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } -} \ No newline at end of file diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.css b/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.css deleted file mode 100644 index 6fda792753f2e15f22b529c7b90a82185b2770bf..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,9 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.hml b/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.hml deleted file mode 100644 index c45422b42d0bf788a1c2c0eb299a981f07ce8613..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{title}} - -
diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.js b/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.js deleted file mode 100644 index 21dce8485e7329da7cc3e28e0fc853048030635f..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2021 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 file from '@system.file' -import {Core, ExpectExtend} from 'deccjsunit/index' - -const injectRef = Object.getPrototypeOf(global) || global -injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') - -export default { - data: { - title: "account pressure test" - }, - onInit() { - this.title = "account pressure test"; - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - core.addService('expect', expectExtend) - core.init() - - const configService = core.getDefaultService('config') - this.timeout = 180000; - configService.setConfig(this) - - require('../../../test/List.test') - core.execute() - }, - onReady() { - }, -} \ No newline at end of file diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/resources/base/element/string.json b/account/appaccount/actsaccountpressure/entry/src/main/js/resources/base/element/string.json deleted file mode 100644 index fecd7c5d952385ddd11c8e7d344dd67a98b50cc5..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "ActsAccountPressure" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] -} \ No newline at end of file diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/resources/base/media/icon.png b/account/appaccount/actsaccountpressure/entry/src/main/js/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/account/appaccount/actsaccountpressure/entry/src/main/js/resources/base/media/icon.png and /dev/null differ diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/test/List.test.js b/account/appaccount/actsaccountpressure/entry/src/main/js/test/List.test.js deleted file mode 100644 index 489bb9ab541fdb7643843cb454c258398bea4332..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/test/List.test.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2021 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. - */ -require('./Pressure.test.js') \ No newline at end of file diff --git a/account/appaccount/actsaccountpressure/entry/src/main/js/test/Pressure.test.js b/account/appaccount/actsaccountpressure/entry/src/main/js/test/Pressure.test.js deleted file mode 100644 index 6a4fb5af6eb477811ffd3084c8d64cf3c458f075..0000000000000000000000000000000000000000 --- a/account/appaccount/actsaccountpressure/entry/src/main/js/test/Pressure.test.js +++ /dev/null @@ -1,786 +0,0 @@ -/* - * Copyright (c) 2021 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 abilityAccessCtrl from '@ohos.abilityAccessCtrl' -import account from '@ohos.account.appAccount' -import bundle from '@ohos.bundle' -import featureAbility from '@ohos.ability.featureAbility' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -const STRESSLEVEL = 100; -const TIMEOUT = 300; -const ACCOUNTLIMIT = 1000; -const PERMISSION_USER_SET = 1; -const PERMISSION_USER_NAME = "ohos.permission.DISTRIBUTED_DATASYNC"; -var tokenID = undefined; -describe('ActsAccountPressure', function () { - - beforeAll(async function (done) { - console.debug("====>beforeAll start===="); - var appInfo = await bundle.getApplicationInfo('com.example.actsaccountpressure', 0, 100); - tokenID = appInfo.accessTokenId; - console.debug("accessTokenId" + appInfo.accessTokenId + " bundleName:" + appInfo.bundleName); - var atManager = abilityAccessCtrl.createAtManager(); - var result = await atManager.grantUserGrantedPermission(tokenID, PERMISSION_USER_NAME, PERMISSION_USER_SET); - console.debug("tokenId" + tokenID + " result:" + result); - sleep(2000); - console.debug("====>startAbility start===="); - await featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.example.actsaccountsceneappaccess", - abilityName: "com.example.actsaccountsceneappaccess.MainAbility", - action: "action1", - parameters: - {}, - }, - }, - ); - sleep(TIMEOUT); - setTimeout(done(), TIMEOUT); - }); - - function sleep(delay) { - var start = (new Date()).getTime(); - while((new Date()).getTime() - start < delay) { - continue; - } - } - - /* - * @tc.number : ActsAccountPressure_0100 - * @tc.name : Stress test add and delete accounts - * @tc.desc : Stress test to add and delete accounts, and to determine the success of the addition and - * deletion by obtaining the specified application information - */ - it('ActsAccountPressure_0100', 0, async function (done) { - console.debug("====>ActsAccountPressure_0100 start===="); - var appAccountManager = account.createAppAccountManager(); - var selfBundle = "com.example.actsaccountpressure"; - let count; - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>addAccount time: " + count); - try{ - await appAccountManager.addAccount("account_pressure_promise"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>addAccount fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - var data = await appAccountManager.getAllAccounts(selfBundle); - sleep(TIMEOUT); - console.debug("====>getAllAccounts time: " + count); - console.debug('====>getAllAccounts data: ' + JSON.stringify(data)); - expect(typeof data).assertEqual('object'); - expect(data[0].name).assertEqual("account_pressure_promise"); - expect(data[0].owner).assertEqual(selfBundle); - expect(data.length).assertEqual(1); - console.debug("====>deleteAccount time: " + count); - try{ - await appAccountManager.deleteAccount("account_pressure_promise"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>deleteAccount fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - var dataDel = await appAccountManager.getAllAccounts(selfBundle); - console.debug("====>getAllAccounts time: " + count); - console.debug('====>getAllAccounts dataDel: ' + JSON.stringify(dataDel)); - expect(typeof data).assertEqual('object'); - expect(dataDel.length).assertEqual(0); - if(data.length != 1 || dataDel.length != 0){ - break; - } - sleep(TIMEOUT); - } - console.debug("====>the number of times to complete the stress test is: " + count); - console.debug("====>ActsAccountPressure_0100 end===="); - done(); - }); - - /* - * @tc.number : ActsAccountPressure_0200 - * @tc.name : Stress test add and delete accounts - * @tc.desc : Stress test callback form add and delete accounts - */ - it('ActsAccountPressure_0200', 0, async function (done) { - console.debug("====>ActsAccountPressure_0200 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - let flag = true; - let count = 0; - let STRESSNUM; - if(STRESSLEVEL > ACCOUNTLIMIT){ - STRESSNUM = ACCOUNTLIMIT; - }else{ - STRESSNUM = STRESSLEVEL; - } - for (let i = 0; i < STRESSNUM; i++) { - let accountName = "account_pressure_callback" + i; - sleep(TIMEOUT); - appAccountManager.addAccount(accountName, (err)=>{ - console.debug('====>addAccount name: ' + accountName); - expect(err.code).assertEqual(0); - if(err.code != 0){ - console.error("====>addAccount fail err:" + JSON.stringify(err)); - expect().assertFail(); - flag = false; - done(); - } - sleep(TIMEOUT); - appAccountManager.deleteAccount(accountName, (err)=>{ - console.debug('====>deleteAccount name: ' + accountName); - expect(err.code).assertEqual(0); - if(err.code != 0){ - console.error("====>deleteAccount fail err:" + JSON.stringify(err)); - console.error('====>call function level is: ' + count); - expect().assertFail(); - flag = false; - done(); - } - if (count == STRESSLEVEL - 1) { - count++; - console.debug("====>the number of times to complete the stress test is: " + count); - console.debug("====>ActsAccountPressure_0200 end===="); - done(); - } - count++; - }) - }); - if (!flag) { - done(); - break; - } - } - }); - - /* - * @tc.number : ActsAccountPressure_0300 - * @tc.name : Stress test add and delete accounts - * @tc.desc : Stress testing a large number of adding accounts together and deleting accounts together - */ - it('ActsAccountPressure_0300', 0, async function (done) { - console.debug("====>ActsAccountPressure_0300 start===="); - var appAccountManager = account.createAppAccountManager(); - let count; - let STRESSNUM; - if(STRESSLEVEL > ACCOUNTLIMIT){ - STRESSNUM = ACCOUNTLIMIT; - }else{ - STRESSNUM = STRESSLEVEL; - } - console.debug("====>addAccount start===="); - for (count = 0; count < STRESSNUM; count++) { - let accountName = "account_pressure_limit" + count; - console.debug('====>addAccount name: ' + accountName); - try{ - await appAccountManager.addAccount(accountName); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>addAccount fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - } - if(STRESSNUM == ACCOUNTLIMIT){ - try{ - await appAccountManager.addAccount("account_name_limit"); - console.debug("====>the number of added accounts exceeds the limit===="); - expect().assertFail(); - done(); - } - catch(err){ - console.debug("====>add Account that exceed the limit err:" + JSON.stringify(err)); - expect(err.code != 0).assertEqual(true); - console.debug("====>deleteAccount start===="); - for (count = 0; count < STRESSNUM; count++) { - let accountName = "account_pressure_limit" + count; - console.debug('====>deleteAccount name: ' + accountName); - try{ - await appAccountManager.deleteAccount(accountName); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>deleteAccount fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - } - console.debug("====>the number of times to complete the stress test is: " + count) - console.debug("====>ActsAccountPressure_0300 end===="); - done(); - } - }else{ - console.debug("====>deleteAccount start===="); - for (count = 0; count < STRESSNUM; count++) { - let accountName = "account_pressure_limit" + count; - console.debug('====>deleteAccount name: ' + accountName); - try{ - await appAccountManager.deleteAccount(accountName); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>deleteAccount fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - } - console.debug("====>the number of times to complete the stress test is: " + count) - console.debug("====>ActsAccountPressure_0300 end===="); - done(); - } - }); - - /* - * @tc.number : ActsAccountPressure_0400 - * @tc.name : Stress test enableAppAccess and disableAppAccess - * @tc.desc : Stress test authorize the account to the application and de-authorize the account to the - * application - */ - it('ActsAccountPressure_0400', 0, async function (done) { - console.debug("====>ActsAccountPressure_0400 start===="); - var appAccountManager = account.createAppAccountManager(); - var enableBundle = "com.example.actsaccountsceneappaccess"; - let count; - console.debug("====>addAccount 0400 start===="); - try{ - await appAccountManager.addAccount("account_pressure_enable"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>addAccount fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>enableAppAccess time: " + count); - try{ - await appAccountManager.enableAppAccess("account_pressure_enable", enableBundle); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>enableAppAccess 0400 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>disableAppAccess time: " + count); - try{ - await appAccountManager.disableAppAccess("account_pressure_enable", enableBundle); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>disableAppAccess 0400 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - } - console.debug("====>deleteAccount 0400 start===="); - try{ - await appAccountManager.deleteAccount("account_pressure_enable"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>deleteAccount fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>the number of times to complete the stress test is: " + count) - console.debug("====>ActsAccountPressure_0400 end===="); - done(); - }); - - /* - * @tc.number : ActsAccountPressure_0500 - * @tc.name : Stress test setAssociatedData and getAssociatedData - * @tc.desc : Stress test setting associated data and obtaining associated data - */ - it('ActsAccountPressure_0500', 0, async function (done) { - console.debug("====>ActsAccountPressure_0500 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - let count; - let associateKey = ""; - let associateValue = ""; - console.debug("====>add account 0500 start===="); - try{ - await appAccountManager.addAccount("account_pressure_associate"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>add Account ActsAccountPressure_0500 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>setAssociatedData time: " + count); - associateKey = "key_pre" + count; - associateValue = "value_pressure" + count; - try{ - await appAccountManager.setAssociatedData("account_pressure_associate", associateKey, associateValue); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>setAssociatedData ActsAccountPressure_0500 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAssociatedData time: " + count); - try{ - var data = await appAccountManager.getAssociatedData("account_pressure_associate", associateKey); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>getAssociatedData ActsAccountPressure_0500 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAssociatedData data:" + JSON.stringify(data)); - expect(data).assertEqual(associateValue); - } - console.debug("====>deleteAccount 0500 start===="); - try{ - await appAccountManager.deleteAccount("account_pressure_associate"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>delete account 0500 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>the number of times to complete the stress test is: " + count) - console.debug("====>ActsAccountPressure_0500 end===="); - done(); - }); - - /* - * @tc.number : ActsAccountPressure_0600 - * @tc.name : Stress test setAccountExtraInfo and getAccountExtraInfo - * @tc.desc : Stress test setting additional information and obtaining additional information - */ - it('ActsAccountPressure_0600', 0, async function (done) { - console.debug("====>ActsAccountPressure_0600 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - let count; - let extraInfo = ""; - console.debug("====>add account 0600 start===="); - try{ - await appAccountManager.addAccount("account_pressure_extrainfo"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>addAccount 0600 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>setAccountExtraInfo time: " + count); - extraInfo = "pressure_extra" + count; - try{ - await appAccountManager.setAccountExtraInfo("account_pressure_extrainfo", extraInfo); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>setAccountExtraInfo 0600 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAccountExtraInfo time: " + count); - try{ - var data = await appAccountManager.getAccountExtraInfo("account_pressure_extrainfo"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>getAccountExtraInfo 0600 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAccountExtraInfo data:" + JSON.stringify(data)); - expect(data).assertEqual(extraInfo); - } - console.debug("====>delete account 0600 start===="); - try{ - await appAccountManager.deleteAccount("account_pressure_extrainfo"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>deleteAccount 0600 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>the number of times to complete the stress test is: " + count) - console.debug("====>ActsAccountPressure_0600 end===="); - done(); - }); - - /* - * @tc.number : ActsAccountPressure_0700 - * @tc.name : Stress test setAccountCredential and getAccountCredential - * @tc.desc : Stress test setting credential and obtaining credential - */ - it('ActsAccountPressure_0700', 0, async function (done) { - console.debug("====>ActsAccountPressure_0700 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - let count; - let credentialType = ""; - let credentialvalue = ""; - console.debug("====>addAccount 0700 start===="); - try{ - await appAccountManager.addAccount("account_credential"); - sleep(TIMEOUT); - } - catch(err){ - console.error("addAccount 0700 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>setAccountCredential time: " + count); - credentialType = "pressure_credentialType" + count; - credentialvalue = "pressure_credential" + count; - try{ - await appAccountManager.setAccountCredential("account_credential", credentialType, credentialvalue); - sleep(TIMEOUT); - } - catch(err){ - console.error("setAccountCredential 0700 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAccountCredential time: " + count); - try{ - var data = await appAccountManager.getAccountCredential("account_credential", credentialType); - sleep(TIMEOUT); - } - catch(err){ - console.error("getAccountCredential 0700 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAccountCredential 0700 data:" + JSON.stringify(data)); - expect(data).assertEqual(credentialvalue); - } - console.debug("====>delete account 0700 start===="); - try{ - await appAccountManager.deleteAccount("account_credential"); - sleep(TIMEOUT); - } - catch(err){ - console.error("deleteAccount 0700 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>the number of times to complete the stress test is: " + count) - console.debug("====>ActsAccountPressure_0700 end===="); - done(); - }); - - // /* - // * @tc.number : ActsAccountPressure_0800 - // * @tc.name : setOAuthToken getOAuthToken and clearOAuthToken - // * @tc.desc : Stress test sets the token, obtains the token and then clears the token - // */ - // it('ActsAccountPressure_0800', 0, async function (done) { - // console.debug("====>ActsAccountPressure_0800 start===="); - // var appAccountManager = account.createAppAccountManager(); - // console.debug("====>creat finish===="); - // let count; - // let oauthToken = ""; - // console.debug("====>addAccount 0800 start===="); - // try{ - // await appAccountManager.addAccount("accountToken_pressure_token"); - // sleep(TIMEOUT); - // } - // catch(err){ - // console.error("addAccount 0800 err:" + JSON.stringify(err)); - // expect().assertFail(); - // done(); - // } - // for (count = 0; count < STRESSLEVEL; count++) { - // console.debug("====>setOAuthToken time: " + count); - // oauthToken = "pressure_token" + count; - // try{ - // await appAccountManager.setOAuthToken("accountToken_pressure_token", oauthToken); - // sleep(TIMEOUT); - // } - // catch(err){ - // console.error("setOAuthToken 0800 err:" + JSON.stringify(err)); - // expect().assertFail(); - // done(); - // } - // console.debug("====>getOAuthToken time: " + count); - // try{ - // var data = await appAccountManager.getOAuthToken("accountToken_pressure_token"); - // sleep(TIMEOUT); - // } - // catch(err){ - // console.error("getOAuthToken 0800 err:" + JSON.stringify(err)); - // expect().assertFail(); - // done(); - // } - // console.debug("====>getOAuthToken data: " + data); - // expect(data).assertEqual(oauthToken); - // console.debug("====>clearOAuthToken time: " + count); - // try{ - // await appAccountManager.clearOAuthToken("accountToken_pressure_token"); - // sleep(TIMEOUT); - // } - // catch(err){ - // console.error("clearOAuthToken 0800 err:" + JSON.stringify(err)); - // expect().assertFail(); - // done(); - // } - // } - // console.debug("====>delete account 0800 start===="); - // try{ - // await appAccountManager.deleteAccount("accountToken_pressure_token"); - // sleep(TIMEOUT); - // } - // catch(err){ - // console.error("deleteAccount 0800 err:" + JSON.stringify(err)); - // expect().assertFail(); - // done(); - // } - // console.debug("====>the number of times to complete the stress test is: " + count); - // console.debug("====>ActsAccountPressure_0800 end===="); - // done(); - // }); - - /* - * @tc.number : ActsAccountPressure_0900 - * @tc.name : Stress test setAppAccountSyncEnable and checkAppAccountSyncEnable - * @tc.desc : Stress test setting synchronization flag and obtaining synchronization flag - */ - it('ActsAccountPressure_0900', 0, async function (done) { - console.debug("====>ActsAccountPressure_0900 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - let count; - console.debug("====>add account 0900 start===="); - try{ - await appAccountManager.addAccount("account_pressure_syncenable"); - } - catch(err){ - console.error("====>add account 0900 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>setAppAccountSyncEnable time: " + count); - try{ - await appAccountManager.setAppAccountSyncEnable("account_pressure_syncenable", true); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>setAppAccountSyncEnable 0900 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>checkAppAccountSyncEnable time: " + count); - try{ - var data = await appAccountManager.checkAppAccountSyncEnable("account_pressure_syncenable"); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>checkAppAccountSyncEnable 0900 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>checkAppAccountSyncEnable data:" + data); - expect(data).assertEqual(true); - } - console.debug("====>delete account 0900 start===="); - try{ - await appAccountManager.deleteAccount("account_pressure_syncenable"); - } - catch(err){ - console.error("====>delete account 0900 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>the number of times to complete the stress test is: " + count); - console.debug("====>ActsAccountPressure_0900 end===="); - done(); - }); - - /* - * @tc.number : ActsAccountPressure_1000 - * @tc.name : Stress test getAllAccounts - * @tc.desc : Stress test to obtain specified application information - */ - it('ActsAccountPressure_1000', 0, async function (done) { - console.debug("====>ActsAccountPressure_1000 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - let count; - var specifyBundle = "com.example.actsaccountsceneappaccess"; - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>getAllAccounts time: " + count); - try{ - var data = await appAccountManager.getAllAccounts(specifyBundle); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>getAllAccounts 1000 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccounts data: " + JSON.stringify(data)); - expect(data[0].name).assertEqual("account_name_scene_first"); - expect(data[0].owner).assertEqual(specifyBundle); - expect(data[1].name).assertEqual("account_name_scene_second"); - expect(data[1].owner).assertEqual(specifyBundle); - } - console.debug("====>the number of times to complete the stress test is: " + count); - console.debug("====>ActsAccountPressure_1000 end===="); - done(); - }); - - /* - * @tc.number : ActsAccountPressure_1100 - * @tc.name : Stress test getAllAccessibleAccounts - * @tc.desc : Stress test to obtain the application account information and authorized account information - */ - it('ActsAccountPressure_1100', 0, async function (done) { - console.debug("====>ActsAccountPressure_1100 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - let count; - var selfBundle = "com.example.actsaccountpressure"; - var specifyBundle = "com.example.actsaccountsceneappaccess"; - console.debug("====>add account 1100 start===="); - try{ - await appAccountManager.addAccount("account_accessible_first"); - await appAccountManager.addAccount("account_accessible_second"); - } - catch(err){ - console.error("====>add account 1100 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>getAllAccounts time: " + count); - try{ - var data = await appAccountManager.getAllAccessibleAccounts(); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>getAllAccounts 1100 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccounts data: " + JSON.stringify(data)); - console.debug("====>getAllAccounts data.length: " + data.length); - expect(data.length).assertEqual(4); - expect(data[0].name).assertEqual("account_name_scene_first"); - expect(data[0].owner).assertEqual(specifyBundle); - expect(data[1].name).assertEqual("account_name_scene_second"); - expect(data[1].owner).assertEqual(specifyBundle); - expect(data[2].name).assertEqual("account_accessible_first"); - expect(data[2].owner).assertEqual(selfBundle); - expect(data[3].name).assertEqual("account_accessible_second"); - expect(data[3].owner).assertEqual(selfBundle); - } - console.debug("====>delete account 1100 start===="); - try{ - await appAccountManager.deleteAccount("account_accessible_first"); - await appAccountManager.deleteAccount("account_accessible_second"); - } - catch(err){ - console.error("====>delete account 1100 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>the number of times to complete the stress test is: " + count); - console.debug("====>ActsAccountPressure_1100 end===="); - done(); - }); - - /* - * @tc.number : ActsAccountPressure_1200 - * @tc.name : Stress test on and off - * @tc.desc : Stress test receive account information changes - */ - it('ActsAccountPressure_1200', 0, async function (done) { - console.debug("====>ActsAccountPressure_1200 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat appAccountManager finish"); - console.debug("====>add account 1200 start"); - let count; - var countSign = 0; - let changeExtra = ""; - try{ - await appAccountManager.addAccount("account_pressure_onoff"); - } - catch(err){ - console.error("====>add account 1200 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - function changeOnCallback(data){ - console.debug("====>receive change 1200 data:" + JSON.stringify(data)); - expect(data[0].name).assertEqual("account_pressure_onoff"); - expect(data[0].owner).assertEqual("com.example.actsaccountpressure"); - countSign++; - } - console.debug("====>on ActsAccountPressure_1200 start"); - try{ - appAccountManager.on('change', ["com.example.actsaccountpressure"], changeOnCallback); - } - catch(err){ - console.error("====>on ActsAccountPressure_1200 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - for (count = 0; count < STRESSLEVEL; count++) { - console.debug("====>change account information time: " + count); - changeExtra = "pressure_extra" + count; - try{ - await appAccountManager.setAccountExtraInfo("account_pressure_onoff", changeExtra); - sleep(TIMEOUT); - } - catch(err){ - console.error("====>setAccountExtraInfo fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - } - console.debug("====>off 1200 start===="); - appAccountManager.off('change', async function (){ - console.debug("====>off enter===="); - console.debug("====>countSign is: " + countSign); - expect(countSign).assertEqual(STRESSLEVEL); - console.debug("====>delete account===="); - try{ - await appAccountManager.deleteAccount("account_pressure_onoff"); - } - catch(err){ - console.error("====>delete account 1200 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>the number of times to complete the stress test is: " + count); - console.debug("====>ActsAccountPressure_1200 end===="); - done(); - }); - }); -}) \ No newline at end of file diff --git a/account/appaccount/actsaccountpressure/signature/openharmony_sx.p7b b/account/appaccount/actsaccountpressure/signature/openharmony_sx.p7b deleted file mode 100644 index cc53179a48f88f20acc379c138a001e9a15838f6..0000000000000000000000000000000000000000 Binary files a/account/appaccount/actsaccountpressure/signature/openharmony_sx.p7b and /dev/null differ diff --git a/account/appaccount/actsaccounttest/entry/src/main/js/test/OAuthToken.test.js b/account/appaccount/actsaccounttest/entry/src/main/js/test/OAuthToken.test.js index 742158473c42655441fa7e8012ef0345ab4dbbe2..acbab136f2f0e06933abd661fc38a14096c8d29a 100644 --- a/account/appaccount/actsaccounttest/entry/src/main/js/test/OAuthToken.test.js +++ b/account/appaccount/actsaccounttest/entry/src/main/js/test/OAuthToken.test.js @@ -30,25 +30,22 @@ const OWNERSELF = "com.example.actsaccounttest"; describe('ActsAccountOAuthToken', function () { function sleep(delay) { - return new Promise((resolve, reject) => { - setTimeout(() => { - resolve() - }, delay) - }).then(() => { - console.info(`sleep #{time} over ...`) - }) + var start = (new Date()).getTime(); + while((new Date()).getTime() - start < delay) { + continue; + } } beforeAll(async function (done) { console.debug("====>beforeAll start===="); - await sleep(TIMEOUT); + sleep(TIMEOUT); console.debug("====>beforeAll end===="); done(); }); beforeEach(async function (done) { console.debug("====>beforeAll enter===="); - await sleep(EACHTIMEOUT); + sleep(EACHTIMEOUT); done(); }); @@ -511,14 +508,15 @@ describe('ActsAccountOAuthToken', function () { console.debug("====>ActsAccountOAuthToken_8100 start===="); var appAccountManager = account.createAppAccountManager(); console.debug("====>ActsAccountOAuthToken_8100 getAllOAuthTokens start===="); - appAccountManager.getAllOAuthTokens(limitName, OWNERSELF,(err,ArrayData)=>{ - console.debug("====>ActsAccountOAuthToken_8100 getAllOAuthTokens err:" + JSON.stringify(err)); - console.debug("====>ActsAccountOAuthToken_8100 getAllOAuthTokens ArrayData:" + JSON.stringify(ArrayData)); - expect(err.code!=0).assertEqual(true); + appAccountManager.getAllOAuthTokens(limitName, OWNERSELF).then((ArrayData)=>{ + console.debug("====>ActsAccountOAuthToken_8100 getAllOAuthTokens ArrayData:" + JSON.stringify(ArrayData)); expect(ArrayData.length).assertEqual(0); console.debug("====>ActsAccountOAuthToken_8100 ===="); done(); - }); + }).catch((err)=>{ + expect(err.code!=0).assertEqual(true); + done(); + }) }); it('ActsAccountOAuthToken_8200', 0, async function (done) { @@ -2458,12 +2456,14 @@ describe('ActsAccountOAuthToken', function () { it('ActsAccountOAuthToken_9200', 0, async function (done) { console.debug("====>ActsAccountOAuthToken_9200 start===="); var appAccountManager = account.createAppAccountManager(); - appAccountManager.getAuthenticatorCallback("test_sessionId",(err,databack)=>{ + appAccountManager.getAuthenticatorCallback("test_sessionId").then((databack)=>{ + expect(databack).assertEqual(undefined); + done(); + }).catch((err)=>{ console.debug("====>ActsAccountOAuthToken_9200 getAuthenticatorCallback err:" + JSON.stringify(err)); expect(err.code!=0).assertEqual(true); - expect(databack).assertEqual(undefined); done(); - }); + }) }); it('ActsAccountOAuthToken_9300', 0, async function (done) { @@ -2494,6 +2494,25 @@ describe('ActsAccountOAuthToken', function () { appAccountManager.getAuthenticatorInfo(OWNERSELF,(err,databack)=>{ console.debug("====>ActsAccountOAuthToken_9500 getAuthenticatorInfo err:" + JSON.stringify(err)); expect(err.code!=0).assertEqual(true); + expect(account.ResultCode.SUCCESS).assertEqual(0); + expect(account.ResultCode.ERROR_ACCOUNT_NOT_EXIST).assertEqual(10001); + expect(account.ResultCode.ERROR_APP_ACCOUNT_SERVICE_EXCEPTION).assertEqual(10002); + expect(account.ResultCode.ERROR_INVALID_PASSWORD).assertEqual(10003); + expect(account.ResultCode.ERROR_INVALID_REQUEST).assertEqual(10004); + expect(account.ResultCode.ERROR_INVALID_RESPONSE).assertEqual(10005); + expect(account.ResultCode.ERROR_NETWORK_EXCEPTION).assertEqual(10006); + expect(account.ResultCode.ERROR_OAUTH_AUTHENTICATOR_NOT_EXIST).assertEqual(10007); + expect(account.ResultCode.ERROR_OAUTH_CANCELED).assertEqual(10008); + expect(account.ResultCode.ERROR_OAUTH_LIST_TOO_LARGE).assertEqual(10009); + expect(account.ResultCode.ERROR_OAUTH_SERVICE_BUSY).assertEqual(10010); + expect(account.ResultCode.ERROR_OAUTH_SERVICE_EXCEPTION).assertEqual(10011); + expect(account.ResultCode.ERROR_OAUTH_SESSION_NOT_EXIST).assertEqual(10012); + expect(account.ResultCode.ERROR_OAUTH_TIMEOUT).assertEqual(10013); + expect(account.ResultCode.ERROR_OAUTH_TOKEN_NOT_EXIST).assertEqual(10014); + expect(account.ResultCode.ERROR_OAUTH_TOKEN_TOO_MANY).assertEqual(10015); + expect(account.ResultCode.ERROR_OAUTH_UNSUPPORT_ACTION).assertEqual(10016); + expect(account.ResultCode.ERROR_OAUTH_UNSUPPORT_AUTH_TYPE).assertEqual(10017); + expect(account.ResultCode.ERROR_PERMISSION_DENIED).assertEqual(10018); done(); }); }); @@ -2504,6 +2523,17 @@ describe('ActsAccountOAuthToken', function () { appAccountManager.getAuthenticatorInfo("",(err,databack)=>{ console.debug("====>ActsAccountOAuthToken_9600 getAuthenticatorInfo err:" + JSON.stringify(err)); expect(err.code!=0).assertEqual(true); + expect(account.Constants.ACTION_ADD_ACCOUNT_IMPLICITLY).assertEqual('addAccountImplicitly'); + expect(account.Constants.ACTION_AUTHENTICATE).assertEqual('authenticate'); + expect(account.Constants.KEY_NAME).assertEqual('name'); + expect(account.Constants.KEY_OWNER).assertEqual('owner'); + expect(account.Constants.KEY_TOKEN).assertEqual('token'); + expect(account.Constants.KEY_ACTION).assertEqual('action'); + expect(account.Constants.KEY_AUTH_TYPE).assertEqual('authType'); + expect(account.Constants.KEY_SESSION_ID).assertEqual('sessionId'); + expect(account.Constants.KEY_CALLER_PID).assertEqual('callerPid'); + expect(account.Constants.KEY_CALLER_UID).assertEqual('callerUid'); + expect(account.Constants.KEY_CALLER_BUNDLE_NAME).assertEqual('callerBundleName'); done(); }); }); @@ -2538,9 +2568,7 @@ describe('ActsAccountOAuthToken', function () { appAccountManager.addAccount("account_setOAuthTokenVisibility_name",(err,)=>{ console.debug("====>ActsAccountOAuthToken_9900 addAccount err:" + JSON.stringify(err)); expect(err.code).assertEqual(0); - appAccountManager.setOAuthTokenVisibility("account_setOAuthTokenVisibility_name","authType","test_BundleName",true,(err)=>{ - console.debug("====>ActsAccountOAuthToken_9900 setOAuthTokenVisibility err:" + JSON.stringify(err)); - expect(err.code).assertEqual(0); + appAccountManager.setOAuthTokenVisibility("account_setOAuthTokenVisibility_name","authType","test_BundleName",true).then(()=>{ appAccountManager.getOAuthToken("account_setOAuthTokenVisibility_name",OWNERSELF,"authType",(err,data)=>{ console.debug("====>ActsAccountOAuthToken_9900 getOAuthToken err:" + JSON.stringify(err)); console.debug("====>ActsAccountOAuthToken_9900 getOAuthToken data:" + data); @@ -2560,7 +2588,10 @@ describe('ActsAccountOAuthToken', function () { }); }); }); - }); + }).catch((err)=>{ + expect(err.code).assertEqual(0); + done(); + }) }); }); @@ -3227,13 +3258,14 @@ describe('ActsAccountOAuthToken', function () { it('ActsAccountOAuthToken_12700', 0, async function (done) { console.debug("====>ActsAccountOAuthToken_12700 start===="); var appAccountManager = account.createAppAccountManager(); - appAccountManager.getOAuthList("","authType",(err,dataArray)=>{ - console.debug("====>ActsAccountOAuthToken_12700 getOAuthList err:" + JSON.stringify(err)); - console.debug("====>ActsAccountOAuthToken_12700 getOAuthList dataArray:" + JSON.stringify(dataArray)); - expect(err.code!=0).assertEqual(true); + appAccountManager.getOAuthList("","authType").then((dataArray)=>{ + console.debug("====>ActsAccountOAuthToken_12700 getOAuthList dataArray:" + JSON.stringify(dataArray)); expect(dataArray.length).assertEqual(0); done(); - }); + }).catch((err)=>{ + expect(err.code!=0).assertEqual(true); + done(); + }) }); it('ActsAccountOAuthToken_12800', 0, async function (done) { @@ -3337,6 +3369,8 @@ describe('ActsAccountOAuthToken', function () { console.debug("====>ActsAccountOAuthToken_13200 getAuthenticatorInfo err:" + JSON.stringify(err)); console.debug("====>ActsAccountOAuthToken_13200 getAuthenticatorInfo dataInfo:" + JSON.stringify(dataInfo)); expect(err.code).assertEqual(0); + expect(isNaN(dataInfo.iconId)).assertFalse(); + expect(isNaN(dataInfo.labelId)).assertFalse(); done(); }); }); @@ -3385,16 +3419,4 @@ describe('ActsAccountOAuthToken', function () { }); done(); }); -it('ActsAccountOAuthToken_28500', 0, async function (done) { - console.debug("====>ActsAccountOAuthToken_28500 start===="); - var appAccountManager = account.createAppAccountManager(); - var dataInfo = await appAccountManager.getAuthenticatorInfo - ("com.example.actsaccountOauthtoken").catch((err)=>{ - console.debug("====>ActsAccountOAuthToken_28500 getAuthenticatorInfo err:" + JSON.stringify(err)); - expect(err.code).assertEqual(0); - }); - console.debug("====>ActsAccountOAuthToken_28500 getAuthenticatorInfo dataInfo:" - + JSON.stringify(dataInfo)); - done(); - }); -}) \ No newline at end of file +}) diff --git a/account/appaccount/actsgetallaccounts/entry/src/main/config.json b/account/appaccount/actsgetallaccounts/entry/src/main/config.json index 16393adc2a7e3f560ce122a121bcd71d45aa1e2d..b83bb0ee53bb518fb364ef20cc52140ba7d165c1 100755 --- a/account/appaccount/actsgetallaccounts/entry/src/main/config.json +++ b/account/appaccount/actsgetallaccounts/entry/src/main/config.json @@ -24,13 +24,6 @@ "moduleName": "entry", "moduleType": "entry" }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } - ], "reqPermissions": [ { "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", diff --git a/account/appaccount/actssetchecksyncenable/entry/src/main/config.json b/account/appaccount/actssetchecksyncenable/entry/src/main/config.json index ff2b444eb672b7aeb4b9ec215db5a5eb13e56882..1cbed54158a80dc45646d880d1126e6fc4b01ecf 100755 --- a/account/appaccount/actssetchecksyncenable/entry/src/main/config.json +++ b/account/appaccount/actssetchecksyncenable/entry/src/main/config.json @@ -24,13 +24,6 @@ "moduleName": "entry", "moduleType": "entry" }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "user_grant", - "name": "ohos.permission.DISTRIBUTED_DATASYNC" - } - ], "reqPermissions": [ { "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/entry/src/main/config.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/entry/src/main/config.json index 6b3c6d02c8a795f74fc9d1cd11b5796a9d0c3d21..e1b8be78993d6ede6e67a4db2f07fc3bb2a8565f 100755 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/entry/src/main/config.json +++ b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/entry/src/main/config.json @@ -24,13 +24,6 @@ "moduleName": "entry", "moduleType": "entry" }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } - ], "reqPermissions": [ { "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/entry/src/main/config.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/entry/src/main/config.json index 9292314f6ec020c09fe65d40e0ab5098fd4a1a69..9bde9315778d2c161ba078386c10ed12194f89ac 100755 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/entry/src/main/config.json +++ b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/entry/src/main/config.json @@ -24,13 +24,6 @@ "moduleName": "entry", "moduleType": "entry" }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } - ], "reqPermissions": [ { "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", diff --git a/account/osaccount/actsosaccountthirdpartytest/entry/src/main/config.json b/account/osaccount/actsosaccountthirdpartytest/entry/src/main/config.json index eadb59a2523d4dff7e17936983b2767312db3977..0f3eec461adf9b817e4449480247dc5f8f3b8609 100755 --- a/account/osaccount/actsosaccountthirdpartytest/entry/src/main/config.json +++ b/account/osaccount/actsosaccountthirdpartytest/entry/src/main/config.json @@ -24,18 +24,6 @@ "moduleName": "entry", "moduleType": "entry" }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS" - }, - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.DISTRIBUTED_DATASYNC" - } - ], "reqPermissions": [ { "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS", diff --git a/account/osaccount/actsosaccountthirdpartytest/entry/src/main/js/test/OsAccountGet.test.js b/account/osaccount/actsosaccountthirdpartytest/entry/src/main/js/test/OsAccountGet.test.js index 55ce29a8ab1a46ecbbd7fadcb9cd792eff26b56e..79a637195659500c13ff0af212ad7ccaf40a20ba 100755 --- a/account/osaccount/actsosaccountthirdpartytest/entry/src/main/js/test/OsAccountGet.test.js +++ b/account/osaccount/actsosaccountthirdpartytest/entry/src/main/js/test/OsAccountGet.test.js @@ -328,6 +328,11 @@ describe('ActsOsAccountThirdPartyTest_third1', function () { console.debug("====>create os account OsAccountInfo: " + JSON.stringify(data)); expect(err.code).assertEqual(0); expect(data.localName).assertEqual("osAccountNameIdSerialA"); + expect(data.domainInfo.accountName == "").assertEqual(true) + expect(data.type.NORMAL).assertEqual(1); + expect(data.constraints.length > 0).assertEqual(true); + expect(data.isVerified).assertEqual(false); + expect(data.distributedInfo.name != null).assertEqual(true); localId = data.localId; osAccountManager.getSerialNumberByOsAccountLocalId(localId, (err, serialNumber)=>{ console.debug("====>queryOsAccountById err:" + JSON.stringify(err)); @@ -466,4 +471,30 @@ describe('ActsOsAccountThirdPartyTest_third1', function () { console.debug("====>ActsOsAccountGetCount_0200 end===="); done(); }) + + + it('ActsOsAccountQueryActivedOsAccountIds_0100', 0, async function (done) { + console.debug("====>ActsOsAccountQueryActivedOsAccountIds_0100 start===="); + var osAccountManager = osaccount.getAccountManager(); + osAccountManager.queryActivatedOsAccountIds((err,dataArray)=>{ + console.info("ActsOsAccountGQueryActicedOsAccountIds_0100 err :" + JSON.stringify(err)); + expect(err.code).assertEqual(0) + console.info("ActsOsAccountGQueryActicedOsAccountIds_0100 dataArray" + dataArray.length); + done(); + }) + }) + + it('ActsOsAccountQueryActivedOsAccountIds_0200', 0, async function (done) { + console.debug("====>ActsOsAccountQueryActivedOsAccountIds_0200 start===="); + var osAccountManager = osaccount.getAccountManager(); + osAccountManager.queryActivatedOsAccountIds().catch((err)=>{ + console.info("====>ActsOsAccountQueryActivedOsAccountIds_0200 err " + JSON.stringify(err)); + expect(err.code).assertEqual(0) + done(); + }).then((data)=>{ + console.debug("====>ActsOsAccountQueryActivedOsAccountIds_0200 data" + JSON.stringify(data)) + done(); + }); + }) + }) \ No newline at end of file