diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/entry/src/main/js/default/app.js b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/entry/src/main/js/default/app.js old mode 100644 new mode 100755 diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/signature/openharmony_sx.p7b old mode 100644 new mode 100755 diff --git a/appexecfwk/bundle_standard/bundlemanager/bmscheckpermissiontest/entry/src/main/js/default/app.js b/appexecfwk/bundle_standard/bundlemanager/bmscheckpermissiontest/entry/src/main/js/default/app.js old mode 100755 new mode 100644 diff --git a/notification/ans_standard/publish_test/badgedisplayed/BUILD.gn b/notification/ans_standard/publish_test/badgedisplayed/BUILD.gn index d74a19a8421c8e0b1bb175acb6ca1b79bcaf9865..639821ddbca4606abf999c28cb3afcef5ec787b5 100644 --- a/notification/ans_standard/publish_test/badgedisplayed/BUILD.gn +++ b/notification/ans_standard/publish_test/badgedisplayed/BUILD.gn @@ -17,8 +17,8 @@ group("badgedisplayed") { testonly = true if (is_standard_system) { deps = [ - #"badgedisplay:ActsAnsBadgeDisplayTest", - #"localcandisplay:localcandisplay", + "badgedisplay:ActsAnsBadgeDisplayTest", + "localcandisplay:localcandisplay", ] } } diff --git a/notification/ans_standard/publish_test/enablenotification/BUILD.gn b/notification/ans_standard/publish_test/enablenotification/BUILD.gn index 88e1eaf0af6c6c43196715c20bf391c0b599c27b..cc641e79afedc38c03b8a1e378d30b49cba784bf 100644 --- a/notification/ans_standard/publish_test/enablenotification/BUILD.gn +++ b/notification/ans_standard/publish_test/enablenotification/BUILD.gn @@ -17,8 +17,8 @@ group("enablenotification") { testonly = true if (is_standard_system) { deps = [ - #"enablenotification:ActsAnsEnableNotificationTest", - #"localnotificationenable:ActsAnsLocalNotificationTest", + "enablenotification:ActsAnsEnableNotificationTest", + "localnotificationenable:ActsAnsLocalNotificationTest", ] } } diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/.gitignore b/notification/ans_standard/publish_test/enablenotification/enablenotification/.gitignore deleted file mode 100644 index 82dc42bd41e44f0a17e007c62feabac9a3f35d72..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -/entry/.preview -.cxx diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/.gitignore b/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/.gitignore deleted file mode 100644 index eaf91e2ac647df635a09f01b8a2a254252aae8d7..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/compiler.xml b/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/compiler.xml deleted file mode 100644 index 245a82c8279131bde0c8c09a1f1791c8b0312984..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/gradle.xml b/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/gradle.xml deleted file mode 100644 index c848cf9e3b543d3cc2089b7ea3ddf4ed6abda171..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/gradle.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/jarRepositories.xml b/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/jarRepositories.xml deleted file mode 100644 index aa00d771aa98b60cc8db06b5e24919c06b208cda..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/misc.xml b/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/misc.xml deleted file mode 100644 index 9883d055f8725da2d0f5c1cecc525b815e5dfcec..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/Test.json b/notification/ans_standard/publish_test/enablenotification/enablenotification/Test.json index 71acd318939868352a1e58d02189f4cc1455ccdd..2ff6b82327c766fa6d9654275ac611ab1afe3501 100644 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/Test.json +++ b/notification/ans_standard/publish_test/enablenotification/enablenotification/Test.json @@ -9,7 +9,8 @@ "kits": [ { "test-file-name": [ - "ActsAnsEnableNotificationTest.hap" + "ActsAnsEnableNotificationTest.hap", + "ActsAnsLocalNotificationTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/.gitignore b/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/.gitignore deleted file mode 100644 index 3543521e9fef8e7322940a87c2b45dd0061b0f45..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/config.json b/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/config.json index d8811b53aeba020aa06c62ca61c265d859357cca..49e5236f1480af85318c7c7b2df06c955010b408 100644 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/config.json +++ b/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/config.json @@ -14,7 +14,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.example.actsansenablenotificationonetest", + "package": "com.example.actsansenablenotificationtest", "name": ".MyApplication", "deviceType": [ "phone" @@ -36,7 +36,7 @@ ] } ], - "name": "com.example.actsansenablenotificationonetest.MainAbility", + "name": "com.example.actsansenablenotificationtest.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/js/test/EnableNotification.js b/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/js/test/EnableNotification.js index 9ebf8c22ef12e7b0101738e0160282ec4e6de51e..20cdb5ec5dae4d131d63dff837b3f7e3a46047ca 100644 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/js/test/EnableNotification.js +++ b/notification/ans_standard/publish_test/enablenotification/enablenotification/entry/src/main/js/test/EnableNotification.js @@ -169,6 +169,29 @@ describe('ActsAnsEnableNotificationTest', function () { done(); }) }) + /* + * @tc.number: ActsGetEnable_test_1100 + * @tc.name: isNotificationEnabled() + * @tc.desc: verify the function of isNotificationEnabled + */ + it('ActsGetEnable_test_1100', 0, async function (done) { + await notify.isNotificationEnabled((err,data) => { + console.log("==========================>ActsGetEnable_test_1100 success=======================>"+err+data) + expect(typeof(data)).assertEqual('boolean') + }) + done(); + }) + /* + * @tc.number: ActsGetEnable_test_1200 + * @tc.name: isNotificationEnabled() + * @tc.desc: verify the function of isNotificationEnabled + */ + it('ActsGetEnable_test_1200', 0, async function (done) { + var promise = await notify.isNotificationEnabled() + console.log("==========================>ActsGetEnable_test_1200 success=======================>"+promise) + expect(typeof(promise)).assertEqual('boolean') + done(); + }) /* * @tc.number: ActsSetEnable_test_0100 * @tc.name: enableNotification() diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.gitignore b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.gitignore deleted file mode 100644 index 82dc42bd41e44f0a17e007c62feabac9a3f35d72..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -/entry/.preview -.cxx diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/.gitignore b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/.gitignore deleted file mode 100644 index eaf91e2ac647df635a09f01b8a2a254252aae8d7..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/compiler.xml b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/compiler.xml deleted file mode 100644 index 245a82c8279131bde0c8c09a1f1791c8b0312984..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/gradle.xml b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/gradle.xml deleted file mode 100644 index c848cf9e3b543d3cc2089b7ea3ddf4ed6abda171..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/gradle.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/jarRepositories.xml b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/jarRepositories.xml deleted file mode 100644 index aa00d771aa98b60cc8db06b5e24919c06b208cda..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/misc.xml b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/misc.xml deleted file mode 100644 index 9883d055f8725da2d0f5c1cecc525b815e5dfcec..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json index 5248d49eef03ba3f032249156ccca7cb4b587927..93663d2d6daff396ef073ef618d623d75414cb68 100644 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json +++ b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json @@ -1,18 +1,3 @@ { - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "60000", - "package": "com.example.actsanslocalnotificationtest", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAnsLocalNotificationTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] + "description": "Configuration for hjunit demo Tests", } diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/.gitignore b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/.gitignore deleted file mode 100644 index 3543521e9fef8e7322940a87c2b45dd0061b0f45..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/default/pages/index/index.js b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/default/pages/index/index.js index c3b6a96287aa8ad4c9bf0e44ccba5d69b68ae02c..564fb917e86558511fcd08d438b143c939f8ef70 100644 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/default/pages/index/index.js +++ b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/default/pages/index/index.js @@ -37,8 +37,6 @@ export default { const configService = core.getDefaultService('config') configService.setConfig(this) - - require('../../../test/List.test') core.execute() }, onReady() { diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/test/List.test.js b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/test/List.test.js deleted file mode 100644 index cf2baaf7a32ff0a7c90a8c3464bcbd111e39203f..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/test/List.test.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -require('./LocalNotificationEnable.js') \ No newline at end of file diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/test/LocalNotificationEnable.js b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/test/LocalNotificationEnable.js deleted file mode 100644 index 027304cce0b69931ce5331c92cc48a8024b819af..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/src/main/js/test/LocalNotificationEnable.js +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import notify from '@ohos.notification' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -var time = 1000 -describe('ActsAnsLocalNotificationTest', function () { - console.info("===========ActsLocalNotificationTest start====================>"); - /* - * @tc.number: ActsLocalNotification_test_0100 - * @tc.name: isNotificationEnabled() - * @tc.desc: verify the function of isNotificationEnabled - */ - it('ActsLocalNotification_test_0100', 0, async function (done) { - await notify.isNotificationEnabled((err,data) => { - console.log("==========================>ActsLocalNotification_test_0100 success=======================>"+err+data) - expect(typeof(data)).assertEqual('boolean') - }) - done(); - setTimeout(function(){ - console.debug("====>time out ActsLocalNotification_test_0100====>"); - }, time); - }) - /* - * @tc.number: ActsLocalNotification_test_0200 - * @tc.name: isNotificationEnabled() - * @tc.desc: verify the function of isNotificationEnabled - */ - it('ActsLocalNotification_test_0200', 0, async function (done) { - var promise = await notify.isNotificationEnabled() - console.log("==========================>ActsLocalNotification_test_0200 success=======================>"+promise) - expect(typeof(promise)).assertEqual('boolean') - done(); - setTimeout(function(){ - console.debug("====>time out ActsLocalNotification_test_0200====>"); - }, time); - }) - -}) - diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/.gitignore b/notification/ans_standard/publish_test/getactive/actsansgetactive/.gitignore deleted file mode 100644 index 82dc42bd41e44f0a17e007c62feabac9a3f35d72..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -/entry/.preview -.cxx diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/.gitignore b/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/.gitignore deleted file mode 100644 index eaf91e2ac647df635a09f01b8a2a254252aae8d7..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/compiler.xml b/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/compiler.xml deleted file mode 100644 index 245a82c8279131bde0c8c09a1f1791c8b0312984..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/gradle.xml b/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/gradle.xml deleted file mode 100644 index 86cf9d664ea4912cf947aeabc735747c8a1faeec..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/gradle.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/jarRepositories.xml b/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/jarRepositories.xml deleted file mode 100644 index aa00d771aa98b60cc8db06b5e24919c06b208cda..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/misc.xml b/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/misc.xml deleted file mode 100644 index 9883d055f8725da2d0f5c1cecc525b815e5dfcec..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/entry/.gitignore b/notification/ans_standard/publish_test/getactive/actsansgetactive/entry/.gitignore deleted file mode 100644 index 3543521e9fef8e7322940a87c2b45dd0061b0f45..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/entry/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/entry/src/main/js/test/getActive.js b/notification/ans_standard/publish_test/getactive/actsansgetactive/entry/src/main/js/test/getActive.js index c7d9cd7af38e8ae7b8a88d47ebb65a226ed61067..a0cdfca9af49eff6a5b1b4a69806d6e87e39e940 100644 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/entry/src/main/js/test/getActive.js +++ b/notification/ans_standard/publish_test/getactive/actsansgetactive/entry/src/main/js/test/getActive.js @@ -15,7 +15,7 @@ import notify from '@ohos.notification' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -var time = 1000 +var time = 300 var ERR_ANS_NON_SYSTEM_APP = 67108877 describe('ActsAnsActiveTest', function () { console.info("===========ActsAnsActiveTest start====================>"); @@ -79,9 +79,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetActive_0100 publish end==================>"); notify.getActiveNotifications(getCallback); console.debug("===============Ans_GetActive_0100 getActiveNotifications end==================>"); - done(); setTimeout(async function(){ console.debug("===============Ans_GetActive_0100 done==================>"); + done(); }, time); }) @@ -142,9 +142,9 @@ describe('ActsAnsActiveTest', function () { console.log("=======Ans_GetActive_0200 getCallback badgeIconStyle=====>"+promiseData[i].badgeIconStyle) } console.debug("===============Ans_GetActive_0200 getActiveNotifications end==================>"); - done(); setTimeout(async function(){ console.debug("===============Ans_GetActive_0200 done==================>"); + done(); }, time); }) @@ -218,9 +218,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetActive_0300 publish2 end==================>"); notify.getActiveNotifications(getCallbackTwo); console.debug("===============Ans_GetActive_0300 getActiveNotifications end==================>"); - done(); setTimeout(async function(){ console.debug("===============Ans_GetActive_0300 done==================>"); + done(); }, time); }) @@ -289,9 +289,9 @@ describe('ActsAnsActiveTest', function () { } } console.debug("===============Ans_GetActive_0400 getActiveNotifications end==================>"); - done(); setTimeout(async function(){ console.debug("===============Ans_GetActive_0400 done==================>"); + done(); }, time); }) @@ -307,9 +307,9 @@ describe('ActsAnsActiveTest', function () { console.log("Ans_GetActive_0500 getCallback data.length============>" + data.length); console.log("Ans_GetActive_0500 getCallback JSON.stringify(data)============>" + JSON.stringify(data)); expect(data.length).assertEqual(0); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_0500 done==================>"); + done(); }, time); }); }) @@ -327,9 +327,9 @@ describe('ActsAnsActiveTest', function () { expect(promiseData.length).assertEqual(0); console.debug("=========Ans_GetActive_0600 promiseData.length=============>"+promiseData.length); console.debug("==Ans_GetActivcae_0600 JSON.stringify(promiseData)========>"+JSON.stringify(promiseData)); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_0600 done==================>"); + done(); }, time); }) @@ -394,9 +394,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetActive_0700 cancel end==================>"); notify.getActiveNotifications(getCallbackFour); console.debug("===============Ans_GetActive_0700 getActiveNotifications end==================>"); - done(); setTimeout(async function(){ console.debug("===============Ans_GetActive_0700 done==================>"); + done(); }, time); }) @@ -454,9 +454,9 @@ describe('ActsAnsActiveTest', function () { console.log("============Ans_GetActive_0800 getCallback label=====>"+promiseData[i].label) } console.debug("===============Ans_GetActive_0800 getActiveNotifications end==================>"); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_0800 done==================>"); + done(); }, time); }) @@ -508,9 +508,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetActive_0900 cancelAll end==================>"); notify.getActiveNotifications(getCallbackFive); console.debug("===============Ans_GetActive_0900 getActiveNotifications end==================>"); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_0900 done==================>"); + done(); }, time); }) @@ -558,9 +558,9 @@ describe('ActsAnsActiveTest', function () { console.log("Ans_GetActive_1000 getCallback data============>"+JSON.stringify(promiseData)); expect(promiseData.length).assertEqual(0); console.debug("===============Ans_GetActive_1000 getActiveNotifications end==================>"); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1000 done==================>"); + done(); }, time); }) @@ -599,9 +599,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetActive_1100 publish end==================>"); notify.getActiveNotificationCount(getCountCallback); console.debug("===============Ans_GetActive_1100 getActiveNotificationCount end==================>"); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1100 done==================>"); + done(); }, time); }) @@ -636,9 +636,9 @@ describe('ActsAnsActiveTest', function () { var promiseCount = await notify.getActiveNotificationCount(); expect(promiseCount).assertEqual(1); console.debug("===============Ans_GetActive_1200 promiseCount==================>"+promiseCount); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1200 done==================>"); + done(); }, time); }) @@ -698,9 +698,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetActive_1300 publish end==================>"); notify.getActiveNotificationCount(getCountCallbackTwo); console.debug("===============Ans_GetActive_1300 getActiveNotificationCount end==================>"); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1300 done==================>"); + done(); }, time); }) @@ -755,9 +755,9 @@ describe('ActsAnsActiveTest', function () { var promiseCount = await notify.getActiveNotificationCount(); expect(promiseCount).assertEqual(2); console.debug("===============Ans_GetActive_1400 promiseCount==================>"+promiseCount); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1400 done==================>"); + done(); }, time); }) @@ -776,9 +776,9 @@ describe('ActsAnsActiveTest', function () { await notify.cancelAll(); notify.getActiveNotificationCount(getCountCallbackThree); console.debug("===============Ans_GetActive_1500 getActiveNotificationCount end==================>"); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1500 done==================>"); + done(); }, time); }) @@ -793,9 +793,9 @@ describe('ActsAnsActiveTest', function () { var promiseCount = await notify.getActiveNotificationCount(); expect(promiseCount).assertEqual(0); console.debug("===============Ans_GetActive_1600 promiseCount==================>"+promiseCount); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1600 done==================>"); + done(); }, time); }) @@ -846,9 +846,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetActive_1700 cancel end==================>"); notify.getActiveNotificationCount(getCountCallbackFour); console.debug("===============Ans_GetActive_1700 getActiveNotifications end==================>"); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1700 done==================>"); + done(); }, time); }) @@ -894,9 +894,9 @@ describe('ActsAnsActiveTest', function () { var promiseCount = await notify.getActiveNotificationCount(); expect(promiseCount).assertEqual(1); console.debug("===============Ans_GetActive_1800 promiseCount===========>"+promiseCount); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1800 done==================>"); + done(); }, time); }) @@ -946,9 +946,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetActive_1900 cancel end==================>"); notify.getActiveNotificationCount(getCountCallbackFive); console.debug("===============Ans_GetActive_1900 getActiveNotifications end==================>"); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_1900 done==================>"); + done(); }, time); }) @@ -994,19 +994,17 @@ describe('ActsAnsActiveTest', function () { var promiseCount = await notify.getActiveNotificationCount(); expect(promiseCount).assertEqual(0); console.debug("===============Ans_GetActive_2000 promiseCount===========>"+promiseCount); - done(); setTimeout(function(){ console.debug("===============Ans_GetActive_2000 done==================>"); + done(); }, time); }) - function getAllCallbackNine(err, data){ - console.debug("========Ans_GetAllActive_0900 getAllCallbackNine data.length========>"+data.length); - console.debug("========Ans_GetAllActive_0900 getAllCallbackNine err.code========>"+err.code); - expect(err.code).assertEqual(67108877); - expect(data).assertEqual(undefined); + function getAllCallbackNine(err,data){ + console.debug("===========Ans_GetAllActive_0900 getAllCallbackNine data.length============>"+data.length); + console.debug("===========Ans_GetAllActive_0900 getAllCallbackNine err.code============>"+err.code); + expect(err.code).assertEqual(ERR_ANS_NON_SYSTEM_APP); } - /* * @tc.number: Ans_GetAllActive_0900 * @tc.name: getAllActiveNotifications(callback: AsyncCallback>): void; @@ -1032,9 +1030,9 @@ describe('ActsAnsActiveTest', function () { console.debug("===============Ans_GetAllActive_0900 publish CurrentApp notify end==================>"); notify.getAllActiveNotifications(getAllCallbackNine); console.debug("===============Ans_GetAllActive_0900 getAllActiveNotifications end==================>"); - done(); - setTimeout(async function(){ + setTimeout(function(){ console.debug("===============Ans_GetAllActive_0900 done==================>"); + done(); }, time); }) @@ -1061,11 +1059,16 @@ describe('ActsAnsActiveTest', function () { } await notify.publish(notificationRequestOfCurrentApp); console.debug("===============Ans_GetAllActive_1000 publish CurrentApp notify end==================>"); - await notify.getAllActiveNotifications().then().catch((err)=>{ + await notify.getAllActiveNotifications().then(()=>{ + console.debug("=======Ans_GetAllActive_1000 then========>"); + }).catch((err)=>{ expect(err.code).assertEqual(ERR_ANS_NON_SYSTEM_APP); - console.debug("==Ans_GetAllActive_1000 err==>"+err.code); - done(); + console.debug("=======Ans_GetAllActive_1000 err==========>"+err.code); }); + setTimeout(function(){ + console.debug("===============Ans_GetAllActive_1000 done==================>"); + done(); + }, time); }) }) diff --git a/notification/ans_standard/publish_test/subscribe/BUILD.gn b/notification/ans_standard/publish_test/subscribe/BUILD.gn index 9a9a8f8d2a8be0046dae20d35f890ae1f7517d04..d985e16c852a5e1d53ba1d01348cd65028d68ecf 100644 --- a/notification/ans_standard/publish_test/subscribe/BUILD.gn +++ b/notification/ans_standard/publish_test/subscribe/BUILD.gn @@ -19,7 +19,6 @@ group("subscribe") { deps = [ "publish:ActsAnsPublishTest", "subscribe:ActsAnsSubscriberTest", - "subsystem:ActsAnsSubSystemTest", ] } } diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/.gitignore b/notification/ans_standard/publish_test/subscribe/subsystem/.gitignore deleted file mode 100644 index 82dc42bd41e44f0a17e007c62feabac9a3f35d72..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -/entry/.preview -.cxx diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/.gitignore b/notification/ans_standard/publish_test/subscribe/subsystem/.idea/.gitignore deleted file mode 100644 index eaf91e2ac647df635a09f01b8a2a254252aae8d7..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/compiler.xml b/notification/ans_standard/publish_test/subscribe/subsystem/.idea/compiler.xml deleted file mode 100644 index 245a82c8279131bde0c8c09a1f1791c8b0312984..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/gradle.xml b/notification/ans_standard/publish_test/subscribe/subsystem/.idea/gradle.xml deleted file mode 100644 index c848cf9e3b543d3cc2089b7ea3ddf4ed6abda171..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/gradle.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/jarRepositories.xml b/notification/ans_standard/publish_test/subscribe/subsystem/.idea/jarRepositories.xml deleted file mode 100644 index aa00d771aa98b60cc8db06b5e24919c06b208cda..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/misc.xml b/notification/ans_standard/publish_test/subscribe/subsystem/.idea/misc.xml deleted file mode 100644 index 9883d055f8725da2d0f5c1cecc525b815e5dfcec..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/BUILD.gn b/notification/ans_standard/publish_test/subscribe/subsystem/BUILD.gn deleted file mode 100644 index dd614deba9822d1b6cdc66b7432c7a8c84f7ac1b..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//test/xts/tools/build/suite.gni") - -ohos_js_hap_suite("ActsAnsSubSystemTest") { - hap_profile = "./entry/src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsSubSystemTest" -} -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/subscribe/subsystem/Test.json b/notification/ans_standard/publish_test/subscribe/subsystem/Test.json deleted file mode 100644 index a071fd38bdcd14359a9935ef50d98d056ef5ac4f..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "60000", - "package": "com.example.actsanssubsystemtest", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAnsSubSystemTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/.gitignore b/notification/ans_standard/publish_test/subscribe/subsystem/entry/.gitignore deleted file mode 100644 index 3543521e9fef8e7322940a87c2b45dd0061b0f45..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/config.json b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/config.json deleted file mode 100644 index ba837a9f0b2e58ed06acbb7a1a2d1c363f90e328..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/config.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "app": { - "bundleName": "com.example.actsanssubsystemtest", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.actsanssubsystemtest", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.example.actsanssubsystemtest.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "isVisible": "true", - "launchType": "standard", - "visible": true - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/app.js b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/app.js deleted file mode 100644 index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/app.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/i18n/en-US.json b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/i18n/en-US.json deleted file mode 100644 index e63c70d978a3a53be988388c87182f81785e170c..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - } -} \ No newline at end of file diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/i18n/zh-CN.json b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index de6ee5748322f44942c1b003319d8e66c837675f..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } -} \ No newline at end of file diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.css b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.css deleted file mode 100644 index 6fda792753f2e15f22b529c7b90a82185b2770bf..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,9 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.hml b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.hml deleted file mode 100644 index e42bdfdd29c1e18681d7f2924d1b98191d47fa4a..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - 订阅发布 - -
diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.js b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.js deleted file mode 100644 index c3b6a96287aa8ad4c9bf0e44ccba5d69b68ae02c..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import file from '@system.file' -import {Core, ExpectExtend} from 'deccjsunit/index' - -const injectRef = Object.getPrototypeOf(global) || global -injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') - -export default { - data: { - title: "" - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - core.addService('expect', expectExtend) - core.init() - - const configService = core.getDefaultService('config') - configService.setConfig(this) - - require('../../../test/List.test') - core.execute() - }, - onReady() { - console.info('onReady'); - }, -} diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/resources/base/element/string.json b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/resources/base/element/string.json deleted file mode 100644 index 30895093f1f793272b0638cbde300dd08dfcf1c0..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "Subscriber" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] -} \ No newline at end of file diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/resources/base/media/icon.png b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/resources/base/media/icon.png and /dev/null differ diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/test/List.test.js b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/test/List.test.js deleted file mode 100644 index 41999288d49304127387014dc88894130a148ab4..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/test/List.test.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -require('./Subscriber.js') \ No newline at end of file diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/test/Subscriber.js b/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/test/Subscriber.js deleted file mode 100644 index 5228d93195c78f474547c7c1c70725b3e07caaa5..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/subsystem/entry/src/main/js/test/Subscriber.js +++ /dev/null @@ -1,48 +0,0 @@ - /* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import notify from '@ohos.notification' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -var time = 1000 -var ERR_ANS_NON_SYSTEM_APP = 67108877 -describe('ActsAnsSubSystemTest', function () { - console.info("===========ActsAnsSubSystemTest start====================>"); - //subscribeOn - function subscribeOnCallback(err) { - console.debug("===>subscribeOnCallback===>"); - expect(err.code).assertEqual(0); - } - /* - * @tc.number: ActsSubscriber_test_1400 - * @tc.name: subscribe() - * @tc.desc: verify the function of subscribe - */ - it('ActsSubscriber_test_1500', 0, async function (done) { - console.debug("===ActsSubscriber_test_1400===begin===>"); - - var subInfo ={ - onConnect:subscribeOnCallback, - } - await notify.subscribe(subInfo, (err)=>{ - console.debug("=====subErrorCode====="+err.code) - expect(err.code).assertEqual(ERR_ANS_NON_SYSTEM_APP); - done(); - }) - console.debug("===ActsSubscriber_test_1500===end==>"); - setTimeout(function(){ - console.debug("====>time out ActsSubscriber_test_1500====>"); - }, time); - }) -}) - diff --git a/notification/ans_standard/publish_test/subscribe/subsystem/signature/openharmony_sx.p7b b/notification/ans_standard/publish_test/subscribe/subsystem/signature/openharmony_sx.p7b deleted file mode 100644 index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000 Binary files a/notification/ans_standard/publish_test/subscribe/subsystem/signature/openharmony_sx.p7b and /dev/null differ