!7462 【resourceschedule】【master】提醒代理模块api8用例优化

Merge pull request !7462 from 南先森/rms0207

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();
-            });
+            })
         })
 
         /**