From 2fe4585a0a162bd9518a882136fbdec124cecd88 Mon Sep 17 00:00:00 2001
From: zhaimengchao <zhaimengchao@huawei.com>
Date: Mon, 10 Apr 2023 19:18:00 +0800
Subject: [PATCH] =?UTF-8?q?fixed=205639361=20from=20https://gitee.com/zhai?=
 =?UTF-8?q?mengchao/xts=5Facts/pulls/8404=20=E3=80=90Account=E3=80=91?=
 =?UTF-8?q?=E3=80=90Master=E3=80=91Case=20execution=20duration=20optimizat?=
 =?UTF-8?q?ion=20and=20Interface=20Changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhaimengchao <zhaimengchao@huawei.com>
---
 .../src/main/js/test/Authenticator.test.js    | 12 +++++-----
 .../src/main/js/test/Authenticator.test.js    | 24 ++++++++-----------
 .../actsosaccountthirdpartytest/Test.json     |  3 ++-
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/account/appaccount/actsaccountoperatetest/src/main/js/test/Authenticator.test.js b/account/appaccount/actsaccountoperatetest/src/main/js/test/Authenticator.test.js
index 6473a6ab1..9fffa6f72 100644
--- a/account/appaccount/actsaccountoperatetest/src/main/js/test/Authenticator.test.js
+++ b/account/appaccount/actsaccountoperatetest/src/main/js/test/Authenticator.test.js
@@ -45,8 +45,8 @@ export default function ActsAccountAppAccess() {
         });
         beforeEach(async (done)=>{
             console.debug("====>afterEach start====");
-            var appAccountManager = account.getAccountManager();
-            var accounts = await appAccountManager.getAllAccountByOwner(owner)
+            var appAccountManager = account.createAppAccountManager();
+            var accounts = await appAccountManager.getAccountsByOwner(owner)
             for (var i=0;i<accounts.length;i++){
                 var localName = accounts[i].name
                 if(localName == 'zhangsan'){
@@ -733,8 +733,8 @@ export default function ActsAccountAppAccess() {
                 onRequestRedirected:null,
                 onRequestContinued: function(){ 
                     console.debug("====>ActsAccountCreateAccountImplicitly_0100 onRequestContinued")
-                    }  
-            });            
+                    }
+            });
         });
 
         /*
@@ -759,8 +759,8 @@ export default function ActsAccountAppAccess() {
                 onRequestRedirected:null,
                 onRequestContinued: function(){ 
                     console.debug("====>ActsAccountCreateAccountImplicitly_0200 onRequestContinued")
-                    }  
-            });            
+                    }
+            });
         });
     })
 }
\ No newline at end of file
diff --git a/account/appaccount/actsaccounttest/src/main/js/test/Authenticator.test.js b/account/appaccount/actsaccounttest/src/main/js/test/Authenticator.test.js
index 4fd80ba18..79fc957b2 100644
--- a/account/appaccount/actsaccounttest/src/main/js/test/Authenticator.test.js
+++ b/account/appaccount/actsaccounttest/src/main/js/test/Authenticator.test.js
@@ -24,7 +24,7 @@ export default function ActsAccountAuthenticator() {
     describe('ActsAccountAuthenticator', function () {
         beforeAll(async function (done) {  
             console.debug("====>accountauthenticatorbeforeAll start====");		
-            await featureAbility.startAbility(
+            await featureAbility.startAbilityForResult(
                 {
                     want:
                     {
@@ -44,8 +44,8 @@ export default function ActsAccountAuthenticator() {
         });
         beforeEach(async function (done) {            
             console.debug("====>afterEach start====");
-            var appAccountManager = account.getAccountManager();
-            var accounts = await appAccountManager.getAllAccountByOwner(owner)
+            var appAccountManager = account.createAppAccountManager();
+            var accounts = await appAccountManager.getAccountsByOwner(owner)
             for (var i=0;i<accounts.length;i++){
                 var localName = accounts[i].name
                 if(localName == 'zhangsan'){
@@ -76,7 +76,7 @@ export default function ActsAccountAuthenticator() {
                         expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCheckAccountLabels_0100 end====");
                         done();
-                    })                
+                    })
                 });
             });
         });
@@ -134,11 +134,9 @@ export default function ActsAccountAuthenticator() {
                         console.debug("====>ActsAccountCheckAccountLabels_0300 end====");
                         done();                     
                     })
-                    
                 });
             });
-                
-        }); 
+        });
 
         /*
         * @tc.number    : ActsAccountCheckAccountLabels_0400
@@ -665,7 +663,6 @@ export default function ActsAccountAuthenticator() {
             });        
         });
 
-
         /*
         * @tc.number    : ActsAccountSelectAccountByOptions_0100
         * @tc.name      : Verify Credential callback form
@@ -692,14 +689,13 @@ export default function ActsAccountAuthenticator() {
                     appAccountManager.deleteAccount(name)
                     console.debug('====>ActsAccountSelectAccountByOptions_0300 deleteAccount_success')
                     done();
-                }                               
+                }
                 catch{
                     console.debug('====>ActsAccountSelectAccountByOptions_0300 deleteAccount_err')
                     expect().assertFail()
                     done();
-                }    
-            });        
-        }); 
-        
+                }
+            });
+        });
     })
-}
\ No newline at end of file
+}
diff --git a/account/osaccount/actsosaccountthirdpartytest/Test.json b/account/osaccount/actsosaccountthirdpartytest/Test.json
index 72697e7e1..e5a21dfbc 100644
--- a/account/osaccount/actsosaccountthirdpartytest/Test.json
+++ b/account/osaccount/actsosaccountthirdpartytest/Test.json
@@ -5,7 +5,8 @@
         "test-timeout": "300000",
         "bundle-name": "com.example.actsosaccountthirdpartytest",
         "package-name": "com.example.actsosaccountthirdpartytest",
-        "shell-timeout": "60000"
+        "shell-timeout": "60000",
+        "testcase-timeout": "100000"
     },
     "kits": [
         {
-- 
GitLab