From f0b3d75d3b110003cddb0282eafb3b755ce2ede9 Mon Sep 17 00:00:00 2001
From: jsjzju <jinsenjun@huawei.com>
Date: Wed, 16 Mar 2022 10:21:51 +0800
Subject: [PATCH] fixed d0a0637 from
 https://gitee.com/jsjzju/xts_acts/pulls/2489 IssueNo:#I4XZRR Description: Fix
 aafwk test case Sig:SIG_ApplicationFramework Feature or Bugfix:Bugfix Binary
 Source:No

Signed-off-by: jsjzju <jinsenjun@huawei.com>
Change-Id: I6a251349a0be585767e4f4d1d90071ab70b67072
---
 .../main/js/test/MangerAbilityJsunit.test.js  |  8 +-------
 .../main/js/test/MangerAbilityJsunit.test.js  | 19 +++++--------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js
index a28022c48..6fd98421e 100644
--- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js
+++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js
@@ -70,7 +70,7 @@ describe('ActsAmsCallBackFirstScene', function () {
                 ' + error.code + ', data length [' + data.length + ']');
             }
         );
-        setTimeout(done(), 5000);
+        done();
     });
 
     function timeout(done) {
@@ -118,7 +118,6 @@ describe('ActsAmsCallBackFirstScene', function () {
                 }
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -153,7 +152,6 @@ describe('ActsAmsCallBackFirstScene', function () {
                 }
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -175,7 +173,6 @@ describe('ActsAmsCallBackFirstScene', function () {
                 expect(error.code).assertLarger(-1);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -196,7 +193,6 @@ describe('ActsAmsCallBackFirstScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -212,7 +208,6 @@ describe('ActsAmsCallBackFirstScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -233,7 +228,6 @@ describe('ActsAmsCallBackFirstScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
 })
\ No newline at end of file
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js
index f628a5b0d..4f70cfd13 100644
--- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js
+++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js
@@ -127,7 +127,7 @@ describe('ActsAmsCallBackFourthScene', function () {
                 ' + error.code + ', data length [' + data.length + ']');
             }
         );
-        setTimeout(done(), 5000);
+        done();
     });
 
     function timeout(done) {
@@ -175,8 +175,6 @@ describe('ActsAmsCallBackFourthScene', function () {
                 }
                 done();
             });
-        setTimeout(timeout, 5000);
-
     })
 
     /*
@@ -191,7 +189,7 @@ describe('ActsAmsCallBackFourthScene', function () {
                 console.info('Acts_Ams_test_5400 getMissionInfos error.code : \
                 ' + error.code + ',data length [' + data.length + ']');
                 expect(Array.isArray(data)).assertEqual(true);
-                expect(data.length).assertEqual(5);
+                expect(data.length).assertEqual(4);
                 for (var i = 0; i < data.length; i++) {
                     console.info('Acts_Ams_test_5400 getMissionInfos data[' + i + "]: " + JSON.stringify(data[i]));
                     expect(typeof (data[i].missionId)).assertEqual("number");
@@ -211,7 +209,6 @@ describe('ActsAmsCallBackFourthScene', function () {
                 }
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -232,7 +229,6 @@ describe('ActsAmsCallBackFourthScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -253,7 +249,6 @@ describe('ActsAmsCallBackFourthScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -263,14 +258,11 @@ describe('ActsAmsCallBackFourthScene', function () {
      */
     it('Acts_Ams_test_6400', 0, async function (done) {
         appManager.killProcessesByBundleName('xxxxxxxxx',
-            (error, info) => {
-                console.info('Acts_Ams_test_6400 killProcessesByBundleName error.code \
-                ' + error.code + ',data  [' + info + ']');
-                expect(typeof (info)).assertEqual("number");
-                expect(info).assertEqual(2097215);
+            (error) => {
+                console.info('Acts_Ams_test_6400 killProcessesByBundleName error.code ' + error.code);
+                expect(error.code).assertEqual(2097215);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -291,6 +283,5 @@ describe('ActsAmsCallBackFourthScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 })
\ No newline at end of file
-- 
GitLab