From 07a51734a8c6dd64dbc5fac377cf1cd9ab29daab Mon Sep 17 00:00:00 2001 From: zhijianwen Date: Thu, 13 Oct 2022 10:16:46 +0800 Subject: [PATCH] --ans_show-- Signed-off-by: zhijianwen --- notification/ans_standard/BUILD.gn | 2 +- .../BUILD.gn | 0 .../Test.json | 36 +- .../signature/openharmony_sx.p7b | Bin .../src/main/config.json | 230 +++---- .../src/main/js/MainAbility/app.js | 44 +- .../src/main/js/MainAbility/i18n/en-US.json | 10 +- .../src/main/js/MainAbility/i18n/zh-CN.json | 10 +- .../main/js/MainAbility/pages/index/index.css | 48 +- .../main/js/MainAbility/pages/index/index.hml | 42 +- .../main/js/MainAbility/pages/index/index.js | 66 +- .../src/main/js/TestAbility/app.js | 62 +- .../src/main/js/TestAbility/i18n/en-US.json | 14 +- .../src/main/js/TestAbility/i18n/zh-CN.json | 14 +- .../main/js/TestAbility/pages/index/index.css | 58 +- .../main/js/TestAbility/pages/index/index.hml | 10 +- .../main/js/TestAbility/pages/index/index.js | 52 +- .../js/TestRunner/OpenHarmonyTestRunner.js | 118 ++-- .../main/js/test/ActsNotificationShowTest.js | 572 +++++++++--------- .../src/main/js/test/List.test.js | 36 +- .../main/resources/base/element/string.json | 54 +- .../src/main/resources/base/media/icon.png | Bin 22 files changed, 739 insertions(+), 739 deletions(-) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/BUILD.gn (100%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/Test.json (96%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/signature/openharmony_sx.p7b (100%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/config.json (96%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/MainAbility/app.js (97%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/MainAbility/i18n/en-US.json (91%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/MainAbility/i18n/zh-CN.json (91%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/MainAbility/pages/index/index.css (96%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/MainAbility/pages/index/index.hml (97%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/MainAbility/pages/index/index.js (96%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/TestAbility/app.js (97%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/TestAbility/i18n/en-US.json (91%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/TestAbility/i18n/zh-CN.json (91%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/TestAbility/pages/index/index.css (94%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/TestAbility/pages/index/index.hml (95%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/TestAbility/pages/index/index.js (96%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/TestRunner/OpenHarmonyTestRunner.js (97%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/test/ActsNotificationShowTest.js (97%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/js/test/List.test.js (97%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/resources/base/element/string.json (94%) rename notification/ans_standard/{actsnotificationshow => actsNotificationShowTest}/src/main/resources/base/media/icon.png (100%) diff --git a/notification/ans_standard/BUILD.gn b/notification/ans_standard/BUILD.gn index 09b4264b4..b6719e861 100644 --- a/notification/ans_standard/BUILD.gn +++ b/notification/ans_standard/BUILD.gn @@ -20,7 +20,7 @@ group("ans_standard") { "actsNotificationPublishTest:ActsNotificationPublishTest", "actsNotificationSlotTest:ActsNotificationSlotTest", "actsNotificationWantAgentTest:ActsNotificationWantAgentTest", - "actsnotificationshow:ActsNotificationShowTest", + "actsNotificationShowTest:ActsNotificationShowTest", ] } } diff --git a/notification/ans_standard/actsnotificationshow/BUILD.gn b/notification/ans_standard/actsNotificationShowTest/BUILD.gn similarity index 100% rename from notification/ans_standard/actsnotificationshow/BUILD.gn rename to notification/ans_standard/actsNotificationShowTest/BUILD.gn diff --git a/notification/ans_standard/actsnotificationshow/Test.json b/notification/ans_standard/actsNotificationShowTest/Test.json similarity index 96% rename from notification/ans_standard/actsnotificationshow/Test.json rename to notification/ans_standard/actsNotificationShowTest/Test.json index acab7af20..7e09defd3 100644 --- a/notification/ans_standard/actsnotificationshow/Test.json +++ b/notification/ans_standard/actsNotificationShowTest/Test.json @@ -1,19 +1,19 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "180000", - "shell-timeout": "180000", - "bundle-name": "com.example.actsnotificationshow", - "package-name": "com.example.actsnotificationshow" - }, - "kits": [ - { - "test-file-name": [ - "ActsNotificationShowTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "shell-timeout": "180000", + "bundle-name": "com.example.actsnotificationshow", + "package-name": "com.example.actsnotificationshow" + }, + "kits": [ + { + "test-file-name": [ + "ActsNotificationShowTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] } \ No newline at end of file diff --git a/notification/ans_standard/actsnotificationshow/signature/openharmony_sx.p7b b/notification/ans_standard/actsNotificationShowTest/signature/openharmony_sx.p7b similarity index 100% rename from notification/ans_standard/actsnotificationshow/signature/openharmony_sx.p7b rename to notification/ans_standard/actsNotificationShowTest/signature/openharmony_sx.p7b diff --git a/notification/ans_standard/actsnotificationshow/src/main/config.json b/notification/ans_standard/actsNotificationShowTest/src/main/config.json similarity index 96% rename from notification/ans_standard/actsnotificationshow/src/main/config.json rename to notification/ans_standard/actsNotificationShowTest/src/main/config.json index f16722cab..1eca4089f 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/config.json +++ b/notification/ans_standard/actsNotificationShowTest/src/main/config.json @@ -1,117 +1,117 @@ -{ - "app": { - "bundleName": "com.example.actsnotificationshow", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.actsnotificationshow", - "name": ".entry", - "deviceType": [ +{ + "app": { + "bundleName": "com.example.actsnotificationshow", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 5, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.actsnotificationshow", + "name": ".entry", + "deviceType": [ "default", - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "reqPermissions": [ - { - "name": "publish_event0800_permission", - "reason": "ceshi" - }, - { - "name": "publish_event0900_subscriberPermissions", - "reason": "ceshi" - }, - { - "name": "publish_event0900_publisherPermission", - "reason": "ceshi" - }, - { - "name": "publish_event1000_permission", - "reason": "ceshi" - }, - { - "name": "permission.COMMONEVENT_STICKY", - "reason": "ceshi" - } - ], - "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": "" - } + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "reqPermissions": [ + { + "name": "publish_event0800_permission", + "reason": "ceshi" + }, + { + "name": "publish_event0900_subscriberPermissions", + "reason": "ceshi" + }, + { + "name": "publish_event0900_publisherPermission", + "reason": "ceshi" + }, + { + "name": "publish_event1000_permission", + "reason": "ceshi" + }, + { + "name": "permission.COMMONEVENT_STICKY", + "reason": "ceshi" + } + ], + "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/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/app.js b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/app.js similarity index 97% rename from notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/app.js rename to notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/app.js index bdbaaf37c..b58cf3c57 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/app.js +++ b/notification/ans_standard/actsNotificationShowTest/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/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/i18n/en-US.json b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/i18n/en-US.json similarity index 91% rename from notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/i18n/en-US.json rename to notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/i18n/en-US.json index a4c13dcbd..e63c70d97 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/i18n/en-US.json +++ b/notification/ans_standard/actsNotificationShowTest/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/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/i18n/zh-CN.json b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/i18n/zh-CN.json similarity index 91% rename from notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/i18n/zh-CN.json rename to notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/i18n/zh-CN.json index b1c02368f..de6ee5748 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/i18n/zh-CN.json +++ b/notification/ans_standard/actsNotificationShowTest/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/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.css b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.css similarity index 96% rename from notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.css rename to notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.css index 4bc7e63ea..b6c4207e3 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.css +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.css @@ -1,24 +1,24 @@ -/* - * 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. - */ - -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} +/* + * 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. + */ + +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} diff --git a/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.hml b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.hml similarity index 97% rename from notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.hml rename to notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.hml index cce488f1b..153d713d1 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.hml +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.hml @@ -1,21 +1,21 @@ -/* - * 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. - */ - -
- - Hello, World! - {{ $t('strings.hello') }} {{ title }} - -
+/* + * 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. + */ + +
+ + Hello, World! + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.js b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.js similarity index 96% rename from notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.js rename to notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.js index 35f7f922a..312c30c0c 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/MainAbility/pages/index/index.js +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/MainAbility/pages/index/index.js @@ -1,33 +1,33 @@ -/* - * 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' - -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() { - }, -} - +/* + * 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' + +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() { + }, +} + diff --git a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/app.js b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/app.js similarity index 97% rename from notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/app.js rename to notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/app.js index cdc31f3dc..d5ee271df 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/app.js +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/app.js @@ -1,31 +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"); - } -}; +/* + * 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/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/i18n/en-US.json b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/i18n/en-US.json similarity index 91% rename from notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/i18n/en-US.json rename to notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/i18n/en-US.json index 3cb24b374..55561b837 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/i18n/en-US.json +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/i18n/en-US.json @@ -1,8 +1,8 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - }, - "Files": { - } +{ + "strings": { + "hello": "Hello", + "world": "World" + }, + "Files": { + } } \ No newline at end of file diff --git a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/i18n/zh-CN.json b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/i18n/zh-CN.json similarity index 91% rename from notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/i18n/zh-CN.json rename to notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/i18n/zh-CN.json index c804e32c0..cce1af067 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/i18n/zh-CN.json +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/i18n/zh-CN.json @@ -1,8 +1,8 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - }, - "Files": { - } +{ + "strings": { + "hello": "您好", + "world": "世界" + }, + "Files": { + } } \ No newline at end of file diff --git a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.css b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.css similarity index 94% rename from notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.css rename to notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.css index b1bcd4338..b21c92c62 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.css +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.css @@ -1,30 +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; - } +.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/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.hml b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.hml similarity index 95% rename from notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.hml rename to notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.hml index f629c71a9..f64b040a5 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.hml +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.hml @@ -1,5 +1,5 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
+
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.js b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.js similarity index 96% rename from notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.js rename to notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.js index 88b083a7f..d94b75c08 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/TestAbility/pages/index/index.js +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestAbility/pages/index/index.js @@ -1,26 +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'); - } -} - - - +/* + * 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/notification/ans_standard/actsnotificationshow/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestRunner/OpenHarmonyTestRunner.js similarity index 97% rename from notification/ans_standard/actsnotificationshow/src/main/js/TestRunner/OpenHarmonyTestRunner.js rename to notification/ans_standard/actsNotificationShowTest/src/main/js/TestRunner/OpenHarmonyTestRunner.js index c5fa8620c..b9e78ce7c 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/TestRunner/OpenHarmonyTestRunner.js +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/TestRunner/OpenHarmonyTestRunner.js @@ -1,59 +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); - }) - } -}; +/* + * 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/notification/ans_standard/actsnotificationshow/src/main/js/test/ActsNotificationShowTest.js b/notification/ans_standard/actsNotificationShowTest/src/main/js/test/ActsNotificationShowTest.js similarity index 97% rename from notification/ans_standard/actsnotificationshow/src/main/js/test/ActsNotificationShowTest.js rename to notification/ans_standard/actsNotificationShowTest/src/main/js/test/ActsNotificationShowTest.js index 325c22f59..ce5da8245 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/test/ActsNotificationShowTest.js +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/test/ActsNotificationShowTest.js @@ -1,286 +1,286 @@ -/* - * 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 notification from '@system.notification' -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' - -export default function ActsNotificationShowTest() { - describe('SUB_NOTIFICATION_ANS_SHOW_TEST', function () { - const TAG = 'SUB_NOTIFICATION_ANS_SHOW_TEST ===> ' - console.info(TAG + "SUB_NOTIFICATION_ANS_SHOW_TEST START") - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0100 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0100', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0100 START ') - let ShowNotificationOptions = { - contentTitle: 'Title1', - contentText: 'This is a notification 001' - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) - console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) - expect(ShowNotificationOptions.contentTitle).assertEqual('Title1') - expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 001') - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0200 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0200', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0200 START ') - let ShowNotificationOptions = { - contentTitle: 123, - contentText: 'This is a notification 002' - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' conteneTitle is number:' + ShowNotificationOptions.contentTitle) - console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) - expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 002') - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0300 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0300', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0300 START ') - let ShowNotificationOptions = {} - notification.show(ShowNotificationOptions) - expect(ShowNotificationOptions.contentTitle).assertEqual(undefined) - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0400 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0400', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0400 START ') - let ActionResult = { - bundleName: 'com.example.actsnotificationshow', - abilityName: 'com.example.actsnotificationshow.MainAbility', - uri: '/' - } - let ShowNotificationOptions = { - contentTitle: 'Title4', - contentText: 'This is a notification 004', - clickAction: ActionResult - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) - console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) - console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) - console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) - console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) - expect(ShowNotificationOptions.contentTitle).assertEqual('Title4') - expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 004') - expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') - expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') - expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0500 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0500', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0500 START ') - let ActionResult = { - bundleName: 'com.example.actsnotificationshow', - abilityName: 'com.example.actsnotificationshow.MainAbility', - uri: 'pages/index/index' - } - let ShowNotificationOptions = { - contentTitle: 'Title5', - contentText: 'This is a notification 005', - clickAction: ActionResult - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) - console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) - console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) - console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) - console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) - expect(ShowNotificationOptions.contentTitle).assertEqual('Title5') - expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 005') - expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') - expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') - expect(ShowNotificationOptions.clickAction.uri).assertEqual('pages/index/index') - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0600 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0600', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0600 START ') - let ActionResult = { - bundleName: '', - abilityName: 'com.example.actsnotificationshow.MainAbility', - uri: '/', - } - let ShowNotificationOptions = { - contentTitle: 'Title6', - contentText: 'This is a notification 006', - clickAction: ActionResult - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) - console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) - console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) - console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) - console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) - expect(ShowNotificationOptions.contentTitle).assertEqual('Title6') - expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 006') - expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') - expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0700 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0700', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0700 START ') - let ActionResult = { - bundleName: 'com.example.actsnotificationshow', - abilityName: '', - uri: '/', - } - let ShowNotificationOptions = { - contentTitle: 'Title7', - contentText: 'This is a notification 007', - clickAction: ActionResult - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) - console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) - console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) - console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) - console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) - expect(ShowNotificationOptions.contentTitle).assertEqual('Title7') - expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 007') - expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') - expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0800 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0800', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0800 START ') - let ActionResult = { - bundleName: 'com.example.actsnotificationshow', - abilityName: 'com.example.actsnotificationshow.MainAbility', - uri: '', - } - let ShowNotificationOptions = { - contentTitle: 'Title8', - contentText: 'This is a notification 008', - clickAction: ActionResult - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) - console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) - console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) - console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) - console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) - expect(ShowNotificationOptions.contentTitle).assertEqual('Title8') - expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 008') - expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') - expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0900 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_0900', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0900 START ') - let ActionResult = { - bundleName: 'com.example.actsnotificationshow', - abilityName: 'com.example.actsnotificationshow.MainAbility', - uri: '/', - } - let ShowNotificationOptions = { - contentText: 'This is a notification 009', - clickAction: ActionResult - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) - console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) - console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) - console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) - expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 009') - expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') - expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') - expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') - done() - }) - - /* - * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_1000 - * @tc.name: show() - * @tc.desc: verify the function of show - */ - it('SUB_NOTIFICATION_ANS_SHOW_TEST_1000', 0, async function (done) { - console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_1000 START ') - let ActionResult = { - bundleName: 'com.example.actsnotificationshow', - abilityName: 'com.example.actsnotificationshow.MainAbility', - uri: '/', - } - let ShowNotificationOptions = { - contentTitle: 'Title10', - clickAction: ActionResult - } - notification.show(ShowNotificationOptions) - console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) - console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) - console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) - console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) - expect(ShowNotificationOptions.contentTitle).assertEqual('Title10') - expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') - expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') - expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') - done() - }) - - console.info(TAG + "SUB_NOTIFICATION_ANS_SHOW_TEST END"); - - - }) - -} +/* + * 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 notification from '@system.notification' +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' + +export default function ActsNotificationShowTest() { + describe('SUB_NOTIFICATION_ANS_SHOW_TEST', function () { + const TAG = 'SUB_NOTIFICATION_ANS_SHOW_TEST ===> ' + console.info(TAG + "SUB_NOTIFICATION_ANS_SHOW_TEST START") + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0100 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0100', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0100 START ') + let ShowNotificationOptions = { + contentTitle: 'Title1', + contentText: 'This is a notification 001' + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) + console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) + expect(ShowNotificationOptions.contentTitle).assertEqual('Title1') + expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 001') + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0200 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0200', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0200 START ') + let ShowNotificationOptions = { + contentTitle: 123, + contentText: 'This is a notification 002' + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' conteneTitle is number:' + ShowNotificationOptions.contentTitle) + console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) + expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 002') + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0300 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0300', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0300 START ') + let ShowNotificationOptions = {} + notification.show(ShowNotificationOptions) + expect(ShowNotificationOptions.contentTitle).assertEqual(undefined) + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0400 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0400', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0400 START ') + let ActionResult = { + bundleName: 'com.example.actsnotificationshow', + abilityName: 'com.example.actsnotificationshow.MainAbility', + uri: '/' + } + let ShowNotificationOptions = { + contentTitle: 'Title4', + contentText: 'This is a notification 004', + clickAction: ActionResult + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) + console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) + console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) + console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) + console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) + expect(ShowNotificationOptions.contentTitle).assertEqual('Title4') + expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 004') + expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') + expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') + expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0500 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0500', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0500 START ') + let ActionResult = { + bundleName: 'com.example.actsnotificationshow', + abilityName: 'com.example.actsnotificationshow.MainAbility', + uri: 'pages/index/index' + } + let ShowNotificationOptions = { + contentTitle: 'Title5', + contentText: 'This is a notification 005', + clickAction: ActionResult + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) + console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) + console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) + console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) + console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) + expect(ShowNotificationOptions.contentTitle).assertEqual('Title5') + expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 005') + expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') + expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') + expect(ShowNotificationOptions.clickAction.uri).assertEqual('pages/index/index') + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0600 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0600', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0600 START ') + let ActionResult = { + bundleName: '', + abilityName: 'com.example.actsnotificationshow.MainAbility', + uri: '/', + } + let ShowNotificationOptions = { + contentTitle: 'Title6', + contentText: 'This is a notification 006', + clickAction: ActionResult + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) + console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) + console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) + console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) + console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) + expect(ShowNotificationOptions.contentTitle).assertEqual('Title6') + expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 006') + expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') + expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0700 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0700', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0700 START ') + let ActionResult = { + bundleName: 'com.example.actsnotificationshow', + abilityName: '', + uri: '/', + } + let ShowNotificationOptions = { + contentTitle: 'Title7', + contentText: 'This is a notification 007', + clickAction: ActionResult + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) + console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) + console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) + console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) + console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) + expect(ShowNotificationOptions.contentTitle).assertEqual('Title7') + expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 007') + expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') + expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0800 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0800', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0800 START ') + let ActionResult = { + bundleName: 'com.example.actsnotificationshow', + abilityName: 'com.example.actsnotificationshow.MainAbility', + uri: '', + } + let ShowNotificationOptions = { + contentTitle: 'Title8', + contentText: 'This is a notification 008', + clickAction: ActionResult + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) + console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) + console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) + console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) + console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) + expect(ShowNotificationOptions.contentTitle).assertEqual('Title8') + expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 008') + expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') + expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_0900 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_0900', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_0900 START ') + let ActionResult = { + bundleName: 'com.example.actsnotificationshow', + abilityName: 'com.example.actsnotificationshow.MainAbility', + uri: '/', + } + let ShowNotificationOptions = { + contentText: 'This is a notification 009', + clickAction: ActionResult + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' contentText:' + ShowNotificationOptions.contentText) + console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) + console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) + console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) + expect(ShowNotificationOptions.contentText).assertEqual('This is a notification 009') + expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') + expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') + expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') + done() + }) + + /* + * @tc.number: SUB_NOTIFICATION_ANS_SHOW_TEST_1000 + * @tc.name: show() + * @tc.desc: verify the function of show + */ + it('SUB_NOTIFICATION_ANS_SHOW_TEST_1000', 0, async function (done) { + console.info(TAG + 'SUB_NOTIFICATION_ANS_SHOW_TEST_1000 START ') + let ActionResult = { + bundleName: 'com.example.actsnotificationshow', + abilityName: 'com.example.actsnotificationshow.MainAbility', + uri: '/', + } + let ShowNotificationOptions = { + contentTitle: 'Title10', + clickAction: ActionResult + } + notification.show(ShowNotificationOptions) + console.info(TAG + ' conteneTitle:' + ShowNotificationOptions.contentTitle) + console.info(TAG + ' ActionResult bundleName:' + ShowNotificationOptions.clickAction.bundleName) + console.info(TAG + ' ActionResult abilityName:' + ShowNotificationOptions.clickAction.abilityName) + console.info(TAG + ' ActionResult uri:' + ShowNotificationOptions.clickAction.uri) + expect(ShowNotificationOptions.contentTitle).assertEqual('Title10') + expect(ShowNotificationOptions.clickAction.bundleName).assertEqual('com.example.actsnotificationshow') + expect(ShowNotificationOptions.clickAction.abilityName).assertEqual('com.example.actsnotificationshow.MainAbility') + expect(ShowNotificationOptions.clickAction.uri).assertEqual('/') + done() + }) + + console.info(TAG + "SUB_NOTIFICATION_ANS_SHOW_TEST END"); + + + }) + +} diff --git a/notification/ans_standard/actsnotificationshow/src/main/js/test/List.test.js b/notification/ans_standard/actsNotificationShowTest/src/main/js/test/List.test.js similarity index 97% rename from notification/ans_standard/actsnotificationshow/src/main/js/test/List.test.js rename to notification/ans_standard/actsNotificationShowTest/src/main/js/test/List.test.js index 6ea37b96e..bf0adb5ab 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/js/test/List.test.js +++ b/notification/ans_standard/actsNotificationShowTest/src/main/js/test/List.test.js @@ -1,18 +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. - */ -import ActsNotificationShowTest from './ActsNotificationShowTest.js' -export default function testsuite() { -ActsNotificationShowTest() -} +/* + * 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 ActsNotificationShowTest from './ActsNotificationShowTest.js' +export default function testsuite() { +ActsNotificationShowTest() +} diff --git a/notification/ans_standard/actsnotificationshow/src/main/resources/base/element/string.json b/notification/ans_standard/actsNotificationShowTest/src/main/resources/base/element/string.json similarity index 94% rename from notification/ans_standard/actsnotificationshow/src/main/resources/base/element/string.json rename to notification/ans_standard/actsNotificationShowTest/src/main/resources/base/element/string.json index a4311fdbd..054c46cf8 100644 --- a/notification/ans_standard/actsnotificationshow/src/main/resources/base/element/string.json +++ b/notification/ans_standard/actsNotificationShowTest/src/main/resources/base/element/string.json @@ -1,28 +1,28 @@ -{ - "string": [ - { - "name": "app_name", - "value": "JsHelloWorld" - }, - { - "name": "mainability_description", - "value": "hap sample empty page" - }, - { - "name": "MainAbility_desc", - "value": "description" - }, - { - "name": "MainAbility_label", - "value": "label" - }, - { - "name": "TestAbility_desc", - "value": "description" - }, - { - "name": "TestAbility_label", - "value": "label" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "JsHelloWorld" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + }, + { + "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/notification/ans_standard/actsnotificationshow/src/main/resources/base/media/icon.png b/notification/ans_standard/actsNotificationShowTest/src/main/resources/base/media/icon.png similarity index 100% rename from notification/ans_standard/actsnotificationshow/src/main/resources/base/media/icon.png rename to notification/ans_standard/actsNotificationShowTest/src/main/resources/base/media/icon.png -- GitLab