!3450 modify sleep logic in app account xts

Merge pull request !3450 from jidong/dev

account/appaccount/actsaccounttest/entry/src/main/js/test/AppAccess.test.js

@@ -20,22 +20,25 @@ const STRCOUNT = 1025;
 const EACHTIMEOUT = 500;
 describe('ActsAccountAppAccess', function () {
     function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
     }
 
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     })
 
     beforeEach(async function (done) {
         console.debug("====>beforeEach enter====");
-        sleep(EACHTIMEOUT);
+        await sleep(EACHTIMEOUT);
         done();
     })
 

account/appaccount/actsaccounttest/entry/src/main/js/test/AssociatedData.test.js

@@ -19,22 +19,25 @@ const TIMEOUT = 5000;
 const EACHTIMEOUT = 500;
 describe('ActsAccountAssociatedData', function () {
     function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
     }
 
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     })
 
     beforeEach(async function (done) {
         console.debug("====>beforeEach enter====");
-        sleep(EACHTIMEOUT);
+        await sleep(EACHTIMEOUT);
         done();
     })
 

account/appaccount/actsaccounttest/entry/src/main/js/test/CreatManager.test.js

@@ -18,15 +18,18 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 const TIMEOUT = 5000;
 describe('ActsCreatAppAccountManager', function () {
     function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
     }
 
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     });

account/appaccount/actsaccounttest/entry/src/main/js/test/Credential.test.js

@@ -19,22 +19,25 @@ const TIMEOUT = 5000;
 const EACHTIMEOUT = 500;
 describe('ActsAccountCredential', function () {
     function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
     }
 
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     })
 
     beforeEach(async function (done) {
         console.debug("====>beforeEach enter====");
-        sleep(EACHTIMEOUT);
+        await sleep(EACHTIMEOUT);
         done();
     })
 

account/appaccount/actsaccounttest/entry/src/main/js/test/DeleteAccount.test.js

@@ -19,15 +19,18 @@ const NAMELIMIT = 512;
 const TIMEOUT = 5000;
 describe('ActsAccountDeleteAccount', function () {
     function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
     }
 
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     });

account/appaccount/actsaccounttest/entry/src/main/js/test/ExtraInfo.test.js

@@ -19,22 +19,25 @@ const TIMEOUT = 5000;
 const EACHTIMEOUT = 500;
 describe('ActsAccountSetGetExtraInfo', function () {
     function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
     }
 
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     })
 
     beforeEach(async function (done) {
         console.debug("====>beforeEach enter====");
-        sleep(EACHTIMEOUT);
+        await sleep(EACHTIMEOUT);
         done();
     })
 

account/appaccount/actsaccounttest/entry/src/main/js/test/NoPermission.test.js

@@ -19,15 +19,17 @@ const TIMEOUT = 5000;
 const ERR_APPACCOUNT_SERVICE_PERMISSION_DENIED = 4521993;
 describe('ActsAccountNoPermission', function () {
     function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
     }
-
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     });

account/appaccount/actsaccounttest/entry/src/main/js/test/OAuthToken.test.js

@@ -30,22 +30,25 @@ const OWNERSELF = "com.example.actsaccounttest";
 
 describe('ActsAccountOAuthToken', function () {
     function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
     }
 
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     });
 
     beforeEach(async function (done) {
         console.debug("====>beforeAll enter====");
-        sleep(EACHTIMEOUT);
+        await sleep(EACHTIMEOUT);
         done();
     });
 

account/appaccount/actsaccounttest/entry/src/main/js/test/OnOff.js

@@ -20,6 +20,15 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 const TIMEOUT = 5000;
 describe('ActsAccountChangeOnOff', async function () {
 
+    function sleep(delay) {
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, delay)
+        }).then(() => {
+            console.info(`sleep #{time} over ...`)
+        })
+    }
     beforeAll(async function (done) {
         console.debug("====>startAbility start====");
         await featureAbility.startAbility(
@@ -35,7 +44,8 @@ describe('ActsAccountChangeOnOff', async function () {
                 },
             },
         );
-        setTimeout(done(), TIMEOUT);
+        await sleep(TIMEOUT);
+        done();
     });
 
     /*