diff --git a/frameworks/ans/native/test/unittest/BUILD.gn b/frameworks/ans/native/test/unittest/BUILD.gn index 5822ce2fce71617b3298d3636469fb89ed9ffcf1..2ec01dca076feec43dcf27e8aeb97ab466f0d58e 100644 --- a/frameworks/ans/native/test/unittest/BUILD.gn +++ b/frameworks/ans/native/test/unittest/BUILD.gn @@ -36,6 +36,8 @@ ohos_unittest("ans_reminder_unit_test") { "${native_path}/test/unittest/reminder_request_timer_test.cpp", ] + cflags_cc = [ "-fexceptions" ] + configs = [ "//utils/native/base:utils_config" ] deps = [ @@ -71,5 +73,5 @@ group("unittest") { testonly = true deps = [] - # deps += [ ":ans_reminder_unit_test" ] + deps += [ ":ans_reminder_unit_test" ] } diff --git a/frameworks/ans/test/moduletest/BUILD.gn b/frameworks/ans/test/moduletest/BUILD.gn index 941b39a8468526b7b81b690731041dab8c4c5d96..6aa957703ec8cb4e2a897277ebf7f200ad144476 100644 --- a/frameworks/ans/test/moduletest/BUILD.gn +++ b/frameworks/ans/test/moduletest/BUILD.gn @@ -340,7 +340,7 @@ group("moduletest") { deps = [] deps += [ - # ":ReminderAgentJsTest", + ":ReminderAgentJsTest", # ":ans_fw_module_test", # ":ans_innerkits_module_publish_test", # ":ans_innerkits_module_setting_test", diff --git a/frameworks/ans/test/moduletest/ReminderHelperTest.js b/frameworks/ans/test/moduletest/ReminderHelperTest.js index c3952cb152c551c671dd6b4c2a807645af431687..5ac55b9ee530ff009668b24cccea6ff69ce167eb 100644 --- a/frameworks/ans/test/moduletest/ReminderHelperTest.js +++ b/frameworks/ans/test/moduletest/ReminderHelperTest.js @@ -48,13 +48,592 @@ describe("ReminderHelperTest", function () { reminderAgent.cancelAllReminders(); }) + // /* + // * @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: testReminderHelper001 + * @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 +658,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 +680,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,12 +694,12 @@ 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(() => { @@ -137,12 +716,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 +733,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 +747,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 +780,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 +813,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 +842,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 +871,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 +907,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 +943,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 +973,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 +1003,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,12 +1018,12 @@ 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(); @@ -460,12 +1039,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 +1057,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 +1076,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 +1096,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 +1116,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 +1129,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 +1155,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 : { @@ -661,12 +1248,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 : { @@ -742,12 +1329,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 : { @@ -787,19 +1374,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 : { @@ -839,19 +1432,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