From 52ecd7a18d0122848982657d7bd147460bf88b41 Mon Sep 17 00:00:00 2001 From: jiyong_sd Date: Wed, 20 Jul 2022 19:01:07 +0800 Subject: [PATCH] Adapt to the new framework Signed-off-by: jiyong_sd Change-Id: Ib02c3d98f3fc0ae61be350de2c85596e98027168 --- .../ability_runtime/amsdatauriutils/BUILD.gn | 12 +- .../ability_runtime/amsdatauriutils/Test.json | 37 +- .../entry/src/main/config.json | 83 -- .../src/main/js/default/pages/index/index.js | 44 - .../js/resources/base/element/string.json | 12 - .../amsdatauriutils/src/main/config.json | 116 +++ .../main/js/MainAbility}/app.js | 44 +- .../src/main/js/MainAbility}/i18n/en-US.json | 10 +- .../src/main/js/MainAbility}/i18n/zh-CN.json | 10 +- .../js/MainAbility}/pages/index/index.css | 24 +- .../js/MainAbility}/pages/index/index.hml | 16 +- .../main/js/MainAbility/pages/index/index.js | 30 + .../src/main/js/TestAbility/app.js | 31 + .../src/main/js/TestAbility/i18n/en-US.json | 8 + .../src/main/js/TestAbility/i18n/zh-CN.json | 8 + .../main/js/TestAbility/pages/index/index.css | 30 + .../js/TestAbility}/pages/index/index.hml | 10 +- .../main/js/TestAbility/pages/index/index.js | 26 + .../js/TestRunner/OpenHarmonyTestRunner.js | 59 ++ .../src/main/js/test/DataUriUtilsJsSt.test.js | 740 +++++++-------- .../{entry => }/src/main/js/test/List.test.js | 33 +- .../main/resources/base/element/string.json | 28 + .../main}/resources/base/media/icon.png | Bin ability/ability_runtime/context/BUILD.gn | 2 +- .../context/actscontexttest/BUILD.gn | 63 +- .../context/actscontexttest/Test.json | 40 +- .../entry/src/main/config.json | 105 --- .../js/resources/base/element/string.json | 16 - .../actscontexttest/src/main/config.json | 138 +++ .../main/js/MainAbility}/app.js | 46 +- .../src/main/js/MainAbility}/i18n/en-US.json | 10 +- .../src/main/js/MainAbility}/i18n/zh-CN.json | 10 +- .../js/MainAbility}/pages/index/index.css | 18 +- .../main/js/MainAbility/pages/index/index.hml | 5 + .../main/js/MainAbility}/pages/index/index.js | 81 +- .../src/main/js/TestAbility/app.js | 31 + .../src/main/js/TestAbility/i18n/en-US.json | 8 + .../src/main/js/TestAbility/i18n/zh-CN.json | 8 + .../main/js/TestAbility/pages/index/index.css | 30 + .../main/js/TestAbility/pages/index/index.hml | 5 + .../main/js/TestAbility/pages/index/index.js | 26 + .../js/TestRunner/OpenHarmonyTestRunner.js | 59 ++ .../src/main/js/test/ContextJsunit.test.js | 850 +++++++++--------- .../{entry => }/src/main/js/test/List.test.js | 33 +- .../main/resources/base/element/string.json | 32 + .../main}/resources/base/media/icon.png | Bin .../context/scene/defpermission/BUILD.gn | 70 +- .../scene/defpermission/src/main/config.json | 186 ++-- .../defpermission/src/main/js/default/app.js | 46 +- .../src/main/js/default/i18n/en-US.json | 10 +- .../src/main/js/default/i18n/zh-CN.json | 10 +- .../src/main/js/default/pages/index/index.css | 18 +- .../src/main/js/default/pages/index/index.hml | 10 +- .../src/main/js/default/pages/index/index.js | 52 +- .../js/resources/base/element/string.json | 22 +- 55 files changed, 1935 insertions(+), 1516 deletions(-) delete mode 100644 ability/ability_runtime/amsdatauriutils/entry/src/main/config.json delete mode 100644 ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.js delete mode 100644 ability/ability_runtime/amsdatauriutils/entry/src/main/js/resources/base/element/string.json create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/config.json rename ability/ability_runtime/amsdatauriutils/{entry/src/main/js/default => src/main/js/MainAbility}/app.js (97%) rename ability/ability_runtime/{context/actscontexttest/entry/src/main/js/default => amsdatauriutils/src/main/js/MainAbility}/i18n/en-US.json (91%) rename ability/ability_runtime/{context/actscontexttest/entry/src/main/js/default => amsdatauriutils/src/main/js/MainAbility}/i18n/zh-CN.json (91%) rename ability/ability_runtime/amsdatauriutils/{entry/src/main/js/default => src/main/js/MainAbility}/pages/index/index.css (92%) rename ability/ability_runtime/amsdatauriutils/{entry/src/main/js/default => src/main/js/MainAbility}/pages/index/index.hml (95%) create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.js create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/app.js create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/i18n/en-US.json create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/i18n/zh-CN.json create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.css rename ability/ability_runtime/{context/actscontexttest/entry/src/main/js/default => amsdatauriutils/src/main/js/TestAbility}/pages/index/index.hml (95%) create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.js create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/js/TestRunner/OpenHarmonyTestRunner.js rename ability/ability_runtime/amsdatauriutils/{entry => }/src/main/js/test/DataUriUtilsJsSt.test.js (96%) rename ability/ability_runtime/amsdatauriutils/{entry => }/src/main/js/test/List.test.js (80%) create mode 100644 ability/ability_runtime/amsdatauriutils/src/main/resources/base/element/string.json rename ability/ability_runtime/amsdatauriutils/{entry/src/main/js => src/main}/resources/base/media/icon.png (100%) delete mode 100644 ability/ability_runtime/context/actscontexttest/entry/src/main/config.json delete mode 100644 ability/ability_runtime/context/actscontexttest/entry/src/main/js/resources/base/element/string.json create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/config.json rename ability/ability_runtime/context/actscontexttest/{entry/src/main/js/default => src/main/js/MainAbility}/app.js (97%) rename ability/ability_runtime/{amsdatauriutils/entry/src/main/js/default => context/actscontexttest/src/main/js/MainAbility}/i18n/en-US.json (91%) rename ability/ability_runtime/{amsdatauriutils/entry/src/main/js/default => context/actscontexttest/src/main/js/MainAbility}/i18n/zh-CN.json (91%) rename ability/ability_runtime/context/actscontexttest/{entry/src/main/js/default => src/main/js/MainAbility}/pages/index/index.css (93%) create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.hml rename ability/ability_runtime/context/actscontexttest/{entry/src/main/js/default => src/main/js/MainAbility}/pages/index/index.js (70%) create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/app.js create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/i18n/en-US.json create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/i18n/zh-CN.json create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.css create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.hml create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.js create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/js/TestRunner/OpenHarmonyTestRunner.js rename ability/ability_runtime/context/actscontexttest/{entry => }/src/main/js/test/ContextJsunit.test.js (97%) rename ability/ability_runtime/context/actscontexttest/{entry => }/src/main/js/test/List.test.js (82%) create mode 100644 ability/ability_runtime/context/actscontexttest/src/main/resources/base/element/string.json rename ability/ability_runtime/context/actscontexttest/{entry/src/main/js => src/main}/resources/base/media/icon.png (100%) diff --git a/ability/ability_runtime/amsdatauriutils/BUILD.gn b/ability/ability_runtime/amsdatauriutils/BUILD.gn index e3574feb5..334a3426e 100644 --- a/ability/ability_runtime/amsdatauriutils/BUILD.gn +++ b/ability/ability_runtime/amsdatauriutils/BUILD.gn @@ -9,12 +9,12 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsDataUriUtilsTest") { - hap_profile = "./entry/src/main/config.json" + hap_profile = "./src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", @@ -23,9 +23,11 @@ ohos_js_hap_suite("ActsAmsDataUriUtilsTest") { hap_name = "ActsAmsDataUriUtilsTest" } ohos_js_assets("hjs_demo_js_assets") { - source_dir = "./entry/src/main/js/default" + js2abc = true + hap_profile = "./src/main/config.json" + source_dir = "./src/main/js" } ohos_resources("hjs_demo_resources") { - sources = [ "./entry/src/main/js/resources" ] - hap_profile = "./entry/src/main/config.json" + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" } diff --git a/ability/ability_runtime/amsdatauriutils/Test.json b/ability/ability_runtime/amsdatauriutils/Test.json index 2bd73ea90..580f5a8fe 100644 --- a/ability/ability_runtime/amsdatauriutils/Test.json +++ b/ability/ability_runtime/amsdatauriutils/Test.json @@ -1,18 +1,19 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "180000", - "package": "com.amsst.amsdatauriutils", - "shell-timeout": "600000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAmsDataUriUtilsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "shell-timeout": "180000", + "bundle-name": "com.amsst.amsdatauriutils", + "package-name": "com.amsst.amsdatauriutils" + }, + "kits": [ + { + "test-file-name": [ + "ActsAmsDataUriUtilsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/entry/src/main/config.json b/ability/ability_runtime/amsdatauriutils/entry/src/main/config.json deleted file mode 100644 index b08056758..000000000 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/config.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "app": { - "bundleName": "com.amsst.amsdatauriutils", - "vendor": "amsst", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.amsst.amsdatauriutils", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.amsst.amsdatauriutils.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard", - "visible": true - } - ], - "reqPermissions": [ - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "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" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} diff --git a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.js b/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.js deleted file mode 100644 index efc8c58f3..000000000 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' - -export default { - data: { - title: '' - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('====onShow finish====<') - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - id: 'extend' - }) - const reportExtend = new ReportExtend(file) - core.addService('expect', expectExtend) - core.addService('report', reportExtend) - core.init() - const configService = core.getDefaultService('config') - configService.setConfig(this) - - require('../../../test/List.test') - core.execute() - }, - onReady() { - }, -} \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/resources/base/element/string.json b/ability/ability_runtime/amsdatauriutils/entry/src/main/js/resources/base/element/string.json deleted file mode 100644 index e2f89fdc4..000000000 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "DataUriUtils" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/src/main/config.json b/ability/ability_runtime/amsdatauriutils/src/main/config.json new file mode 100644 index 000000000..e84e34c95 --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/config.json @@ -0,0 +1,116 @@ +{ + "app": { + "bundleName": "com.amsst.amsdatauriutils", + "vendor": "amsst", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.amsst.amsdatauriutils", + "name": ".entry", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "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" + } + ], + "reqPermissions": [ + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "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" + } + ], + "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" + }, + "mainAbility": ".MainAbility", + "srcPath": "" + } +} \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/app.js b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/app.js similarity index 97% rename from ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/app.js rename to ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/app.js index c15844220..2a68c1992 100644 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/app.js +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/app.js @@ -1,22 +1,22 @@ -/* - * 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'); - } -}; +/* + * 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/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/i18n/en-US.json b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/i18n/en-US.json similarity index 91% rename from ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/i18n/en-US.json rename to ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/i18n/en-US.json index e63c70d97..a4c13dcbd 100644 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/i18n/en-US.json +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/i18n/en-US.json @@ -1,6 +1,6 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - } +{ + "strings": { + "hello": "Hello", + "world": "World" + } } \ No newline at end of file diff --git a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/i18n/zh-CN.json b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/i18n/zh-CN.json similarity index 91% rename from ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/i18n/zh-CN.json rename to ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/i18n/zh-CN.json index de6ee5748..b1c02368f 100644 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/i18n/zh-CN.json +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/i18n/zh-CN.json @@ -1,6 +1,6 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } +{ + "strings": { + "hello": "您好", + "world": "世界" + } } \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.css b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.css similarity index 92% rename from ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.css rename to ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.css index 76479895b..fa76e884e 100644 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.css +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.css @@ -1,13 +1,13 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} - -.titleST { - font-size: 32px; +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} + +.titleST { + font-size: 32px; } \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.hml b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.hml similarity index 95% rename from ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.hml rename to ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.hml index 9575ac642..20f58d345 100644 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/pages/index/index.hml +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.hml @@ -1,8 +1,8 @@ -
- - {{ $t('strings.hello') }} {{ title }} - - - STDataUriUtils - -
+
+ + {{ $t('strings.hello') }} {{ title }} + + + STDataUriUtils + +
diff --git a/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.js b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.js new file mode 100644 index 000000000..49022d9c0 --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/MainAbility/pages/index/index.js @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import file from '@system.file' + +export default { + data: { + title: '' + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('====onShow finish====<') + }, + onReady() { + }, +} \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/app.js b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/app.js new file mode 100644 index 000000000..cdc31f3dc --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/app.js @@ -0,0 +1,31 @@ +/* + * 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/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/i18n/en-US.json b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/i18n/en-US.json new file mode 100644 index 000000000..3cb24b374 --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/i18n/en-US.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + }, + "Files": { + } +} \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/i18n/zh-CN.json b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/i18n/zh-CN.json new file mode 100644 index 000000000..c804e32c0 --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/i18n/zh-CN.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + }, + "Files": { + } +} \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.css b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.css new file mode 100644 index 000000000..b1bcd4338 --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.css @@ -0,0 +1,30 @@ +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} + +@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/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.hml b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.hml similarity index 95% rename from ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.hml rename to ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.hml index f64b040a5..f629c71a9 100644 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.hml +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.hml @@ -1,5 +1,5 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
+
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.js b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.js new file mode 100644 index 000000000..88b083a7f --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/TestAbility/pages/index/index.js @@ -0,0 +1,26 @@ +/* + * 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/ability/ability_runtime/amsdatauriutils/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/ability/ability_runtime/amsdatauriutils/src/main/js/TestRunner/OpenHarmonyTestRunner.js new file mode 100644 index 000000000..c5fa8620c --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/TestRunner/OpenHarmonyTestRunner.js @@ -0,0 +1,59 @@ +/* + * 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/ability/ability_runtime/amsdatauriutils/entry/src/main/js/test/DataUriUtilsJsSt.test.js b/ability/ability_runtime/amsdatauriutils/src/main/js/test/DataUriUtilsJsSt.test.js similarity index 96% rename from ability/ability_runtime/amsdatauriutils/entry/src/main/js/test/DataUriUtilsJsSt.test.js rename to ability/ability_runtime/amsdatauriutils/src/main/js/test/DataUriUtilsJsSt.test.js index 15e823cc7..b449966cc 100644 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/test/DataUriUtilsJsSt.test.js +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/test/DataUriUtilsJsSt.test.js @@ -1,369 +1,371 @@ -/* - * 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 dataUriUtils from '@ohos.ability.dataUriUtils' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -describe('ActsDataUriUtilsTest', function () { - -/* -* @tc.number: ACTS_getId_0100 -* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_getId_0100', 0, function (done) { - console.log('dataUriUtils getId start1'); - var result = dataUriUtils.getId("com.ix.dataUriUtils/1221"); - console.log('dataUriUtils getId URI : ' + result); - - expect(typeof(result)).assertEqual("number"); - expect(result).assertEqual(1221); - console.log('dataUriUtils getId_test start1 successful'); - done(); - }) - -/* -* @tc.number: ACTS_getId_0200 -* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_getId_0200', 0, function (done) { - console.log('dataUriUtils getId start2 '); - var result = dataUriUtils.getId("com.ix.dataUriUtils1221"); - console.log('dataUriUtils getId URI : ' + result); - - expect(typeof(result)).assertEqual("number"); - expect(result).assertEqual(-1); - console.log('dataUriUtils getId_test start2 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_getId_0300 -* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_getId_0300', 0, function (done) { - console.log('dataUriUtils getId start3 '); - var result = dataUriUtils.getId("com.ix.dataUriUtils/11234567890"); - console.log('dataUriUtils getId URI : ' + result); - - expect(typeof(result)).assertEqual("number"); - expect(result).assertEqual(11234567890); - console.log('dataUriUtils getId_test start3 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_getId_0400 -* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_getId_0400', 0, function (done) { - console.log('dataUriUtils getId start4 '); - var result = dataUriUtils.getId("com.ix.dataUriUtils"); - console.log('dataUriUtils getId URI : ' + result); - - expect(typeof(result)).assertEqual("number"); - expect(result).assertEqual(-1); - console.log('dataUriUtils getId_test start4 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_getId_0500 -* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_getId_0500', 0, function (done) { - console.log('dataUriUtils getId start5 '); - var result = dataUriUtils.getId("com.ix.dataUriUtils/-777"); - console.log('dataUriUtils getId URI : ' + result);//-777 - - expect(typeof(result)).assertEqual("number"); - expect(result).assertEqual(-777); - console.log('dataUriUtils getId_test start5 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_attachId_0100 -* @tc.name: Attaches the given ID to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_attachId_0100',0, function (done) { - console.log('dataUriUtils attachId start1 '); - var idint = 1122; - var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint); - console.log('dataUriUtils attachId URI :' + result) - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/1122"); - console.log('dataUriUtils attachId_test start1 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_attachId_0200 -* @tc.name: Attaches the given ID to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_attachId_0200',0, function (done) { - console.log('dataUriUtils attachId start2 '); - var idint = 0; - var result = dataUriUtils.attachId("com.ix.dataUriUtils/777",idint); - console.log('dataUriUtils attachId URI :' + result) - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/777/0"); - console.log('dataUriUtils attachId_test start2 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_attachId_0300 -* @tc.name: Attaches the given ID to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_attachId_0300',0, function (done) { - console.log('dataUriUtils attachId start3 '); - var idint = 456789; - var result = dataUriUtils.attachId("com.ix.dataUriUtils/123",idint); - console.log('dataUriUtils attachId URI :' + result) - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/123/456789"); - console.log('dataUriUtils attachId_test start3 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_attachId_0400 -* @tc.name: Attaches the given ID to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_attachId_0400',0, function (done) { - console.log('dataUriUtils attachId start4 '); - var idint = 123456789011; - var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint); - console.log('dataUriUtils attachId URI :' + result) - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/123456789011"); - console.log('dataUriUtils attachId_test start4 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_attachId_0500 -* @tc.name: Attaches the given ID to the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_attachId_0500',0, function (done) { - console.log('dataUriUtils attachId start5 '); - var idint = -1; - var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint); - console.log('dataUriUtils attachId URI :' + result) - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/-1"); - console.log('dataUriUtils attachId_test start5 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_deleteId_0100 -* @tc.name: Deletes the ID from the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_deleteId_0100',0, function (done) { - console.log('dataUriUtils deleteId start1 '); - var result = dataUriUtils.deleteId("com.ix.dataUriUtils"); - console.log('dataUriUtils deleteId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils"); - console.log('dataUriUtils deleteId_test start1 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_deleteId_0200 -* @tc.name: Deletes the ID from the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_deleteId_0200',0, function (done) { - console.log('dataUriUtils deleteId start2 '); - var result = dataUriUtils.deleteId("com.ix.dataUriUtils/1122"); - console.log('dataUriUtils deleteId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils"); - console.log('dataUriUtils deleteId_test start2 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_deleteId_0300 -* @tc.name: Deletes the ID from the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_deleteId_0300',0, function (done) { - console.log('dataUriUtils deleteId start3 '); - var result = dataUriUtils.deleteId("com.ix.dataUriUtils1122"); - console.log('dataUriUtils deleteId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils1122"); - console.log('dataUriUtils deleteId_test start3 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_deleteId_0400 -* @tc.name: Deletes the ID from the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_deleteId_0400',0, function (done) { - console.log('dataUriUtils deleteId start4 '); - var result = dataUriUtils.deleteId("com.ix.dataUriUtils/-1"); - console.log('dataUriUtils deleteId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils"); - console.log('dataUriUtils deleteId_test start4 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_deleteId_0500 -* @tc.name: Deletes the ID from the end of the path component of the given URI. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_deleteId_0500',0, function (done) { - console.log('dataUriUtils deleteId start5 '); - var result = dataUriUtils.deleteId("com.ix.dataUriUtils/1122/2211"); - console.log('dataUriUtils deleteId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/1122"); - console.log('dataUriUtils deleteId_test start5 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_updateId_0100 -* @tc.name: Updates the ID in the specified dataUri. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_updateId_0100',0, function (done) { - console.log('dataUriUtils updateId start1 '); - var idint = 1122; - var result = dataUriUtils.updateId("com.ix.dataUriUtils",idint); - console.log('updateId updateId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils"); - console.log('dataUriUtils updateId_test start1 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_updateId_0200 -* @tc.name: Updates the ID in the specified dataUri. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_updateId_0200',0, function (done) { - console.log('dataUriUtils updateId start2 '); - var idint = 1122; - var result = dataUriUtils.updateId("com.ix.dataUriUtils/",idint) - console.log('updateId updateId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/"); - console.log('dataUriUtils updateId_test start2 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_updateId_0300 -* @tc.name: Updates the ID in the specified dataUri. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_updateId_0300',0, function (done) { - console.log('dataUriUtils updateId start3 '); - var idint = 3344; - var result = dataUriUtils.updateId("com.ix.dataUriUtils/-1",idint) - console.log('updateId updateId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/3344"); - console.log('dataUriUtils updateId_test start3 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_updateId_0400 -* @tc.name: Updates the ID in the specified dataUri. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_updateId_0400',0, function (done) { - console.log('dataUriUtils updateId start4 '); - var idint = 5566; - var result = dataUriUtils.updateId("com.ix.dataUriUtils/123456789011",idint) - console.log('updateId updateId URI : ' + result); - - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/5566"); - console.log('dataUriUtils updateId_test start4 successful '); - - done(); - }) - -/* -* @tc.number: ACTS_updateId_0500 -* @tc.name: Updates the ID in the specified dataUri. -* @tc.desc: Check the return value of the interface -*/ - it('ACTS_updateId_0500',0, function (done) { - console.log('dataUriUtils updateId start5 '); - - var idint = 0; - expect(typeof(idint)).assertEqual("number"); - console.log('dataUriUtils updateId start666 '); - - var result = dataUriUtils.updateId("com.ix.dataUriUtils/1122",idint) - console.log('updateId updateId URI : ' + result); - expect(typeof(result)).assertEqual("string"); - expect(result).assertEqual("com.ix.dataUriUtils/0"); - done(); - }) -}) +/* + * 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 dataUriUtils from '@ohos.ability.dataUriUtils' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium' + +export default function ActsDataUriUtilsTest() { +describe('ActsDataUriUtilsTest', function () { + +/* +* @tc.number: ACTS_getId_0100 +* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_getId_0100', 0, function (done) { + console.log('dataUriUtils getId start1'); + var result = dataUriUtils.getId("com.ix.dataUriUtils/1221"); + console.log('dataUriUtils getId URI : ' + result); + + expect(typeof(result)).assertEqual("number"); + expect(result).assertEqual(1221); + console.log('dataUriUtils getId_test start1 successful'); + done(); + }) + +/* +* @tc.number: ACTS_getId_0200 +* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_getId_0200', 0, function (done) { + console.log('dataUriUtils getId start2 '); + var result = dataUriUtils.getId("com.ix.dataUriUtils1221"); + console.log('dataUriUtils getId URI : ' + result); + + expect(typeof(result)).assertEqual("number"); + expect(result).assertEqual(-1); + console.log('dataUriUtils getId_test start2 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_getId_0300 +* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_getId_0300', 0, function (done) { + console.log('dataUriUtils getId start3 '); + var result = dataUriUtils.getId("com.ix.dataUriUtils/11234567890"); + console.log('dataUriUtils getId URI : ' + result); + + expect(typeof(result)).assertEqual("number"); + expect(result).assertEqual(11234567890); + console.log('dataUriUtils getId_test start3 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_getId_0400 +* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_getId_0400', 0, function (done) { + console.log('dataUriUtils getId start4 '); + var result = dataUriUtils.getId("com.ix.dataUriUtils"); + console.log('dataUriUtils getId URI : ' + result); + + expect(typeof(result)).assertEqual("number"); + expect(result).assertEqual(-1); + console.log('dataUriUtils getId_test start4 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_getId_0500 +* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_getId_0500', 0, function (done) { + console.log('dataUriUtils getId start5 '); + var result = dataUriUtils.getId("com.ix.dataUriUtils/-777"); + console.log('dataUriUtils getId URI : ' + result);//-777 + + expect(typeof(result)).assertEqual("number"); + expect(result).assertEqual(-777); + console.log('dataUriUtils getId_test start5 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_attachId_0100 +* @tc.name: Attaches the given ID to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_attachId_0100',0, function (done) { + console.log('dataUriUtils attachId start1 '); + var idint = 1122; + var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint); + console.log('dataUriUtils attachId URI :' + result) + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/1122"); + console.log('dataUriUtils attachId_test start1 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_attachId_0200 +* @tc.name: Attaches the given ID to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_attachId_0200',0, function (done) { + console.log('dataUriUtils attachId start2 '); + var idint = 0; + var result = dataUriUtils.attachId("com.ix.dataUriUtils/777",idint); + console.log('dataUriUtils attachId URI :' + result) + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/777/0"); + console.log('dataUriUtils attachId_test start2 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_attachId_0300 +* @tc.name: Attaches the given ID to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_attachId_0300',0, function (done) { + console.log('dataUriUtils attachId start3 '); + var idint = 456789; + var result = dataUriUtils.attachId("com.ix.dataUriUtils/123",idint); + console.log('dataUriUtils attachId URI :' + result) + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/123/456789"); + console.log('dataUriUtils attachId_test start3 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_attachId_0400 +* @tc.name: Attaches the given ID to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_attachId_0400',0, function (done) { + console.log('dataUriUtils attachId start4 '); + var idint = 123456789011; + var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint); + console.log('dataUriUtils attachId URI :' + result) + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/123456789011"); + console.log('dataUriUtils attachId_test start4 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_attachId_0500 +* @tc.name: Attaches the given ID to the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_attachId_0500',0, function (done) { + console.log('dataUriUtils attachId start5 '); + var idint = -1; + var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint); + console.log('dataUriUtils attachId URI :' + result) + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/-1"); + console.log('dataUriUtils attachId_test start5 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_deleteId_0100 +* @tc.name: Deletes the ID from the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_deleteId_0100',0, function (done) { + console.log('dataUriUtils deleteId start1 '); + var result = dataUriUtils.deleteId("com.ix.dataUriUtils"); + console.log('dataUriUtils deleteId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils"); + console.log('dataUriUtils deleteId_test start1 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_deleteId_0200 +* @tc.name: Deletes the ID from the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_deleteId_0200',0, function (done) { + console.log('dataUriUtils deleteId start2 '); + var result = dataUriUtils.deleteId("com.ix.dataUriUtils/1122"); + console.log('dataUriUtils deleteId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils"); + console.log('dataUriUtils deleteId_test start2 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_deleteId_0300 +* @tc.name: Deletes the ID from the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_deleteId_0300',0, function (done) { + console.log('dataUriUtils deleteId start3 '); + var result = dataUriUtils.deleteId("com.ix.dataUriUtils1122"); + console.log('dataUriUtils deleteId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils1122"); + console.log('dataUriUtils deleteId_test start3 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_deleteId_0400 +* @tc.name: Deletes the ID from the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_deleteId_0400',0, function (done) { + console.log('dataUriUtils deleteId start4 '); + var result = dataUriUtils.deleteId("com.ix.dataUriUtils/-1"); + console.log('dataUriUtils deleteId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils"); + console.log('dataUriUtils deleteId_test start4 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_deleteId_0500 +* @tc.name: Deletes the ID from the end of the path component of the given URI. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_deleteId_0500',0, function (done) { + console.log('dataUriUtils deleteId start5 '); + var result = dataUriUtils.deleteId("com.ix.dataUriUtils/1122/2211"); + console.log('dataUriUtils deleteId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/1122"); + console.log('dataUriUtils deleteId_test start5 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_updateId_0100 +* @tc.name: Updates the ID in the specified dataUri. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_updateId_0100',0, function (done) { + console.log('dataUriUtils updateId start1 '); + var idint = 1122; + var result = dataUriUtils.updateId("com.ix.dataUriUtils",idint); + console.log('updateId updateId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils"); + console.log('dataUriUtils updateId_test start1 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_updateId_0200 +* @tc.name: Updates the ID in the specified dataUri. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_updateId_0200',0, function (done) { + console.log('dataUriUtils updateId start2 '); + var idint = 1122; + var result = dataUriUtils.updateId("com.ix.dataUriUtils/",idint) + console.log('updateId updateId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/"); + console.log('dataUriUtils updateId_test start2 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_updateId_0300 +* @tc.name: Updates the ID in the specified dataUri. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_updateId_0300',0, function (done) { + console.log('dataUriUtils updateId start3 '); + var idint = 3344; + var result = dataUriUtils.updateId("com.ix.dataUriUtils/-1",idint) + console.log('updateId updateId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/3344"); + console.log('dataUriUtils updateId_test start3 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_updateId_0400 +* @tc.name: Updates the ID in the specified dataUri. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_updateId_0400',0, function (done) { + console.log('dataUriUtils updateId start4 '); + var idint = 5566; + var result = dataUriUtils.updateId("com.ix.dataUriUtils/123456789011",idint) + console.log('updateId updateId URI : ' + result); + + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/5566"); + console.log('dataUriUtils updateId_test start4 successful '); + + done(); + }) + +/* +* @tc.number: ACTS_updateId_0500 +* @tc.name: Updates the ID in the specified dataUri. +* @tc.desc: Check the return value of the interface +*/ + it('ACTS_updateId_0500',0, function (done) { + console.log('dataUriUtils updateId start5 '); + + var idint = 0; + expect(typeof(idint)).assertEqual("number"); + console.log('dataUriUtils updateId start666 '); + + var result = dataUriUtils.updateId("com.ix.dataUriUtils/1122",idint) + console.log('updateId updateId URI : ' + result); + expect(typeof(result)).assertEqual("string"); + expect(result).assertEqual("com.ix.dataUriUtils/0"); + done(); + }) +}) +} diff --git a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/test/List.test.js b/ability/ability_runtime/amsdatauriutils/src/main/js/test/List.test.js similarity index 80% rename from ability/ability_runtime/amsdatauriutils/entry/src/main/js/test/List.test.js rename to ability/ability_runtime/amsdatauriutils/src/main/js/test/List.test.js index cffa683ef..33d924449 100644 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/test/List.test.js +++ b/ability/ability_runtime/amsdatauriutils/src/main/js/test/List.test.js @@ -1,15 +1,18 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -require('./DataUriUtilsJsSt.test.js') \ No newline at end of file +/* + * 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 ActsDataUriUtilsTest from './DataUriUtilsJsSt.test.js' +export default function testsuite() { +ActsDataUriUtilsTest() +} diff --git a/ability/ability_runtime/amsdatauriutils/src/main/resources/base/element/string.json b/ability/ability_runtime/amsdatauriutils/src/main/resources/base/element/string.json new file mode 100644 index 000000000..5a6079a30 --- /dev/null +++ b/ability/ability_runtime/amsdatauriutils/src/main/resources/base/element/string.json @@ -0,0 +1,28 @@ +{ + "string": [ + { + "name": "app_name", + "value": "DataUriUtils" + }, + { + "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/ability/ability_runtime/amsdatauriutils/entry/src/main/js/resources/base/media/icon.png b/ability/ability_runtime/amsdatauriutils/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/amsdatauriutils/entry/src/main/js/resources/base/media/icon.png rename to ability/ability_runtime/amsdatauriutils/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/context/BUILD.gn b/ability/ability_runtime/context/BUILD.gn index 96677333f..5c1dee281 100644 --- a/ability/ability_runtime/context/BUILD.gn +++ b/ability/ability_runtime/context/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") diff --git a/ability/ability_runtime/context/actscontexttest/BUILD.gn b/ability/ability_runtime/context/actscontexttest/BUILD.gn index 99ce3e12b..d08bf86aa 100644 --- a/ability/ability_runtime/context/actscontexttest/BUILD.gn +++ b/ability/ability_runtime/context/actscontexttest/BUILD.gn @@ -1,31 +1,32 @@ -# 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("ActsContextTest") { - hap_profile = "./entry/src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsContextTest" -} -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "./entry/src/main/js/default" -} -ohos_resources("hjs_demo_resources") { - sources = [ "./entry/src/main/js/resources" ] - hap_profile = "./entry/src/main/config.json" -} +# 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("ActsContextTest") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsContextTest" +} +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/ability/ability_runtime/context/actscontexttest/Test.json b/ability/ability_runtime/context/actscontexttest/Test.json index 12f456e65..bb483a476 100644 --- a/ability/ability_runtime/context/actscontexttest/Test.json +++ b/ability/ability_runtime/context/actscontexttest/Test.json @@ -1,20 +1,20 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "500000", - "package": "com.example.actscontext", - "shell-timeout": "600000" - }, - "kits": [ - { - "test-file-name": [ - "DefPermission.hap", - "ActsContextTest.hap" - - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "500000", + "shell-timeout": "500000", + "bundle-name": "com.example.actscontext", + "package-name": "com.example.actscontext" + }, + "kits": [ + { + "test-file-name": [ + "DefPermission.hap", + "ActsContextTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actscontexttest/entry/src/main/config.json b/ability/ability_runtime/context/actscontexttest/entry/src/main/config.json deleted file mode 100644 index d59f806e6..000000000 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/config.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "app": { - "bundleName": "com.example.actscontext", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.actscontext", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "reqPermissions": [ - { - "name": "com.example.permission", - "reason": "$string:permreason_example", - "usedScene": { - "ability": [ - "com.example.Ability", - "com.example.AbilityBackground" - ], - "when": "always" - } - }, - { - "name": "com.example.permission.user", - "reason": "$string:permreason_example", - "usedScene": { - "ability": [ - "com.example.Ability", - "com.example.AbilityBackground" - ], - "when": "always" - } - }, - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "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" - } - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "name": "com.example.actscontext.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} \ No newline at end of file diff --git a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/resources/base/element/string.json b/ability/ability_runtime/context/actscontexttest/entry/src/main/js/resources/base/element/string.json deleted file mode 100644 index 46b750f3e..000000000 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/resources/base/element/string.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "MyApplication" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "permreason_example", - "value": "permreason example" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/context/actscontexttest/src/main/config.json b/ability/ability_runtime/context/actscontexttest/src/main/config.json new file mode 100644 index 000000000..217133b3d --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/config.json @@ -0,0 +1,138 @@ +{ + "app": { + "bundleName": "com.example.actscontext", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.actscontext", + "name": ".entry", + "deviceType": [ + "phone" + ], + "reqPermissions": [ + { + "name": "com.example.permission", + "reason": "$string:permreason_example", + "usedScene": { + "ability": [ + "com.example.Ability", + "com.example.AbilityBackground" + ], + "when": "always" + } + }, + { + "name": "com.example.permission.user", + "reason": "$string:permreason_example", + "usedScene": { + "ability": [ + "com.example.Ability", + "com.example.AbilityBackground" + ], + "when": "always" + } + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "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" + } + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "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" + }, + "mainAbility": ".MainAbility", + "srcPath": "" + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/app.js b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/app.js similarity index 97% rename from ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/app.js rename to ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/app.js index 8e47afff1..2ba842eda 100644 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/app.js +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/app.js @@ -1,23 +1,23 @@ -/* - * 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'); - } -}; +/* + * 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/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/i18n/en-US.json b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/i18n/en-US.json similarity index 91% rename from ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/i18n/en-US.json rename to ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/i18n/en-US.json index e63c70d97..a4c13dcbd 100644 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/i18n/en-US.json +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/i18n/en-US.json @@ -1,6 +1,6 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - } +{ + "strings": { + "hello": "Hello", + "world": "World" + } } \ No newline at end of file diff --git a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/i18n/zh-CN.json b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/i18n/zh-CN.json similarity index 91% rename from ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/i18n/zh-CN.json rename to ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/i18n/zh-CN.json index de6ee5748..b1c02368f 100644 --- a/ability/ability_runtime/amsdatauriutils/entry/src/main/js/default/i18n/zh-CN.json +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/i18n/zh-CN.json @@ -1,6 +1,6 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } +{ + "strings": { + "hello": "您好", + "world": "世界" + } } \ No newline at end of file diff --git a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.css b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.css similarity index 93% rename from ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.css rename to ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.css index 6fda79275..5c52a87a0 100644 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.css +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.css @@ -1,9 +1,9 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} diff --git a/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.hml b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.hml new file mode 100644 index 000000000..f629c71a9 --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.js b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.js similarity index 70% rename from ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.js rename to ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.js index 033f12909..1e364b6db 100644 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/default/pages/index/index.js +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/MainAbility/pages/index/index.js @@ -1,47 +1,34 @@ -/* - * 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 {Core, ExpectExtend} from 'deccjsunit/index' - -const injectRef = Object.getPrototypeOf(global) || global -injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') - -export default { - data: { - title: '' - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - id: 'extend' - }) - core.addService('expect', expectExtend) - core.init() - - const configService = core.getDefaultService('config') - configService.setConfig(this) - - require('../../../test/List.test') - core.execute() - }, - onReady() { - console.info('onReady'); - }, -} - +/* + * 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: '' + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('onShow finish') + }, + onReady() { + console.info('onReady'); + }, +} + diff --git a/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/app.js b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/app.js new file mode 100644 index 000000000..cdc31f3dc --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/app.js @@ -0,0 +1,31 @@ +/* + * 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/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/i18n/en-US.json b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/i18n/en-US.json new file mode 100644 index 000000000..3cb24b374 --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/i18n/en-US.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + }, + "Files": { + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/i18n/zh-CN.json b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/i18n/zh-CN.json new file mode 100644 index 000000000..c804e32c0 --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/i18n/zh-CN.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + }, + "Files": { + } +} \ No newline at end of file diff --git a/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.css b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.css new file mode 100644 index 000000000..b1bcd4338 --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.css @@ -0,0 +1,30 @@ +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} + +@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/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.hml b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.hml new file mode 100644 index 000000000..f629c71a9 --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.js b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.js new file mode 100644 index 000000000..88b083a7f --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/TestAbility/pages/index/index.js @@ -0,0 +1,26 @@ +/* + * 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/ability/ability_runtime/context/actscontexttest/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/ability/ability_runtime/context/actscontexttest/src/main/js/TestRunner/OpenHarmonyTestRunner.js new file mode 100644 index 000000000..c5fa8620c --- /dev/null +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/TestRunner/OpenHarmonyTestRunner.js @@ -0,0 +1,59 @@ +/* + * 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/ability/ability_runtime/context/actscontexttest/entry/src/main/js/test/ContextJsunit.test.js b/ability/ability_runtime/context/actscontexttest/src/main/js/test/ContextJsunit.test.js similarity index 97% rename from ability/ability_runtime/context/actscontexttest/entry/src/main/js/test/ContextJsunit.test.js rename to ability/ability_runtime/context/actscontexttest/src/main/js/test/ContextJsunit.test.js index a67c88111..91dc94f50 100644 --- a/ability/ability_runtime/context/actscontexttest/entry/src/main/js/test/ContextJsunit.test.js +++ b/ability/ability_runtime/context/actscontexttest/src/main/js/test/ContextJsunit.test.js @@ -1,424 +1,426 @@ -/* - * 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 featureAbility from '@ohos.ability.featureAbility' -import bundle from '@ohos.bundle' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -describe('ActsContextTest', function () { - - // @tc.number: ACTS_GetBundleName_0100 - // @tc.name: getBundleName : Query return value type - // @tc.desc: The class of the test return value is made Promise - it('ACTS_GetBundleName_0100', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var result = await context.getBundleName(); - expect(typeof(context)).assertEqual("object"); - ret = true - done(); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_GetBundleName_0200 - // @tc.name: getBundleName : Get the bundlename of the hap package - // @tc.desc: Get the bundlename of the hap package(by promise) - it('ACTS_GetBundleName_0200', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var result = await context.getBundleName(); - expect(result).assertEqual('com.example.actscontext'); - ret = true - done(); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_GetBundleName_0300 - // @tc.name: getBundleName : Get the bundlename of the hap package - // @tc.desc: Get the value of return is void (by callback) - it('ACTS_GetBundleName_0300', 0, async function (done) { - var ret = false - var context = featureAbility.getContext(); - var info = context.getBundleName( - (err, data) => { - expect(err.code).assertEqual(0); - expect(data).assertEqual('com.example.actscontext'); - ret = true - done(); - }) - - - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_GetBundleName_0400 - // @tc.name: getBundleName : Get the bundlename of the hap package - // @tc.desc: Get the bundlename of the hap package(by callback) - it('ACTS_GetBundleName_0400', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var info = context.getBundleName( - (err, data) => { - expect(data).assertEqual('com.example.actscontext'); - ret = true - done(); - } - ); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_GetBundleName_0500 - // @tc.name: getBundleName : Get the bundlename of the hap package - // @tc.desc: Wrong parameters are provided, and the test return type is void (by callback) - it('ACTS_GetBundleName_0500', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var info = context.getBundleName("error_param", - (err, data) => { - expect(data).assertEqual('com.example.actscontext'); - } - ); - expect(info).assertEqual(null); - ret = true - done(); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_VerifyPermission_0100 - // @tc.name: verifySelfPermission : Query whether the application of the specified PID and - // UID has been granted a certain permission - // @tc.desc: Query whether the application of the specified PID and UID has been granted - // a certain permission (by callback) - it('ACTS_VerifyPermission_0100', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); - var options = { - pid :0, - uid :datainfo.uid - } - context.verifyPermission("ohos.permission.INSTALL_BUNDLE",options, - (err, data) => { - console.info("ACTS_VerifyPermission_0100 in verifyPermission") - expect(data).assertEqual(0); - ret = true - done(); - }); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_VerifyPermission_0200 - // @tc.name: verifySelfPermission : Query whether the application of the specified PID and - // UID has been granted a certain permission - // @tc.desc: Query whether the application of the specified PID and UID has been granted - // a certain permission (by Promise) - it('ACTS_VerifyPermission_0200', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); - var options = { - pid :0, - uid :datainfo.uid - } - var promise = await context.verifyPermission("ohos.permission.INSTALL_BUNDLE",options ); - expect(promise).assertEqual(0); - ret = true - done(); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_VerifyPermission_0300 - // @tc.name: verifySelfPermission : Query whether the application of the specified PID and - // UID has been granted a certain permission - // @tc.desc: Query whether the application of the specified PID and UID has been granted - // a certain permission (by Promise) - it('ACTS_VerifyPermission_0300', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); - var options = { - pid :0, - uid :datainfo.uid - } - var result = context.verifyPermission("com.example.permission.NOT",options, - (err, data) => { - expect(data).assertEqual(-1); - ret = true - done(); - }); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_VerifyPermission_0400 - // @tc.name: verifySelfPermission : Query whether the application of the specified PID and - // UID has been granted a certain permission - // @tc.desc: Query whether the application of the specified PID and UID has been granted - // a certain permission (by Promise) - it('ACTS_VerifyPermission_0400', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); - var options = { - pid :0, - uid :datainfo.uid - } - var promise = await context.verifyPermission("ohos.permission.CAMERA.NOT",options ); - expect(promise).assertEqual(-1); - ret = true - done(); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_VerifyPermission_0500 - // @tc.name: verifySelfPermission : Query whether the application of the specified PID and - // UID has been granted a certain permission - // @tc.desc: Query whether the application of the specified PID and UID has been granted - // a certain permission (by Promise) - it('ACTS_VerifyPermission_0500', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); - var options = { - pid :0, - uid :datainfo.uid - } - var promise = await context.verifyPermission(2000,options ); - expect(promise).assertEqual(null); - ret = true - done(); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - - // @tc.number: ACTS_RequestPermissionForUser_0100 - // @tc.name: requestPermissionsFromUser : Requests certain permissions from the system. - // permission: The list of permissions to be requested. - // @tc.desc: Requests certain permissions from the system. - // process is the current process. (by callback) - it('ACTS_RequestPermissionForUser_0100', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - console.log("ACTS_RequestPermissionForUser_0100 ----------1"); - - context.requestPermissionsFromUser([], 1, - (err, data)=>{ - console.log("====>ACTS_RequestPermissionForUser_0100 data====>" + JSON.stringify(data)); - console.log("====>ACTS_RequestPermissionForUser_0100 err====>" + JSON.stringify(err.code)); - expect(err.code).assertEqual(-104) - }); - console.log("ACTS_RequestPermissionForUser_0100 ----------2"); - ret = true - done(); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - // @tc.number: ACTS_RequestPermissionForUser_0200 - // @tc.name: requestPermissionsFromUser : Requests certain permissions from the system. - // permission: The list of permissions to be requested. - // @tc.desc: Requests certain permissions from the system. - // process is the current process. (by promise) - it('ACTS_RequestPermissionForUser_0200', 0, async function (done) { - var ret = false - var context = await featureAbility.getContext(); - console.log("ACTS_RequestPermissionForUser_0200 ----------1"); - - context.requestPermissionsFromUser([], 1).then((data) => { - console.log("====>ACTS_RequestPermissionForUser_0200 data====>" + JSON.stringify(data)); - }).catch((err) => { - console.log("====>ACTS_RequestPermissionForUser_0200 err====>" + JSON.stringify(err.code)); - expect(err.code).assertEqual(-104) - }) - console.log("ACTS_RequestPermissionForUser_0200 ----------2"); - ret = true - done(); - setTimeout(function(){ - expect(ret).assertEqual(true) - },1000) - }) - - /* - * @tc.number: ACTS_GetDisplayOrientation_0100 - * @tc.name: context.getDisplayOrientation : Get an ability display orientation. - * @tc.desc: Check the return display orientation of the interface (by AsyncCallback) - */ - it('ACTS_GetDisplayOrientation_0100', 0, async function (done) { - console.log('ACTS_GetDisplayOrientation_0100===={ - console.log('getDisplayOrientation call back'); - done(); - }); - done(); - } catch (err) { - console.log('ACTS_GetDisplayOrientation_0100===={ - console.log('SetDisplayOrientation call back'); - done(); - }); - done(); - } catch (err) { - console.log('ACTS_SetDisplayOrientation_0100===={ - console.log('SetShowOnLockScreen call back'); - done(); - }); - done(); - } catch (err) { - console.log('ACTS_SetShowOnLockScreen_0100===={ - console.log('setWakeUpScreen call back'); - done(); - }); - done(); - } catch (err) { - console.log('ACTS_SetWakeUpScreen_0100==== { + expect(err.code).assertEqual(0); + expect(data).assertEqual('com.example.actscontext'); + ret = true + done(); + }) + + + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + // @tc.number: ACTS_GetBundleName_0400 + // @tc.name: getBundleName : Get the bundlename of the hap package + // @tc.desc: Get the bundlename of the hap package(by callback) + it('ACTS_GetBundleName_0400', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + var info = context.getBundleName( + (err, data) => { + expect(data).assertEqual('com.example.actscontext'); + ret = true + done(); + } + ); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + // @tc.number: ACTS_GetBundleName_0500 + // @tc.name: getBundleName : Get the bundlename of the hap package + // @tc.desc: Wrong parameters are provided, and the test return type is void (by callback) + it('ACTS_GetBundleName_0500', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + var info = context.getBundleName("error_param", + (err, data) => { + expect(data).assertEqual('com.example.actscontext'); + } + ); + expect(info).assertEqual(null); + ret = true + done(); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + // @tc.number: ACTS_VerifyPermission_0100 + // @tc.name: verifySelfPermission : Query whether the application of the specified PID and + // UID has been granted a certain permission + // @tc.desc: Query whether the application of the specified PID and UID has been granted + // a certain permission (by callback) + it('ACTS_VerifyPermission_0100', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); + var options = { + pid :0, + uid :datainfo.uid + } + context.verifyPermission("ohos.permission.INSTALL_BUNDLE",options, + (err, data) => { + console.info("ACTS_VerifyPermission_0100 in verifyPermission") + expect(data).assertEqual(0); + ret = true + done(); + }); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + // @tc.number: ACTS_VerifyPermission_0200 + // @tc.name: verifySelfPermission : Query whether the application of the specified PID and + // UID has been granted a certain permission + // @tc.desc: Query whether the application of the specified PID and UID has been granted + // a certain permission (by Promise) + it('ACTS_VerifyPermission_0200', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); + var options = { + pid :0, + uid :datainfo.uid + } + var promise = await context.verifyPermission("ohos.permission.INSTALL_BUNDLE",options ); + expect(promise).assertEqual(0); + ret = true + done(); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + // @tc.number: ACTS_VerifyPermission_0300 + // @tc.name: verifySelfPermission : Query whether the application of the specified PID and + // UID has been granted a certain permission + // @tc.desc: Query whether the application of the specified PID and UID has been granted + // a certain permission (by Promise) + it('ACTS_VerifyPermission_0300', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); + var options = { + pid :0, + uid :datainfo.uid + } + var result = context.verifyPermission("com.example.permission.NOT",options, + (err, data) => { + expect(data).assertEqual(-1); + ret = true + done(); + }); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + // @tc.number: ACTS_VerifyPermission_0400 + // @tc.name: verifySelfPermission : Query whether the application of the specified PID and + // UID has been granted a certain permission + // @tc.desc: Query whether the application of the specified PID and UID has been granted + // a certain permission (by Promise) + it('ACTS_VerifyPermission_0400', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); + var options = { + pid :0, + uid :datainfo.uid + } + var promise = await context.verifyPermission("ohos.permission.CAMERA.NOT",options ); + expect(promise).assertEqual(-1); + ret = true + done(); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + // @tc.number: ACTS_VerifyPermission_0500 + // @tc.name: verifySelfPermission : Query whether the application of the specified PID and + // UID has been granted a certain permission + // @tc.desc: Query whether the application of the specified PID and UID has been granted + // a certain permission (by Promise) + it('ACTS_VerifyPermission_0500', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + var datainfo = await bundle.getBundleInfo('com.example.actscontext',1); + var options = { + pid :0, + uid :datainfo.uid + } + var promise = await context.verifyPermission(2000,options ); + expect(promise).assertEqual(null); + ret = true + done(); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + + // @tc.number: ACTS_RequestPermissionForUser_0100 + // @tc.name: requestPermissionsFromUser : Requests certain permissions from the system. + // permission: The list of permissions to be requested. + // @tc.desc: Requests certain permissions from the system. + // process is the current process. (by callback) + it('ACTS_RequestPermissionForUser_0100', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + console.log("ACTS_RequestPermissionForUser_0100 ----------1"); + + context.requestPermissionsFromUser([], 1, + (err, data)=>{ + console.log("====>ACTS_RequestPermissionForUser_0100 data====>" + JSON.stringify(data)); + console.log("====>ACTS_RequestPermissionForUser_0100 err====>" + JSON.stringify(err.code)); + expect(err.code).assertEqual(-104) + }); + console.log("ACTS_RequestPermissionForUser_0100 ----------2"); + ret = true + done(); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + // @tc.number: ACTS_RequestPermissionForUser_0200 + // @tc.name: requestPermissionsFromUser : Requests certain permissions from the system. + // permission: The list of permissions to be requested. + // @tc.desc: Requests certain permissions from the system. + // process is the current process. (by promise) + it('ACTS_RequestPermissionForUser_0200', 0, async function (done) { + var ret = false + var context = await featureAbility.getContext(); + console.log("ACTS_RequestPermissionForUser_0200 ----------1"); + + context.requestPermissionsFromUser([], 1).then((data) => { + console.log("====>ACTS_RequestPermissionForUser_0200 data====>" + JSON.stringify(data)); + }).catch((err) => { + console.log("====>ACTS_RequestPermissionForUser_0200 err====>" + JSON.stringify(err.code)); + expect(err.code).assertEqual(-104) + }) + console.log("ACTS_RequestPermissionForUser_0200 ----------2"); + ret = true + done(); + setTimeout(function(){ + expect(ret).assertEqual(true) + },1000) + }) + + /* + * @tc.number: ACTS_GetDisplayOrientation_0100 + * @tc.name: context.getDisplayOrientation : Get an ability display orientation. + * @tc.desc: Check the return display orientation of the interface (by AsyncCallback) + */ + it('ACTS_GetDisplayOrientation_0100', 0, async function (done) { + console.log('ACTS_GetDisplayOrientation_0100===={ + console.log('getDisplayOrientation call back'); + done(); + }); + done(); + } catch (err) { + console.log('ACTS_GetDisplayOrientation_0100===={ + console.log('SetDisplayOrientation call back'); + done(); + }); + done(); + } catch (err) { + console.log('ACTS_SetDisplayOrientation_0100===={ + console.log('SetShowOnLockScreen call back'); + done(); + }); + done(); + } catch (err) { + console.log('ACTS_SetShowOnLockScreen_0100===={ + console.log('setWakeUpScreen call back'); + done(); + }); + done(); + } catch (err) { + console.log('ACTS_SetWakeUpScreen_0100==== - - {{ $t('strings.hello') }} {{ title }} - - +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/ability/ability_runtime/context/scene/defpermission/src/main/js/default/pages/index/index.js b/ability/ability_runtime/context/scene/defpermission/src/main/js/default/pages/index/index.js index f2094c496..1fb0e176c 100644 --- a/ability/ability_runtime/context/scene/defpermission/src/main/js/default/pages/index/index.js +++ b/ability/ability_runtime/context/scene/defpermission/src/main/js/default/pages/index/index.js @@ -1,26 +1,26 @@ -/* - * 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: '' - }, - onInit() { - this.title = this.$t('strings.world'); - } -} +/* + * 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: '' + }, + onInit() { + this.title = this.$t('strings.world'); + } +} diff --git a/ability/ability_runtime/context/scene/defpermission/src/main/js/resources/base/element/string.json b/ability/ability_runtime/context/scene/defpermission/src/main/js/resources/base/element/string.json index 2f9470d82..d405647b9 100644 --- a/ability/ability_runtime/context/scene/defpermission/src/main/js/resources/base/element/string.json +++ b/ability/ability_runtime/context/scene/defpermission/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "MyApplication" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "MyApplication" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file -- GitLab