!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/actsaccounttest/entry/src/main/js/test/OnOff.js

@@ -20,15 +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 ...`)
-        })
+    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("====>startAbility start====");
         await featureAbility.startAbility(
@@ -82,9 +82,9 @@ describe('ActsAccountChangeOnOff', async function () {
             commonevent.unsubscribe(subscriber, unSubscriberCallback);
             appAccountManager.disableAppAccess("changeonoff_extra", "com.example.actsaccountsceneonoff", disCallback);
         }
-        function publishCallback(err){
+        async function publishCallback(err){
             console.debug("====>publish call back err:" + JSON.stringify(err));
-            setTimeout(async function (){
+            await sleep(500);
             console.debug("====>setAccountExtraInfo start====");
             try{
                 await appAccountManager.setAccountExtraInfo("changeonoff_extra", "change_extra");
@@ -95,7 +95,6 @@ describe('ActsAccountChangeOnOff', async function () {
                 done();
             }
             console.debug("====>setAccountExtraInfo finish====");
-            }, 500)
         }
         var commonEventSubscribeInfo = {
             events: ["account_on_change_extra"]
@@ -110,10 +109,9 @@ describe('ActsAccountChangeOnOff', async function () {
         var commonEventPublishData = {
             code: 1
         }
-        setTimeout(function (){
+        await sleep(1000)
         console.debug("====>publish event account_on_change 0100====");
         commonevent.publish("account_on_change", commonEventPublishData, publishCallback);
-        }, 1000);
     });
 
     /*
@@ -145,9 +143,9 @@ describe('ActsAccountChangeOnOff', async function () {
             commonevent.unsubscribe(subscriber, unSubscriberCallback);
             appAccountManager.deleteAccount("onoff_associatedata", deleteAccountCallback);
         }
-        function publishCallback(err){
+        async function publishCallback(err){
             console.debug("====>publish call back err:" + JSON.stringify(err));
-            setTimeout(async function (){
+            await sleep(500)
             console.debug("====>setAssociatedData start====");
             try{
                 await appAccountManager.setAssociatedData("onoff_associatedata", "change_key", "change_value");
@@ -158,7 +156,6 @@ describe('ActsAccountChangeOnOff', async function () {
                 done();
             }
             console.debug("====>setAssociatedData finish====");
-            }, 500)
         }
         var commonEventSubscribeInfo = {
             events: ["account_on_change_associatedata"]
@@ -173,10 +170,9 @@ describe('ActsAccountChangeOnOff', async function () {
         var commonEventPublishData = {
             code: 2
         }
-        setTimeout(function (){
+        await sleep(1000)
         console.debug("====>publish event account_on_change 0200====");
         commonevent.publish("account_on_change", commonEventPublishData, publishCallback);
-        }, 1000);
     });
 
     /*
@@ -208,9 +204,9 @@ describe('ActsAccountChangeOnOff', async function () {
             commonevent.unsubscribe(subscriber, unSubscriberCallback);
             appAccountManager.deleteAccount("onoff_credential", deleteAccountCallback);
         }
-        function publishCallback(err){
+        async function publishCallback(err){
             console.debug("====>publish call back err:" + JSON.stringify(err));
-            setTimeout(async function (){
+            await sleep(500)
             console.debug("====>setAccountCredential start====");
             try{
                 await appAccountManager.setAccountCredential("onoff_credential", "credentialType", "credential");
@@ -221,7 +217,6 @@ describe('ActsAccountChangeOnOff', async function () {
                 done();
             }
             console.debug("====>setAccountCredential finish====");
-            }, 500)
         }
         var commonEventSubscribeInfo = {
             events: ["account_on_change_credential"]
@@ -236,10 +231,9 @@ describe('ActsAccountChangeOnOff', async function () {
         var commonEventPublishData = {
             code: 3
         }
-        setTimeout(function (){
+        await sleep(1000)
         console.debug("====>publish event account_on_change 0300====");
         commonevent.publish("account_on_change", commonEventPublishData, publishCallback);
-        }, 1000);
     });
 
     /*
@@ -275,9 +269,9 @@ describe('ActsAccountChangeOnOff', async function () {
             commonevent.unsubscribe(subscriber, unSubscriberCallback);
             appAccountManager.deleteAccount("onoff_deleteFir", deleteAccountCallback);
         }
-        function publishCallback(err){
+        async function publishCallback(err){
             console.debug("====>publish call back err:" + JSON.stringify(err));
-            setTimeout(async function (){
+            await sleep(500)
             console.debug("====>deleteAccount start====");
             try{
                 await appAccountManager.deleteAccount("onoff_deleteSec");
@@ -288,7 +282,6 @@ describe('ActsAccountChangeOnOff', async function () {
                 done();
             }
             console.debug("====>deleteAccount finish====");
-            }, 500)
         }
         var commonEventSubscribeInfo = {
             events: ["account_on_delete_another"]
@@ -303,10 +296,9 @@ describe('ActsAccountChangeOnOff', async function () {
         var commonEventPublishData = {
             code: 4
         }
-        setTimeout(function (){
+        await sleep(1000)
         console.debug("====>publish event account_on_change 0400====");
         commonevent.publish("account_on_change", commonEventPublishData, publishCallback);
-        }, 1000);
     });
 
     /*
@@ -333,9 +325,9 @@ describe('ActsAccountChangeOnOff', async function () {
             commonevent.unsubscribe(subscriber, unSubscriberCallback);
             done();
         }
-        function publishCallback(err){
+        async function publishCallback(err){
             console.debug("====>publish call back err:" + JSON.stringify(err));
-            setTimeout(async function (){
+            await sleep(500)
             console.debug("====>deleteAccount start====");
             try{
                 await appAccountManager.deleteAccount("onoff_delete");
@@ -346,7 +338,6 @@ describe('ActsAccountChangeOnOff', async function () {
                 done();
             }
             console.debug("====>deleteAccount finish====");
-            }, 500)
         }
         var commonEventSubscribeInfo = {
             events: ["account_on_change_delete"]
@@ -361,10 +352,9 @@ describe('ActsAccountChangeOnOff', async function () {
         var commonEventPublishData = {
             code: 5
         }
-        setTimeout(function (){
+        await sleep(1000)
         console.debug("====>publish event account_on_change 0500====");
         commonevent.publish("account_on_change", commonEventPublishData, publishCallback);
-        }, 1000);
     });
 
     /*
@@ -404,9 +394,9 @@ describe('ActsAccountChangeOnOff', async function () {
             commonevent.unsubscribe(subscriber, unSubscriberCallback);
             appAccountManager.deleteAccount("onoff_enableFir", deleteAccountCallback);
         }
-        function publishCallback(err){
+        async function publishCallback(err){
             console.debug("====>publish call back err:" + JSON.stringify(err));
-            setTimeout(async function (){
+            await sleep(500)
             console.debug("====>disableAppAccess start====");
             try{
                 await appAccountManager.disableAppAccess("onoff_enableSec", "com.example.actsaccountsceneonoff");
@@ -417,7 +407,6 @@ describe('ActsAccountChangeOnOff', async function () {
                 done();
             }
             console.debug("====>disableAppAccess finish====");
-            }, 500)
         }
         var commonEventSubscribeInfo = {
             events: ["account_on_disable_another"]
@@ -432,10 +421,9 @@ describe('ActsAccountChangeOnOff', async function () {
         var commonEventPublishData = {
             code: 6
         }
-        setTimeout(function (){
+        await sleep(1000)
             console.debug("====>publish event account_on_change 0600====");
             commonevent.publish("account_on_change", commonEventPublishData, publishCallback);
-        }, 1000);
     });
 
     /*
@@ -467,9 +455,9 @@ describe('ActsAccountChangeOnOff', async function () {
             commonevent.unsubscribe(subscriber, unSubscriberCallback);
             appAccountManager.deleteAccount("onoff_disable", deleteAccountCallback);
         }
-        function publishCallback(err){
+        async function publishCallback(err){
             console.debug("====>publish call back err:" + JSON.stringify(err));
-            setTimeout(async function (){
+            await sleep(500)
             console.debug("====>disableAppAccess start====");
             try{
                 await appAccountManager.disableAppAccess("onoff_disable", "com.example.actsaccountsceneonoff");
@@ -480,7 +468,6 @@ describe('ActsAccountChangeOnOff', async function () {
                 done();
             }
             console.debug("====>disableAppAccess finish====");
-            }, 500)
         }
         var commonEventSubscribeInfo = {
             events: ["account_on_change_disable"]
@@ -495,10 +482,9 @@ describe('ActsAccountChangeOnOff', async function () {
         var commonEventPublishData = {
             code: 7
         }
-        setTimeout(function (){
+        await sleep(1000)
         console.debug("====>publish event account_on_change 0700====");
         commonevent.publish("account_on_change", commonEventPublishData, publishCallback);
-        }, 1000);
     });
 
     /*
@@ -651,7 +637,7 @@ describe('ActsAccountChangeOnOff', async function () {
             }
             twiceSign = twiceSign + 1;
         }
-        function changeOnSecondCallback(data){
+        async function changeOnSecondCallback(data){
             console.debug("====>second receive change 1000 data:" + JSON.stringify(data));
             console.debug("====>data.length:" + data.length);
             for (let i = 0, len = data.length; i < len; i++) {
@@ -664,7 +650,7 @@ describe('ActsAccountChangeOnOff', async function () {
                 expect(data).assertEqual("com.example.actsaccounttest");
             }
             twiceSign = twiceSign + 1;
-            setTimeout(async function (){
+            await sleep(1000)
             console.debug("====>off start====");
             appAccountManager.off('change', function (){
                 console.debug("====>off ActsAccountChangeOnOff_1000 finish====");
@@ -676,7 +662,6 @@ describe('ActsAccountChangeOnOff', async function () {
                     done();
                 });
             });
-            }, 1000)
         }
         try{
             appAccountManager.on('change', ["com.example.actsaccounttest"], changeOnFirstCallback);
@@ -744,7 +729,7 @@ describe('ActsAccountChangeOnOff', async function () {
             expect().assertFail();
             done();
         }
-        setTimeout(async function (){
+        await sleep(1000)
         console.debug("====>off 1100 start====");
         expect(sameSign).assertEqual(1);
         appAccountManager.off('change', function (){
@@ -756,7 +741,6 @@ describe('ActsAccountChangeOnOff', async function () {
                 done();
             });
         });
-        }, 1000)
     });
 
     /*
@@ -786,9 +770,9 @@ describe('ActsAccountChangeOnOff', async function () {
             }
             appAccountManager.off('change', function (){
                 console.debug("====>first off ActsAccountChangeOnOff_1200 finish====");
-                appAccountManager.off('change', function (){
+                appAccountManager.off('change',async function (){
                     console.debug("====>second off ActsAccountChangeOnOff_1200 finish====");
-                    setTimeout(async function (){
+                    await sleep(1000)
                     console.debug("====>delete account 1200 start====");
                     appAccountManager.deleteAccount("onoff_repeatoff", (err)=>{
                         console.debug("====>delete account ActsAccountChangeOnOff_1200 err:" + JSON.stringify(err));
@@ -796,7 +780,6 @@ describe('ActsAccountChangeOnOff', async function () {
                         console.debug("====>ActsAccountChangeOnOff_1200 end====");
                         done();
                     });
-                    }, 1000)
                 });
             });
         }
@@ -855,7 +838,7 @@ describe('ActsAccountChangeOnOff', async function () {
             expect().assertFail();
             done();
         }
-        setTimeout(async function (){
+        await sleep(1000)
         console.debug("====>delete account 1300 start====");
         appAccountManager.deleteAccount("onoff_same", (err)=>{
             console.debug("====>delete account ActsAccountChangeOnOff_1300 err:" + JSON.stringify(err));
@@ -863,7 +846,6 @@ describe('ActsAccountChangeOnOff', async function () {
             console.debug("====>ActsAccountChangeOnOff_1300 end====");
             done();
         });
-        }, 1000)
     });
 
     /*
@@ -902,7 +884,7 @@ describe('ActsAccountChangeOnOff', async function () {
             expect().assertFail();
             done();
         }
-        setTimeout(async function (){
+        await sleep(1000)
         console.debug("====>delete account 1400 start====");
         appAccountManager.deleteAccount("onoff_same", (err)=>{
             console.debug("====>delete account ActsAccountChangeOnOff_1400 err:" + JSON.stringify(err));
@@ -910,6 +892,5 @@ describe('ActsAccountChangeOnOff', async function () {
             console.debug("====>ActsAccountChangeOnOff_1400 end====");
             done();
         });
-        }, 1000)
     });
 })
\ No newline at end of file

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(){
+        await sleep(TIMEOUT)
         console.debug("====>getAllAccounts 0900 start====");
         appAccountManager.getAllAccounts(selfBundle, getAllCallback);
-        }, TIMEOUT); 
     });
 
     /*
@@ -318,7 +326,7 @@ describe('ActsGetAllAccounts', function () {
                 },
             },
         );
-        setTimeout(async function(){
+        await sleep(TIMEOUT)
         console.debug("====>getAllAccounts 1000 start====");
         try{
             var data = await appAccountManager.getAllAccounts(selfBundle);
@@ -342,7 +350,6 @@ describe('ActsGetAllAccounts', function () {
         await appAccountManager.deleteAccount("Account_application_promise");
         console.debug("====>ActsGetAllAccounts_1000 end====");
         done(); 
-        }, TIMEOUT); 
     });
 
     /*
@@ -379,10 +386,9 @@ describe('ActsGetAllAccounts', function () {
             console.debug("====>ActsGetAllAccounts_1100 end====");
             done();
         }
-        setTimeout(async function(){
+        await sleep(TIMEOUT)
         console.debug("====>getAllAccounts 1100 start====");
         appAccountManager.getAllAccounts(specifiedBundle, getAllCallback); 
-        }, TIMEOUT); 
     });
 
     /*
@@ -410,7 +416,7 @@ describe('ActsGetAllAccounts', function () {
                 },
             },
         );
-        setTimeout(async function(){
+        await sleep(TIMEOUT)
         console.debug("====>getAllAccounts 1200 start====");
         try{
             var data = await appAccountManager.getAllAccounts(specifiedBundle);
@@ -425,7 +431,6 @@ describe('ActsGetAllAccounts', function () {
         expect(data[0].owner).assertEqual("com.example.actsscenegetallaccounts");
         console.debug("====>ActsGetAllAccounts_1200 end====");
         done();
-        }, TIMEOUT);
     });
 
     /*

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)
     }
 
     /*