!4975 【账号】错误返回值undefined改为null，接口属性部分补全

Merge pull request !4975 from 何海涛/0815UndefinedToNull

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

@@ -31,10 +31,10 @@ export default function ActsAccountAddAccount() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_callback_first", (err)=>{
                 console.debug("====>add account ActsAccountAddAccount_0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("account_name_callback_first", (err)=>{
                     console.debug("====>delete Account ActsAccountAddAccount_0100 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountAddAccount_0100 end====");
                     done();
                 });
@@ -76,10 +76,10 @@ export default function ActsAccountAddAccount() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_callback_second", "account_extraInfo_callback_second", (err)=>{
                 console.debug("====>add account ActsAccountAddAccount_0300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("account_name_callback_second", (err)=>{
                     console.debug("====>delete Account ActsAccountAddAccount_0300 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountAddAccount_0300 end====");
                     done();
                 });
@@ -121,13 +121,13 @@ export default function ActsAccountAddAccount() {
             var appAccountManager = account.createAppAccountManager();
             appAccountManager.addAccount("account_name_callback_third", "account_extraInfo_callback_third", (err)=>{
                 console.debug("====>add account first time ActsAccountAddAccount_0500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.addAccount("account_name_callback_third", "account_extraInfo_callback_third", (err)=>{
                     console.debug("====>add account second time ActsAccountAddAccount_0500 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_callback_third", (err)=>{
                         console.debug("====>delete Account ActsAccountAddAccount_0500 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountAddAccount_0500 end====");
                         done();
                     });
@@ -292,10 +292,10 @@ export default function ActsAccountAddAccount() {
             var appAccountManager = account.createAppAccountManager();
             appAccountManager.addAccount("account_name_callback_seventh", "", (err)=>{
                 console.debug("====>add account ActsAccountAddAccount_1300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("account_name_callback_seventh", (err)=>{
                     console.debug("====>delete Account ActsAccountAddAccount_1300 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountAddAccount_1300 end====");
                     done();
                 });
@@ -373,10 +373,10 @@ export default function ActsAccountAddAccount() {
             var specialStr = "#@$%^&*()_+!<>~?,./[]abcdefgABCDEFG1234567890";
             appAccountManager.addAccount(specialStr, "account_extraInfo_callback_ninth", (err)=>{
                 console.debug("====>add account ActsAccountAddAccount_1700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount(specialStr, (err)=>{
                     console.debug("====>delete Account ActsAccountAddAccount_1700 err" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountAddAccount_1700 end====");
                     done();
                 });
@@ -418,10 +418,10 @@ export default function ActsAccountAddAccount() {
             var specialStr = " ";
             appAccountManager.addAccount("account_name_callback_tenth", specialStr, (err)=>{
                 console.debug("====>add account ActsAccountAddAccount_1900 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("account_name_callback_tenth", (err)=>{
                     console.debug("====>delete Account ActsAccountAddAccount_1900 err" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountAddAccount_1900 end====");
                     done();
                 });
@@ -463,10 +463,10 @@ export default function ActsAccountAddAccount() {
             var specialStr = "#@$%^&*()_+!<>~?,./[]abcdefgABCDEFG1234567890";
             appAccountManager.addAccount("account_extraInfo_callback_eleventh", specialStr, (err)=>{
                 console.debug("====>add account ActsAccountAddAccount_2100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("account_extraInfo_callback_eleventh", (err)=>{
                     console.debug("====>delete Account ActsAccountAddAccount_2100 err" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountAddAccount_2100 end====");
                     done();
                 });
@@ -507,13 +507,13 @@ export default function ActsAccountAddAccount() {
             var appAccountManager = account.createAppAccountManager();
             appAccountManager.addAccount("account_name_callback_same", "account_extraInfo_callback", (err)=>{
                 console.debug("====>add account first time ActsAccountAddAccount_2300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.addAccount("account_name_callback_same", "account_extraInfo_callback_different", (err)=>{
                     console.debug("====>add account second time ActsAccountAddAccount_2300 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_callback_same", (err)=>{
                         console.debug("====>delete Account ActsAccountAddAccount_2300 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountAddAccount_2300 end====");
                         done();
                     });
@@ -558,10 +558,10 @@ export default function ActsAccountAddAccount() {
             var appAccountManager = account.createAppAccountManager();
             appAccountManager.addAccount(limitName, "account_extraInfo_callback", (err)=>{
                 console.debug("====>add account ActsAccountAddAccount_2500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount(limitName, (err)=>{
                     console.debug("====>delete Account ActsAccountAddAccount_2500 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountAddAccount_2500 end====");
                     done();
                 });
@@ -609,10 +609,10 @@ export default function ActsAccountAddAccount() {
             var appAccountManager = account.createAppAccountManager();
             appAccountManager.addAccount("account_extra_callback_limit", limitExtra, (err)=>{
                 console.debug("====>add account ActsAccountAddAccount_2700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("account_extra_callback_limit", (err)=>{
                     console.debug("====>delete Account ActsAccountAddAccount_2700 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountAddAccount_2700 end====");
                     done();
                 });

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

@@ -54,13 +54,13 @@ export default function ActsAccountAppAccess() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("AppAccess_callback_itself", "extrainfo_callback_itself", (err)=>{
                 console.debug("====>add account ActsAccountAppAccess_0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.enableAppAccess("AppAccess_callback_itself", "com.example.actsaccountappaccess", (err)=>{
                     console.debug("====>enableAppAccess err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("AppAccess_callback_itself", (err)=>{
                         console.debug("====>delete Account ActsAccountAppAccess_0100 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountAppAccess_0100 end====");
                         done();
                     });
@@ -105,13 +105,13 @@ export default function ActsAccountAppAccess() {
             var nonExistBundle = "com.example.NonExistentBundleCallback";
             appAccountManager.addAccount("AppAccess_callback_NotExistBundle", "extrainfo_callback_NotExistBundle", (err)=>{
                 console.debug("====>add account ActsAccountAppAccess_0300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.enableAppAccess("AppAccess_callback_NotExistBundle", nonExistBundle, (err)=>{
                     console.debug("====>enableAppAccess 0300 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("AppAccess_callback_NotExistBundle", (err)=>{
                         console.debug("====>delete Account ActsAccountAppAccess_0300 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountAppAccess_0300 end====");
                         done();
                     });
@@ -199,15 +199,16 @@ export default function ActsAccountAppAccess() {
             var enableBundle = "com.example.actsaccountsceneappaccess";
             appAccountManager.addAccount("AppAccess_callback_account", (err)=>{
                 console.debug("====>add account ActsAccountAppAccess_0700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.enableAppAccess("AppAccess_callback_account", enableBundle, (err)=>{
                     console.debug("====>enableAppAccess 0700 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.disableAppAccess("AppAccess_callback_account", enableBundle, (err)=>{
-                        expect(err).assertEqual(undefined)
+			console.debug("====>disableAppAccess 0700 err:" + JSON.stringify(err));
+                        expect(err).assertEqual(null)
                         appAccountManager.deleteAccount("AppAccess_callback_account", (err)=>{
                             console.debug("====>delete Account ActsAccountAppAccess_0700 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsAccountAppAccess_0700 end====");
                             done();
                         });
@@ -315,13 +316,13 @@ export default function ActsAccountAppAccess() {
             }
             appAccountManager.addAccount("AppAccess_callback_bigBundleName", (err)=>{
                 console.debug("====>add account ActsAccountAppAccess_1100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.enableAppAccess("AppAccess_callback_bigBundleName", bigBundleName, (err)=>{
                     console.debug("====>enableAppAccess 1100 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("AppAccess_callback_bigBundleName", (err)=>{
                         console.debug("====>delete Account ActsAccountAppAccess_1100 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountAppAccess_1100 end====");
                         done();
                     });
@@ -370,13 +371,13 @@ export default function ActsAccountAppAccess() {
             var emptyBundleName = '';
             appAccountManager.addAccount("AppAccess_callback_emptyBundleName", (err)=>{
                 console.debug("====>add account ActsAccountAppAccess_1300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.enableAppAccess("AppAccess_callback_emptyBundleName", emptyBundleName, (err)=>{
                     console.debug("====>enableAppAccess 1300 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("AppAccess_callback_emptyBundleName", (err)=>{
                         console.debug("====>delete Account ActsAccountAppAccess_1300 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountAppAccess_1300 end====");
                         done();
                     });
@@ -422,12 +423,12 @@ export default function ActsAccountAppAccess() {
             var enableBundle = "com.example.actsaccountsceneappaccess";
             appAccountManager.addAccount("AppAccess_callback_account", (err)=>{
                 console.debug("====>add account ActsAccountAppAccess_1500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.disableAppAccess("AppAccess_callback_account", enableBundle, (err)=>{
                     expect(err.code != 0).assertEqual(true)
                     appAccountManager.deleteAccount("AppAccess_callback_account", (err)=>{
                         console.debug("====>delete Account ActsAccountAppAccess_1500 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountAppAccess_1500 end====");
                         done();
                     });
@@ -479,12 +480,12 @@ export default function ActsAccountAppAccess() {
             var notExistBundle = "com.example.actsaccountnotexistbundle";
             appAccountManager.addAccount("AppAccess_callback_notExistBundle", (err)=>{
                 console.debug("====>add account ActsAccountAppAccess_1700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.disableAppAccess("AppAccess_callback_notExistBundle", notExistBundle, (err)=>{
                     expect(err.code != 0).assertEqual(true)
                     appAccountManager.deleteAccount("AppAccess_callback_notExistBundle", (err)=>{
                         console.debug("====>delete Account ActsAccountAppAccess_1700 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountAppAccess_1700 end====");
                         done();
                     });

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

@@ -33,14 +33,14 @@ export default function ActsAccountAppAccess() {
             console.debug("====>start finish====");
             appAccountManager.addAccount(name, 'test_extraInfo', (err)=>{
                 console.debug("====>ActsAccountCheckAccountLabels_0100 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.checkAccountLabels(name, owner, ['level4'], (err, data)=>{
                     console.debug("====>ActsAccountCheckAccountLabels_0100 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountCheckAccountLabels_0100 data:" + JSON.stringify(data));                
                     appAccountManager.deleteAccount(name, (err) =>{
                         console.debug("====>ActsAccountCheckAccountLabels_0100 deleteAccount_err:" + JSON.stringify(err))
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCheckAccountLabels_0100 end====");
                         done();
                     })                
@@ -61,14 +61,14 @@ export default function ActsAccountAppAccess() {
             console.debug("====>start finish====");
             appAccountManager.addAccount(name, (err)=>{
                 console.debug("====>ActsAccountCheckAccountLabels_0200 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.checkAccountLabels(name, owner, ['20-30'], (err, data)=>{
                     console.debug("====>ActsAccountCheckAccountLabels_0200 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountCheckAccountLabels_0200 data:" + JSON.stringify(data));                
                     appAccountManager.deleteAccount(name, (err) =>{
                         console.debug("====>ActsAccountCheckAccountLabels_0200 deleteAccount_err:" + JSON.stringify(err))
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCheckAccountLabels_0200 end====");
                         done();
                     })
@@ -88,15 +88,15 @@ export default function ActsAccountAppAccess() {
             console.debug("====>start finish====");
             appAccountManager.addAccount('CheckAccountLabels_0300', (err)=>{
                 console.debug("====>ActsAccountCheckAccountLabels_0300 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.checkAccountLabels('CheckAccountLabels_0300', owner, ['male'], (err, data)=>{
                     console.debug("====>ActsAccountCheckAccountLabels_0300 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountCheckAccountLabels_0300 data:" + JSON.stringify(data));    
                     expect(data).assertEqual(false)   
                     appAccountManager.deleteAccount("CheckAccountLabels_0300", (err) =>{
                         console.debug("====>ActsAccountCheckAccountLabels_0300 deleteAccount_err:" + JSON.stringify(err))
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCheckAccountLabels_0300 end====");
                         done();                     
                     })
@@ -212,25 +212,25 @@ export default function ActsAccountAppAccess() {
             var appAccountManager = account.createAppAccountManager();
             appAccountManager.addAccount(name, (err)=>{
                 console.debug("====>ActsAccountCheckAppAccess_0100 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.checkAppAccess(name, owner, (err, data)=>{
                     console.debug("====>ActsAccountCheckAppAccess_0100 first_err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountCheckAppAccess_0100 first_data:" + JSON.stringify(data));
                     expect(data).assertEqual(false)
                     appAccountManager.enableAppAccess(name, owner, (err, data) =>{
                         console.debug("====>ActsAccountCheckAppAccess_0100 enableAppAccess_err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.checkAppAccess(name, owner, (err, data) =>{
                             console.debug("====>ActsAccountCheckAppAccess_0100 second_err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data).assertEqual(true)
                             appAccountManager.disableAppAccess(name, owner, (err, data) =>{
                                 console.debug("====>ActsAccountCheckAppAccess_0100 disableAppAccount_err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);  
+                                expect(err).assertEqual(null);  
                                 appAccountManager.checkAppAccess(name, owner,(err, data)=>{
                                     console.debug("====>ActsAccountCheckAppAccess_0100 third_err:" + JSON.stringify(err))
-                                    expect(err).assertEqual(undefined)
+                                    expect(err).assertEqual(null)
                                     expect(data).assertEqual(false)
                                     try {
                                         appAccountManager.deleteAccount(name)     
@@ -330,18 +330,18 @@ export default function ActsAccountAppAccess() {
             console.debug("====>start finish====");
             appAccountManager.addAccount(name, (err)=>{
                 console.debug("====>ActsAccountDeleteAccountCredential_0100 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential(name, "PIN", (err, data)=>{
                     console.debug("====>ActsAccountDeleteAccountCredential_0100 setAccountCredential_err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountDeleteAccountCredential_0100 setAccountCredential_data:" + JSON.stringify(data));  
                     appAccountManager.getAccountCredential(name, "PIN", (err) =>{
                         console.debug("====>ActsAccountDeleteAccountCredential_0100 getAccountCredential_err:" + JSON.stringify(err))
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountDeleteAccountCredential_0100 getAccountCredential_success:" + JSON.stringify(data));
                         appAccountManager.deleteAccountCredential(name, "PIN", (err, data)=>{
                             console.debug("====>ActsAccountDeleteAccountCredential_0100 deleteAccountCredential_err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data).assertEqual(undefined);
                             console.debug("====>ActsAccountDeleteAccountCredential_0100 deleteAccountCredential_data:" + JSON.stringify(data));   
                             try{
@@ -371,14 +371,12 @@ export default function ActsAccountAppAccess() {
             var appAccountManager = account.createAppAccountManager();
             appAccountManager.addAccount(name, 'test_extraInfo').then((data) =>{
                 console.debug("====>ActsAccountDeleteAccountCredential_0200 add_account_success");
-                appAccountManager.setAccountCredential(name, "PIN").then((data) =>{
+                appAccountManager.setAccountCredential(name, "PIN").then(() =>{
                     console.debug("====>ActsAccountDeleteAccountCredential_0200 setAccountCredential_success");
-                    expect(data).assertEqual(undefined);
                     appAccountManager.getAccountCredential(name, "PIN").then((data) =>{
                         console.debug("====>ActsAccountDeleteAccountCredential_0200 getAccountCredential_data:" + JSON.stringify(data));
                         appAccountManager.deleteAccountCredential(name, "PIN").then((data) =>{
-                            console.debug("====>ActsAccountDeleteAccountCredential_0200 data:" + JSON.stringify(data));
-                            expect(data).assertEqual(undefined);                                                                          //expect undefined assertEqual true
+                            console.debug("====>ActsAccountDeleteAccountCredential_0200 data:" + JSON.stringify(data));                
                             try{
                                 appAccountManager.deleteAccount(name)
                                 console.debug('====>ActsAccountDeleteAccountCredential_0200 deleteAccount_success')
@@ -423,7 +421,7 @@ export default function ActsAccountAppAccess() {
             console.debug("====>start finish====");
             appAccountManager.addAccount(name, (err)=>{
                 console.debug("====>ActsAccountVerifyCredential_0100 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.verifyCredential(name, owner, options, {
                 onResult:(resultCode, resultData)=>{
                     console.debug("====>ActsAccountVerifyCredential_0100 verifyCredential_resultcode:" + JSON.stringify(resultCode));
@@ -461,9 +459,9 @@ export default function ActsAccountAppAccess() {
             console.debug("====>start finish====");
             appAccountManager.addAccount(name, (err)=>{
                 console.debug("====>ActsAccountVerifyCredential_0200 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 console.debug("====>ActsAccountVerifyCredential_0200 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.verifyCredential(name, owner,  {
                 onResult:(resultCode, resultData)=>{
                     console.debug("====>ActsAccountVerifyCredential_0200 verifyCredential_resultcode:" + JSON.stringify(resultCode));
@@ -502,7 +500,7 @@ export default function ActsAccountAppAccess() {
             console.debug("====>start finish====");
             appAccountManager.addAccount(name, (err)=>{
                 console.debug("====>ActsAccountSetAuthenticatorProperties_0100 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAuthenticatorProperties(owner, options, {
                 onResult:(resultCode, resultData)=>{
                     console.debug("====>ActsAccountSetAuthenticatorProperties_0100 setAuthenticatorProperties_resultcode:" + JSON.stringify(resultCode));
@@ -539,7 +537,7 @@ export default function ActsAccountAppAccess() {
             console.debug("====>start finish====");
             appAccountManager.addAccount(name, (err)=>{
                 console.debug("====>ActsAccountSetAuthenticatorProperties_0200 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAuthenticatorProperties(owner, {
                 onResult:(resultCode, resultData)=>{
                     console.debug("====>ActsAccountSetAuthenticatorProperties_0200 setAuthenticatorProperties_resultcode:" + JSON.stringify(resultCode));
@@ -573,18 +571,19 @@ export default function ActsAccountAppAccess() {
         it('ActsAccountSelectAccountByOptions_0100', 0, async function (done) {
             console.debug("====>ActsAccountSelectAccountByOptions_0100 start====");
             var appAccountManager = account.createAppAccountManager();
-            var select_options = {"allowedAccounts":[{"name":name,"owner":owner}]}
+            var select_options = {allowedAccounts:[{"name":name,"owner":owner}]}
             console.debug("====>start finish====");
-            appAccountManager.addAccount(name, (err)=>{
+            appAccountManager.addAccount(name, async (err)=>{
                 console.debug("====>ActsAccountSelectAccountByOptions_0100 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
-                appAccountManager.selectAccountsByOptions(select_options, ((err, data)=>{
-                    console.debug("====>ActsAccountSelectAccountByOptions_0100 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined)
-                    console.debug("====>ActsAccountSelectAccountByOptions_0100 data:" + JSON.stringify(data.length));
-                    expect(data.length).assertEqual(0)
-                    done();
-                }))
+                expect(err).assertEqual(null);
+                try {
+                    var data = await appAccountManager.selectAccountsByOptions(select_options)
+                    console.debug("====>ActsAccountSelectAccountByOptions_0100 data:" + JSON.stringify(data));
+                    expect(data.length).assertEqual(1)                
+                } catch(err) {
+                    onsole.debug("====>ActsAccountSelectAccountByOptions_0100 err:" + JSON.stringify(err));
+                    expect(err).assertEqual(null)
+                }
                 try{
                     appAccountManager.deleteAccount(name)
                     console.debug('====>ActsAccountSelectAccountByOptions_0100 deleteAccount_success')
@@ -593,6 +592,7 @@ export default function ActsAccountAppAccess() {
                 catch{
                     console.debug('====>ActsAccountSelectAccountByOptions_0100 deleteAccount_err')
                     expect().assertFail()
+                    done();
                 }    
             });        
         });
@@ -606,20 +606,19 @@ export default function ActsAccountAppAccess() {
         it('ActsAccountSelectAccountByOptions_0200', 0, async function (done) {
             console.debug("====>ActsAccountSelectAccountByOptions_0200 start====");
             var appAccountManager = account.createAppAccountManager();
-            var select_options = {"allowedOwners": [owner]}
+            var select_options = {allowedOwners: [owner]}
             console.debug("====>start finish====");
-            appAccountManager.addAccount(name, (err)=>{
+            appAccountManager.addAccount(name, async (err)=>{
                 console.debug("====>ActsAccountSelectAccountByOptions_0200 add_account_err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
-                appAccountManager.selectAccountsByOptions(select_options).then((data)=>{
-                    console.debug("====>ActsAccountSelectAccountByOptions_0200 data:" + JSON.stringify(data.length));
-                    expect(data.length).assertEqual(0)
-                    done();
-                }).catch(()=>{
+                expect(err).assertEqual(null);
+                try {
+                    var data = await appAccountManager.selectAccountsByOptions(select_options)
+                    console.debug("====>ActsAccountSelectAccountByOptions_0200 data:" + JSON.stringify(data));
+                    expect(data.length).assertEqual(3)                
+                } catch(err) {
                     onsole.debug("====>ActsAccountSelectAccountByOptions_0200 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined)
-                    done()
-                })   
+                    expect(err).assertEqual(null)
+                }
                 try{
                     appAccountManager.deleteAccount(name)
                     console.debug('====>ActsAccountSelectAccountByOptions_0200 deleteAccount_success')
@@ -628,9 +627,46 @@ export default function ActsAccountAppAccess() {
                 catch{
                     console.debug('====>ActsAccountSelectAccountByOptions_0200 deleteAccount_err')
                     expect().assertFail()
+                    done();
                 }    
             });        
         });
+
+
+        /*
+        * @tc.number    : ActsAccountSelectAccountByOptions_0100
+        * @tc.name      : Verify Credential callback form
+        * @tc.desc      : 
+        */
+
+        it('ActsAccountSelectAccountByOptions_0300', 0, async function (done) {
+            console.debug("====>ActsAccountSelectAccountByOptions_0300 start====");
+            var appAccountManager = account.createAppAccountManager();
+            var options = {requiredLabels: ["male", "30-40"]}
+            console.debug("====>start finish====");
+            appAccountManager.addAccount(name, async (err)=>{
+                console.debug("====>ActsAccountSelectAccountByOptions_0300 add_account_err:" + JSON.stringify(err));
+                expect(err).assertEqual(null);
+                try {
+                    var data = await appAccountManager.selectAccountsByOptions(options)
+                    console.debug("====>ActsAccountSelectAccountByOptions_0300 data:" + JSON.stringify(data));
+                    expect(data.length).assertEqual(1)                
+                } catch(err) {
+                    onsole.debug("====>ActsAccountSelectAccountByOptions_0300 err:" + JSON.stringify(err));
+                    expect(err).assertEqual(null)
+                }
+                try{
+                    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

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

@@ -48,10 +48,10 @@ export default function ActsCreatAppAccountManager() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("creatappaccount_name_first", (err)=>{
                 console.debug("====>add account ActsCreatAppAccountManager_0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManagerTwo.deleteAccount("creatappaccount_name_first", (err)=>{
                     console.debug("====>delete Account ActsCreatAppAccountManager_0100 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsCreatAppAccountManager_0100 end====");
                     done();
                 });
@@ -72,18 +72,18 @@ export default function ActsCreatAppAccountManager() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("creatappaccount_name_second", (err)=>{
                 console.debug("====>add account ActsCreatAppAccountManager_0200 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManagerTwo.setAccountExtraInfo("creatappaccount_name_second", "creatappaccount_extra", (err)=>{
                     console.debug("====>setAccountExtraInfo err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.getAccountExtraInfo("creatappaccount_name_second", (err, data)=>{
                         console.debug("====>getAccountExtraInfo err:" + JSON.stringify(err));
                         console.debug("====>getAccountExtraInfo data:" + JSON.stringify(data));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data).assertEqual("creatappaccount_extra");
                         appAccountManagerTwo.deleteAccount("creatappaccount_name_second", (err)=>{
                             console.debug("====>delete Account err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsCreatAppAccountManager_0200 end====");
                             done();
                         });

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

@@ -54,18 +54,18 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_0100", (err)=>{
                 console.debug("====>add account ActsAccountCredential_0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential("account_name_0100", "credentialType1", "credential1",(err)=>{
                     console.debug("====>ActsAccountCredential_0100 setAccountCredential:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.getAccountCredential("account_name_0100", "credentialType1", (err,data)=>{
                         console.debug("====>getAccountCredential 0100 err:" + JSON.stringify(err));
                         console.debug("====>getAccountCredential 0100 data:" + JSON.stringify(data));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data).assertEqual("credential1");
                         appAccountManager.deleteAccount("account_name_0100", (err)=>{
                             console.debug("====>delete Account 0100 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsAccountCredential_0100 end====");
                             done();
                         });
@@ -125,21 +125,21 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_0300",(err)=>{
                 console.debug("====>add account ActsAccountCredential_0300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential("account_name_0300", "credentialType3", "credential3",(err)=>{
                     console.debug("====>setAccountCredential first time 0300 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.setAccountCredential("account_name_0300", "credentialType3", "newcredential3",(err)=>{
                         console.debug("====>setAccountCredential second time 0300 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.getAccountCredential("account_name_0300", "credentialType3", (err, data)=>{
                             console.debug("====>getAccountCredential 0300 err:" + JSON.stringify(err));
                             console.debug("====>getAccountCredential 0300 data:" + JSON.stringify(data));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data).assertEqual("newcredential3");
                             appAccountManager.deleteAccount("account_name_0300", (err)=>{
                                 console.debug("====>delete Account 0300 err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 console.debug("====>ActsAccountCredential_0300 end====");
                                 done();
                             });
@@ -198,18 +198,18 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_0500",(err)=>{
                 console.debug("====>add account ActsAccountCredential_0500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential("account_name_0500", "credentialType5", "", (err)=>{
                     console.debug("====>setAccountCredential ActsAccountCredential_0500 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.getAccountCredential("account_name_0500", "credentialType5", (err,data)=>{
                         console.debug("====>getAccountCredential ActsAccountCredential_0500 err:" + JSON.stringify(err));
                         console.debug("====>getAccountCredential ActsAccountCredential_0500 data:" + JSON.stringify(data));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data).assertEqual("");
                         appAccountManager.deleteAccount("account_name_0500", (err)=>{
                             console.debug("====>delete Account ActsAccountCredential_0500 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsAccountCredential_0500 end====");
                             done();
                         });
@@ -252,13 +252,13 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_0700", (err)=>{
                 console.debug("====>add account ActsAccountCredential_0700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential("account_name_0700", "", "credential7", (err)=>{
                     console.debug("====>setAccountCredential ActsAccountCredential_0700 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_0700", (err)=>{
                         console.debug("====>delete Account ActsAccountCredential_0700 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCredential_0700 end====");
                         done();
                     });
@@ -301,13 +301,13 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_0900", (err)=>{
                 console.debug("====>add account ActsAccountCredential_0900 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAccountCredential("account_name_0900", "", (err)=>{
                     console.debug("====>getAccountCredential ActsAccountCredential_0900 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_0900", (err)=>{
                         console.debug("====>delete Account ActsAccountCredential_0900 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCredential_0900 end====");
                         done();
                     });
@@ -351,18 +351,18 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_1100",(err)=>{
                 console.debug("====>add account ActsAccountCredential_1100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential("account_name_1100", " ", "credential11",(err)=>{
                     console.debug("====>setAccountCredential ActsAccountCredential_1100 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.getAccountCredential("account_name_1100", " ", (err, data)=>{
                         console.debug("====>getAccountCredential 1100 err:" + JSON.stringify(err));
                         console.debug("====>getAccountCredential 1100 data:" + JSON.stringify(data));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data).assertEqual("credential11");
                         appAccountManager.deleteAccount("account_name_1100", (err)=>{
                             console.debug("====>delete Account 1100 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsAccountCredential_1100 end====");
                             done();
                         });
@@ -406,13 +406,13 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_1300",(err)=>{
                 console.debug("====>add account ActsAccountCredential_1300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential("", "credentialType13", "credential13", (err)=>{
                     console.debug("====>setAccountCredential ActsAccountCredential_1300 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_1300", (err)=>{
                         console.debug("====>delete Account ActsAccountCredential_1300 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCredential_1300 end====");
                         done();
                     });
@@ -455,13 +455,13 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_1500", (err)=>{
                 console.debug("====>add account ActsAccountCredential_1500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAccountCredential("account_name_1500", "credentialType15", (err)=>{
                     console.debug("====>getAccountCredential ActsAccountCredential_1500 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_1500", (err)=>{
                         console.debug("====>delete Account ActsAccountCredential_1500 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCredential_1500 end====");
                         done();
                     });
@@ -507,7 +507,7 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_1700", (err)=>{
                 console.debug("====>add account ActsAccountCredential_1700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential("account_name_1700", "credentialType17", CREDENTIALOVERSIZE, (err)=>{
                     console.debug("====>CREDENTIALOVERSIZE.length:" + JSON.stringify(CREDENTIALOVERSIZE.length));
                     expect(CREDENTIALOVERSIZE.length).assertEqual(1025);
@@ -515,7 +515,7 @@ export default function ActsAccountCredential() {
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_1700", (err)=>{
                         console.debug("====>delete Account ActsAccountCredential_1700 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCredential_1700 end====");
                         done();
                     });
@@ -566,7 +566,7 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_1900", (err)=>{
                 console.debug("====>add account ActsAccountCredential_1900 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential("account_name_1900", CREDENTIALTYPEOVERSIZE, "credential19", (err)=>{
                     console.debug("====>CREDENTIALTYPEOVERSIZE.length:" + JSON.stringify(CREDENTIALTYPEOVERSIZE.length));
                     expect(CREDENTIALTYPEOVERSIZE.length).assertEqual(1025);
@@ -574,7 +574,7 @@ export default function ActsAccountCredential() {
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_1900", (err)=>{
                         console.debug("====>delete Account ActsAccountCredential_1900 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountCredential_1900 end====");
                         done();
                     });
@@ -625,14 +625,14 @@ export default function ActsAccountCredential() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_2100", (err)=>{
                 console.debug("====>add account ActsAccountCredential_2100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountCredential(NAMEOVERSIZE, "credentialType21", "credential21", (err)=>{
                     console.debug("====>setAccountCredential ActsAccountCredential_2100 err:" + JSON.stringify(err));
                     expect(err.code != 0).assertEqual(true);
                     appAccountManager.deleteAccount("account_name_2100", (err)=>{
                         console.debug("====>delete Account ActsAccountCredential_2100 err:" + JSON.stringify(err));
                         console.debug("====>ActsAccountCredential_2100 end====");
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         done();
                     });
                 });

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

@@ -46,10 +46,10 @@ export default function ActsAccountDeleteAccount() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("deleteAccount_name_callback_first", "extraInfo_callback_first", (err)=>{
                 console.debug("====>add account ActsAccountDeleteAccount_0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("deleteAccount_name_callback_first", (err)=>{
                     console.debug("====>delete Account ActsAccountDeleteAccount_0100 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountDeleteAccount_0100 end====");
                     done();
                 });
@@ -124,10 +124,10 @@ export default function ActsAccountDeleteAccount() {
             var appAccountManager = account.createAppAccountManager();
             appAccountManager.addAccount("deleteAccount_name_callback_third", "extraInfo_callback_third", (err)=>{
                 console.debug("====>add account ActsAccountDeleteAccount_0500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("deleteAccount_name_callback_third", (err)=>{
                     console.debug("====>delete account first time  err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.deleteAccount("deleteAccount_name_callback_third", (err)=>{
                         console.debug("====>delete Account second time err:" + JSON.stringify(err));
                         expect(err.code != 0).assertEqual(true);

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

@@ -54,15 +54,15 @@ export default function ActsAccountSetGetExtraInfo() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_callback_first", extraInfoStr, (err)=>{
                 console.debug("====>add account ActsAccountSetGetExtraInfo_0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAccountExtraInfo("account_name_callback_first", (err, data)=>{
                     console.debug("====>getAccountExtraInfo 0100 err:" + JSON.stringify(err));
                     console.debug("====>getAccountExtraInfo 0100 data:" + JSON.stringify(data));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(data).assertEqual(extraInfoStr);
                     appAccountManager.deleteAccount("account_name_callback_first", (err)=>{
                         console.debug("====>delete Account 0100 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountSetGetExtraInfo_0100 end====");
                         done();
                     });
@@ -151,10 +151,10 @@ export default function ActsAccountSetGetExtraInfo() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_callback_third", "account_extrainfo_callback_third", (err)=>{
                 console.debug("====>add account ActsAccountSetGetExtraInfo_0500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("account_name_callback_third", (err)=>{
                     console.debug("====>delete Account 0500 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.getAccountExtraInfo("account_name_callback_third", (err, data)=>{
                         console.debug("====>getAccountExtraInfo 0500 err:" + JSON.stringify(err));
                         console.debug("====>getAccountExtraInfo 0500 data:" + JSON.stringify(data));
@@ -204,15 +204,15 @@ export default function ActsAccountSetGetExtraInfo() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_callback_fourth", (err)=>{
                 console.debug("====>add account ActsAccountSetGetExtraInfo_0700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAccountExtraInfo("account_name_callback_fourth", (err, data)=>{
                     console.debug("====>getAccountExtraInfo 0700 err:" + JSON.stringify(err));
                     console.debug("====>getAccountExtraInfo 0700 data:" + JSON.stringify(data));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(data).assertEqual("");
                     appAccountManager.deleteAccount("account_name_callback_fourth", (err)=>{
                         console.debug("====>delete Account 0700 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountSetGetExtraInfo_0700 end====");
                         done();
                     });
@@ -301,18 +301,18 @@ export default function ActsAccountSetGetExtraInfo() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_callback_sixth", "account_extrainfo_callback_sixth",(err)=>{
                 console.debug("====>add account ActsAccountSetGetExtraInfo_1100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountExtraInfo("account_name_callback_sixth", "account_extra_sixth_twice", (err)=>{
                     console.debug("====>setAccountExtraInfo 1100 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.getAccountExtraInfo("account_name_callback_sixth", (err, data)=>{
                         console.debug("====>getAccountExtraInfo 1100 err:" + JSON.stringify(err));
                         console.debug("====>getAccountExtraInfo 1100 data:" + JSON.stringify(data));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data).assertEqual("account_extra_sixth_twice");
                         appAccountManager.deleteAccount("account_name_callback_sixth", (err)=>{
                             console.debug("====>delete Account 1100 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsAccountSetGetExtraInfo_1100 end====");
                             done();
                         });
@@ -361,17 +361,17 @@ export default function ActsAccountSetGetExtraInfo() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_callback_seventh",(err)=>{
                 console.debug("====>add account ActsAccountSetGetExtraInfo_1300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountExtraInfo("account_name_callback_seventh", "callback_seventh", (err)=>{
                     console.debug("====>setAccountExtraInfo 1300 first time err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.setAccountExtraInfo("account_name_callback_seventh", "call_seventh_twice", (err)=>{
                         console.debug("====>setAccountExtraInfo 1300 second time err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.getAccountExtraInfo("account_name_callback_seventh", (err, data)=>{
                             console.debug("====>getAccountExtraInfo 1300 err:" + JSON.stringify(err));
                             console.debug("====>getAccountExtraInfo 1300 data:" + JSON.stringify(data));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data).assertEqual("call_seventh_twice");
                             appAccountManager.deleteAccount("account_name_callback_seventh", (err)=>{
                                 console.debug("====>delete Account 1300 err:" + JSON.stringify(err));
@@ -437,17 +437,17 @@ export default function ActsAccountSetGetExtraInfo() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("account_name_callback_eighth",(err)=>{
                 console.debug("====>add account ActsAccountSetGetExtraInfo_1500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAccountExtraInfo("account_name_callback_eighth", "extra_callback_eighth", (err)=>{
                     console.debug("====>setAccountExtraInfo second time err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.setAccountExtraInfo("account_name_callback_eighth", "extra_callback_eighth", (err)=>{
                         console.debug("====>setAccountExtraInfo 1500 first time err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.getAccountExtraInfo("account_name_callback_eighth", (err, data)=>{
                             console.debug("====>getAccountExtraInfo 1500 err:" + JSON.stringify(err));
                             console.debug("====>getAccountExtraInfo 1500 data:" + JSON.stringify(data));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data).assertEqual("extra_callback_eighth");
                             appAccountManager.deleteAccount("account_name_callback_eighth", (err)=>{
                                 console.debug("====>delete Account 1500 err:" + JSON.stringify(err));

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

@@ -46,13 +46,13 @@ export default function ActsAccountNoPermission() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("syncenable_callback_setnopermission", (err)=>{
                 console.debug("====>add account ActsAccountNoPermission_0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAppAccountSyncEnable("syncenable_callback_setnopermission", true, (err)=>{
                     console.debug("====>setAppAccountSyncEnable 0100 err:" + JSON.stringify(err));
                     expect(err.code).assertEqual(account.ResultCode.ERROR_PERMISSION_DENIED);
                     appAccountManager.deleteAccount("syncenable_callback_setnopermission", (err)=>{
                         console.debug("====>delete Account ActsAccountNoPermission_0100 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountNoPermission_0100 end====");
                         done();
                     }); 
@@ -96,13 +96,13 @@ export default function ActsAccountNoPermission() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("syncenable_callback_checknopermission", (err)=>{
                 console.debug("====>add account ActsAccountNoPermission_0300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.checkAppAccountSyncEnable("syncenable_callback_checknopermission", (err, data)=>{
                     console.debug("====>checkAppAccountSyncEnable 0300 err:" + JSON.stringify(err));
                     expect(err.code).assertEqual(account.ResultCode.ERROR_PERMISSION_DENIED);
                     appAccountManager.deleteAccount("syncenable_callback_checknopermission", (err)=>{
                         console.debug("====>delete Account ActsAccountNoPermission_0300 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountNoPermission_0300 end====");
                         done();
                     });
@@ -145,13 +145,13 @@ export default function ActsAccountNoPermission() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("accessibleAccount_callback_nopermission", (err)=>{
                 console.debug("====> add account ActsAccountNoPermission_0500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAllAccessibleAccounts((err, data)=>{
                     console.debug("====>getAllAccessibleAccounts 0500 err:" + JSON.stringify(err));
                     expect(err.code).assertEqual(account.ResultCode.ERROR_PERMISSION_DENIED);
                     appAccountManager.deleteAccount("accessibleAccount_callback_nopermission", (err)=>{
                         console.debug("====>delete Account ActsAccountNoPermission_0500 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountNoPermission_0500 end====");
                         done();
                     })
@@ -195,13 +195,13 @@ export default function ActsAccountNoPermission() {
             var selfBundle = "com.example.actsaccounttest";
             appAccountManager.addAccount("getAll_callback_nopermission", (err)=>{
                 console.debug("====>add account 0700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAllAccounts(selfBundle, (err, data)=>{
                     console.debug("====>getAllAccounts 0700 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err.code).assertEqual(account.ResultCode.ERROR_PERMISSION_DENIED);
                     appAccountManager.deleteAccount("getAll_callback_nopermission", (err)=>{
                         console.debug("====>delete account 0700 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountNoPermission_0700 end====");
                         done();
                     });
@@ -224,7 +224,7 @@ export default function ActsAccountNoPermission() {
             console.debug("====>getAllAccounts 0800 start====");
             try{
                 var data = await appAccountManager.getAllAccounts(selfBundle);
-                console.debug("====>getAll_promist_nopermission data:" + JSON.stringify(data))
+                console.debug("====>getAll_promise_nopermission data:" + JSON.stringify(data))
                 expect(data.length>0).assertEqual(true);
                 done();
             }

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

@@ -68,12 +68,12 @@ export default function ActsAccountChangeOnOff() {
             }
             function deleteAccountCallback(err){
                 console.debug("====>delete account 0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 done();
             }
             function disCallback(err){
                 console.debug("====>delete account 0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("changeonoff_extra", deleteAccountCallback);
             }
             function subscriberCallback(err, data){
@@ -136,7 +136,7 @@ export default function ActsAccountChangeOnOff() {
             }
             function deleteAccountCallback(err){
                 console.debug("====>delete account 0200 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 done();
             }
             function subscriberCallback(err, data){
@@ -199,7 +199,7 @@ export default function ActsAccountChangeOnOff() {
             }
             function deleteAccountCallback(err){
                 console.debug("====>delete account 0300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 done();
             }
             function subscriberCallback(err, data){
@@ -266,7 +266,7 @@ export default function ActsAccountChangeOnOff() {
             }
             function deleteAccountCallback(err){
                 console.debug("====>delete account 0400 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 done();
             }
             function subscriberCallback(err, data){
@@ -325,15 +325,14 @@ export default function ActsAccountChangeOnOff() {
             console.debug("====>enableAppAccess ActsAccountChangeOnOff_0500 start");
             await appAccountManager.enableAppAccess("onoff_delete", "com.example.actsaccountsceneonoff");
             function unSubscriberCallback(err){
-                console.debug("====>unsubscribe 0500 err:" + JSON.stringify(err));
-                expect(err.code).assertEqual(0);
-                done();
+                console.debug("====>unsubscribe 0500 err:" + JSON.stringify(err));                
             }
             function subscriberCallback(err, data){
                 console.debug("====>subscriberCallback 0500 data:" + JSON.stringify(data));
                 expect(data.event).assertEqual("account_on_change_delete");
                 expect(data.data).assertEqual("SUCCESS");
                 commonevent.unsubscribe(subscriber, unSubscriberCallback);
+                done();
             }
             function publishCallback(err){
                 console.debug("====>publish call back err:" + JSON.stringify(err));
@@ -392,10 +391,10 @@ export default function ActsAccountChangeOnOff() {
             }
             function deleteAccountCallback(err){
                 console.debug("====>delete first account 0600 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.deleteAccount("onoff_enableSec", (err)=>{
                     console.debug("====>delete second account 0600 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     done();
                 });
             }
@@ -459,7 +458,7 @@ export default function ActsAccountChangeOnOff() {
             }
             function deleteAccountCallback(err){
                 console.debug("====>delete account 0700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 done();
             }
             function subscriberCallback(err, data){
@@ -532,7 +531,7 @@ export default function ActsAccountChangeOnOff() {
                     console.debug("====>off ActsAccountChangeOnOff_0800 finish====");
                     appAccountManager.deleteAccount("onoff_self", (err)=>{
                         console.debug("====>delete account ActsAccountChangeOnOff_0800 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountChangeOnOff_0800 end====");
                         done();
                     });
@@ -595,10 +594,10 @@ export default function ActsAccountChangeOnOff() {
                     console.debug("====>off ActsAccountChangeOnOff_0900 finish====");
                     appAccountManager.deleteAccount("onoff_self_first", (err)=>{
                         console.debug("====>delete first account 0900 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.deleteAccount("onoff_self_second", (err)=>{
                             console.debug("====>delete second account 0900 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsAccountChangeOnOff_0900 end====");
                             done();
                         });
@@ -672,7 +671,7 @@ export default function ActsAccountChangeOnOff() {
                         console.debug("====>off ActsAccountChangeOnOff_1000 finish====");
                         appAccountManager.deleteAccount("onoff_twice", (err)=>{
                             console.debug("====>delete account ActsAccountChangeOnOff_1000 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(twiceSign).assertEqual(2);
                             console.debug("====>ActsAccountChangeOnOff_1000 end====");
                             done();
@@ -753,7 +752,7 @@ export default function ActsAccountChangeOnOff() {
                     console.debug("====>off ActsAccountChangeOnOff_1100 finish====");
                     appAccountManager.deleteAccount("onoff_same", (err)=>{
                         console.debug("====>delete account ActsAccountChangeOnOff_1100 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsAccountChangeOnOff_1100 end====");
                         done();
                     });
@@ -794,7 +793,7 @@ export default function ActsAccountChangeOnOff() {
                             console.debug("====>delete account 1200 start====");
                             appAccountManager.deleteAccount("onoff_repeatoff", (err)=>{
                                 console.debug("====>delete account ActsAccountChangeOnOff_1200 err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 console.debug("====>ActsAccountChangeOnOff_1200 end====");
                                 done();
                             });
@@ -861,7 +860,7 @@ export default function ActsAccountChangeOnOff() {
                 console.debug("====>delete account 1300 start====");
                 appAccountManager.deleteAccount("onoff_same", (err)=>{
                     console.debug("====>delete account ActsAccountChangeOnOff_1300 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountChangeOnOff_1300 end====");
                     done();
                 });
@@ -908,7 +907,7 @@ export default function ActsAccountChangeOnOff() {
                 console.debug("====>delete account 1400 start====");
                 appAccountManager.deleteAccount("onoff_same", (err)=>{
                     console.debug("====>delete account ActsAccountChangeOnOff_1400 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsAccountChangeOnOff_1400 end====");
                     done();
                 });

account/appaccount/actsgetallaccounts/src/main/js/test/Getallaccounts.test.js

@@ -33,11 +33,11 @@ export default function ActsGetAllAccounts() {
             var selfBundle = "com.example.actsgetallaaccounts";
             appAccountManager.addAccount("Account_this_application_callback", (err)=>{
                 console.debug("====>add account 0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAllAccounts(selfBundle, (err, data)=>{
                     console.debug("====>getAllAccounts 0100 err:" + JSON.stringify(err));
                     console.debug("====>getAllAccounts 0100 data:" + JSON.stringify(data));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     try{
                         expect(data[0].name).assertEqual("Account_this_application_callback");
                         expect(data[0].owner).assertEqual("com.example.actsgetallaaccounts");
@@ -49,7 +49,7 @@ export default function ActsGetAllAccounts() {
                     }
                     appAccountManager.deleteAccount("Account_this_application_callback", (err)=>{
                         console.debug("====>delete account 0100 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsGetAllAccounts_0100 end====");
                         done();
                     });
@@ -122,7 +122,7 @@ export default function ActsGetAllAccounts() {
             appAccountManager.getAllAccounts(selfBundle, (err, data)=>{
                 console.debug("====>getAllAccounts 0300 err:" + JSON.stringify(err));
                 console.debug("====>getAllAccounts 0300 data:" + JSON.stringify(data));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data.length).assertEqual(0);
                 console.debug("====>ActsGetAllAccounts_0300 end====");
                 done();
@@ -276,12 +276,12 @@ export default function ActsGetAllAccounts() {
             function getAllCallback(err, data){
                 console.debug("====>getAllAccounts 0900 err:" + JSON.stringify(err));
                 console.debug("====>getAllAccounts 0900 data:" + JSON.stringify(data));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data[0].name).assertEqual("Account_application_callback");
                 expect(data[0].owner).assertEqual("com.example.actsgetallaaccounts");
                 appAccountManager.deleteAccount("Account_application_callback", (err)=>{
                     console.debug("====>delete account 0900 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     console.debug("====>ActsGetAllAccounts_0900 end====");
                     done();
                 });
@@ -374,7 +374,7 @@ export default function ActsGetAllAccounts() {
             function getAllCallback(err, data){
                 console.debug("====>getAllAccounts 1100 err:" + JSON.stringify(err));
                 console.debug("====>getAllAccounts 1100 data:" + JSON.stringify(data));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data[0].name).assertEqual("account_name_scene_single");
                 expect(data[0].owner).assertEqual("com.example.actsscenegetallaccounts");
                 console.debug("====>ActsGetAllAccounts_1100 end====");
@@ -480,20 +480,20 @@ export default function ActsGetAllAccounts() {
             var selfBundle = "com.example.actsgetallaaccounts";
             appAccountManager.addAccount("account_callback_delete", (err)=>{
                 console.debug("====>add account 1500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAllAccounts(selfBundle, (err, data)=>{
                     console.debug("====>getAllAccounts 1500 err:" + JSON.stringify(err));
                     console.debug("====>getAllAccounts 1500 data:" + JSON.stringify(data));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(data[0].name).assertEqual("account_callback_delete");
                     expect(data[0].owner).assertEqual("com.example.actsgetallaaccounts");
                     appAccountManager.deleteAccount("account_callback_delete", (err)=>{
                         console.debug("====>delete account 1500 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.getAllAccounts(selfBundle, (err, data)=>{
                             console.debug("====>getAllAccounts 1500 err:" + JSON.stringify(err));
                             console.debug("====>getAllAccounts 1500 data:" + JSON.stringify(data));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data.length).assertEqual(0);
                             console.debug("====>ActsGetAllAccounts_1500 end====");
                             done();
@@ -570,20 +570,20 @@ export default function ActsGetAllAccounts() {
             var selfBundle = "com.example.actsgetallaaccounts";
             appAccountManager.addAccount("account_callback_additional", "account_extrainfo", (err)=>{
                 console.debug("====>add account 1700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAllAccounts(selfBundle, (err, data)=>{
                     console.debug("====>getAllAccounts 1700 err:" + JSON.stringify(err));
                     console.debug("====>getAllAccounts 1700 data:" + JSON.stringify(data));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(data[0].name).assertEqual("account_callback_additional");
                     expect(data[0].owner).assertEqual("com.example.actsgetallaaccounts");
                     appAccountManager.deleteAccount("account_callback_additional", (err)=>{
                         console.debug("====>delete account 1700 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.getAllAccounts(selfBundle, (err, data)=>{
                             console.debug("====>getAllAccounts 1700 err:" + JSON.stringify(err));
                             console.debug("====>getAllAccounts 1700 data:" + JSON.stringify(data));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data.length).assertEqual(0);
                             console.debug("====>ActsGetAllAccounts_1700 end====");
                             done();

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

@@ -54,15 +54,15 @@ export default function ActsSetCheckSyncEnable() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("syncenable_callback_notset", (err)=>{
                 console.debug("====>add account ActsSetCheckSyncEnable_0100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.checkAppAccountSyncEnable("syncenable_callback_notset", (err, data)=>{
                     console.debug("====>checkAppAccountSyncEnable 0100 err:" + JSON.stringify(err));
                     console.debug("====>checkAppAccountSyncEnable 0100 data:" + JSON.stringify(data));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(data).assertEqual(false);
                     appAccountManager.deleteAccount("syncenable_callback_notset", (err)=>{
                         console.debug("====>delete Account ActsSetCheckSyncEnable_0100 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsSetCheckSyncEnable_0100 end====");
                         done();
                     });
@@ -123,18 +123,18 @@ export default function ActsSetCheckSyncEnable() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("syncenable_callback_settrue", (err)=>{
                 console.debug("====>add account ActsSetCheckSyncEnable_0300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAppAccountSyncEnable("syncenable_callback_settrue", true, (err)=>{
                     console.debug("====>setAppAccountSyncEnable 0300 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.checkAppAccountSyncEnable("syncenable_callback_settrue", (err, data)=>{
                         console.debug("====>checkAppAccountSyncEnable 0300 err:" + JSON.stringify(err));
                         console.debug("====>checkAppAccountSyncEnable 0300 data:" + JSON.stringify(data));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data).assertEqual(true);
                         appAccountManager.deleteAccount("syncenable_callback_settrue", (err)=>{
                             console.debug("====>delete Account ActsSetCheckSyncEnable_0300 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsSetCheckSyncEnable_0300 end====");
                             done();
                         });
@@ -198,18 +198,18 @@ export default function ActsSetCheckSyncEnable() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("syncenable_callback_setfalse", (err)=>{
                 console.debug("====>add account ActsSetCheckSyncEnable_0500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAppAccountSyncEnable("syncenable_callback_setfalse", false, (err)=>{
                     console.debug("====>setAppAccountSyncEnable 0500 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.checkAppAccountSyncEnable("syncenable_callback_setfalse", (err, data)=>{
                         console.debug("====>checkAppAccountSyncEnable 0500 err:" + JSON.stringify(err));
                         console.debug("====>checkAppAccountSyncEnable 0500 data:" + JSON.stringify(data));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data).assertEqual(false);
                         appAccountManager.deleteAccount("syncenable_callback_setfalse", (err)=>{
                             console.debug("====>delete Account ActsSetCheckSyncEnable_0500 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsSetCheckSyncEnable_0500 end====");
                             done();
                         });
@@ -274,21 +274,21 @@ export default function ActsSetCheckSyncEnable() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("syncenable_callback_falsetrue", (err)=>{
                 console.debug("====>add account ActsSetCheckSyncEnable_0700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAppAccountSyncEnable("syncenable_callback_falsetrue", false, (err)=>{
                     console.debug("====>setAppAccountSyncEnable first time 0700 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.setAppAccountSyncEnable("syncenable_callback_falsetrue", true, (err)=>{
                         console.debug("====>setAppAccountSyncEnable second time 0700 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.checkAppAccountSyncEnable("syncenable_callback_falsetrue", (err, data)=>{
                             console.debug("====>checkAppAccountSyncEnable 0700 err:" + JSON.stringify(err));
                             console.debug("====>checkAppAccountSyncEnable 0700 data:" + JSON.stringify(data));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data).assertEqual(true);
                             appAccountManager.deleteAccount("syncenable_callback_falsetrue", (err)=>{
                                 console.debug("====>delete Account 0700 err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 console.debug("====>ActsSetCheckSyncEnable_0700 end====");
                                 done();
                             });
@@ -350,21 +350,21 @@ export default function ActsSetCheckSyncEnable() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("syncenable_callback_falsetrue", (err)=>{
                 console.debug("====>add account ActsSetCheckSyncEnable_0900 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAppAccountSyncEnable("syncenable_callback_falsetrue", true, (err)=>{
                     console.debug("====>setAppAccountSyncEnable first time 0900 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.setAppAccountSyncEnable("syncenable_callback_falsetrue", false, (err)=>{
                         console.debug("====>setAppAccountSyncEnable second time 0900 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.checkAppAccountSyncEnable("syncenable_callback_falsetrue", (err, data)=>{
                             console.debug("====>checkAppAccountSyncEnable 0900 err:" + JSON.stringify(err));
                             console.debug("====>checkAppAccountSyncEnable 0900 data:" + JSON.stringify(data));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data).assertEqual(false);
                             appAccountManager.deleteAccount("syncenable_callback_falsetrue", (err)=>{
                                 console.debug("====>delete Account 0900 err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 console.debug("====>ActsSetCheckSyncEnable_0900 end====");
                                 done();
                             });
@@ -426,21 +426,21 @@ export default function ActsSetCheckSyncEnable() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("syncenable_callback_truetrue", (err)=>{
                 console.debug("====>add account ActsSetCheckSyncEnable_1100 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.setAppAccountSyncEnable("syncenable_callback_truetrue", true, (err)=>{
                     console.debug("====>setAppAccountSyncEnable first time 1100 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.setAppAccountSyncEnable("syncenable_callback_truetrue", true, (err)=>{
                         console.debug("====>setAppAccountSyncEnable second time 1100 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.checkAppAccountSyncEnable("syncenable_callback_truetrue", (err, data)=>{
                             console.debug("====>checkAppAccountSyncEnable 1100 err:" + JSON.stringify(err));
                             console.debug("====>checkAppAccountSyncEnable 1100 data:" + JSON.stringify(data));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data).assertEqual(true);
                             appAccountManager.deleteAccount("syncenable_callback_truetrue", (err)=>{
                                 console.debug("====>delete Account 1100 err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 console.debug("====>ActsSetCheckSyncEnable_1100 end====");
                                 done();
                             });

account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/js/test/Getallaccessible.test.js

@@ -34,7 +34,7 @@ export default function ActsGetAllAccessibleAccounts() {
                 console.debug("====>getAllAccessibleAccounts 0100 err:" + JSON.stringify(err));
                 console.debug("====>getAllAccessibleAccounts 0100 data:" + JSON.stringify(data));
                 console.debug("====>getAllAccessibleAccounts 0100 data.length:" + data.length);
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data.length).assertEqual(0);
                 console.debug("====>ActsGetAllAccessibleAccounts_0100 end====");
                 done();
@@ -78,12 +78,12 @@ export default function ActsGetAllAccessibleAccounts() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("accessibleAccount_callback_single", (err)=>{
                 console.debug("====> add account ActsGetAllAccessibleAccounts_0300 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.getAllAccessibleAccounts((err, data)=>{
                     console.debug("====>getAllAccessibleAccounts 0300 err:" + JSON.stringify(err));
                     console.debug("====>getAllAccessibleAccounts 0300 data:" + JSON.stringify(data));
                     console.debug("====>getAllAccessibleAccounts 0300 data.length:" + data.length);
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(data.length).assertEqual(1);
                     try{
                         expect(data[0].name).assertEqual("accessibleAccount_callback_single");
@@ -96,7 +96,7 @@ export default function ActsGetAllAccessibleAccounts() {
                     }
                     appAccountManager.deleteAccount("accessibleAccount_callback_single", (err)=>{
                         console.debug("====>delete Account ActsGetAllAccessibleAccounts_0300 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         console.debug("====>ActsGetAllAccessibleAccounts_0300 end====");
                         done();
                     })
@@ -167,18 +167,18 @@ export default function ActsGetAllAccessibleAccounts() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("accessibleAccount_callback_first", (err)=>{
                 console.debug("====>add account first time 0500 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.addAccount("accessibleAccount_callback_second", (err)=>{
                     console.debug("====>add account second time 0500 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.addAccount("accessibleAccount_callback_third", (err)=>{
                         console.debug("====>add account third time 0500 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.getAllAccessibleAccounts((err, data)=>{
                             console.debug("====>getAllAccessibleAccounts 0500 err:" + JSON.stringify(err));
                             console.debug("====>getAllAccessibleAccounts 0500 data:" + JSON.stringify(data));
                             console.debug("====>getAllAccessibleAccounts 0500 data.length:" + data.length);
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data.length).assertEqual(3);
                             try{
                                 expect(data[0].name).assertEqual("accessibleAccount_callback_first");
@@ -195,13 +195,13 @@ export default function ActsGetAllAccessibleAccounts() {
                             }
                             appAccountManager.deleteAccount("accessibleAccount_callback_first", (err)=>{
                                 console.debug("====>delete Account first 0500 err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 appAccountManager.deleteAccount("accessibleAccount_callback_second", (err)=>{
                                     console.debug("====>delete Account second 0500 err:" + JSON.stringify(err));
-                                    expect(err).assertEqual(undefined);
+                                    expect(err).assertEqual(null);
                                     appAccountManager.deleteAccount("accessibleAccount_callback_third", (err)=>{
                                         console.debug("====>delete Account third 0500 err:" + JSON.stringify(err));
-                                        expect(err).assertEqual(undefined);
+                                        expect(err).assertEqual(null);
                                         console.debug("====>ActsGetAllAccessibleAccounts_0500 end====");
                                         done();
                                     })
@@ -289,21 +289,21 @@ export default function ActsGetAllAccessibleAccounts() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("accessibleAccount_callback_delete_first", (err)=>{
                 console.debug("====>add first account 0700 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.addAccount("accessibleAccount_callback_delete_second", (err)=>{
                     console.debug("====>add second account 0700 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.addAccount("accessibleAccount_callback_delete_third", (err)=>{
                         console.debug("====>add third account 0700 err:" + JSON.stringify(err));
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         appAccountManager.deleteAccount("accessibleAccount_callback_delete_second", (err)=>{
                             console.debug("====>delete second account 0700 err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             appAccountManager.getAllAccessibleAccounts((err, data)=>{
                                 console.debug("====>getAllAccessibleAccounts 0700 err:" + JSON.stringify(err));
                                 console.debug("====>getAllAccessibleAccounts 0700 data:" + JSON.stringify(data));
                                 console.debug("====>getAllAccessibleAccounts 0700 data.length:" + data.length);
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 expect(data.length).assertEqual(2);
                                 try{
                                     expect(data[0].name).assertEqual("accessibleAccount_callback_delete_first");
@@ -318,10 +318,10 @@ export default function ActsGetAllAccessibleAccounts() {
                                 }
                                 appAccountManager.deleteAccount("accessibleAccount_callback_delete_first", (err)=>{
                                     console.debug("====>delete first account 0700 err:" + JSON.stringify(err));
-                                    expect(err).assertEqual(undefined);
+                                    expect(err).assertEqual(null);
                                     appAccountManager.deleteAccount("accessibleAccount_callback_delete_third", (err)=>{
                                         console.debug("====>delete third account 0700 err:" + JSON.stringify(err));
-                                        expect(err).assertEqual(undefined);
+                                        expect(err).assertEqual(null);
                                         console.debug("====>ActsGetAllAccessibleAccounts_0700 end====");
                                         done();
                                     })
@@ -408,15 +408,15 @@ export default function ActsGetAllAccessibleAccounts() {
             console.debug("====>creat finish====");
             appAccountManager.addAccount("accessibleAccount_callback_multiple_first", (err)=>{
                 console.debug("====>add first account 0900 err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 appAccountManager.addAccount("accessibleAccount_callback_multiple_second", (err)=>{
                     console.debug("====>add third account 0900 err:" + JSON.stringify(err));
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     appAccountManager.getAllAccessibleAccounts((err, data)=>{
                         console.debug("====>getAllAccessibleAccounts first 0900 err:" + JSON.stringify(err));
                         console.debug("====>getAllAccessibleAccounts first 0900 data:" + JSON.stringify(data));
                         console.debug("====>getAllAccessibleAccounts first 0900 data.length:" + data.length);
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data.length).assertEqual(2);
                         try{
                             expect(data[0].name).assertEqual("accessibleAccount_callback_multiple_first");
@@ -433,7 +433,7 @@ export default function ActsGetAllAccessibleAccounts() {
                             console.debug("====>getAllAccessibleAccounts second 0900 err:" + JSON.stringify(err));
                             console.debug("====>getAllAccessibleAccounts second 0900 data:" + JSON.stringify(data));
                             console.debug("====>getAllAccessibleAccounts second 0900 data.length:" + data.length);
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             expect(data.length).assertEqual(2);
                             try{
                                 expect(data[0].name).assertEqual("accessibleAccount_callback_multiple_first");
@@ -448,10 +448,10 @@ export default function ActsGetAllAccessibleAccounts() {
                             }
                             appAccountManager.deleteAccount("accessibleAccount_callback_multiple_first", (err)=>{
                                 console.debug("====>delete first account 0900 err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 appAccountManager.deleteAccount("accessibleAccount_callback_multiple_second", (err)=>{
                                     console.debug("====>delete second account 0900 err:" + JSON.stringify(err));
-                                    expect(err).assertEqual(undefined);
+                                    expect(err).assertEqual(null);
                                     console.debug("====>ActsGetAllAccessibleAccounts_0900 end====");
                                     done();
                                 })

account/appaccount/sceneProject/actsaccountaccessibleSecond/Test.json

 {
-    "description": "Configuration for hjunit demo Tests",
+    "description": "Configuration for hjunit demo Tests"
 }

account/appaccount/sceneProject/actsaccountauthenticator/entry/src/main/js/MainAbility/app.js

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 export default {
     onCreate() {
         console.info("Application onCreate");

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

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-
 export default {
     data: {
         title: "Hello World"

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

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import account_appAccount from '@ohos.account.appAccount';
 import {MyAuthenticator} from '../Common/utils'
 
@@ -24,11 +23,11 @@ export default {
         var accountMgr = account_appAccount.createAppAccountManager();
         try {
             await accountMgr.addAccount("zhangsan", "");
-            await accountMgr.enableAppAccess("zhangsan", "com.example.accounttest");
+            await accountMgr.enableAppAccess("zhangsan", "com.example.actsaccounttest");
             await accountMgr.addAccount("lisi", "");
-            await accountMgr.enableAppAccess("lisi", "com.example.accounttest");
+            await accountMgr.enableAppAccess("lisi", "com.example.actsaccounttest");
             await accountMgr.addAccount("wangwu", "");
-            await accountMgr.enableAppAccess("wangwu", "com.example.accounttest");
+            await accountMgr.enableAppAccess("wangwu", "com.example.actsaccounttest");
         } catch(err) {
             console.error(TAG + "addAccount or enableAppAccess failed, error: " + JSON.stringify(err))
         }

account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountGet.test.js

@@ -38,7 +38,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             osAccountManager.getOsAccountLocalIdFromUid(uid, (err, localId)=>{
                 console.debug("====>get localId err: " + JSON.stringify(err));
                 console.debug("====>localId obtained by uid:" + localId);
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(localId).assertEqual(testLocalId);
                 console.debug("====>ActsOsAccountGetIdFormUid_0100 end====");
                 done();
@@ -80,7 +80,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
                 console.debug("====>get localId err: " + JSON.stringify(err));
                 console.debug("====>localId obtained by uid:" + localId);
                 expect(err.code).assertEqual(ERR_OS_ACCOUNT_SERVICE_MANAGER_BAD_UID_ERR);
-                expect(localId).assertEqual(undefined);
+                expect(localId).assertEqual(null);
                 console.debug("====>ActsOsAccountGetIdFormUid_0300 end====");
                 done();
             });
@@ -120,7 +120,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
                 console.debug("====>get localId err: " + JSON.stringify(err));
                 console.debug("====>localId obtained by uid:" + localId);
                 expect(err.code).assertEqual(ERR_OS_ACCOUNT_SERVICE_MANAGER_BAD_UID_ERR);
-                expect(localId).assertEqual(undefined);
+                expect(localId).assertEqual(null);
                 console.debug("====>ActsOsAccountGetIdFormUid_0500 end====");
                 done();
             });
@@ -162,7 +162,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             osAccountManager.getOsAccountLocalIdFromProcess((err, localId)=>{
                 console.debug("====>get localId err: " + JSON.stringify(err));
                 console.debug("====>localId obtained by process:" + localId);
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(localId).assertEqual(testLocalId);
                 console.debug("====>ActsOsAccountGetIdFormProcess_0100 end====");
                 done();
@@ -202,7 +202,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             osAccountManager.getOsAccountTypeFromProcess((err, accountType)=>{
                 console.debug("====>get type err: " + JSON.stringify(err));
                 console.debug("====>type obtained by process:" + JSON.stringify(accountType));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(accountType.ADMIN).assertEqual(0);
                 console.debug("====>ActsOsAccountGetTypeFormProcess_0100 end====");
                 done();
@@ -238,7 +238,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             osAccountManager.getSerialNumberByOsAccountLocalId(100, (err, serialNumber)=>{
                 console.debug("====>ger serialNumber err:" + JSON.stringify(err));
                 console.debug("====>get serialNumber:" + serialNumber + " by localId: 100" );
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 var serialNumberStr = serialNumber.toString();
                 var serialIntercept = serialNumberStr.substring(8);
                 console.debug("====>truncate the last eight characters: " + serialIntercept);
@@ -246,7 +246,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
                 osAccountManager.getOsAccountLocalIdBySerialNumber(serialNumber, (err, localId)=>{
                     console.debug("====>ger localId err:" + JSON.stringify(err));
                     console.debug("====>get localId:" + localId + " by serialNumber: " + serialNumber);
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(localId).assertEqual(testLocalId);
                     console.debug("====>ActsOsAccountLocalIdSerial_0100 end====");
                     done();
@@ -289,7 +289,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             osAccountManager.getSerialNumberByOsAccountLocalId(0, (err, serialNumber)=>{
                 console.debug("====>ger serialNumber err:" + JSON.stringify(err));
                 console.debug("====>get serialNumber:" + serialNumber + " by localId: 0" );
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 var serialNumberStr = serialNumber.toString();
                 var serialIntercept = serialNumberStr.substring(8);
                 console.debug("====>truncate the last eight characters: " + serialIntercept);
@@ -297,7 +297,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
                 osAccountManager.getOsAccountLocalIdBySerialNumber(serialNumber, (err, localId)=>{
                     console.debug("====>ger localId err:" + JSON.stringify(err));
                     console.debug("====>get localId:" + localId + " by serialNumber: " + serialNumber);
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(localId).assertEqual(0);
                     console.debug("====>ActsOsAccountLocalIdSerial_0300 end====");
                     done();
@@ -341,21 +341,27 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             osAccountManager.createOsAccount("osAccountNameIdSerialA", osaccount.OsAccountType.NORMAL, (err, data)=>{
                 console.debug("====>create os account err: " + JSON.stringify(err));
                 console.debug("====>create os account OsAccountInfo: " + JSON.stringify(data));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data.localName).assertEqual("osAccountNameIdSerialA");
+                expect(data.domainInfo.accountName == "").assertEqual(true)
+                expect(data.type.NORMAL).assertEqual(1);
+                expect(data.constraints.length > 0).assertEqual(true);
+                expect(data.isVerified).assertEqual(false);
+                expect(data.distributedInfo.name != null).assertEqual(true);
+                expect(data.domainInfo.domain == "").assertEqual(true);
                 localId = data.localId;
                 osAccountManager.getSerialNumberByOsAccountLocalId(localId, (err, serialNumber)=>{
                     console.debug("====>queryOsAccountById err:" + JSON.stringify(err));
                     console.debug("====>get serialNumber:" + serialNumber + " by localId: " + localId);
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     osAccountManager.getOsAccountLocalIdBySerialNumber(serialNumber, (err, getlocalId)=>{
                         console.debug("====>ger localId err:" + JSON.stringify(err));
                         console.debug("====>get localId:" + getlocalId + " by serialNumber: " + serialNumber);
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(getlocalId).assertEqual(localId);
                         osAccountManager.removeOsAccount(localId, (err)=>{
                             console.debug("====>remove localId: " + localId + " err:" + JSON.stringify(err));
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             console.debug("====>ActsOsAccountLocalIdSerial_0500 end====");
                             done();
                         })
@@ -375,7 +381,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             var osAccountManager = osaccount.getAccountManager();
             console.debug("====>get AccountManager finish====");
             var localId;
-            var OsAccountInfo = await osAccountManager.createOsAccount("accountIdSerialB", osaccount.OsAccountType.NORMAL);
+            var OsAccountInfo = await osAccountManager.createOsAccount("accountIdSerialB", osaccount.OsAccountType.Guest);
             console.debug("====>create os account OsAccountInfo: " + JSON.stringify(OsAccountInfo));
             expect(OsAccountInfo.localName).assertEqual("accountIdSerialB");
             localId = OsAccountInfo.localId;
@@ -404,38 +410,38 @@ export default function ActsOsAccountThirdPartyTest_third_2() {
             osAccountManager.getCreatedOsAccountsCount((err, data)=>{
                 console.debug("====>obtains the number of all os accounts created err:" + JSON.stringify(err));
                 console.debug("====>obtains the number of all os accounts created data:" + data);
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 obtainCount = data;
                 osAccountManager.createOsAccount("osAccountNameIdSerialE", osaccount.OsAccountType.NORMAL, (err, data)=>{
                     console.debug("====>create first os account err: " + JSON.stringify(err));
                     console.debug("====>create first os account OsAccountInfo: " + JSON.stringify(data));
                     localIdFir = data.localId;
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(data.localName).assertEqual("osAccountNameIdSerialE");
                     osAccountManager.createOsAccount("osAccountIdSerialF", osaccount.OsAccountType.NORMAL, (err, data)=>{
                         console.debug("====>create second os account err: " + JSON.stringify(err));
                         console.debug("====>create second os account OsAccountInfo: " + JSON.stringify(data));
                         localIdSec = data.localId;
-                        expect(err).assertEqual(undefined);
+                        expect(err).assertEqual(null);
                         expect(data.localName).assertEqual("osAccountIdSerialF");
                         osAccountManager.getCreatedOsAccountsCount((err, count)=>{
                             console.debug("====>obtains the number of all os accounts created err:" + JSON.stringify(err));
                             console.debug("====>obtains the number of all os accounts created count:" + count);
-                            expect(err).assertEqual(undefined);
+                            expect(err).assertEqual(null);
                             count = count - 2;
                             expect(count).assertEqual(obtainCount);
                             osAccountManager.removeOsAccount(localIdFir, (err)=>{
                                 console.debug("====>remove localId: " + localIdFir + " err:" + JSON.stringify(err));
-                                expect(err).assertEqual(undefined);
+                                expect(err).assertEqual(null);
                                 osAccountManager.getCreatedOsAccountsCount((err, data)=>{
                                     console.debug("====>obtains the number accounts created err:" + JSON.stringify(err));
                                     console.debug("====>obtains the number accounts created data:" + data);
-                                    expect(err).assertEqual(undefined);
+                                    expect(err).assertEqual(null);
                                     data = data - 1;
                                     expect(data).assertEqual(obtainCount);
                                     osAccountManager.removeOsAccount(localIdSec, (err)=>{
                                         console.debug("====>remove localId: " + localIdSec + " err:" + JSON.stringify(err));
-                                        expect(err).assertEqual(undefined);
+                                        expect(err).assertEqual(null);
                                         console.debug("====>ActsOsAccountGetCount_0100 end====");
                                         done();
                                     })

account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountIs.test.js

@@ -43,7 +43,7 @@ export default function ActsOsAccountThirdPartyTest_third_1() {
                 AccountManager.getDistributedVirtualDeviceId((err, id)=>{
                     console.debug("====>getDistributedVirtualDeviceId err:" + JSON.stringify(err));
                     console.debug("====>getDistributedVirtualDeviceId deviceId:" + id);
-                    expect(err).assertEqual(undefined);
+                    expect(err).assertEqual(null);
                     expect(id).assertEqual(deviceId);
                     console.debug("====>ActsOsAccountDeviceId_0100 end====");
                     done();
@@ -90,7 +90,7 @@ export default function ActsOsAccountThirdPartyTest_third_1() {
             AccountManager.isOsAccountActived(0, (err, isActived)=>{
                 console.debug("====>isOsAccountActived err:" + JSON.stringify(err));
                 console.debug("====>isOsAccountActived isActived:" + isActived);
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(isActived).assertEqual(true);
                 console.debug("====>ActsOsAccountIsActived_0100 end");
                 done();
@@ -246,7 +246,7 @@ export default function ActsOsAccountThirdPartyTest_third_1() {
             AccountManager.isMultiOsAccountEnable((err, data)=>{
                 console.debug("====>isMultiOsAccountEnable err:" + JSON.stringify(err));
                 console.debug("====>isMultiOsAccountEnable data:" + data);
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data).assertEqual(true);
                 console.debug("====>ActsOsAccountIsMulty_0100 end====");
                 done();
@@ -288,7 +288,7 @@ export default function ActsOsAccountThirdPartyTest_third_1() {
             AccountManager.isOsAccountVerified((err, data)=>{
                 console.debug("====>isOsAccountVerified err:" + JSON.stringify(err));
                 console.debug("====>isOsAccountVerified data:" + data);
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data).assertEqual(false);
                 console.debug("====>ActsOsAccountVerified_0100 end====");
                 done();
@@ -322,7 +322,7 @@ export default function ActsOsAccountThirdPartyTest_third_1() {
             console.debug("====>get os AccountManager finish====");
             AccountManager.isOsAccountVerified(0, (err, data)=>{
                 console.debug("====>isOsAccountVerified err:" + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data).assertFalse();
                 console.debug("====>ActsOsAccountIsVerified_0300 end====");
                 done();
@@ -357,7 +357,7 @@ export default function ActsOsAccountThirdPartyTest_third_1() {
             AccountManager.isOsAccountVerified(localIdStr, (err, data)=>{
                 console.debug("====>error received callback====");
                 console.debug("====>receive isOsAccountVerified err: " + JSON.stringify(err));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data).assertEqual(false);
                 console.debug("====>receive isOsAccountVerified data: " + JSON.stringify(data));
                 done();
@@ -397,7 +397,7 @@ export default function ActsOsAccountThirdPartyTest_third_1() {
             var localIdUndefined = undefined;
             AccountManager.isOsAccountVerified(localIdUndefined, (err, data) =>{
                 console.debug("====>ActsOsAccountIsVerified_0700 isOsAccountVerified_err:" + JSON.stringify(err))
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 console.debug("====>ActsOsAccountIsVerified_0700 isOsAccountVerified_data:" + JSON.stringify(data))
                 expect(data).assertEqual(false)
                 console.debug("====>ActsOsAccountIsVerified_0700 end====");
@@ -478,7 +478,7 @@ export default function ActsOsAccountThirdPartyTest_third_1() {
             AccountManager.isTestOsAccount((err, data)=>{
                 console.debug("====>isTestOsAccount err:" + JSON.stringify(err));
                 console.debug("====>isTestOsAccount data:" + JSON.stringify(data));
-                expect(err).assertEqual(undefined);
+                expect(err).assertEqual(null);
                 expect(data).assertEqual(false);
                 console.debug("====>ActsOsAccountIsTest_0100 end====");
                 done();