From 77fce4485ee5664975aba9f07f4b2f69783fca34 Mon Sep 17 00:00:00 2001 From: nan-xiansen Date: Tue, 7 Feb 2023 16:04:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90resourceschedule=E3=80=91=E6=8F=90?= =?UTF-8?q?=E9=86=92=E4=BB=A3=E7=90=86=E6=A8=A1=E5=9D=97api8=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nan-xiansen Change-Id: I1056d73bb381a774967afa8d3f30a8920129b40f --- .../src/main/js/test/ReminderAgentJs.test.js | 102 +++++++++--------- 1 file changed, 48 insertions(+), 54 deletions(-) diff --git a/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/test/ReminderAgentJs.test.js b/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/test/ReminderAgentJs.test.js index 3c0e380d5..76a392b4b 100644 --- a/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/test/ReminderAgentJs.test.js +++ b/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/test/ReminderAgentJs.test.js @@ -371,26 +371,16 @@ export default function ReminderAgentTest() { * @tc.name testAddNotificationSlotNorFun_012 * @tc.desc Adds a reminder notification slot with the promise function and null mySlot. */ - it('testAddNotificationSlotNorFun_012', 0, async function (done) { - console.info('----------------------testAddNotificationSlotNorFun_012---------------------------'); - let mySlot = null; - try { - reminderAgent.addNotificationSlot(mySlot, function (err) { - if (err == undefined) { - console.info('testAddNotificationSlotNorFun_012 execute success'); - } else { - console.info('testAddNotificationSlotNorFun_012 execute failed'); - } - }).catch(function (err) { - console.info("testAddNotificationSlotNorFun_012 execute catch" + err.code); - }) - } catch (error) { - console.info("testAddNotificationSlotNorFun_012 execute try - catch" + error.code); - let i = 0; - expect(0).assertEqual(i); - done(); - } - }) + it('testAddNotificationSlotNorFun_012', 0, async function (done) { + console.info('----------------------testAddNotificationSlotNorFun_012---------------------------'); + let mySlot = null; + + reminderAgent.addNotificationSlot(mySlot, function (err) { + console.info("testAddNotificationSlotNorFun_012 null slot is invalid parameter " + err.code); + expect(err.code).assertEqual(401); + done(); + }) + }) /** * @tc.number SUB_RESOURCESCHEDULE_REMINDER_AGENT_XTS_013 @@ -434,20 +424,22 @@ export default function ReminderAgentTest() { type: 4 } function reminderCallback(err, data) { - if (err) { - expect(true).assertTrue(); - } else { - expect(false).assertTrue(); - } - setTimeout(() => { - done(); - }, 500); + if (err.code == 0) { + console.info('testAddNotificationSlotNorFun_014 add slot success'); + expect(err.code).assertEqual(0); + done(); + } else { + console.info('testAddNotificationSlotNorFun_014 slot type 4 is invalid value err code is:' + err.code); + expect(err.code).assertEqual(401); + done(); + } } reminderAgent.addNotificationSlot(mySlot0, reminderCallback); reminderAgent.addNotificationSlot(mySlot1, reminderCallback); reminderAgent.addNotificationSlot(mySlot2, reminderCallback); reminderAgent.addNotificationSlot(mySlot3, reminderCallback); reminderAgent.addNotificationSlot(mySlot4, reminderCallback); + }) /** @@ -2589,7 +2581,7 @@ export default function ReminderAgentTest() { expect(button).assertEqual(1); done(); }) - + /** * @tc.number SUB_RESOURCESCHEDULE_REMINDER_AGENT_XTS_0100 * @tc.name testNotificationSlotType_0100 @@ -2682,13 +2674,13 @@ export default function ReminderAgentTest() { type: 1 } reminderAgent.addNotificationSlot(tarRemoveSlot.type, (err, data) => { - console.info('addNotificationSlot 106 err code:' + err.code) - }); - reminderAgent.removeNotificationSlot(tarRemoveSlot.type, (err, data) => { - console.info('err code 106 is :' + err.code) - expect(err.code).assertEqual(0); - done(); - }); + console.info('addNotificationSlot 106 err code:' + err.code); + reminderAgent.removeNotificationSlot(tarRemoveSlot.type, (err, data) => { + console.info('err code 106 is :' + err.code) + expect(err.code).assertEqual(0); + done(); + }) + }) }) /** @@ -2722,12 +2714,15 @@ export default function ReminderAgentTest() { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 3 } - reminderAgent.publishReminder(timer).then((reminderId) => { }); - reminderAgent.getValidReminders().then((reminders) => { - console.info('reminders length is :' + reminders.length) - expect(reminders.length).assertLarger(0) - done() - }); + reminderAgent.cancelAllReminders().then(() => { + reminderAgent.publishReminder(timer).then((reminderId) => { + reminderAgent.getValidReminders().then((reminders) => { + console.info('reminders length is :' + reminders.length) + expect(reminders.length).assertLarger(0) + done(); + }) + }) + }) }) /** @@ -2741,13 +2736,15 @@ export default function ReminderAgentTest() { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 3 } - reminderAgent.cancelAllReminders().then(() => { }) - reminderAgent.publishReminder(timer).then((reminderId) => { }); - reminderAgent.getValidReminders((err, reminders) => { - console.info('reminder length 109 is :' + reminders.length) - expect(reminders.length).assertEqual(0); - done() - }); + reminderAgent.cancelAllReminders().then(() => { + reminderAgent.publishReminder(timer).then((reminderId) => { + reminderAgent.getValidReminders((err, reminders) => { + console.info('reminder length 109 is :' + reminders.length) + expect(reminders.length).assertLarger(0); + done() + }) + }) + }) }) /** @@ -2762,14 +2759,11 @@ export default function ReminderAgentTest() { hour: 21, minute: 14 } - reminderAgent.cancelAllReminders().then((err,data) => { - console.info('err.code 0110 is :' + err.code) - }); reminderAgent.publishReminder(alarm).then((reminderId) => { console.info("promise the testPublishReminderNorAlarmFun_0110 remiderId =" + reminderId); expect(reminderId).assertLarger(0); done() - }); + }) }) /** @@ -2788,7 +2782,7 @@ export default function ReminderAgentTest() { console.info("callback the testPublishReminderNorAlarmFun_0111 remiderId =" + reminderId); expect(reminderId).assertLarger(0); done(); - }); + }) }) /** -- GitLab