!8579 【Account】【3.1Release】Memory Leak Rectification

Merge pull request !8579 from 翟孟超/memleak0428

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

@@ -19,14 +19,13 @@ const TIMEOUT = 5000;
 const STRCOUNT = 1025;
 const EACHTIMEOUT = 500;
 describe('ActsAccountAppAccess', function () {
-    function sleep(delay) {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve()
-            }, delay)
-        }).then(() => {
-            console.info(`sleep #{time} over ...`)
-        })
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     beforeAll(async function (done) {

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

@@ -18,14 +18,13 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 const TIMEOUT = 5000;
 const EACHTIMEOUT = 500;
 describe('ActsAccountAssociatedData', function () {
-    function sleep(delay) {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve()
-            }, delay)
-        }).then(() => {
-            console.info(`sleep #{time} over ...`)
-        })
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     beforeAll(async function (done) {

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

@@ -17,14 +17,13 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 
 const TIMEOUT = 5000;
 describe('ActsCreatAppAccountManager', function () {
-    function sleep(delay) {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve()
-            }, delay)
-        }).then(() => {
-            console.info(`sleep #{time} over ...`)
-        })
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     beforeAll(async function (done) {

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

@@ -18,14 +18,13 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 const TIMEOUT = 5000;
 const EACHTIMEOUT = 500;
 describe('ActsAccountCredential', function () {
-    function sleep(delay) {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve()
-            }, delay)
-        }).then(() => {
-            console.info(`sleep #{time} over ...`)
-        })
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     beforeAll(async function (done) {

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

@@ -18,14 +18,13 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 const NAMELIMIT = 512;
 const TIMEOUT = 5000;
 describe('ActsAccountDeleteAccount', function () {
-    function sleep(delay) {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve()
-            }, delay)
-        }).then(() => {
-            console.info(`sleep #{time} over ...`)
-        })
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     beforeAll(async function (done) {

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

@@ -18,14 +18,13 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 const TIMEOUT = 5000;
 const EACHTIMEOUT = 500;
 describe('ActsAccountSetGetExtraInfo', function () {
-    function sleep(delay) {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve()
-            }, delay)
-        }).then(() => {
-            console.info(`sleep #{time} over ...`)
-        })
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     beforeAll(async function (done) {

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

@@ -18,15 +18,15 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 const TIMEOUT = 5000;
 const ERR_APPACCOUNT_SERVICE_PERMISSION_DENIED = 4521993;
 describe('ActsAccountNoPermission', function () {
-    function sleep(delay) {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve()
-            }, delay)
-        }).then(() => {
-            console.info(`sleep #{time} over ...`)
-        })
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
+
     beforeAll(async function (done) {
         console.debug("====>beforeAll start====");
         await sleep(TIMEOUT);

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

@@ -29,23 +29,25 @@ const OWNERLENGTHLIMIT = 1024;
 const OWNERSELF = "com.example.actsaccounttest";
 
 describe('ActsAccountOAuthToken', function () {
-    function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     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/actsgetallaccounts/entry/src/main/js/test/Getallaccounts.test.js

@@ -20,6 +20,15 @@ const TIMEOUT = 2000;
 const LENGTHLIMIT = 1024;
 describe('ActsGetAllAccounts', function () {
 
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
+    }
+
     /*
      * @tc.number    : ActsGetAllAccounts_0100
      * @tc.name      : getAllAccounts callback
@@ -285,10 +294,9 @@ describe('ActsGetAllAccounts', function () {
                 done();
             });
         }
-        setTimeout(async function(){
-            console.debug("====>getAllAccounts 0900 start====");
-            appAccountManager.getAllAccounts(selfBundle, getAllCallback); 
-        }, TIMEOUT); 
+        await sleep(TIMEOUT)
+        console.debug("====>getAllAccounts 0900 start====");
+        appAccountManager.getAllAccounts(selfBundle, getAllCallback);
     });
 
     /*
@@ -318,31 +326,30 @@ describe('ActsGetAllAccounts', function () {
                 },
             },
         );
-        setTimeout(async function(){
-            console.debug("====>getAllAccounts 1000 start====");
-            try{
-                var data = await appAccountManager.getAllAccounts(selfBundle);
-            }
-            catch(err){
-                console.error("====>getAllAccounts 1000 fail err:" + JSON.stringify(err));
-                expect().assertFail();
-                done();
-            }
-            console.debug("====>getAllAccounts 1000 data:" + JSON.stringify(data));
-            try{
-                expect(data[0].name).assertEqual("Account_application_promise");
-                expect(data[0].owner).assertEqual("com.example.actsgetallaaccounts");
-            }
-            catch(err){
-                console.error("====>check data 1000 fail err:" + JSON.stringify(err));
-                expect().assertFail();
-                done();
-            }
-            console.debug("====>delete account 1000 start====");
-            await appAccountManager.deleteAccount("Account_application_promise");
-            console.debug("====>ActsGetAllAccounts_1000 end====");
+        await sleep(TIMEOUT)
+        console.debug("====>getAllAccounts 1000 start====");
+        try{
+            var data = await appAccountManager.getAllAccounts(selfBundle);
+        }
+        catch(err){
+            console.error("====>getAllAccounts 1000 fail err:" + JSON.stringify(err));
+            expect().assertFail();
             done();
-        }, TIMEOUT); 
+        }
+        console.debug("====>getAllAccounts 1000 data:" + JSON.stringify(data));
+        try{
+            expect(data[0].name).assertEqual("Account_application_promise");
+            expect(data[0].owner).assertEqual("com.example.actsgetallaaccounts");
+        }
+        catch(err){
+            console.error("====>check data 1000 fail err:" + JSON.stringify(err));
+            expect().assertFail();
+            done();
+        }
+        console.debug("====>delete account 1000 start====");
+        await appAccountManager.deleteAccount("Account_application_promise");
+        console.debug("====>ActsGetAllAccounts_1000 end====");
+        done(); 
     });
 
     /*
@@ -379,10 +386,9 @@ describe('ActsGetAllAccounts', function () {
             console.debug("====>ActsGetAllAccounts_1100 end====");
             done();
         }
-        setTimeout(async function(){
-            console.debug("====>getAllAccounts 1100 start====");
-            appAccountManager.getAllAccounts(specifiedBundle, getAllCallback); 
-        }, TIMEOUT); 
+        await sleep(TIMEOUT)
+        console.debug("====>getAllAccounts 1100 start====");
+        appAccountManager.getAllAccounts(specifiedBundle, getAllCallback); 
     });
 
     /*
@@ -410,22 +416,21 @@ describe('ActsGetAllAccounts', function () {
                 },
             },
         );
-        setTimeout(async function(){
-            console.debug("====>getAllAccounts 1200 start====");
-            try{
-                var data = await appAccountManager.getAllAccounts(specifiedBundle);
-            }
-            catch(err){
-                console.error("====>getAllAccounts 1200 fail err:" + JSON.stringify(err));
-                expect().assertFail();
-                done();
-            }
-            console.debug("====>getAllAccounts 1200 data:" + JSON.stringify(data));
-            expect(data[0].name).assertEqual("account_name_scene_single");
-            expect(data[0].owner).assertEqual("com.example.actsscenegetallaccounts");
-            console.debug("====>ActsGetAllAccounts_1200 end====");
+        await sleep(TIMEOUT)
+        console.debug("====>getAllAccounts 1200 start====");
+        try{
+            var data = await appAccountManager.getAllAccounts(specifiedBundle);
+        }
+        catch(err){
+            console.error("====>getAllAccounts 1200 fail err:" + JSON.stringify(err));
+            expect().assertFail();
             done();
-        }, TIMEOUT);
+        }
+        console.debug("====>getAllAccounts 1200 data:" + JSON.stringify(data));
+        expect(data[0].name).assertEqual("account_name_scene_single");
+        expect(data[0].owner).assertEqual("com.example.actsscenegetallaccounts");
+        console.debug("====>ActsGetAllAccounts_1200 end====");
+        done();
     });
 
     /*

account/appaccount/actssetchecksyncenable/entry/src/main/js/test/Syncenable.test.js

@@ -30,16 +30,18 @@ describe('ActsSetCheckSyncEnable', function () {
         var atManager = abilityAccessCtrl.createAtManager();
         var result = await atManager.grantUserGrantedPermission(tokenID, PERMISSION_USER_NAME, PERMISSION_USER_SET);
         console.debug("tokenId" + tokenID + " result:" + result);
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         console.debug("====>beforeAll end====");
         done();
     })
 
-    function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     /*

account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/entry/src/main/js/test/Getmultiple.test.js

@@ -33,15 +33,17 @@ describe('ActsGetAllAccessibleMultiple', function () {
                 },
             },
         );
-        sleep(TIMEOUT);
+        await sleep(TIMEOUT);
         done();
     });
 
-    function sleep(delay) {
-        var start = (new Date()).getTime();
-        while((new Date()).getTime() - start < delay) {
-            continue;
-        }
+    async function sleep(delay) {
+        let timeoutId = null;
+        var promise = new Promise((resolve, reject) => {
+            timeoutId = setTimeout(() => resolve("done!"), delay);
+        });
+        await promise
+        clearTimeout(timeoutId)
     }
 
     /*