diff --git a/account/appaccount/sceneProject/actsscenegetallaccounts/entry/src/main/js/default/pages/index/index.js b/account/appaccount/sceneProject/actsscenegetallaccounts/entry/src/main/js/default/pages/index/index.js index 7538c63b9a834c526e79f2a945d0c7e4e0f138be..49d2526c92379cb2d1cd22c71fb7d0356d3ed863 100755 --- a/account/appaccount/sceneProject/actsscenegetallaccounts/entry/src/main/js/default/pages/index/index.js +++ b/account/appaccount/sceneProject/actsscenegetallaccounts/entry/src/main/js/default/pages/index/index.js @@ -28,7 +28,7 @@ export default { console.debug('====>scene getAllAccounts start===='); var appAccountManager = account.createAppAccountManager(); console.debug("====>creat scene manager finish===="); - var enableBundle = "com.example.actsgetallaaccounts"; + var enableBundle = "com.example.actsgetallaccounts"; var enableBundle2 = "com.example.actsgetaccountsbyowner"; console.debug("====>add account scene start===="); appAccountManager.createAccount("account_name_scene_single", (err)=>{ diff --git a/account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountGet.test.js b/account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountGet.test.js index 8811d86bd6a867f25396220c91e72cbc2a16316c..e8b7bdf3859c159bae55abee4e1646e3f4efae47 100644 --- a/account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountGet.test.js +++ b/account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountGet.test.js @@ -213,7 +213,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() { console.debug("====>get type err: " + JSON.stringify(err)); console.debug("====>type obtained by process:" + JSON.stringify(accountType)); expect(err).assertEqual(null); - expect(accountType.ADMIN).assertEqual(0); + expect(accountType).assertEqual(0); console.debug("====>ActsOsAccountGetTypeFormProcess_0100 end===="); done(); }); @@ -230,7 +230,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() { console.debug("====>get AccountManager finish===="); var accountType = await osAccountManager.getOsAccountTypeFromProcess(); console.debug("====>type obtained by process:" + JSON.stringify(accountType)); - expect(accountType.ADMIN).assertEqual(0); + expect(accountType).assertEqual(0); console.debug("====>ActsOsAccountGetTypeFormProcess_0200 end===="); done(); }); @@ -354,7 +354,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() { expect(err).assertEqual(null); expect(data.localName).assertEqual("osAccountNameIdSerialA"); expect(data.domainInfo.accountName == "").assertEqual(true) - expect(data.type.NORMAL).assertEqual(1); + expect(data.type).assertEqual(1); expect(data.constraints.length > 0).assertEqual(true); expect(data.isVerified).assertEqual(false); expect(data.distributedInfo.name != null).assertEqual(true); @@ -644,7 +644,7 @@ export default function ActsOsAccountThirdPartyTest_third_2() { var data = await AccountManager.queryCurrentOsAccount(); console.debug("====>queryCurrentOsAccount data:" + JSON.stringify(data)); expect(data.localId).assertEqual(100); - expect(data.type.ADMIN).assertEqual(0); + expect(data.type).assertEqual(0); var serialNumberStr = data.serialNumber.toString(); var serialIntercept = serialNumberStr.substring(8); console.debug("====>truncate the last eight characters: " + serialIntercept); diff --git a/account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountQuery.test.js b/account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountQuery.test.js index e2c1f3fa129ecd0d16b071e93cecc12d6d005977..4e00fd05b8a6c574a35f1335684607865b9f62a9 100644 --- a/account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountQuery.test.js +++ b/account/osaccount/actsosaccountthirdpartytest/src/main/js/test/OsAccountQuery.test.js @@ -215,7 +215,7 @@ export default function ActsOsAccountThirdPartyTest_third_4() { console.debug("====>get type err: " + JSON.stringify(err)); console.debug("====>type obtained by process:" + JSON.stringify(accountType)); expect(err).assertEqual(null); - expect(accountType.ADMIN).assertEqual(0); + expect(accountType).assertEqual(0); console.debug("====>ActsOsAccountgetType_0100 end===="); done(); }); @@ -232,7 +232,7 @@ export default function ActsOsAccountThirdPartyTest_third_4() { console.debug("====>get AccountManager finish===="); var accountType = await osAccountManager.getOsAccountType(); console.debug("====>type obtained by process:" + JSON.stringify(accountType)); - expect(accountType.ADMIN).assertEqual(0); + expect(accountType).assertEqual(0); console.debug("====>ActsOsAccountgetType_0200 end===="); done(); }); @@ -356,7 +356,7 @@ export default function ActsOsAccountThirdPartyTest_third_4() { expect(err).assertEqual(null); expect(data.localName).assertEqual("osAccountNameIdSerialA"); expect(data.domainInfo.accountName == "").assertEqual(true) - expect(data.type.NORMAL).assertEqual(1); + expect(data.type).assertEqual(1); expect(data.constraints.length > 0).assertEqual(true); expect(data.isVerified).assertEqual(false); expect(data.distributedInfo.name != null).assertEqual(true); @@ -646,7 +646,7 @@ export default function ActsOsAccountThirdPartyTest_third_4() { var data = await AccountManager.getCurrentOsAccount(); console.debug("====>getCurrentOsAccount data:" + JSON.stringify(data)); expect(data.localId).assertEqual(100); - expect(data.type.ADMIN).assertEqual(0); + expect(data.type).assertEqual(0); var serialNumberStr = data.serialNumber.toString(); var serialIntercept = serialNumberStr.substring(8); console.debug("====>truncate the last eight characters: " + serialIntercept);