diff --git a/notification/ces_standard/subscribeandpublish/BUILD.gn b/notification/ces_standard/subscribeandpublish/BUILD.gn index 661f203eebc545b1930cd3e79038ea3e30777c3d..c74cb5d737cbc8f8f57acb9b887dc7ab6578bce3 100644 --- a/notification/ces_standard/subscribeandpublish/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/BUILD.gn @@ -20,6 +20,7 @@ group("SubscribeAndPublish") { "actssubscriberorderedtest:ActsSubscriberOrderTest", "actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystemTest", "actssubscriberunordertest:ActsSubscriberUnorderTest", + "emittertest:EmitterTest", ] } } diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/entry/src/main/js/test/ActsSubscriber_test_unorder.js b/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/entry/src/main/js/test/ActsSubscriber_test_unorder.js index b7549cc4e374b967ebce9d842cac0ba6a9eb0337..c14b815bce62e50f581ede3be8cfdbb69b768def 100755 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/entry/src/main/js/test/ActsSubscriber_test_unorder.js +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/entry/src/main/js/test/ActsSubscriber_test_unorder.js @@ -107,6 +107,8 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) { Subscriber.Support.COMMON_EVENT_AIRPLANE_MODE_CHANGED, Subscriber.Support.COMMON_EVENT_SMS_RECEIVE_COMPLETED, Subscriber.Support.COMMON_EVENT_SPN_INFO_UPDATED, + Subscriber.Support.COMMON_EVENT_BOOT_COMPLETED, + Subscriber.Support.COMMON_EVENT_SPLIT_SCREEN ]; function publishCallback(err) { diff --git a/notification/ces_standard/subscribeandpublish/emittertest/BUILD.gn b/notification/ces_standard/subscribeandpublish/emittertest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..5b66b06eab6976961eeabaff5c417561c34f773d --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/BUILD.gn @@ -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("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("EmitterTest") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "EmitterTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" +} diff --git a/notification/ces_standard/subscribeandpublish/emittertest/Test.json b/notification/ces_standard/subscribeandpublish/emittertest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..520f5b9bb4e3dbf12110a0e6a388b666c50c8470 --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/Test.json @@ -0,0 +1,18 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "180000", + "package": "com.example.emittertest", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "emittertest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/config.json b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..2800c3cc47bd2f78468fe40d0c0029c1e20c1f29 --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/config.json @@ -0,0 +1,110 @@ +{ + "app": { + "bundleName": "com.example.emittertest", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 5, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.emittertest", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "defPermissions": [ + { + "availableScope": [], + "grantMode": "system_grant", + "name": "publish_event0800_permission" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "publish_event0900_subscriberPermissions" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "publish_event0900_publisherPermission" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "publish_event1000_permission" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "permission.COMMONEVENT_STICKY" + } + ], + "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" + ] + } + ], + "visible": true, + "name": "com.example.emittertest.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/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/app.js b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/app.js new file mode 100644 index 0000000000000000000000000000000000000000..b58cf3c570b660c6f6f8cdcb1b317d67687deb29 --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/app.js @@ -0,0 +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============='); + } +}; diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/i18n/en-US.json b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/i18n/en-US.json new file mode 100644 index 0000000000000000000000000000000000000000..e63c70d978a3a53be988388c87182f81785e170c --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/i18n/en-US.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + } +} \ No newline at end of file diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/i18n/zh-CN.json b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/i18n/zh-CN.json new file mode 100644 index 0000000000000000000000000000000000000000..de6ee5748322f44942c1b003319d8e66c837675f --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/i18n/zh-CN.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + } +} \ No newline at end of file diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.css b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000000000000000000000000000000000000..6fda792753f2e15f22b529c7b90a82185b2770bf --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,9 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.hml b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.hml new file mode 100644 index 0000000000000000000000000000000000000000..794e7a821251294b64992d05da282bee4211221a --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,6 @@ +
+ + 您好，地球1111 + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.js b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.js new file mode 100644 index 0000000000000000000000000000000000000000..cafa53ad3eb2ed6477e0fed1cab29a40633818ce --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/default/pages/index/index.js @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import file from '@system.file' +import {Core, ExpectExtend} from 'deccjsunit/index' + +const injectRef = Object.getPrototypeOf(global) || global +injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') + +export default { + data: { + title: "" + }, + 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() { + }, +} + diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/resources/base/element/string.json b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..76e501f214f84c96a44d08973dbbdeab8515e1de --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "JsHelloWorld" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} \ No newline at end of file diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/resources/base/media/icon.png b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/resources/base/media/icon.png differ diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/test/EmitterTest.js b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/test/EmitterTest.js new file mode 100644 index 0000000000000000000000000000000000000000..3bb013d061d0af433549601b31d0404c2317dabd --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/test/EmitterTest.js @@ -0,0 +1,97 @@ +/* + * 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 emitter from '@ohos.events.emitter' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' + +describe('EmitterTest', function () { + console.info("===========EmitterTest start====================>"); + + var eventData = { + data: { + "id": 1, + "content": "message", + } + } + + var innerEvent_immediadte = { + eventId: 1, + priority: emitter.EventPriority.IMMEDIATE + } + + var innerEvent_low = { + eventId: 2, + priority: emitter.EventPriority.LOW + } + + function callback(data){ + console.info('callback success'); + expect(data.eventId).assertEqual("message"); + } + + function callback01(data){ + console.info('callback success'); + expect(data.data.id).assertEqual(1); + expect(data.data.content).assertEqual("message"); + } + + /* + * @tc.number : EmitterOnTest + * @tc.name : verify on : Check subscribe same on common ordered event + * @tc.desc : Check the subscriber can receive event "EmitterOnTest" type of the interface (by Promise) + */ + it('EmitterOnTest', 0, async function (done) { + console.info("===========EmitterOnTest====================>"); + emitter.on(innerEvent_immediadte, callback); + done(); + }) + + /* + * @tc.number : EmitterOnceTest + * @tc.name : verify once : Check subscribe same once common ordered event + * @tc.desc : Check the subscriber can receive event "EmitterOnceTest" type of the interface (by Promise) + */ + it('EmitterOnceTest', 0, async function (done){ + console.info("===========EmitterOnceTest====================>"); + emitter.once(innerEvent_immediadte, callback); + done(); + }) + + /* + * @tc.number : EmitterEmitTest + * @tc.name : verify emit : Check subscribe same emit common ordered event + * @tc.desc : Check the subscriber can receive event "EmitterEmitTest" type of the interface (by Promise) + */ + it('EmitterEmitTest', 0, async function (done){ + console.info("===========EmitterEmitTest====================>"); + emitter.once(innerEvent_immediadte, callback01); + emitter.emit(innerEvent_immediadte, eventData); + done(); + }) + + /* + * @tc.number : EmitterLowTest + * @tc.name : verify low : Check subscribe same low common ordered event + * @tc.desc : Check the subscriber can receive event "EmitterLowTest" type of the interface (by Promise) + */ + it('EmitterLowTest', 0, async function (done){ + console.info("===========EmitterLowTest====================>"); + emitter.once(innerEvent_low, callback01); + emitter.emit(innerEvent_low,eventData); + done(); + }) + + + +}) diff --git a/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/test/List.test.js b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/test/List.test.js new file mode 100644 index 0000000000000000000000000000000000000000..6726d7d046247711129e5e43d67b5db2abc7383a --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/emittertest/entry/src/main/js/test/List.test.js @@ -0,0 +1,15 @@ +/* + * 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('./EmitterTest.js') \ No newline at end of file diff --git a/notification/ces_standard/subscribeandpublish/emittertest/signature/openharmony_sx.p7b b/notification/ces_standard/subscribeandpublish/emittertest/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/notification/ces_standard/subscribeandpublish/emittertest/signature/openharmony_sx.p7b differ