From 577ef46c2a5913b5df407ab319305c004e27f5d5 Mon Sep 17 00:00:00 2001 From: nan-xiansen Date: Thu, 17 Feb 2022 11:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=A8=E5=B1=80=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=AD=90=E7=B3=BB=E7=BB=9F=E3=80=91=E3=80=90?= =?UTF-8?q?master=E3=80=91=E8=A1=A5=E5=85=85=E6=8F=90=E9=86=92=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nan-xiansen Change-Id: I732c698461f99061686697509fbac0aaceeeaa55 --- .../src/main/js/default/pages/index/index.js | 1 + .../js/default/test/ReminderAgentJs.test.js | 114 +++++++++++++++++- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/default/pages/index/index.js b/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/default/pages/index/index.js index 0c564bb03..25a5449b7 100644 --- a/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/default/pages/index/index.js +++ b/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/default/pages/index/index.js @@ -39,6 +39,7 @@ export default { require('../../test/List.test') core.execute() + runDeccjsunit(5) }, onReady() { }, diff --git a/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/default/test/ReminderAgentJs.test.js b/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/default/test/ReminderAgentJs.test.js index 5399ec6e7..201335a04 100644 --- a/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/default/test/ReminderAgentJs.test.js +++ b/resourceschedule/resourceschedule_standard/reminderagent/src/main/js/default/test/ReminderAgentJs.test.js @@ -15,8 +15,6 @@ // @ts-nocheck import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' -import router from '@system.router' -import notification from '@ohos.notification' import reminderAgent from '@ohos.reminderAgent' describe('ReminderAgentTest', function () { @@ -630,5 +628,117 @@ describe('ReminderAgentTest', function () { } done(); }) + + /** + * @tc.number SUB_RESOURCESCHEDULE_REMINDER_AGENT_024 + * @tc.name testReminderTypeCalendarFun001 + * @tc.desc test cancelAllReminders can cancel all exist reminders with type of calendar. + */ + it('testReminderTypeCalendarFun001', 0, async function (done) { + let timer = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, + triggerTimeInSeconds: 100 + } + let calendar = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, + dateTime : { + year: 2025, + month: 10, + day: 10, + hour: 23, + minute: 30 + } + } + reminderAgent.publishReminder(timer).then((reminderId) => {}); + reminderAgent.publishReminder(calendar).then((reminderId) => {}); + setTimeout(() => { + reminderAgent.cancelAllReminders().then(() => { + reminderAgent.getValidReminders().then((reminders) => { + expect(reminders.length === 0).assertEqual(true); + }); + }); + }, 5000); + done(); + }) + + /** + * @tc.number SUB_RESOURCESCHEDULE_REMINDER_AGENT_025 + * @tc.name testPublishReminderTypeCalendarFun001 + * @tc.desc test pulish reminders with type of calendar. + */ + it('testReminderTypeCalendarFun001', 0, async function (done) { + let calendar = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, + dateTime : { + year: 2025, + month: 10, + day: 10, + hour: 23, + minute: 30 + }, + repeatMonths:[2], + repeatDays:[2], + actionButton:[ + { + title:"close", + type:0 + }, + { + title:"snooze", + type:1 + } + ], + wantAgent:{ + pkgName:"com.oh.phone", + abilityName:"com.oh.phone.MainAbility" + }, + maxScreenWantAgent:{ + pkgName:"com.oh.phone", + abilityName:"com.oh.phone.MainAbility" + }, + ringDuration:5, + snoozeTimes:2, + timeInterval:5, + title:"this is title", + content:"this is content", + expiredContent:"this reminder has expired", + snoozeContent:"remind later", + notificationId:100, + slotType:3 + } + reminderAgent.publishReminder(calendar).then((reminderId) => { + reminderAgent.getValidReminders().then((reminders) => { + for (let i = 0; i < reminders.length; i++) { + console.log("getValidReminders = " + JSON.stringify(reminders[i])); + console.log("getValidReminders, reminderType = " + reminders[i].reminderType); + for (let j = 0; j < reminders[i].actionButton.length; j++) { + console.log("getValidReminders, actionButton.title = " + reminders[i].actionButton[j].title); + console.log("getValidReminders, actionButton.type = " + reminders[i].actionButton[j].type); + } + console.log("getValidReminders, wantAgent.pkgName = " + reminders[i].wantAgent.pkgName); + console.log("getValidReminders, wantAgent.abilityName = " + reminders[i].wantAgent.abilityName); + console.log("getValidReminders, maxScreenWantAgent.pkgName = " + reminders[i].maxScreenWantAgent.pkgName); + console.log("getValidReminders, maxScreenWantAgent.abilityName = " + reminders[i].maxScreenWantAgent.abilityName); + expect(reminders[i].ringDuration).assertEqual(5); + console.log("getValidReminders, ringDuration = " + reminders[i].ringDuration); + expect(reminders[i].snoozeTimes).assertEqual(2); + console.log("getValidReminders, snoozeTimes = " + reminders[i].snoozeTimes); + console.log("getValidReminders, timeInterval = " + reminders[i].timeInterval); + expect(reminders[i].title).assertEqual("this is title"); + console.log("getValidReminders, title = " + reminders[i].title); + expect(reminders[i].content).assertEqual("this is content"); + console.log("getValidReminders, content = " + reminders[i].content); + expect(reminders[i].expiredContent).assertEqual("this reminder has expired"); + console.log("getValidReminders, expiredContent = " + reminders[i].expiredContent); + expect(reminders[i].snoozeContent).assertEqual("remind later"); + console.log("getValidReminders, snoozeContent = " + reminders[i].snoozeContent); + expect(reminders[i].notificationId).assertEqual(100); + console.log("getValidReminders, notificationId = " + reminders[i].notificationId); + console.log("getValidReminders, slotType = " + reminders[i].slotType); + } + }) + }); + done(); + }) }) -- GitLab