From e4688caf92f0370cff7508518a8dab03b80d3fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=AE=B6=E7=9D=BF?= Date: Mon, 21 Mar 2022 10:50:12 +0800 Subject: [PATCH] =?UTF-8?q?fail=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 付家睿 --- .../main/js/test/actsansdistributedtest.js | 21 +++++++++++++----- .../entry/src/main/js/test/WantAgent.test.js | 18 ++++++++++----- .../publish/entry/src/main/config.json | 3 +++ .../publish/signature/openharmony_sx.p7b | Bin 3437 -> 3442 bytes .../sub/entry/src/main/config.json | 5 +++++ .../sub/signature/openharmony_sx.p7b | Bin 3437 -> 3442 bytes 6 files changed, 36 insertions(+), 11 deletions(-) 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 57f7c5e92..c8a36c4cf 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 f4fcb02c5..4fcfb52a8 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 afe023398..c17f420d6 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 GIT binary patch delta 987 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 L=