jiyong@huawei.com

Signed-off-by: Njiyong <jiyong@huawei.com>

aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -81,7 +81,7 @@ describe('ActsAmsCallBackFirstScene', function () {
                 },
             },
         );
-        done();
+        setTimeout(done(), 5000);
     });
 
     function timeout() {

aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -126,16 +126,21 @@ describe('ActsAmsCallBackFourthScene', function () {
                 },
             }
         );
-        done();
+        setTimeout(done(), 5000);
     });
 
+    function timeout() {
+        expect().assertFail();
+        console.debug('Acts_Ams_test=========timeout========');
+        done();
+    }
+
     /*
      * @tc.number    : Acts_Ams_test_5000
      * @tc.name      : getAllRunningProcesses : Get All Running Processes Info
      * @tc.desc      : Get All Running Processes Info(by CallBack)
      */
     it('Acts_Ams_test_5000', 0, async function (done) {
-        setTimeout(function () {
         abilitymanager.getAllRunningProcesses(
             (error, info) => {
                 console.info('getAllRunningProcesses error.code \
@@ -166,9 +171,10 @@ describe('ActsAmsCallBackFourthScene', function () {
                     expect(typeof (info[i].weightReasonCode)).assertEqual("number");
                     expect(info[i].weightReasonCode).assertEqual(WeightReasonCode.REASON_UNKNOWN);
                 }
-                });
                 done();
-        }, 5000);
+            });
+        setTimeout(timeout, 5000);
+
     })
 
     /*
@@ -223,8 +229,9 @@ describe('ActsAmsCallBackFourthScene', function () {
                     expect(typeof (data[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (data[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -279,8 +286,9 @@ describe('ActsAmsCallBackFourthScene', function () {
                     expect(typeof (data[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (data[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -297,8 +305,9 @@ describe('ActsAmsCallBackFourthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -315,8 +324,9 @@ describe('ActsAmsCallBackFourthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -331,8 +341,9 @@ describe('ActsAmsCallBackFourthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -347,8 +358,9 @@ describe('ActsAmsCallBackFourthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -365,7 +377,8 @@ describe('ActsAmsCallBackFourthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 })

aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -96,16 +96,21 @@ describe('ActsAmsCallBackSecondScene', function () {
                 },
             }
         );
-        done();
+        setTimeout(done(), 5000);
     });
 
+    function timeout() {
+        expect().assertFail();
+        console.debug('Acts_Ams_test=========timeout========');
+        done();
+    }
+
     /*
      * @tc.number    : Acts_Ams_test_1800
      * @tc.name      : getAllRunningProcesses : Get All Running Processes Info
      * @tc.desc      : Get All Running Processes Info(by CallBack)
      */
     it('Acts_Ams_test_1800', 0, async function (done) {
-        setTimeout(function () {
         abilitymanager.getAllRunningProcesses(
             (error, info) => {
                 console.info('getAllRunningProcesses error.code \
@@ -136,9 +141,9 @@ describe('ActsAmsCallBackSecondScene', function () {
                     expect(typeof (info[i].weightReasonCode)).assertEqual("number");
                     expect(info[i].weightReasonCode).assertEqual(WeightReasonCode.REASON_UNKNOWN);
                 }
-                });
                 done();
-        }, 5000);
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -183,8 +188,9 @@ describe('ActsAmsCallBackSecondScene', function () {
                     expect(typeof (info[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (info[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -229,8 +235,9 @@ describe('ActsAmsCallBackSecondScene', function () {
                     expect(typeof (info[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (info[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -246,8 +253,9 @@ describe('ActsAmsCallBackSecondScene', function () {
                 console.info('Acts_Ams_test_2400 removeMission error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -263,8 +271,9 @@ describe('ActsAmsCallBackSecondScene', function () {
                 console.info('Acts_Ams_test_2800 moveMissionToTop error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -280,8 +289,9 @@ describe('ActsAmsCallBackSecondScene', function () {
                 console.info('Acts_Ams_test_3000 removeMissions error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -295,8 +305,9 @@ describe('ActsAmsCallBackSecondScene', function () {
                 console.info('Acts_Ams_test_2600 clearMissions error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -310,9 +321,9 @@ describe('ActsAmsCallBackSecondScene', function () {
                 console.info('Acts_Ams_test_3200 killProcessesByBundleName error.code: \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertEqual(0);
-            });
                 done();
-
+            });
+        setTimeout(timeout, 5000);
     })
 })
 

aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -107,16 +107,21 @@ describe('ActsAmsCallBackThirdScene', function () {
                 },
             },
         );
-        done();
+        setTimeout(done(), 5000);
     });
 
+    function timeout() {
+        expect().assertFail();
+        console.debug('Acts_Ams_test=========timeout========');
+        done();
+    }
+
     /*
      * @tc.number    : Acts_Ams_test_3400
      * @tc.name      : getAllRunningProcesses : Get All Running Processes Info
      * @tc.desc      : Get All Running Processes Info(by CallBack)
      */
     it('Acts_Ams_test_3400', 0, async function (done) {
-        setTimeout(function () {
         abilitymanager.getAllRunningProcesses(
             (error, info) => {
                 console.info('getAllRunningProcesses error.code \
@@ -147,9 +152,9 @@ describe('ActsAmsCallBackThirdScene', function () {
                     expect(typeof (info[i].weightReasonCode)).assertEqual("number");
                     expect(info[i].weightReasonCode).assertEqual(WeightReasonCode.REASON_UNKNOWN);
                 }
-                });
                 done();
-        }, 5000);
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -194,8 +199,9 @@ describe('ActsAmsCallBackThirdScene', function () {
                     expect(typeof (info[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (info[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -240,8 +246,9 @@ describe('ActsAmsCallBackThirdScene', function () {
                     expect(typeof (info[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (info[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -257,8 +264,9 @@ describe('ActsAmsCallBackThirdScene', function () {
                 console.info('Acts_Ams_test_4000 removeMission error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -274,8 +282,9 @@ describe('ActsAmsCallBackThirdScene', function () {
                 console.info('Acts_Ams_test_4400 moveMissionToTop error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -291,8 +300,9 @@ describe('ActsAmsCallBackThirdScene', function () {
                 console.info('Acts_Ams_test_4600 removeMissions error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -306,8 +316,9 @@ describe('ActsAmsCallBackThirdScene', function () {
                 console.info('Acts_Ams_test_4200 clearMissions error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -321,9 +332,9 @@ describe('ActsAmsCallBackThirdScene', function () {
                 console.info('Acts_Ams_test_4800 killProcessesByBundleName error.code: \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertEqual(0);
-            });
                 done();
-
+            });
+        setTimeout(timeout, 5000);
     })
 })