!2472 用例修改

Merge pull request !2472 from jerry/master

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

@@ -89,7 +89,7 @@ describe('ActsAmsCallBackSecondScene', function () {
                 ' + error.code + ', data length [' + data.length + ']');
             }
         );
-        setTimeout(done(), 5000);
+        done();
     });
 
     function timeout(done) {
@@ -137,7 +137,6 @@ describe('ActsAmsCallBackSecondScene', function () {
                 }
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -172,7 +171,6 @@ describe('ActsAmsCallBackSecondScene', function () {
                 }
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -193,7 +191,6 @@ describe('ActsAmsCallBackSecondScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -214,7 +211,6 @@ describe('ActsAmsCallBackSecondScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -230,7 +226,6 @@ describe('ActsAmsCallBackSecondScene', function () {
                 expect(error.code).assertEqual(2097215);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -251,6 +246,5 @@ describe('ActsAmsCallBackSecondScene', function () {
                 expect(error.code).assertEqual(0);
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 })
\ No newline at end of file

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

@@ -88,14 +88,8 @@ describe('ActsAmsCallBackThirdScene', function () {
                 ' + error.code + ', data length [' + data.length + ']');
             }
         );
-        setTimeout(done(), 5000);
-    });
-
-    function timeout(done) {
-        expect().assertFail();
-        console.debug('Acts_Ams_test=========timeout========');
         done();
-    }
+    });
 
     function sleep(delay) {
         var start = new Date().getTime();
@@ -136,7 +130,6 @@ describe('ActsAmsCallBackThirdScene', function () {
                 }
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -171,7 +164,6 @@ describe('ActsAmsCallBackThirdScene', function () {
                 }
                 done();
             });
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -193,7 +185,6 @@ describe('ActsAmsCallBackThirdScene', function () {
                 done();
             }
         );
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -215,7 +206,6 @@ describe('ActsAmsCallBackThirdScene', function () {
                 done();
             }
         );
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -238,7 +228,6 @@ describe('ActsAmsCallBackThirdScene', function () {
             }
         );
         done();
-        setTimeout(timeout, 5000);
     })
 
     /*
@@ -256,6 +245,5 @@ describe('ActsAmsCallBackThirdScene', function () {
             }
         );
         done();
-        setTimeout(timeout, 5000);
     })
 })
\ No newline at end of file