!5514 【OpenHarmony3.2-Beta3】【账号】Authenticator修正偶发错误

Merge pull request !5514 from 何海涛/Beta3-0916-Update

account/appaccount/actsaccounttest/src/main/js/test/Authenticator.test.js

@@ -21,6 +21,15 @@ const name = 'zhangsan'
 const owner = 'com.example.accountauthenticator'
 export default function ActsAccountAppAccess() {
     describe('ActsAccountAuthenticator', function () {
+        function sleep(delay) {
+            return new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    resolve()
+                }, delay)
+            }).then(() => {
+                console.info(`sleep #{time} over ...`)
+            })
+        }
 
         /*
         * @tc.number    : ActsAccountCheckAccountLabels_0100
@@ -532,6 +541,19 @@ export default function ActsAccountAppAccess() {
         */
 
         it('ActsAccountSetAuthenticatorProperties_0200', 0, async function (done) {
+            await featureAbility.startAbility(
+                {
+                    want:
+                    {
+                        deviceId: "",
+                        bundleName: "com.example.accountauthenticator",
+                        abilityName: "com.example.accountauthenticator.MainAbility",
+                        parameters:
+                        {},
+                    },
+                },
+            );
+            await sleep(1000);
             console.debug("====>ActsAccountSetAuthenticatorProperties_0200 start====");
             var appAccountManager = account.createAppAccountManager();
             console.debug("====>start finish====");
@@ -569,6 +591,19 @@ export default function ActsAccountAppAccess() {
         */
 
         it('ActsAccountSelectAccountByOptions_0100', 0, async function (done) {
+            await featureAbility.startAbility(
+                {
+                    want:
+                    {
+                        deviceId: "",
+                        bundleName: "com.example.accountauthenticator",
+                        abilityName: "com.example.accountauthenticator.MainAbility",
+                        parameters:
+                        {},
+                    },
+                },
+            );
+            await sleep(1000);
             console.debug("====>ActsAccountSelectAccountByOptions_0100 start====");
             var appAccountManager = account.createAppAccountManager();
             var select_options = {allowedAccounts:[{"name":name,"owner":owner}]}
@@ -604,6 +639,19 @@ export default function ActsAccountAppAccess() {
         */
 
         it('ActsAccountSelectAccountByOptions_0200', 0, async function (done) {
+            await featureAbility.startAbility(
+                {
+                    want:
+                    {
+                        deviceId: "",
+                        bundleName: "com.example.accountauthenticator",
+                        abilityName: "com.example.accountauthenticator.MainAbility",
+                        parameters:
+                        {},
+                    },
+                },
+            );
+            await sleep(1000);
             console.debug("====>ActsAccountSelectAccountByOptions_0200 start====");
             var appAccountManager = account.createAppAccountManager();
             var select_options = {allowedOwners: [owner]}
@@ -614,7 +662,7 @@ export default function ActsAccountAppAccess() {
                 try {
                     var data = await appAccountManager.selectAccountsByOptions(select_options)
                     console.debug("====>ActsAccountSelectAccountByOptions_0200 data:" + JSON.stringify(data));
-                    expect(data.length).assertEqual(3)                
+                    expect(data.length).assertEqual(1)                
                 } catch(err) {
                     onsole.debug("====>ActsAccountSelectAccountByOptions_0200 err:" + JSON.stringify(err));
                     expect(err).assertEqual(null)

account/appaccount/sceneProject/actsaccountauthenticator/entry/src/main/js/MainAbility/pages/index/index.js

@@ -13,6 +13,9 @@
  * limitations under the License.
  */
 
+import featureAbility from '@ohos.ability.featureAbility'
+import account_appAccount from '@ohos.account.appAccount';
+
 export default {
     data: {
         title: "Hello World"
@@ -20,4 +23,27 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
+    onShow() {
+        console.info('ServiceAbility onStart');
+        var accountMgr = account_appAccount.createAppAccountManager();
+        console.info('ServiceAbility lcc addAccount 01 onStart');
+        accountMgr.addAccount("zhangsan", "",(data)=>{
+            console.info('ServiceAbility lcc enableAppAccess 01 onStart');
+            accountMgr.enableAppAccess("zhangsan", "com.example.actsaccounttest");
+            console.info('ServiceAbility lcc addAccount 02 onStart');
+            accountMgr.addAccount("lisi", "",(err)=>{
+                console.info('ServiceAbility lcc enableAppAccess 02 onStart');
+                accountMgr.enableAppAccess("lisi", "com.example.actsaccounttest");
+                console.info('ServiceAbility lcc addAccount 03 onStart');
+                accountMgr.addAccount("wangwu", "",(err)=>{
+                    console.info('ServiceAbility lcc enableAppAccess 03 onStart');
+                    accountMgr.enableAppAccess("wangwu", "com.example.actsaccounttest",(err)=>{
+                        featureAbility.terminateSelf();
+                        console.info('ServiceAbility add end');
+                    });
+                });
+            });
+        });
+        console.info('ServiceAbility onStart end');
+    }
 }

account/appaccount/sceneProject/actsaccountauthenticator/entry/src/main/js/ServiceAbility/service.js

@@ -20,17 +20,6 @@ var authenticator = null
 export default {
     async onStart(want) {
         console.info('ServiceAbility onStart');
-        var accountMgr = account_appAccount.createAppAccountManager();
-        try {
-            await accountMgr.addAccount("zhangsan", "");
-            await accountMgr.enableAppAccess("zhangsan", "com.example.actsaccounttest");
-            await accountMgr.addAccount("lisi", "");
-            await accountMgr.enableAppAccess("lisi", "com.example.actsaccounttest");
-            await accountMgr.addAccount("wangwu", "");
-            await accountMgr.enableAppAccess("wangwu", "com.example.actsaccounttest");
-        } catch(err) {
-            console.error(TAG + "addAccount or enableAppAccess failed, error: " + JSON.stringify(err))
-        }
         console.info('ServiceAbility onStart end');
     },
     async onStop() {