jiyong@huawei.com

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

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

@@ -110,16 +110,21 @@ describe('ActsAmsCallBackFifthScene', function () {
                 },
             },
         );
-        done();
+        setTimeout(done(), 5000);
     });
     
+    function timeout() {
+        expect().assertFail();
+        console.debug('Acts_Ams_test=========timeout========');
+        done();
+    }
+
     /*
      * @tc.number    : Acts_Ams_test_6600
      * @tc.name      : getAllRunningProcesses : Get All Running Processes Info
      * @tc.desc      : Get All Running Processes Info(by CallBack)
      */
     it('Acts_Ams_test_6600', 0, async function (done) {
-        setTimeout(function () {
         abilitymanager.getAllRunningProcesses(
             (error, info) => {
                 console.info('getAllRunningProcesses error.code \
@@ -150,9 +155,9 @@ describe('ActsAmsCallBackFifthScene', function () {
                     expect(typeof (info[i].weightReasonCode)).assertEqual("number");
                     expect(info[i].weightReasonCode).assertEqual(WeightReasonCode.REASON_UNKNOWN);
                 }
-                });
                 done();
-        }, 5000);
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -197,8 +202,9 @@ describe('ActsAmsCallBackFifthScene', function () {
                     expect(typeof (data[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (data[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -243,8 +249,9 @@ describe('ActsAmsCallBackFifthScene', function () {
                     expect(typeof (data[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (data[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -261,8 +268,9 @@ describe('ActsAmsCallBackFifthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -279,8 +287,9 @@ describe('ActsAmsCallBackFifthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -297,8 +306,9 @@ describe('ActsAmsCallBackFifthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -313,8 +323,9 @@ describe('ActsAmsCallBackFifthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -329,7 +340,8 @@ describe('ActsAmsCallBackFifthScene', function () {
                 ' + error.code + ',data  [' + info + ']');
                 expect(typeof (info)).assertEqual("number");
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 })

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

@@ -84,13 +84,18 @@ describe('ActsAmsCallBackFirstScene', function () {
         done();
     });
     
+    function timeout() {
+        expect().assertFail();
+        console.debug('Acts_Ams_test=========timeout========');
+        done();
+    }
+    
     /*
      * @tc.number    : Acts_Ams_test_0200
      * @tc.name      : getAllRunningProcesses : Get All Running Processes Info
      * @tc.desc      : Get All Running Processes Info(by CallBack)
      */
     it('Acts_Ams_test_0200', 0, async function (done) {
-        setTimeout(function () {
         abilitymanager.getAllRunningProcesses(
             (error, info) => {
                 console.info('getAllRunningProcesses error.code \
@@ -121,9 +126,9 @@ describe('ActsAmsCallBackFirstScene', function () {
                     expect(typeof (info[i].weightReasonCode)).assertEqual("number");
                     expect(info[i].weightReasonCode).assertEqual(WeightReasonCode.REASON_UNKNOWN);
                 }
-                });
                 done();
-        }, 5000);
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -168,8 +173,9 @@ describe('ActsAmsCallBackFirstScene', function () {
                     expect(typeof (info[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (info[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -214,8 +220,9 @@ describe('ActsAmsCallBackFirstScene', function () {
                     expect(typeof (info[i].missionDescription.label)).assertEqual("string");
                     expect(typeof (info[i].missionDescription.iconPath)).assertEqual("string");
                 }
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -231,8 +238,9 @@ describe('ActsAmsCallBackFirstScene', function () {
                 console.info('Acts_Ams_test_0800 removeMission error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -248,8 +256,9 @@ describe('ActsAmsCallBackFirstScene', function () {
                 console.info('Acts_Ams_test_1200 moveMissionToTop error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -265,8 +274,9 @@ describe('ActsAmsCallBackFirstScene', function () {
                 console.info('Acts_Ams_test_1400 removeMissions error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -280,8 +290,9 @@ describe('ActsAmsCallBackFirstScene', function () {
                 console.info('Acts_Ams_test_1000 clearMissions error.code \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertLarger(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
     })
 
     /*
@@ -295,8 +306,9 @@ describe('ActsAmsCallBackFirstScene', function () {
                 console.info('Acts_Ams_test_1600 killProcessesByBundleName error.code: \
                 ' + error.code + ',data  [' + info + ']');
                 expect(info).assertEqual(0);
-            });
                 done();
+            });
+        setTimeout(timeout, 5000);
 
     })
 })

aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("Defpermission") {
   hap_profile = "./src/main/config.json"
   hap_name = "Defpermission"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",