diff --git a/account/appaccount/BUILD.gn b/account/appaccount/BUILD.gn index da882415beb0810f7066572c0e1ca186a4aa0a4a..e7a6ccf9e6955d67b45489c0672679ee734a5271 100644 --- a/account/appaccount/BUILD.gn +++ b/account/appaccount/BUILD.gn @@ -24,7 +24,6 @@ group("appaccount_hap") { "actsgetallaccounts:ActsGetAllAccountsTest", "actssetcheckdatasyncenable:ActsSetCheckDataSyncEnableTest", "actssetchecksyncenable:ActsSetCheckSyncEnableTest", - "getallaccessibleaccounts:accessibleaccounts", "getallaccounts:getallaccounts", "sceneProject:appaccount_scene", ] diff --git a/account/appaccount/actsaccountoperatetest/src/main/js/test/ErrPermission.test.js b/account/appaccount/actsaccountoperatetest/src/main/js/test/ErrPermission.test.js index a6f1061732e797ea114834b5895743120753558a..657a930cdf0e1397bef7fcbcb15a37df38fd6482 100644 --- a/account/appaccount/actsaccountoperatetest/src/main/js/test/ErrPermission.test.js +++ b/account/appaccount/actsaccountoperatetest/src/main/js/test/ErrPermission.test.js @@ -144,11 +144,13 @@ export default function ActsAccountErrPermission() { var appAccountManager = account.createAppAccountManager(); console.debug("====>creat finish===="); appAccountManager.createAccount("accessibleAccount_callback_nopermission", (err)=>{ - console.debug("====> add account ActsAccountErrPermission_0500 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); + console.debug("====>add account ActsAccountErrPermission_0500 err:" + JSON.stringify(err)); + expect(err).assertEqual(null); appAccountManager.getAllAccounts((err, data)=>{ console.debug("====>getAllAccounts 0500 err:" + JSON.stringify(err)); - expect(err.code).assertEqual(ERR_PERMISSION_DENIED); + expect(data.length).assertEqual(1); + expect(data[0].name).assertEqual("accessibleAccount_callback_nopermission"); + expect(data[0].owner).assertEqual("com.example.actsaccountoperatetest"); appAccountManager.removeAccount("accessibleAccount_callback_nopermission", (err)=>{ console.debug("====>delete Account ActsAccountErrPermission_0500 err:" + JSON.stringify(err)); expect(err).assertEqual(null); @@ -173,12 +175,17 @@ export default function ActsAccountErrPermission() { console.debug("====>getAllAccounts 0600 start===="); try{ var data = await appAccountManager.getAllAccounts(); + expect(data.length).assertEqual(1); + expect(data[0].name).assertEqual("accessibleAccount_promise_nopermission"); + expect(data[0].owner).assertEqual("com.example.actsaccountoperatetest"); + console.debug("====>getAllAccounts 0600 err:" + JSON.stringify(data)); + await appAccountManager.removeAccount("accessibleAccount_promise_nopermission"); + console.debug("====>ActsAccountErrPermission_0600 end===="); + done(); } catch(err){ console.debug("====>getAllAccounts 0600 err:" + JSON.stringify(err)); - expect(err.code).assertEqual(ERR_PERMISSION_DENIED); - await appAccountManager.removeAccount("accessibleAccount_promise_nopermission"); - console.debug("====>ActsAccountErrPermission_0600 end===="); + expect().assertFail(); done(); } }); diff --git a/account/appaccount/actsgetaccountsbyowner/signature/openharmony_sx.p7b b/account/appaccount/actsgetaccountsbyowner/signature/openharmony_sx.p7b index 553007892ad39b5d49ea181aa00b85aab944c09d..d1437ed06379a13d408074b041ec6a1f3f52563c 100644 Binary files a/account/appaccount/actsgetaccountsbyowner/signature/openharmony_sx.p7b and b/account/appaccount/actsgetaccountsbyowner/signature/openharmony_sx.p7b differ diff --git a/account/appaccount/actsgetaccountsbyowner/src/main/config.json b/account/appaccount/actsgetaccountsbyowner/src/main/config.json index 5901a7d3cfd71f8cbe003a9cb283e98ba29272fe..db08a4e4413d46aae1d37af62679c0d55df58d2c 100644 --- a/account/appaccount/actsgetaccountsbyowner/src/main/config.json +++ b/account/appaccount/actsgetaccountsbyowner/src/main/config.json @@ -28,17 +28,8 @@ "moduleType": "entry" }, "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } ], "reqPermissions": [ - { - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", - "reason": "ceshi" - }, { "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" diff --git a/account/appaccount/actsgetallaccounts/signature/openharmony_sx.p7b b/account/appaccount/actsgetallaccounts/signature/openharmony_sx.p7b index 3adbe74ee3fd1bc4a2d6636706c19e588ca1a56a..f145018483e3e0ce03a42476ec30753efa392b5b 100644 Binary files a/account/appaccount/actsgetallaccounts/signature/openharmony_sx.p7b and b/account/appaccount/actsgetallaccounts/signature/openharmony_sx.p7b differ diff --git a/account/appaccount/actsgetallaccounts/src/main/config.json b/account/appaccount/actsgetallaccounts/src/main/config.json index 27f57d21d5e08b12c633523edf2e5c3bd8ead007..2603deedaef934df442d4c2f7a7ef370eb1ac115 100644 --- a/account/appaccount/actsgetallaccounts/src/main/config.json +++ b/account/appaccount/actsgetallaccounts/src/main/config.json @@ -29,17 +29,8 @@ "moduleType": "entry" }, "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } ], "reqPermissions": [ - { - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", - "reason": "ceshi" - }, { "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" diff --git a/account/appaccount/actsgetallaccounts/src/main/js/test/Getallaccounts.test.js b/account/appaccount/actsgetallaccounts/src/main/js/test/Getallaccounts.test.js index 91baf102fe97f044d616678f4b4dd930e21d6106..7e47ae73126f9ff9fe74b144cf0d08efd3c6124e 100755 --- a/account/appaccount/actsgetallaccounts/src/main/js/test/Getallaccounts.test.js +++ b/account/appaccount/actsgetallaccounts/src/main/js/test/Getallaccounts.test.js @@ -346,89 +346,6 @@ export default function ActsGetAllAccounts() { }, TIMEOUT); }); - /* - * @tc.number : ActsGetAllAccounts_1100 - * @tc.name : getAllAccounts callback - * @tc.desc : This application adds an account, and after other applications authorize an account to this - * application, this application obtains the information of its own application - */ - it('ActsGetAllAccounts_1100', 0, async function (done) { - console.debug("====>ActsGetAllAccounts_0900 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - var specifiedBundle = "com.example.actsscenegetallaccounts"; - console.debug("====>startAbility 1100 start===="); - await featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.example.actsscenegetallaccounts", - abilityName: "com.example.actsscenegetallaccounts.MainAbility", - action: "action1", - parameters: - {}, - }, - }, - ); - function getAllCallback(err, data){ - console.debug("====>getAllAccounts 1100 err:" + JSON.stringify(err)); - console.debug("====>getAllAccounts 1100 data:" + JSON.stringify(data)); - expect(err).assertEqual(null); - expect(data[0].name).assertEqual("account_name_scene_single"); - expect(data[0].owner).assertEqual("com.example.actsscenegetallaccounts"); - console.debug("====>ActsGetAllAccounts_1100 end===="); - done(); - } - setTimeout(async function(){ - console.debug("====>getAllAccounts 1100 start===="); - appAccountManager.getAllAccounts(specifiedBundle, getAllCallback); - }, TIMEOUT); - }); - - /* - * @tc.number : ActsGetAllAccounts_1200 - * @tc.name : getAllAccounts promise - * @tc.desc : This application adds an account, and after other applications authorize an account to this - * application, this application obtains the information of its own application - */ - it('ActsGetAllAccounts_1200', 0, async function (done) { - console.debug("====>ActsGetAllAccounts_1200 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - var specifiedBundle = "com.example.actsscenegetallaccounts"; - console.debug("====>startAbility 1200 start===="); - await featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.example.actsscenegetallaccounts", - abilityName: "com.example.actsscenegetallaccounts.MainAbility", - action: "action1", - parameters: - {}, - }, - }, - ); - setTimeout(async function(){ - console.debug("====>getAllAccounts 1200 start===="); - try{ - var data = await appAccountManager.getAllAccounts(specifiedBundle); - } - catch(err){ - console.error("====>getAllAccounts 1200 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccounts 1200 data:" + JSON.stringify(data)); - expect(data[0].name).assertEqual("account_name_scene_single"); - expect(data[0].owner).assertEqual("com.example.actsscenegetallaccounts"); - console.debug("====>ActsGetAllAccounts_1200 end===="); - done(); - }, TIMEOUT); - }); - /* * @tc.number : ActsGetAllAccounts_1300 * @tc.name : getAllAccounts callback diff --git a/account/appaccount/getallaccessibleaccounts/BUILD.gn b/account/appaccount/getallaccessibleaccounts/BUILD.gn deleted file mode 100644 index c01b1aade2fc4abafb8b8df047bb33612bcc81d2..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/BUILD.gn +++ /dev/null @@ -1,24 +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") - -group("accessibleaccounts") { - testonly = true - if (is_standard_system) { - deps = [ - "actsgetallaccessibleaccounts:ActsGetAllAccessibleAccountsTest", - "actsgetallaccessiblemultiple:ActsGetAllAccessibleMultipleTest", - ] - } -} diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/BUILD.gn b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/BUILD.gn deleted file mode 100644 index 0e675e89eedb5a2ba7aa72ccf5a07ac2dee8595f..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/BUILD.gn +++ /dev/null @@ -1,36 +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("ActsGetAllAccessibleAccountsTest") { - hap_profile = "./src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsGetAllAccessibleAccountsTest" - subsystem_name = "account" - part_name = "os_account" -} -ohos_js_assets("hjs_demo_js_assets") { - js2abc = true - hap_profile = "./src/main/config.json" - source_dir = "./src/main/js" -} - -ohos_resources("hjs_demo_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/Test.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/Test.json deleted file mode 100644 index 6fb55ad4a9239f9da111387d444d334aaa30c26e..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/Test.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "60000", - "bundle-name": "com.example.actsgetallaccessibleaccounts", - "package-name": "com.example.actsgetallaccessibleaccounts", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsGetAllAccessibleAccountsTest.hap", - "ActsAccountSceneAccessible.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/signature/openharmony_sx.p7b b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/signature/openharmony_sx.p7b deleted file mode 100644 index 4335d797121fce11289bd14d5b12ef96b28e6f98..0000000000000000000000000000000000000000 Binary files a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/signature/openharmony_sx.p7b and /dev/null differ diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/config.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/config.json deleted file mode 100644 index 6225796cbad87689878a75c1351d765381ef95fb..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/config.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "app": { - "bundleName": "com.example.actsgetallaccessibleaccounts", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.actsgetallaccessibleaccounts", - "name": ".entry", - "mainAbility": ".MainAbility", - "srcPath":"", - "deviceType": [ - "tablet", - "default", - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } - ], - "reqPermissions": [ - { - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", - "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" - ] - } - ], - "orientation": "unspecified", - "formsEnabled": false, - "name": ".MainAbility", - "srcLanguage": "js", - "srcPath": "MainAbility", - "icon": "$media:icon", - "description": "$string:MainAbility_desc", - "label": "$string:MainAbility_label", - "type": "page", - "visible": true, - "launchType": "standard" - }, - { - "orientation": "unspecified", - "formsEnabled": false, - "name": ".TestAbility", - "srcLanguage": "js", - "srcPath": "TestAbility", - "icon": "$media:icon", - "description": "$string:TestAbility_desc", - "label": "$string:TestAbility_label", - "type": "page", - "visible": true, - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - }, - { - "pages": [ - "pages/index/index" - ], - "name": ".TestAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ], - "testRunner": { - "name": "OpenHarmonyTestRunner", - "srcPath": "TestRunner" - } - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/app.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/app.js deleted file mode 100755 index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/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/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/i18n/en-US.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/i18n/en-US.json deleted file mode 100755 index e63c70d978a3a53be988388c87182f81785e170c..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/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/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/i18n/zh-CN.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/i18n/zh-CN.json deleted file mode 100755 index de6ee5748322f44942c1b003319d8e66c837675f..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.css b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.css deleted file mode 100644 index 2334ecfa2c147f276998e82e2c35f62800cfb031..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.css +++ /dev/null @@ -1,24 +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. - */ - -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.hml b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.hml deleted file mode 100644 index 58fdc144440ca578003fa3982fb8d0029cc2cdc7..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.hml +++ /dev/null @@ -1,19 +0,0 @@ - -
- - {{title}} - -
diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.js deleted file mode 100755 index 7ffbf87eadfca5fc7efc9873d5d6875ac40d68b2..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/MainAbility/pages/index/index.js +++ /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. - */ - -const injectRef = Object.getPrototypeOf(global) || global -injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') - -export default { - data: { - title: "getAllAccessibleAccounts" - }, - onInit() { - this.title = "getAllAccessibleAccounts"; - }, - onShow() { - console.info('onShow finish') - }, - onReady() { - }, -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/app.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/app.js deleted file mode 100644 index cdc31f3dcf031e2f6a7665d9653e53bb649e21c5..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/app.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -import { Hypium } from '@ohos/hypium' -import testsuite from '../test/List.test' - -export default { - onCreate() { - console.info('TestApplication onCreate') - var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - console.info('start run testcase!!!') - Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) - }, - onDestroy() { - console.info("TestApplication onDestroy"); - } -}; diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/i18n/en-US.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/i18n/en-US.json deleted file mode 100644 index 3cb24b374b1d919ca8eac0638f361692b603a900..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/i18n/en-US.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - }, - "Files": { - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/i18n/zh-CN.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/i18n/zh-CN.json deleted file mode 100644 index c804e32c0c3103929baca5617cdac70be11fdba1..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/i18n/zh-CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - }, - "Files": { - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.css b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.css deleted file mode 100644 index 1ba8e4e82ace01dad36c1279ea520b4903c57e8f..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.css +++ /dev/null @@ -1,37 +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. - */ - -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} - - -@media screen and (device-type: phone) and (orientation: landscape) { - .title { - font-size: 60px; - } -} - -@media screen and (device-type: tablet) and (orientation: landscape) { - .title { - font-size: 100px; - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.hml b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.hml deleted file mode 100644 index 61ea59d936e5a2971f1ea3d179c44a7f3f596c54..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.hml +++ /dev/null @@ -1,21 +0,0 @@ - - -
- - {{ $t('strings.hello') }} {{title}} - - -
diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.js deleted file mode 100644 index 88b083a7f6b979019d6a2c5ad20b19c5fd43286b..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestAbility/pages/index/index.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ - -export default { - data: { - title: "" - }, - onInit() { - this.title = this.$t('strings.world'); - } -} - - - diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestRunner/OpenHarmonyTestRunner.js deleted file mode 100644 index c5fa8620ca77d381f20b65a903b833e6e3378c97..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/TestRunner/OpenHarmonyTestRunner.js +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s itName', - '-s level', '-s testType', '-s size', '-s timeout', - '-s package', '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams += ' ' + key + ' ' + parameters[key] - } - } - return targetParams.trim() -} - - export default { - onPrepare() { - console.info('OpenHarmonyTestRunner OnPrepare') - }, - onRun() { - console.log('OpenHarmonyTestRunner onRun run') - var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - - var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility' - - var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters["-D"] - console.info('debug value : '+debug) - if (debug == 'true') - { - cmd += ' -D' - } - console.info('cmd : '+cmd) - abilityDelegator.executeShellCommand(cmd, (err, data) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + data.stdResult); - console.info('executeShellCommand : data : ' + data.exitCode); - }) - } -}; diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/test/Getallaccessible.test.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/test/Getallaccessible.test.js deleted file mode 100755 index ec513b765a8112e038830c5ec8e76267096dc7e6..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/test/Getallaccessible.test.js +++ /dev/null @@ -1,603 +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 account from '@ohos.account.appAccount' -import featureAbility from '@ohos.ability.featureAbility' -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' - -const TIMEOUT = 2000; -export default function ActsGetAllAccessibleAccounts() { - describe('ActsGetAllAccessibleAccounts', function () { - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0100 - * @tc.name : getAllAccessibleAccounts callback - * @tc.desc : This application has not added an account and has not been authorized by other applications to - * obtain authorization - */ - it('ActsGetAllAccessibleAccounts_0100', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0100 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - appAccountManager.getAllAccessibleAccounts((err, data)=>{ - console.debug("====>getAllAccessibleAccounts 0100 err:" + JSON.stringify(err)); - console.debug("====>getAllAccessibleAccounts 0100 data:" + JSON.stringify(data)); - console.debug("====>getAllAccessibleAccounts 0100 data.length:" + data.length); - expect(err).assertEqual(null); - expect(data.length).assertEqual(0); - console.debug("====>ActsGetAllAccessibleAccounts_0100 end===="); - done(); - }); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0200 - * @tc.name : getAllAccessibleAccounts promise - * @tc.desc : This application has not added an account and has not been authorized by other applications to - * obtain authorization - */ - it('ActsGetAllAccessibleAccounts_0200', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0200 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - console.debug("====>getAllAccessibleAccounts 0300 start===="); - try{ - var data = await appAccountManager.getAllAccessibleAccounts(); - } - catch(err){ - console.error("====>getAllAccessibleAccounts 0200 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts 0200 data:" + JSON.stringify(data)); - console.debug("====>getAllAccessibleAccounts 0200 data.length:" + data.length); - expect(data.length).assertEqual(0); - console.debug("====>ActsGetAllAccessibleAccounts_0200 end===="); - done(); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0300 - * @tc.name : getAllAccessibleAccounts callback - * @tc.desc : This application gets authorization after adding a single account - */ - it('ActsGetAllAccessibleAccounts_0300', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0300 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - appAccountManager.addAccount("accessibleAccount_callback_single", (err)=>{ - console.debug("====> add account ActsGetAllAccessibleAccounts_0300 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.getAllAccessibleAccounts((err, data)=>{ - console.debug("====>getAllAccessibleAccounts 0300 err:" + JSON.stringify(err)); - console.debug("====>getAllAccessibleAccounts 0300 data:" + JSON.stringify(data)); - console.debug("====>getAllAccessibleAccounts 0300 data.length:" + data.length); - expect(err).assertEqual(null); - expect(data.length).assertEqual(1); - try{ - expect(data[0].name).assertEqual("accessibleAccount_callback_single"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>getAllAccessibleAccounts check data 0300 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - appAccountManager.deleteAccount("accessibleAccount_callback_single", (err)=>{ - console.debug("====>delete Account ActsGetAllAccessibleAccounts_0300 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - console.debug("====>ActsGetAllAccessibleAccounts_0300 end===="); - done(); - }) - }); - }); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0400 - * @tc.name : getAllAccessibleAccounts promise - * @tc.desc : This application gets authorization after adding a single account - */ - it('ActsGetAllAccessibleAccounts_0400', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0400 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - var selfBundle = "com.example.actsgetallaccessibleaccounts"; - console.debug("====>getAllAccounts for clean===="); - try{ - var acclist = await appAccountManager.getAllAccounts(selfBundle); - } - catch(err){ - console.error("====>getAllAccounts err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>account list length: " + acclist.length); - if(acclist.length > 0){ - for(var i = 0;i < acclist.length; i++){ - await appAccountManager.deleteAccount(acclist[i].name); - } - } - console.debug("====>add account ActsGetAllAccessibleAccounts_0400 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_single"); - console.debug("====>getAllAccessibleAccounts 0400 start===="); - try{ - var data = await appAccountManager.getAllAccessibleAccounts(); - } - catch(err){ - console.error("====>getAllAccessibleAccounts 0400 err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts 0400 data:" + JSON.stringify(data)); - console.debug("====>getAllAccessibleAccounts 0400 data.length:" + data.length); - try{ - expect(data[0].name).assertEqual("accessibleAccount_promise_single"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>getAllAccessibleAccounts check data 0400 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - await appAccountManager.deleteAccount("accessibleAccount_promise_single"); - console.debug("====>ActsGetAllAccessibleAccounts_0400 end===="); - done(); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0500 - * @tc.name : getAllAccessibleAccounts callback - * @tc.desc : This application is added to obtain authorization after adding multiple application accounts - */ - it('ActsGetAllAccessibleAccounts_0500', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0500 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - appAccountManager.addAccount("accessibleAccount_callback_first", (err)=>{ - console.debug("====>add account first time 0500 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.addAccount("accessibleAccount_callback_second", (err)=>{ - console.debug("====>add account second time 0500 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.addAccount("accessibleAccount_callback_third", (err)=>{ - console.debug("====>add account third time 0500 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.getAllAccessibleAccounts((err, data)=>{ - console.debug("====>getAllAccessibleAccounts 0500 err:" + JSON.stringify(err)); - console.debug("====>getAllAccessibleAccounts 0500 data:" + JSON.stringify(data)); - console.debug("====>getAllAccessibleAccounts 0500 data.length:" + data.length); - expect(err).assertEqual(null); - expect(data.length).assertEqual(3); - try{ - expect(data[0].name).assertEqual("accessibleAccount_callback_first"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[1].name).assertEqual("accessibleAccount_callback_second"); - expect(data[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[2].name).assertEqual("accessibleAccount_callback_third"); - expect(data[2].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check data 0500 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - appAccountManager.deleteAccount("accessibleAccount_callback_first", (err)=>{ - console.debug("====>delete Account first 0500 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.deleteAccount("accessibleAccount_callback_second", (err)=>{ - console.debug("====>delete Account second 0500 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.deleteAccount("accessibleAccount_callback_third", (err)=>{ - console.debug("====>delete Account third 0500 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - console.debug("====>ActsGetAllAccessibleAccounts_0500 end===="); - done(); - }) - }) - }) - }); - }) - }) - }); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0600 - * @tc.name : getAllAccessibleAccounts promise - * @tc.desc : This application is added to obtain authorization after adding multiple application accounts - */ - it('ActsGetAllAccessibleAccounts_0600', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0600 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - console.debug("====>getAllAccounts for clean===="); - var selfBundle = "com.example.actsgetallaccessibleaccounts"; - try{ - var acclist = await appAccountManager.getAllAccounts(selfBundle); - } - catch(err){ - console.error("====>getAllAccounts err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>account list length: " + acclist.length); - if(acclist.length > 0){ - for(var i = 0;i < acclist.length; i++){ - await appAccountManager.deleteAccount(acclist[i].name); - } - } - console.debug("====>add first account 0600 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_first"); - console.debug("====>add second account 0600 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_second"); - console.debug("====>add third account 0600 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_third"); - try{ - var data = await appAccountManager.getAllAccessibleAccounts(); - } - catch(err){ - console.error("====>getAllAccessibleAccounts 0600 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts 0600 data:" + JSON.stringify(data)); - expect(data.length).assertEqual(3); - try{ - expect(data[0].name).assertEqual("accessibleAccount_promise_first"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[1].name).assertEqual("accessibleAccount_promise_second"); - expect(data[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[2].name).assertEqual("accessibleAccount_promise_third"); - expect(data[2].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check data 0600 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>delete first account 0600 start===="); - await appAccountManager.deleteAccount("accessibleAccount_promise_first"); - console.debug("====>delete second account 0600 start===="); - await appAccountManager.deleteAccount("accessibleAccount_promise_second"); - console.debug("====>delete third account 0600 start===="); - await appAccountManager.deleteAccount("accessibleAccount_promise_third"); - console.debug("====>ActsGetAllAccessibleAccounts_0600 end===="); - done(); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0700 - * @tc.name : getAllAccessibleAccounts callback - * @tc.desc : This application adds different application accounts three times in a row, and obtains - * authorization after deleting the account added for the second time - */ - it('ActsGetAllAccessibleAccounts_0700', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0700 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - appAccountManager.addAccount("accessibleAccount_callback_delete_first", (err)=>{ - console.debug("====>add first account 0700 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.addAccount("accessibleAccount_callback_delete_second", (err)=>{ - console.debug("====>add second account 0700 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.addAccount("accessibleAccount_callback_delete_third", (err)=>{ - console.debug("====>add third account 0700 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.deleteAccount("accessibleAccount_callback_delete_second", (err)=>{ - console.debug("====>delete second account 0700 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.getAllAccessibleAccounts((err, data)=>{ - console.debug("====>getAllAccessibleAccounts 0700 err:" + JSON.stringify(err)); - console.debug("====>getAllAccessibleAccounts 0700 data:" + JSON.stringify(data)); - console.debug("====>getAllAccessibleAccounts 0700 data.length:" + data.length); - expect(err).assertEqual(null); - expect(data.length).assertEqual(2); - try{ - expect(data[0].name).assertEqual("accessibleAccount_callback_delete_first"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[1].name).assertEqual("accessibleAccount_callback_delete_third"); - expect(data[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check data 0700 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - appAccountManager.deleteAccount("accessibleAccount_callback_delete_first", (err)=>{ - console.debug("====>delete first account 0700 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.deleteAccount("accessibleAccount_callback_delete_third", (err)=>{ - console.debug("====>delete third account 0700 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - console.debug("====>ActsGetAllAccessibleAccounts_0700 end===="); - done(); - }) - }) - }); - }) - }) - }) - }); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0800 - * @tc.name : getAllAccessibleAccounts promise - * @tc.desc : This application adds different application accounts three times in a row, and obtains - * authorization after deleting the account added for the second time - */ - it('ActsGetAllAccessibleAccounts_0800', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0800 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - console.debug("====>getAllAccounts for clean===="); - var selfBundle = "com.example.actsgetallaccessibleaccounts"; - try{ - var acclist = await appAccountManager.getAllAccounts(selfBundle); - } - catch(err){ - console.error("====>getAllAccounts err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>account list length: " + acclist.length); - if(acclist.length > 0){ - for(var i = 0;i < acclist.length; i++){ - await appAccountManager.deleteAccount(acclist[i].name); - } - } - console.debug("====>add first account 0800 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_first"); - console.debug("====>add second account 0800 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_second"); - console.debug("====>add third account 0800 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_third"); - console.debug("====>delete second account 0800 start===="); - await appAccountManager.deleteAccount("accessibleAccount_promise_second"); - try{ - var data = await appAccountManager.getAllAccessibleAccounts(); - } - catch(err){ - console.error("====>getAllAccessibleAccounts 0800 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts 0800 data:" + JSON.stringify(data)); - expect(data.length).assertEqual(2); - try{ - expect(data[0].name).assertEqual("accessibleAccount_promise_first"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[1].name).assertEqual("accessibleAccount_promise_third"); - expect(data[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check data 0800 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>delete first account 0800 start===="); - await appAccountManager.deleteAccount("accessibleAccount_promise_first"); - console.debug("====>delete third account 0800 start===="); - await appAccountManager.deleteAccount("accessibleAccount_promise_third"); - console.debug("====>ActsGetAllAccessibleAccounts_0800 end===="); - done(); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_0900 - * @tc.name : getAllAccessibleAccounts callback - * @tc.desc : This application adds different application accounts three times in a row, and then obtains - * authorization multiple times - */ - it('ActsGetAllAccessibleAccounts_0900', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_0900 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - appAccountManager.addAccount("accessibleAccount_callback_multiple_first", (err)=>{ - console.debug("====>add first account 0900 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.addAccount("accessibleAccount_callback_multiple_second", (err)=>{ - console.debug("====>add third account 0900 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.getAllAccessibleAccounts((err, data)=>{ - console.debug("====>getAllAccessibleAccounts first 0900 err:" + JSON.stringify(err)); - console.debug("====>getAllAccessibleAccounts first 0900 data:" + JSON.stringify(data)); - console.debug("====>getAllAccessibleAccounts first 0900 data.length:" + data.length); - expect(err).assertEqual(null); - expect(data.length).assertEqual(2); - try{ - expect(data[0].name).assertEqual("accessibleAccount_callback_multiple_first"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[1].name).assertEqual("accessibleAccount_callback_multiple_second"); - expect(data[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check data first 0900 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - appAccountManager.getAllAccessibleAccounts((err, data)=>{ - console.debug("====>getAllAccessibleAccounts second 0900 err:" + JSON.stringify(err)); - console.debug("====>getAllAccessibleAccounts second 0900 data:" + JSON.stringify(data)); - console.debug("====>getAllAccessibleAccounts second 0900 data.length:" + data.length); - expect(err).assertEqual(null); - expect(data.length).assertEqual(2); - try{ - expect(data[0].name).assertEqual("accessibleAccount_callback_multiple_first"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[1].name).assertEqual("accessibleAccount_callback_multiple_second"); - expect(data[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check data second 0900 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - appAccountManager.deleteAccount("accessibleAccount_callback_multiple_first", (err)=>{ - console.debug("====>delete first account 0900 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - appAccountManager.deleteAccount("accessibleAccount_callback_multiple_second", (err)=>{ - console.debug("====>delete second account 0900 err:" + JSON.stringify(err)); - expect(err).assertEqual(null); - console.debug("====>ActsGetAllAccessibleAccounts_0900 end===="); - done(); - }) - }) - }) - }) - }) - }); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_1000 - * @tc.name : getAllAccessibleAccounts promise - * @tc.desc : This application adds different application accounts three times in a row, and then obtains - * authorization multiple times - */ - it('ActsGetAllAccessibleAccounts_1000', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_1000 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - console.debug("====>getAllAccounts for clean===="); - var selfBundle = "com.example.actsgetallaccessibleaccounts"; - try{ - var acclist = await appAccountManager.getAllAccounts(selfBundle); - } - catch(err){ - console.error("====>getAllAccounts err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>account list length: " + acclist.length); - if(acclist.length > 0){ - for(var i = 0;i < acclist.length; i++){ - await appAccountManager.deleteAccount(acclist[i].name); - } - } - console.debug("====>add first account 1000 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_multiple_first"); - console.debug("====>add second account 1000 start===="); - await appAccountManager.addAccount("accessibleAccount_promise_multiple_second"); - console.debug("====>getAllAccessibleAccounts first 1000 start===="); - try{ - var data = await appAccountManager.getAllAccessibleAccounts(); - } - catch(err){ - console.error("====>getAllAccessibleAccounts first 1000 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts 1000 data:" + JSON.stringify(data)); - expect(data.length).assertEqual(2); - try{ - expect(data[0].name).assertEqual("accessibleAccount_promise_multiple_first"); - expect(data[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(data[1].name).assertEqual("accessibleAccount_promise_multiple_second"); - expect(data[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check data 1000 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts second 1000 start===="); - try{ - var dataTwo = await appAccountManager.getAllAccessibleAccounts(); - } - catch(err){ - console.error("====>getAllAccessibleAccounts second 1000 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts 1000 dataTwo:" + JSON.stringify(dataTwo)); - expect(data.length).assertEqual(2); - try{ - expect(dataTwo[0].name).assertEqual("accessibleAccount_promise_multiple_first"); - expect(dataTwo[0].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - expect(dataTwo[1].name).assertEqual("accessibleAccount_promise_multiple_second"); - expect(dataTwo[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check dataTwo 1000 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>delete first account 1000 start===="); - await appAccountManager.deleteAccount("accessibleAccount_promise_multiple_first"); - console.debug("====>delete second account 1000 start===="); - await appAccountManager.deleteAccount("accessibleAccount_promise_multiple_second"); - console.debug("====>ActsGetAllAccessibleAccounts_1000 end===="); - done(); - }); - - /* - * @tc.number : ActsGetAllAccessibleAccounts_1100 - * @tc.name : getAllAccessibleAccounts - * @tc.desc : This application adds an account, other application authorizes an account to this application - * and this application obtains authorization - */ - it('ActsGetAllAccessibleAccounts_1100', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleAccounts_1100 start===="); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - console.debug("====>add account 1100 start===="); - await appAccountManager.addAccount("accessibleAccount_this_application"); - console.debug("====>startAbility 1100 start===="); - await featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.example.actsaccountsceneaccessible", - abilityName: "com.example.actsaccountsceneaccessible.MainAbility", - action: "action1", - parameters: - {}, - }, - }, - ); - setTimeout(async function(){ - console.debug("====>getAllAccessibleAccounts 1100 start===="); - try{ - var data = await appAccountManager.getAllAccessibleAccounts(); - } - catch(err){ - console.error("====>getAllAccessibleAccounts 1100 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts 1100 data:" + JSON.stringify(data)); - expect(data.length).assertEqual(2); - try{ - expect(data[0].name).assertEqual("account_name_scene_single"); - expect(data[0].owner).assertEqual("com.example.actsaccountsceneaccessible"); - expect(data[1].name).assertEqual("accessibleAccount_this_application"); - expect(data[1].owner).assertEqual("com.example.actsgetallaccessibleaccounts"); - } - catch(err){ - console.error("====>check data 1100 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>delete account 1100 start===="); - await appAccountManager.deleteAccount("accessibleAccount_this_application"); - console.debug("====>ActsGetAllAccessibleAccounts_1100 end===="); - done(); - }, TIMEOUT); - }); - }) -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/test/List.test.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/test/List.test.js deleted file mode 100755 index 31116b121a79588c735cfdbb13140ca9a17bdece..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/test/List.test.js +++ /dev/null @@ -1,19 +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 ActsGetAllAccessibleAccounts from './Getallaccessible.test.js' - -export default function testsuite() { - ActsGetAllAccessibleAccounts() -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/resources/base/element/string.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/resources/base/element/string.json deleted file mode 100755 index b8c402107250a58e8ea8b91a03c84ad0c91af068..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/resources/base/element/string.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "ActsGetAllAccessibleAccounts" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "MainAbility_desc", - "value": "description" - }, - { - "name": "MainAbility_label", - "value": "label" - }, - { - "name": "TestAbility_desc", - "value": "description" - }, - { - "name": "TestAbility_label", - "value": "label" - } - ] -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/resources/base/media/icon.png b/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/resources/base/media/icon.png deleted file mode 100755 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/BUILD.gn b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/BUILD.gn deleted file mode 100644 index 28a22291c3e812e4d4ecf98af23d5e54d9812d4a..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/BUILD.gn +++ /dev/null @@ -1,36 +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("ActsGetAllAccessibleMultipleTest") { - hap_profile = "./src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsGetAllAccessibleMultipleTest" - subsystem_name = "account" - part_name = "os_account" -} -ohos_js_assets("hjs_demo_js_assets") { - js2abc = true - hap_profile = "./src/main/config.json" - source_dir = "./src/main/js" -} - -ohos_resources("hjs_demo_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/Test.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/Test.json deleted file mode 100644 index 1e685b5a2ec82b7b232bd44cf24374c85940e20e..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/Test.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "60000", - "bundle-name": "com.example.actsgetallaccessiblemultiple", - "package-name": "com.example.actsgetallaccessiblemultiple", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsGetAllAccessibleMultipleTest.hap", - "ActsAccountAccessibleFirst.hap", - "ActsAccountAccessibleSecond.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/signature/openharmony_sx.p7b b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/signature/openharmony_sx.p7b deleted file mode 100644 index 44061d690534b30141728c66b131edbbfc7d6d5d..0000000000000000000000000000000000000000 Binary files a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/signature/openharmony_sx.p7b and /dev/null differ diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/config.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/config.json deleted file mode 100644 index 5f51bc3da92558400a4d367f0ab0fb92212cf892..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/config.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "app": { - "bundleName": "com.example.actsgetallaccessiblemultiple", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.actsgetallaccessiblemultiple", - "name": ".entry", - "mainAbility": ".MainAbility", - "srcPath":"", - "deviceType": [ - "tablet", - "default", - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } - ], - "reqPermissions": [ - { - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", - "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" - ] - } - ], - "orientation": "unspecified", - "formsEnabled": false, - "name": ".MainAbility", - "srcLanguage": "js", - "srcPath": "MainAbility", - "icon": "$media:icon", - "description": "$string:MainAbility_desc", - "label": "$string:MainAbility_label", - "type": "page", - "visible": true, - "launchType": "standard" - }, - { - "orientation": "unspecified", - "formsEnabled": false, - "name": ".TestAbility", - "srcLanguage": "js", - "srcPath": "TestAbility", - "icon": "$media:icon", - "description": "$string:TestAbility_desc", - "label": "$string:TestAbility_label", - "type": "page", - "visible": true, - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - }, - { - "pages": [ - "pages/index/index" - ], - "name": ".TestAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ], - "testRunner": { - "name": "OpenHarmonyTestRunner", - "srcPath": "TestRunner" - } - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/app.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/app.js deleted file mode 100755 index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/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/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/i18n/en-US.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/i18n/en-US.json deleted file mode 100755 index e63c70d978a3a53be988388c87182f81785e170c..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/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/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/i18n/zh-CN.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/i18n/zh-CN.json deleted file mode 100755 index de6ee5748322f44942c1b003319d8e66c837675f..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.css b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.css deleted file mode 100644 index 2334ecfa2c147f276998e82e2c35f62800cfb031..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.css +++ /dev/null @@ -1,24 +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. - */ - -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.hml b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.hml deleted file mode 100644 index 58fdc144440ca578003fa3982fb8d0029cc2cdc7..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.hml +++ /dev/null @@ -1,19 +0,0 @@ - -
- - {{title}} - -
diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.js deleted file mode 100755 index c4ec231829b3b39bbd75ff2411792dd9f3a4bc6e..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/MainAbility/pages/index/index.js +++ /dev/null @@ -1,30 +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. - */ -const injectRef = Object.getPrototypeOf(global) || global -injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') - -export default { - data: { - title: "getAllAccessibleAccounts" - }, - onInit() { - this.title = "getAllAccessibleAccounts"; - }, - onShow() { - console.info('onShow finish') - }, - onReady() { - }, -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/app.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/app.js deleted file mode 100644 index cdc31f3dcf031e2f6a7665d9653e53bb649e21c5..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/app.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -import { Hypium } from '@ohos/hypium' -import testsuite from '../test/List.test' - -export default { - onCreate() { - console.info('TestApplication onCreate') - var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - console.info('start run testcase!!!') - Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) - }, - onDestroy() { - console.info("TestApplication onDestroy"); - } -}; diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/i18n/en-US.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/i18n/en-US.json deleted file mode 100644 index 3cb24b374b1d919ca8eac0638f361692b603a900..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/i18n/en-US.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - }, - "Files": { - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/i18n/zh-CN.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/i18n/zh-CN.json deleted file mode 100644 index c804e32c0c3103929baca5617cdac70be11fdba1..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/i18n/zh-CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - }, - "Files": { - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.css b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.css deleted file mode 100644 index 1ba8e4e82ace01dad36c1279ea520b4903c57e8f..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.css +++ /dev/null @@ -1,37 +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. - */ - -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} - - -@media screen and (device-type: phone) and (orientation: landscape) { - .title { - font-size: 60px; - } -} - -@media screen and (device-type: tablet) and (orientation: landscape) { - .title { - font-size: 100px; - } -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.hml b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.hml deleted file mode 100644 index 61ea59d936e5a2971f1ea3d179c44a7f3f596c54..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.hml +++ /dev/null @@ -1,21 +0,0 @@ - - -
- - {{ $t('strings.hello') }} {{title}} - - -
diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.js deleted file mode 100644 index 88b083a7f6b979019d6a2c5ad20b19c5fd43286b..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestAbility/pages/index/index.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ - -export default { - data: { - title: "" - }, - onInit() { - this.title = this.$t('strings.world'); - } -} - - - diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestRunner/OpenHarmonyTestRunner.js deleted file mode 100644 index c5fa8620ca77d381f20b65a903b833e6e3378c97..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/TestRunner/OpenHarmonyTestRunner.js +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s itName', - '-s level', '-s testType', '-s size', '-s timeout', - '-s package', '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams += ' ' + key + ' ' + parameters[key] - } - } - return targetParams.trim() -} - - export default { - onPrepare() { - console.info('OpenHarmonyTestRunner OnPrepare') - }, - onRun() { - console.log('OpenHarmonyTestRunner onRun run') - var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - - var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility' - - var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters["-D"] - console.info('debug value : '+debug) - if (debug == 'true') - { - cmd += ' -D' - } - console.info('cmd : '+cmd) - abilityDelegator.executeShellCommand(cmd, (err, data) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + data.stdResult); - console.info('executeShellCommand : data : ' + data.exitCode); - }) - } -}; diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/test/Getmultiple.test.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/test/Getmultiple.test.js deleted file mode 100755 index 3f206507bbcd3123bbaebd4d70175cae60395326..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/test/Getmultiple.test.js +++ /dev/null @@ -1,130 +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 account from '@ohos.account.appAccount' -import featureAbility from '@ohos.ability.featureAbility' -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' - -const TIMEOUT = 5000; -export default function ActsGetAllAccessibleMultiple() { - describe('ActsGetAllAccessibleMultiple', function () { - beforeAll(async function (done) { - console.debug("====>startAbility first start===="); - await featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.example.actsaccountaccessiblefirst", - abilityName: "com.example.actsaccountaccessiblefirst.MainAbility", - action: "action1", - parameters: - {}, - }, - }, - ); - sleep(TIMEOUT); - done(); - }); - - function sleep(delay) { - var start = (new Date()).getTime(); - while((new Date()).getTime() - start < delay) { - continue; - } - } - - /* - * @tc.number : ActsGetAllAccessibleMultiple_0100 - * @tc.name : getAllAccessibleAccounts - * @tc.desc : This application adds multiple account, other applications authorizes multiple accounts to this - * application and this application obtains authorization - */ - it('ActsGetAllAccessibleMultiple_0100', 0, async function (done) { - console.debug("====>ActsGetAllAccessibleMultiple_0100 start===="); - let dataMap = new Map(); - var appAccountManager = account.createAppAccountManager(); - console.debug("====>creat finish===="); - console.debug("====>add first account 0100 start===="); - await appAccountManager.addAccount("accessibleAccount_this_application_first"); - console.debug("====>add second account 0100 start===="); - await appAccountManager.addAccount("accessibleAccount_this_application_second"); - console.debug("====>add third account 0100 start===="); - await appAccountManager.addAccount("accessibleAccount_this_application_third"); - console.debug("====>getAllAccessibleAccounts 0100 start===="); - try{ - var data = await appAccountManager.getAllAccessibleAccounts(); - } - catch(err){ - console.error("====>getAllAccessibleAccounts 0100 fail err:" + JSON.stringify(err)); - expect().assertFail(); - done(); - } - console.debug("====>getAllAccessibleAccounts 0100 data:" + JSON.stringify(data)); - expect(data.length).assertEqual(7); - console.debug("====>data.length:" + data.length); - for (let i = 0, len = data.length; i < len; i++) { - dataMap.set(data[i].name, data[i].owner) - } - expect(dataMap.has("account_name_scene_first_first")).assertTrue(); - if (dataMap.has("account_name_scene_first_first")) { - let data = dataMap.get("account_name_scene_first_first"); - console.debug("====>first account owner is: " + data); - expect(data).assertEqual("com.example.actsaccountaccessiblefirst"); - } - expect(dataMap.has("account_name_scene_first_second")).assertTrue(); - if (dataMap.has("account_name_scene_first_second")) { - let data = dataMap.get("account_name_scene_first_second"); - console.debug("====>second account owner is: " + data); - expect(data).assertEqual("com.example.actsaccountaccessiblefirst"); - } - expect(dataMap.has("account_name_scene_second_first")).assertTrue(); - if (dataMap.has("account_name_scene_second_first")) { - let data = dataMap.get("account_name_scene_second_first"); - console.debug("====>third account owner is: " + data); - expect(data).assertEqual("com.example.actsaccountaccessiblesecond"); - } - expect(dataMap.has("account_name_scene_second_second")).assertTrue(); - if (dataMap.has("account_name_scene_second_second")) { - let data = dataMap.get("account_name_scene_second_second"); - console.debug("====>fourth account owner is: " + data); - expect(data).assertEqual("com.example.actsaccountaccessiblesecond"); - } - expect(dataMap.has("accessibleAccount_this_application_first")).assertTrue(); - if (dataMap.has("accessibleAccount_this_application_first")) { - let data = dataMap.get("accessibleAccount_this_application_first"); - console.debug("====>fifth account owner is: " + data); - expect(data).assertEqual("com.example.actsgetallaccessiblemultiple"); - } - expect(dataMap.has("accessibleAccount_this_application_second")).assertTrue(); - if (dataMap.has("accessibleAccount_this_application_second")) { - let data = dataMap.get("accessibleAccount_this_application_second"); - console.debug("====>sixth account owner is: " + data); - expect(data).assertEqual("com.example.actsgetallaccessiblemultiple"); - } - expect(dataMap.has("accessibleAccount_this_application_third")).assertTrue(); - if (dataMap.has("accessibleAccount_this_application_third")) { - let data = dataMap.get("accessibleAccount_this_application_third"); - console.debug("====>seventh account owner is: " + data); - expect(data).assertEqual("com.example.actsgetallaccessiblemultiple"); - } - console.debug("====>delete account start===="); - await appAccountManager.deleteAccount("accessibleAccount_this_application_first"); - await appAccountManager.deleteAccount("accessibleAccount_this_application_second"); - await appAccountManager.deleteAccount("accessibleAccount_this_application_third"); - console.debug("====>ActsGetAllAccessibleAccounts_0100 end===="); - done(); - }); - }) -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/test/List.test.js b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/test/List.test.js deleted file mode 100755 index 8e3c24929372dae95f4df0aaed50f0b83bf6ab46..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/js/test/List.test.js +++ /dev/null @@ -1,19 +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 ActsGetAllAccessibleMultiple from './Getmultiple.test.js' - -export default function testsuite() { - ActsGetAllAccessibleMultiple() -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/resources/base/element/string.json b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/resources/base/element/string.json deleted file mode 100755 index e2244febf6ffbfb2333c2c3ac0b78ae972b2bf1f..0000000000000000000000000000000000000000 --- a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/resources/base/element/string.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "ActsGetAllAccessibleMultiple" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "MainAbility_desc", - "value": "description" - }, - { - "name": "MainAbility_label", - "value": "label" - }, - { - "name": "TestAbility_desc", - "value": "description" - }, - { - "name": "TestAbility_label", - "value": "label" - } - ] -} \ No newline at end of file diff --git a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/resources/base/media/icon.png b/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/resources/base/media/icon.png deleted file mode 100755 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/signature/openharmony_sx.p7b b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/signature/openharmony_sx.p7b index 812ab5c96ffe0524fff21f2027feaa481ee666ed..b430fe1c5703967e0138228b1f1ba5a62e5959bd 100644 Binary files a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/signature/openharmony_sx.p7b and b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/signature/openharmony_sx.p7b differ diff --git a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/src/main/config.json b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/src/main/config.json index 269a00c92a4b9c6a314feb4e8e769d07f2e5c549..9f5ab2d828aee50f24b720ef4fb3da67e7939dfe 100644 --- a/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/src/main/config.json +++ b/account/appaccount/getallaccounts/actsgetallaccountsnoparameter/src/main/config.json @@ -28,17 +28,8 @@ "moduleType": "entry" }, "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } ], "reqPermissions": [ - { - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", - "reason": "ceshi" - }, { "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" diff --git a/account/appaccount/getallaccounts/actsgetmultipleaccounts/signature/openharmony_sx.p7b b/account/appaccount/getallaccounts/actsgetmultipleaccounts/signature/openharmony_sx.p7b index e5e9f8257b1ce77e9ea2604576ebca542ba4800c..54b081f3fe294c0140a50db93f38ea0cbe067573 100644 Binary files a/account/appaccount/getallaccounts/actsgetmultipleaccounts/signature/openharmony_sx.p7b and b/account/appaccount/getallaccounts/actsgetmultipleaccounts/signature/openharmony_sx.p7b differ diff --git a/account/appaccount/getallaccounts/actsgetmultipleaccounts/src/main/config.json b/account/appaccount/getallaccounts/actsgetmultipleaccounts/src/main/config.json index e3b5ee38be94975904bc5d2726d981cba4a1f1e6..539a2667a1c8b1094053c89ce5895e5ecb1e406f 100644 --- a/account/appaccount/getallaccounts/actsgetmultipleaccounts/src/main/config.json +++ b/account/appaccount/getallaccounts/actsgetmultipleaccounts/src/main/config.json @@ -28,17 +28,8 @@ "moduleType": "entry" }, "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS" - } ], "reqPermissions": [ - { - "name": "ohos.permission.GET_ALL_APP_ACCOUNTS", - "reason": "ceshi" - }, { "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"