diff --git a/notification/ans_standard/publish_test/BUILD.gn b/notification/ans_standard/publish_test/BUILD.gn index 95273df1fb36d18f44aac20440afdcd25b7d9253..6cc0fca6e885c85b436830a0db4bdd3ef3c1ff61 100644 --- a/notification/ans_standard/publish_test/BUILD.gn +++ b/notification/ans_standard/publish_test/BUILD.gn @@ -40,6 +40,7 @@ group("publish_test") { #"publishvibra:ActsAnsPublishVibraTest", #"sub:ActsAnsSubTestXts", "unsubscribe:ActsAnsUnSubscriberTest", + "publishremovalwantagent:ActsAnsPublishRemovalWantAgentTest", "wantagent:wantagent", ] } diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/BUILD.gn b/notification/ans_standard/publish_test/publishremovalwantagent/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..df470d44efa37bf62583baf8b2317e49360386e4 --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/BUILD.gn @@ -0,0 +1,31 @@ +# 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("ActsAnsPublishRemovalWantAgentTest") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAnsPublishRemovalWantAgentTest" +} +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/ans_standard/publish_test/publishremovalwantagent/Test.json b/notification/ans_standard/publish_test/publishremovalwantagent/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..44469d81e6f209065f6b762dfa74e421ea4c6961 --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/Test.json @@ -0,0 +1,18 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "180000", + "package": "com.example.actsanspublishremovalwantagenttest", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ActsAnsPublishRemovalWantAgentTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/config.json b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..9094efa1ea4643cb379c8c2409955f8b31d863f2 --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/config.json @@ -0,0 +1,66 @@ +{ + "app": { + "bundleName": "com.example.actsanspublishremovalwantagenttest", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.actsanspublishremovalwantagenttest", + "name": ".actsanspublishremovalwantagenttest", + "deviceType": [ + "phone" + ], + "reqPermissions": [ + { + "name": "ohos.permission.NOTIFICATION_CONTROLLER" + } + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.actsanspublishremovalwantagenttest.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "launchType": "standard", + "visible": true + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/app.js b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/app.js new file mode 100644 index 0000000000000000000000000000000000000000..4f1747a95c4acbb66db5351e826c31584356e11c --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/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/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/i18n/en-US.json b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/i18n/en-US.json new file mode 100644 index 0000000000000000000000000000000000000000..e63c70d978a3a53be988388c87182f81785e170c --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/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/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/i18n/zh-CN.json b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/i18n/zh-CN.json new file mode 100644 index 0000000000000000000000000000000000000000..de6ee5748322f44942c1b003319d8e66c837675f --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/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/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.css b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000000000000000000000000000000000000..b6c4207e3d98d227f135ee57bfa49b98cfb93faf --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.css @@ -0,0 +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; +} diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.hml b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.hml new file mode 100644 index 0000000000000000000000000000000000000000..f3c3108301119967b798770b8760f6763338c948 --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,20 @@ +/* + * 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. + */ + +
+ + Test of Publishing vibrating Notification + +
diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.js b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.js new file mode 100644 index 0000000000000000000000000000000000000000..1054f8e514806795f3e96c7e5248b921f406ae03 --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/default/pages/index/index.js @@ -0,0 +1,45 @@ + +/* +* 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 app from '@system.app' +import device from '@system.device' +import router from '@system.router' +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() + } +} diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/resources/base/element/string.json b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..668aea23626b9aae9740b272a76f88a3d877b735 --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "PubVibra" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] +} \ No newline at end of file diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/resources/base/media/icon.png b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/resources/base/media/icon.png differ diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/test/ExampleJsunit.test.js b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/test/ExampleJsunit.test.js new file mode 100644 index 0000000000000000000000000000000000000000..66a0f281df3ea861279115991f450ab393ece8b3 --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/test/ExampleJsunit.test.js @@ -0,0 +1,140 @@ +/* + * 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 notify from '@ohos.notification' +import WantAgent from '@ohos.wantAgent' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' +var timeout = 1000; +describe('ActsAnsPublishRemovalWantAgentTest', function () { + console.info("===========ActsAnsPublishRemovalWantAgentTest start====================>"); + + /* + * @tc.number: ACTS_PublishRemovalWantAgent_xts_0100 + * @tc.name: removalWantAgent + * @tc.desc: publish removalWantAgent notification + */ + function consumeCallback(data) { + console.info("===>consumeCallback data : ===>" +JSON.stringify(data)); + var wantAgentObj = data.removalWantAgent + console.info("===>wantAgent: ===>" + JSON.stringify(wantAgentObj)) + WantAgent.getWant(wantAgentObj).then((data) => { + expect(data[0].action).assertEqual("usual.event.REMOVAL_WANTAGENT"); + }); + } + + it('ACTS_PublishRemovalWantAgent_xts_0100', 0, async function (done) { + console.info("===ACTS_PublishRemovalWantAgent_xts_0100===begin===>"); + var subInfo ={ + onConsume:consumeCallback + } + notify.subscribe(subInfo); + + var agentInfo = { + wants: [ + { + bundleName: 'com.example.actsanspublishremovalwantagenttest', + abilityName: 'com.example.actsanspublishremovalwantagenttest.MainAbility', + action: "usual.event.REMOVAL_WANTAGENT" + } + ], + operationType: WantAgent.OperationType.SEND_COMMON_EVENT, + requestCode: 0, + wantAgentFlags:[WantAgent.WantAgentFlags.ONE_TIME_FLAG] + }; + + var wantAgentData = await WantAgent.getWantAgent(agentInfo); + + var notificationRequest = { + content:{ + contentType: notify.ContentType.NOTIFICATION_CONTENT_LONG_TEXT, + longText : { + title: "test_title", + text: "test_text", + additionalText: "test_PublishRemovalWantAgent", + longText: "longText123456", + briefText: "briefText123456", + expandedTitle: "expandedTitle123456" + }, + }, + id: 1, + slotType : notify.SlotType.SERVICE_INFORMATION, + removalWantAgent : wantAgentData + } + console.info("===ACTS_PublishRemovalWantAgent_xts_0100===publish===>"); + await notify.publish(notificationRequest, (err) => { + console.info("===>publish callback===>"+err.code); + expect(err.code).assertEqual(0) + }); + console.info("===ACTS_PublishRemovalWantAgent_xts_0100===end===>"); + + setTimeout((async function(){ + notify.unsubscribe(subInfo); + console.info("======ACTS_PublishRemovalWantAgent_xts_0100 setTimeout unsubscribe===>"); + done(); + }),timeout); + }); + + /* + * @tc.number: SetEnabledForUninstallApp_test_0100 + * @tc.name: set and get enabled when distributed device without app + * @tc.desc: set true and get true + */ + it('SetEnabledForUninstallApp_test_0100', 0, async function (done) { + await notify.setSyncNotificationEnabledForUninstallApp( + 100,true,async() => { + await notify.getSyncNotificationEnabledForUninstallApp(100, (err,data) => { + console.log("===>getSyncNotificationEnabledForUninstallApp===>"+err+data) + expect(data).assertEqual(true) + done(); + }) + }) + }) + + /* + * @tc.number: SetEnabledForUninstallApp_test_0200 + * @tc.name: set and get enabled when distributed device without app + * @tc.desc: set false and get false + */ + it('SetEnabledForUninstallApp_test_0200', 0, async function (done) { + await notify.setSyncNotificationEnabledForUninstallApp( + 100,false,async() => { + await notify.getSyncNotificationEnabledForUninstallApp(100, (err,data) => { + console.log("===>getSyncNotificationEnabledForUninstallApp===>"+err+data) + expect(data).assertEqual(false) + done(); + }) + }) + }) + + /* + * @tc.number: SetEnabledForUninstallApp_test_0300 + * @tc.name: set and get enabled when distributed device without app (promise) + * @tc.desc: set true and get true + */ + it('SetEnabledForUninstallApp_test_0300', 0, async function (done) { + notify.setSyncNotificationEnabledForUninstallApp(100, true).then(() => { + notify.getSyncNotificationEnabledForUninstallApp(100).then((data) => { + console.log("===>getSyncNotificationEnabledForUninstallApp===>"+data) + expect(data).assertEqual(true) + done(); + }).catch((err) => { + Logger.error(TAG, + `===>getSyncNotificationEnabledForUninstallApp failed because ${JSON.stringify(err)}`); + }); + }).catch((err) => { + Logger.error(TAG, `===>setSyncNotificationEnabledForUninstallApp failed because ${JSON.stringify(err)}`); + }); + }) +}) \ No newline at end of file diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/test/List.test.js b/notification/ans_standard/publish_test/publishremovalwantagent/entry/src/main/js/test/List.test.js new file mode 100644 index 0000000000000000000000000000000000000000..833219dd7abe166a664ce61aa1a104852ffdd413 --- /dev/null +++ b/notification/ans_standard/publish_test/publishremovalwantagent/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('./ExampleJsunit.test.js') diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/signature/openharmony_sx.p7b b/notification/ans_standard/publish_test/publishremovalwantagent/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..cc53179a48f88f20acc379c138a001e9a15838f6 Binary files /dev/null and b/notification/ans_standard/publish_test/publishremovalwantagent/signature/openharmony_sx.p7b differ