diff --git a/notification/ans_standard/publish_test/actsansdistributedtest/entry/src/main/js/test/actsansdistributedtest.js b/notification/ans_standard/publish_test/actsansdistributedtest/entry/src/main/js/test/actsansdistributedtest.js index 57f7c5e92ee6583e635168935c9ac95fac4e6eb6..c8a36c4cfce408da6a7b9ba9bce99469fb205955 100644 --- a/notification/ans_standard/publish_test/actsansdistributedtest/entry/src/main/js/test/actsansdistributedtest.js +++ b/notification/ans_standard/publish_test/actsansdistributedtest/entry/src/main/js/test/actsansdistributedtest.js @@ -61,10 +61,13 @@ describe('ActsAnsDistributeTest', function () { it('ActsDistribute_test_0300', 0, async function (done) { await notify.getDeviceRemindType((err,data) => { console.debug("===>ActsDistribute_test_0300===>"+ JSON.stringify(data)) - expect(data != notify.DeviceRemindType.IDLE_DONOT_REMIND ).assertEqual(true); - expect(data != notify.DeviceRemindType.IDLE_REMIND).assertEqual(true); - expect(data != notify.DeviceRemindType.ACTIVE_DONOT_REMIND).assertEqual(true); - expect(data).assertEqual(notify.DeviceRemindType.ACTIVE_REMIND); + if (data != notify.DeviceRemindType.IDLE_DONOT_REMIND + && data != notify.DeviceRemindType.IDLE_REMIND + && data != notify.DeviceRemindType.ACTIVE_DONOT_REMIND + && data != notify.DeviceRemindType.ACTIVE_REMIND ) + { + expect().assertFail(); + } done(); }); }) @@ -77,9 +80,15 @@ describe('ActsAnsDistributeTest', function () { it('ActsDistribute_test_0400', 0, async function (done) { function onConsume0100(data) { console.info("========ActsDistribute_test_0400 onConsume data:=======>" + JSON.stringify(data)); - expect(data.request.distributedOption.remindType).assertEqual(3); + if (data.request.distributedOption.remindType != notify.DeviceRemindType.IDLE_DONOT_REMIND + && data.request.distributedOption.remindType != notify.DeviceRemindType.IDLE_REMIND + && data.request.distributedOption.remindType != notify.DeviceRemindType.ACTIVE_DONOT_REMIND + && data.request.distributedOption.remindType != notify.DeviceRemindType.ACTIVE_REMIND ) + { + expect().assertFail(); + } expect(data.request.deviceId).assertEqual(""); - console.info("========ActsDistribute_test_0400 onConsume data:=======>" + JSON.stringify(data.request.notificationFlags)); + console.info("ActsDistribute_test_0400 onConsume data"+JSON.stringify(data.request.notificationFlags)); expect(JSON.stringify(data.request.notificationFlags)).assertEqual(undefined); } await notify.enableDistributed(true); diff --git a/notification/ans_standard/publish_test/getwantagentinfo/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/getwantagentinfo/entry/src/main/js/test/WantAgent.test.js index f4fcb02c5e07b7942faa1f2063839eba8d2d6189..4fcfb52a8385a916fdb930c5d60686415e6ac4ad 100644 --- a/notification/ans_standard/publish_test/getwantagentinfo/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/getwantagentinfo/entry/src/main/js/test/WantAgent.test.js @@ -229,7 +229,8 @@ describe('ActsAnsGetWantAgentInfoTest', function () { requestCode: 0, wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] } - wantAgent.getWantAgent(agentInfoc, + setTimeout(function(){ + wantAgent.getWantAgent(agentInfoc, (err, data) => { if (err.code == 0) { WantAgentc = data; @@ -266,11 +267,13 @@ describe('ActsAnsGetWantAgentInfoTest', function () { console.info(data); expect(typeof(data)).assertEqual("object"); } - done(); setTimeout(function(){ console.debug("====>time out ACTS_SetWantInfo_0300====>"); + done(); }, time); }); + }, 1000); + }) /* @@ -334,7 +337,8 @@ describe('ActsAnsGetWantAgentInfoTest', function () { requestCode: 0, wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] } - wantAgent.getWantAgent(agentInfof, + setTimeout(function(){ + wantAgent.getWantAgent(agentInfof, (err, data) => { console.log("=======agentInfof======="+err.code+JSON.stringify(data)) if (err.code == 0) { @@ -359,11 +363,13 @@ describe('ActsAnsGetWantAgentInfoTest', function () { else{ console.info('----getWantAgent failed!----'+err.code+data); } - done(); + setTimeout(function(){ console.debug("====>time out ACTS_SetWantInfo_0400====>"); + done(); }, time); }); + }, 1000); }) /* * @tc.number: ACTS_SetWantInfo_0500 @@ -425,7 +431,8 @@ describe('ActsAnsGetWantAgentInfoTest', function () { requestCode: 0, wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] } - wantAgent.getWantAgent(agentInfof, + setTimeout(function(){ + wantAgent.getWantAgent(agentInfof, (err, data) => { if (err.code == 0) { WantAgente = data; @@ -462,6 +469,7 @@ describe('ActsAnsGetWantAgentInfoTest', function () { console.debug("====>time out ACTS_SetWantInfo_0500====>"); }, time); }); + }, 1000); }) /* * @tc.number: ACTS_SetWantInfo_0600 diff --git a/notification/ans_standard/publish_test/publish/entry/src/main/config.json b/notification/ans_standard/publish_test/publish/entry/src/main/config.json index afe023398aa275767538102192abb64d9acec11d..c17f420d6133b4220b32f67aea8bf7b88b85c7d7 100644 --- a/notification/ans_standard/publish_test/publish/entry/src/main/config.json +++ b/notification/ans_standard/publish_test/publish/entry/src/main/config.json @@ -19,6 +19,9 @@ "deviceType": [ "phone" ], + "reqPermissions": [{ + "name": "ohos.permission.NOTIFICATION_CONTROLLER" + }], "distro": { "deliveryWithInstall": true, "moduleName": "entry", diff --git a/notification/ans_standard/publish_test/publish/signature/openharmony_sx.p7b b/notification/ans_standard/publish_test/publish/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..cc53179a48f88f20acc379c138a001e9a15838f6 100644 Binary files a/notification/ans_standard/publish_test/publish/signature/openharmony_sx.p7b and b/notification/ans_standard/publish_test/publish/signature/openharmony_sx.p7b differ diff --git a/notification/ans_standard/publish_test/sub/entry/src/main/config.json b/notification/ans_standard/publish_test/sub/entry/src/main/config.json index 49d73730c73036d3d986d877d488136f5fec0394..d1db94612fdadf2694e77e441b25e0268c035cb6 100644 --- a/notification/ans_standard/publish_test/sub/entry/src/main/config.json +++ b/notification/ans_standard/publish_test/sub/entry/src/main/config.json @@ -18,6 +18,11 @@ "name": ".MyApplication", "deviceType": [ "phone" + ], + "reqPermissions": [ + { + "name": "ohos.permission.NOTIFICATION_CONTROLLER" + } ], "distro": { "deliveryWithInstall": true, diff --git a/notification/ans_standard/publish_test/sub/signature/openharmony_sx.p7b b/notification/ans_standard/publish_test/sub/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..cc53179a48f88f20acc379c138a001e9a15838f6 100644 Binary files a/notification/ans_standard/publish_test/sub/signature/openharmony_sx.p7b and b/notification/ans_standard/publish_test/sub/signature/openharmony_sx.p7b differ