From 468d5b5e35f2a4005ea1e44c18dd1963f27bf909 Mon Sep 17 00:00:00 2001 From: rcy-hw Date: Mon, 23 May 2022 21:35:05 +0800 Subject: [PATCH] =?UTF-8?q?wordtools=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: rcy-hw --- .../ans/native/src/reminder_request.cpp | 8 +- .../ans/test/moduletest/ReminderHelperTest.js | 788 ++++++++++++++++-- 2 files changed, 701 insertions(+), 95 deletions(-) diff --git a/frameworks/ans/native/src/reminder_request.cpp b/frameworks/ans/native/src/reminder_request.cpp index f92f43837..a7f45e007 100644 --- a/frameworks/ans/native/src/reminder_request.cpp +++ b/frameworks/ans/native/src/reminder_request.cpp @@ -1454,12 +1454,12 @@ void ReminderRequest::UpdateNotificationContent(const bool &setSnooze) if (timeIntervalInMilli_ != 0) { // snooze the reminder by manual extendContent = GetShowTime(triggerTimeInMilli_) + - snoozeContent_ == "" ? "" : (" (" + snoozeContent_ + ")"); + (snoozeContent_ == "" ? "" : (" (" + snoozeContent_ + ")")); notificationRequest_->SetTapDismissed(false); } else { // the reminder is expired now, when timeInterval is 0 extendContent = GetShowTime(reminderTimeInMilli_) + - expiredContent_ == "" ? "" : (" (" + expiredContent_ + ")"); + (expiredContent_ == "" ? "" : (" (" + expiredContent_ + ")")); } } else if (IsAlerting()) { // the reminder is alerting, or ring duration is 0 @@ -1467,12 +1467,12 @@ void ReminderRequest::UpdateNotificationContent(const bool &setSnooze) } else if (snoozeTimesDynamic_ != snoozeTimes_) { // the reminder is snoozing by period artithmetic, when the ring duration is over. extendContent = GetShowTime(triggerTimeInMilli_) + - snoozeContent_ == "" ? "" : (" (" + snoozeContent_ + ")"); + (snoozeContent_ == "" ? "" : (" (" + snoozeContent_ + ")")); notificationRequest_->SetTapDismissed(false); } else { // the reminder has already snoozed by period arithmetic, when the ring duration is over. extendContent = GetShowTime(reminderTimeInMilli_) + - expiredContent_ == "" ? "" : (" (" + expiredContent_ + ")"); + (expiredContent_ == "" ? "" : (" (" + expiredContent_ + ")")); } displayContent_ = content_ + " " + extendContent; ANSR_LOGD("Display content=%{public}s", displayContent_.c_str()); diff --git a/frameworks/ans/test/moduletest/ReminderHelperTest.js b/frameworks/ans/test/moduletest/ReminderHelperTest.js index c3952cb15..d232d4965 100644 --- a/frameworks/ans/test/moduletest/ReminderHelperTest.js +++ b/frameworks/ans/test/moduletest/ReminderHelperTest.js @@ -20,6 +20,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from ' describe("ReminderHelperTest", function () { beforeAll(function() { + /* * @tc.setup: setup invoked before all testcases */ @@ -27,6 +28,7 @@ describe("ReminderHelperTest", function () { }) afterAll(function() { + /* * @tc.teardown: teardown invoked after all testcases */ @@ -34,6 +36,7 @@ describe("ReminderHelperTest", function () { }) beforeEach(function() { + /* * @tc.setup: setup invoked before each testcases */ @@ -41,6 +44,7 @@ describe("ReminderHelperTest", function () { }) afterEach(function() { + /* * @tc.teardown: teardown invoked after each testcases */ @@ -50,11 +54,590 @@ describe("ReminderHelperTest", function () { /* * @tc.name: testReminderHelper001 + * @tc.desc: test spent time by publishReminder with timer (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper001", 0, async function (done) { + let timer = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, + triggerTimeInSeconds: 3 + } + function reminderCallback(err, reminderId){ + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + reminderAgent.publishReminder(timer, reminderCallback) + }) + + /* + * @tc.name: testReminderHelper002 + * @tc.desc: test spent time by publishReminder with timer (promise) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper002", 0, async function (done) { + let timer = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, + triggerTimeInSeconds: 3 + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + reminderAgent.publishReminder(timer).then((reminderId) => { + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }); + setTimeout(() => { + done(); + }, 500); + }) + + /* + * @tc.name: testReminderHelper003 + * @tc.desc: test spent time by publishReminder with alarm (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper003", 0, async function (done) { + let alarm = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_ALARM, + hour: 21, + minute: 14, + title: "this is title", + content: "this is content" + } + function reminderCallback(err, reminderId){ + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let times = 0; + let begin = getTime(); + reminderAgent.publishReminder(alarm, reminderCallback) + }) + + /* + * @tc.name: testReminderHelper004 + * @tc.desc: test spent time by publishReminder with alarm (promise) + * @tc.type: FUNC + * @tc.require: + */ + + it("testReminderHelper004", 0, async function (done) { + let alarm = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_ALARM, + hour: 21, + minute: 14, + title: "this is title", + content: "this is content" + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + reminderAgent.publishReminder(alarm).then((reminderId) => { + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }); + setTimeout(() => { + done(); + }, 500); + }) + + /* + * @tc.name: testReminderHelper005 + * @tc.desc: test spent time by publishReminder with calendar (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper005", 0, async function (done) { + let calendar = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, + dateTime : { + year: 2025, + month: 10, + day: 10, + hour: 23, + minute: 30 + } + } + function reminderCallback(err, reminderId){ + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + let times = 0; + reminderAgent.publishReminder(calendar, reminderCallback) + }) + + /* + * @tc.name: testReminderHelper006 + * @tc.desc: test spent time by publishReminder with calendar (promise) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper006", 0, async function (done) { + let calendar = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, + dateTime : { + year: 2025, + month: 10, + day: 10, + hour: 23, + minute: 30 + } + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + reminderAgent.publishReminder(calendar).then((reminderId) => { + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }) + setTimeout(() => { + done(); + }, 500); + }) + + /* + * @tc.name: testReminderHelper007 + * @tc.desc: test spent time by cancelReminder with not reminderId (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper007", 0, async function (done) { + function reminderCallback(err, data){ + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + let times = 0; + reminderAgent.cancelReminder(1, reminderCallback) + }) + + /* + * @tc.name: testReminderHelper008 + * @tc.desc: test spent time by cancelReminder with not reminderId (promise) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper008", 0, async function (done) { + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + reminderAgent.cancelReminder(1).then(() => { + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }) + setTimeout(() => { + done(); + }, 500); + }) + + /* + * @tc.name: testReminderHelper009 + * @tc.desc: test spent time by cancelReminder with timer (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper009", 0, async function (done) { + let timer = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, + triggerTimeInSeconds: 3 + } + function reminderCallback(err, data){ + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = 0; + let times = 0; + reminderAgent.publishReminder(timer, (err, reminderId) => { + begin = getTime(); + reminderAgent.cancelReminder(reminderId, reminderCallback); + }) + }) + + /* + * @tc.name: testReminderHelper010 + * @tc.desc: test spent time by cancelReminder with calendar (promise) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper010", 0, async function (done) { + let calendar = { + reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, + dateTime : { + year: 2025, + month: 10, + day: 10, + hour: 23, + minute: 30 + } + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = 0; + let times = 0; + reminderAgent.publishReminder(calendar, (err, reminderId) => { + begin = getTime(); + reminderAgent.cancelReminder(reminderId).then(() => { + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }) + }) + setTimeout(() => { + done(); + }, 500); + }) + + /* + * @tc.name: testReminderHelper011 + * @tc.desc: test spent time by getValidReminders with not (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper011", 0, async function (done) { + function reminderCallback(err, reminders){ + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + let times = 0; + reminderAgent.getValidReminders(reminderCallback) + }) + + /* + * @tc.name: testReminderHelper012 + * @tc.desc: test spent time by getValidReminders with not (promise) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper012", 0, async function (done) { + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + reminderAgent.getValidReminders().then((reminders) => { + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }) + setTimeout(() => { + done(); + }, 500); + }) + + + /* + * @tc.name: testReminderHelper013 + * @tc.desc: test spent time by cancelAllReminders (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper013", 0, async function (done) { + function reminderCallback(err, data){ + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + let times = 0; + reminderAgent.cancelAllReminders(reminderCallback) + }) + + /* + * @tc.name: testReminderHelper014 + * @tc.desc: test spent time by cancelAllReminders (promise) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper014", 0, async function (done) { + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + reminderAgent.cancelAllReminders().then(() => { + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }) + setTimeout(() => { + done(); + }, 500); + }) + + /* + * @tc.name: testReminderHelper015 + * @tc.desc: test spent time by addNotificationSlot (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper015", 0, async function (done) { + function reminderCallback(err, data){ + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + let times = 0; + reminderAgent.addNotificationSlot(1, reminderCallback) + }) + + /* + * @tc.name: testReminderHelper016 + * @tc.desc: test spent time by addNotificationSlot (promise) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper016", 0, async function (done) { + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + reminderAgent.addNotificationSlot(1).then(() => { + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }) + setTimeout(() => { + done(); + }, 500); + }) + + /* + * @tc.name: testReminderHelper017 + * @tc.desc: test spent time by removeNotificationSlot (callback) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper017", 0, async function (done) { + var tarRemoveSlot = { + type: 1 + } + function reminderCallback(err, data){ + let end = getTime(); + times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + let begin = getTime(); + let times = 0; + reminderAgent.addNotificationSlot(tarRemoveSlot.type, (err, data) => { + begin = getTime(); + reminderAgent.removeNotificationSlot(1, reminderCallback) + }); + }) + + /* + * @tc.name: testReminderHelper018 + * @tc.desc: test spent time by cancelAllReminders (promise) + * @tc.type: FUNC + * @tc.require: + */ + it("testReminderHelper018", 0, async function (done) { + var tarRemoveSlot = { + type: 1 + } + function getTime(){ + var time = new Date(); + var Milliseconds = time.getTime(); + return Milliseconds; + } + reminderAgent.addNotificationSlot(tarRemoveSlot.type, (err, data) => { + let begin = getTime(); + reminderAgent.removeNotificationSlot(tarRemoveSlot.type).then(() => { + let end = getTime(); + let times = end - begin; + if (times < 50) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + }) + }); + setTimeout(() => { + done(); + }, 500); + }) + + /* + * @tc.name: testReminderHelper019 * @tc.desc: test publishReminder can return correct reminder id. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EH AR000GH8E9 AR00GH8EH */ - it("testReminderHelper001", 0, async function (done) { + it("testReminderHelper019", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 100 @@ -79,12 +662,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper002 + * @tc.name: testReminderHelper020 * @tc.desc: test publishReminder can return correct reminder id. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EH AR000GH8E9 AR00GH8EH */ - it("testReminderHelper002", 0, async function (done) { + it("testReminderHelper020", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 100 @@ -101,13 +684,13 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper003 + * @tc.name: testReminderHelper021 * @tc.desc: test addNotificationSlot instance with null * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EC */ - it("testReminderHelper003", 0, async function (done) { - function reminderCallback(err, data) { + it("testReminderHelper021", 0, async function (done) { + function reminderCallback(err, data){ expect(true).assertEqual(true); } reminderAgent.addNotificationSlot(0, reminderCallback); @@ -115,18 +698,18 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper004 + * @tc.name: testReminderHelper022 * @tc.desc: test addNotificationSlot instance with null * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EC */ - it("testReminderHelper004", 0, async function (done) { + it("testReminderHelper022", 0, async function (done) { let mySlot = null; let promise = new Promise((resolve, reject) => { reminderAgent.addNotificationSlot(mySlot).then(() => { resolve(); }) - reject(); + reject(new Error('errr occurred.')); }); promise.then(() => { }, err => { @@ -137,12 +720,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper005 + * @tc.name: testReminderHelper023 * @tc.desc: test addNotificationSlot with normal value * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EC */ - it("testReminderHelper005", 0, async function (done) { + it("testReminderHelper023", 0, async function (done) { let mySlot = { type: 2 } @@ -154,12 +737,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper006 + * @tc.name: testReminderHelper024 * @tc.desc: test addNotificationSlot with normal value * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EC */ - it("testReminderHelper006", 0, async function (done) { + it("testReminderHelper024", 0, async function (done) { reminderAgent.addNotificationSlot(3, (err, data) => { let i = 0; expect(i).assertEqual(0); @@ -168,12 +751,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper007 + * @tc.name: testReminderHelper025 * @tc.desc: test cancelAllReminders can cancel all exist reminders * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EA */ - it("testReminderHelper007", 0, async function (done) { + it("testReminderHelper025", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 100 @@ -201,12 +784,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper008 + * @tc.name: testReminderHelper026 * @tc.desc: test cancelAllReminders can cancel all exist reminders * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EA AR000GH8EF AR000GH8EI */ - it("testReminderHelper008", 0, async function (done) { + it("testReminderHelper026", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 100 @@ -234,12 +817,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper009 + * @tc.name: testReminderHelper027 * @tc.desc: test cancelReminder with not exit reminder. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EA */ - it("testReminderHelper009", 0, async function (done) { + it("testReminderHelper027", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 3 @@ -263,12 +846,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper010 + * @tc.name: testReminderHelper028 * @tc.desc: test cancelReminder with not exit reminder. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EA */ - it("testReminderHelper010", 0, async function (done) { + it("testReminderHelper028", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 3 @@ -292,12 +875,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper011 + * @tc.name: testReminderHelper029 * @tc.desc: test cancelReminder with exist reminder. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EA */ - it("testReminderHelper011", 0, async function (done) { + it("testReminderHelper029", 0, async function (done) { let alarm = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_ALARM, hour: 21, @@ -328,12 +911,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper012 + * @tc.name: testReminderHelper030 * @tc.desc: test cancelReminder with exist reminder. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EA */ - it("testReminderHelper012", 0, async function (done) { + it("testReminderHelper030", 0, async function (done) { let alarm = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_ALARM, hour: 21, @@ -364,12 +947,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper013 + * @tc.name: testReminderHelper031 * @tc.desc: test getValidReminders, verify all the information is correct. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EB AR000GH8EF */ - it("testReminderHelper013", 0, async function (done) { + it("testReminderHelper031", 0, async function (done) { var alarm = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_ALARM, hour: 21, @@ -394,12 +977,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper014 + * @tc.name: testReminderHelper032 * @tc.desc: test getValidReminders, verify all the information is correct. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EB */ - it("testReminderHelper014", 0, async function (done) { + it("testReminderHelper032", 0, async function (done) { var alarm = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_ALARM, hour: 21, @@ -424,12 +1007,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper015 + * @tc.name: testReminderHelper033 * @tc.desc: test removeNotificationSlot with not exist slot. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8ED */ - it("testReminderHelper015", 0, function (done) { + it("testReminderHelper033", 0, function (done) { function reminderCallback(err, data){ let i = 0; expect(0).assertEqual(i); @@ -439,17 +1022,17 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper016 + * @tc.name: testReminderHelper034 * @tc.desc: test removeNotificationSlot with not exist slot. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8ED */ - it("testReminderHelper016", 0, function (done) { + it("testReminderHelper034", 0, function (done) { let promise = new Promise((resolve, reject) => { reminderAgent.removeNotificationSlot(1).then(() => { resolve(); }); - reject(); + reject(new Error('errr occurred.')); }); promise.then(() => { }, err => { @@ -460,12 +1043,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper017 + * @tc.name: testReminderHelper035 * @tc.desc: test removeNotificationSlot with exist slot. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8ED */ - it("testReminderHelper017", 0, async function (done) { + it("testReminderHelper035", 0, async function (done) { var tarRemoveSlot = { type: 1 } @@ -478,12 +1061,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper018 + * @tc.name: testReminderHelper036 * @tc.desc: test removeNotificationSlot with exist slot. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8ED */ - it("testReminderHelper018", 0, async function (done) { + it("testReminderHelper036", 0, async function (done) { var tarRemoveSlot = { type: 1 } @@ -497,12 +1080,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper019 + * @tc.name: testReminderHelper037 * @tc.desc: test getValidReminders. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EB AR000GH8EG */ - it("testReminderHelper019", 0, async function (done) { + it("testReminderHelper037", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 3 @@ -517,12 +1100,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name:testReminderHelper020 + * @tc.name:testReminderHelper038 * @tc.desc: test getValidReminders. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8EB AR000GH8EG */ - it("testReminderHelper020", 0, async function (done) { + it("testReminderHelper038", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 3 @@ -537,12 +1120,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper021 + * @tc.name: testReminderHelper039 * @tc.desc: test publishReminder a normal alarm. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8E9 AR00GH8EH */ - it("testReminderHelper021", 0, async function (done) { + it("testReminderHelper039", 0, async function (done) { let alarm = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_ALARM, hour: 21, @@ -550,20 +1133,25 @@ describe("ReminderHelperTest", function () { title: "this is title", content: "this is content" } + let expectId = -1; reminderAgent.publishReminder(alarm).then((reminderId) => { - let i = 0; - expect(i).assertEqual(0); + expectId = reminderId + 1; + reminderAgent.publishReminder(alarm).then((reminderId) => { + if (reminderId === expectId){ + expect(reminderId).assertEqual(expectId); + } + }); }); done(); }) /* - * @tc.name: testReminderHelper022 + * @tc.name: testReminderHelper040 * @tc.desc: test publishReminder a normal alarm. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8E9 AR00GH8EH AR000GH8EE */ - it("testReminderHelper022", 0, async function (done) { + it("testReminderHelper040", 0, async function (done) { let alarm = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_ALARM, hour: 21, @@ -571,21 +1159,24 @@ describe("ReminderHelperTest", function () { title: "this is title", content: "this is content" } - function reminderCallback (err, reminderId) { - let i = 0; - expect(i).assertEqual(0); + let expectId = -1; + function reminderCallback(err, reminderId) { + expect(reminderId).assertEqual(expectId); } - reminderAgent.publishReminder(alarm, reminderCallback); + reminderAgent.publishReminder(alarm, (err, reminderId) => { + expectId = reminderId + 1; + reminderAgent.publishReminder(alarm, reminderCallback); + }) done(); }) /* - * @tc.name: testReminderHelper023 - * @tc.desc: test publishReminder + * @tc.name: testReminderHelper041 + * @tc.desc: test publishReminder. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8E9 AR00GH8EH */ - it("testReminderHelper023", 0, function (done) { + it("testReminderHelper041", 0, function (done) { let calendar = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, dateTime : { @@ -608,12 +1199,12 @@ describe("ReminderHelperTest", function () { } ], wantAgent:{ - pkgName:"com.huawei.phone", - abilityName:"com.huawei.phone.MainAbility" + pkgName:"com.test.pkg", + abilityName:"com.test.pkg.MainAbility" }, maxScreenWantAgent:{ - pkgName:"com.huawei.phone", - abilityName:"com.huawei.phone.MainAbility" + pkgName:"com.test.pkg", + abilityName:"com.test.pkg.MainAbility" }, ringDuration:5, snoozeTimes:2, @@ -636,8 +1227,10 @@ describe("ReminderHelperTest", function () { } 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); + 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); @@ -661,12 +1254,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper024 - * @tc.desc: test publishReminder + * @tc.name: testReminderHelper042 + * @tc.desc: test publishReminder. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8E9 AR00GH8EH */ - it("testReminderHelper024", 0, async function (done) { + it("testReminderHelper042", 0, async function (done) { let calendar = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, dateTime : { @@ -689,12 +1282,12 @@ describe("ReminderHelperTest", function () { } ], wantAgent:{ - pkgName:"com.huawei.phone", - abilityName:"com.huawei.phone.MainAbility" + pkgName:"com.test.pkg", + abilityName:"com.test.pkg.MainAbility" }, maxScreenWantAgent:{ - pkgName:"com.huawei.phone", - abilityName:"com.huawei.phone.MainAbility" + pkgName:"com.test.pkg", + abilityName:"com.test.pkg.MainAbility" }, ringDuration:5, snoozeTimes:2, @@ -717,8 +1310,10 @@ describe("ReminderHelperTest", function () { } 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); + 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); @@ -742,12 +1337,12 @@ describe("ReminderHelperTest", function () { }) /* - * @tc.name: testReminderHelper025 - * @tc.desc: test publishReminder + * @tc.name: testReminderHelper043 + * @tc.desc: test publishReminder. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8E9 AR00GH8EH */ - it("testReminderHelper025", 0, async function (done) { + it("testReminderHelper043", 0, async function (done) { let calendar = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, dateTime : { @@ -770,12 +1365,12 @@ describe("ReminderHelperTest", function () { } ], wantAgent:{ - pkgName:"com.huawei.phone", - abilityName:"com.huawei.phone.MainAbility" + pkgName:"com.test.pkg", + abilityName:"com.test.pkg.MainAbility" }, maxScreenWantAgent:{ - pkgName:"com.huawei.phone", - abilityName:"com.huawei.phone.MainAbility" + pkgName:"com.test.pkg", + abilityName:"com.test.pkg.MainAbility" }, ringDuration:5, snoozeTimes:2, @@ -787,19 +1382,25 @@ describe("ReminderHelperTest", function () { notificationId:100, slotType:3 } - reminderAgent.publishReminder(calendar, (err, reminderId) => { - expect(typeof(reminderId) === 'number').assertEqual(true); + let expectId = -1; + reminderAgent.publishReminder(calendar).then((reminderId) => { + expectId = reminderId + 1; + reminderAgent.publishReminder(calendar).then((reminderId) => { + if (reminderId === expectId){ + expect(reminderId).assertEqual(expectId); + } + }); }); done(); }) /* - * @tc.name: testReminderHelper026 - * @tc.desc: test publishReminder + * @tc.name: testReminderHelper044 + * @tc.desc: test publishReminder. * @tc.type: FUNC * @tc.require: SR000GGTRB AR000GH8E9 AR00GH8EH */ - it("testReminderHelper026", 0, async function (done) { + it("testReminderHelper044", 0, async function (done) { let calendar = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_CALENDAR, dateTime : { @@ -822,12 +1423,12 @@ describe("ReminderHelperTest", function () { } ], wantAgent:{ - pkgName:"com.huawei.phone", - abilityName:"com.huawei.phone.MainAbility" + pkgName:"com.test.pkg", + abilityName:"com.test.pkg.MainAbility" }, maxScreenWantAgent:{ - pkgName:"com.huawei.phone", - abilityName:"com.huawei.phone.MainAbility" + pkgName:"com.test.pkg", + abilityName:"com.test.pkg.MainAbility" }, ringDuration:5, snoozeTimes:2, @@ -839,19 +1440,24 @@ describe("ReminderHelperTest", function () { notificationId:100, slotType:3 } - reminderAgent.publishReminder(calendar).then((reminderId) => { - expect(typeof(reminderId) === 'number').assertEqual(true); - }); + let expectId = -1; + function reminderCallback(err, reminderId) { + expect(reminderId).assertEqual(expectId); + } + reminderAgent.publishReminder(calendar, (err, reminderId) => { + expectId = reminderId + 1; + reminderAgent.publishReminder(calendar, reminderCallback); + }) done(); }) /* - * @tc.name: testReminderHelper027 + * @tc.name: testReminderHelper045 * @tc.desc: test publishReminder (max number limit of each application) * @tc.type: FUNC * @tc.require: SR000GGTRE AR000GH8E9 AR00GH8EH */ - it("testReminderHelper027", 0, async function (done) { + it("testReminderHelper045", 0, async function (done) { let timer = { reminderType: reminderAgent.ReminderType.REMINDER_TYPE_TIMER, triggerTimeInSeconds: 100 -- Gitee