提交 d897d6c2 编写于 作者: X xuchenghua09

Merge remote-tracking branch 'upstream/master'

......@@ -102,7 +102,7 @@ export default function abilityTest() {
expect(data.labelId.length).assertLarger(0);
expect(data.icon).assertEqual("$media:icon");
expect(data.iconId.length).assertLarger(0);
expect(data.process).assertEqual("");
expect(data.process).assertEqual("com.example.staticabilitystagecontext");
expect(data.supportedModes).assertEqual(0);
expect(data.moduleSourceDirs.length).assertEqual(1);
expect(data.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/" +
......
......@@ -194,7 +194,7 @@ export default function abilityTest() {
expect(data.labelId).assertEqual("16777216");
expect(data.icon).assertEqual("$media:icon");
expect(data.iconId).assertEqual("16777224");
expect(data.process).assertEqual("");
expect(data.process).assertEqual("com.example.staticextensioninfo");
expect(data.supportedModes).assertEqual(0);
expect(data.moduleSourceDirs.length).assertEqual(1);
expect(data.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/" +
......@@ -376,7 +376,7 @@ export default function abilityTest() {
expect(data.labelId.length).assertLarger(0);
expect(data.icon).assertEqual("$media:icon");
expect(data.iconId.length).assertLarger(0);
expect(data.process).assertEqual("");
expect(data.process).assertEqual("com.example.staticextensioninfo");
expect(data.supportedModes).assertEqual(0);
expect(data.moduleSourceDirs.length).assertEqual(1);
expect(data.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/" +
......
......@@ -286,7 +286,7 @@ export default function abilityTest() {
expect(data.labelId.length).assertLarger(0);
expect(data.icon).assertEqual("$media:icon");
expect(data.iconId.length).assertLarger(0);
expect(data.process).assertEqual("");
expect(data.process).assertEqual("com.example.staticinfomationquery");
expect(data.supportedModes).assertEqual(0);
expect(data.moduleSourceDirs.length).assertEqual(1);
expect(data.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/" +
......
......@@ -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();
});
......
......@@ -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();
});
......
......@@ -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
......@@ -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();
});
......
......@@ -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();
});
});
......
......@@ -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);
......
......@@ -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));
......
......@@ -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();
}
......
......@@ -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();
});
......
......@@ -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();
......
......@@ -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();
});
......
......@@ -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();
})
......
{
"description": "Configuration for hjunit demo Tests",
"description": "Configuration for hjunit demo Tests"
}
......@@ -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");
......
......@@ -13,7 +13,6 @@
* limitations under the License.
*/
export default {
data: {
title: "Hello World"
......
......@@ -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))
}
......
......@@ -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();
})
......
......@@ -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();
......
......@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceEtsComponentTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_ets_component_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentFiveTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceEtsComponentFiveTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_ets_component_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentFourTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceEtsComponentFourTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_ets_component_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentThreeTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceEtsComponentThreeTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_ets_component_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentTwoTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceEtsComponentTwoTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_ets_component_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsStTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceEtsStTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_demo_ets_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceEtsTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_ets_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsThirdTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceEtsThirdTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_third_ets_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -22,6 +22,8 @@ ohos_js_hap_suite("AceEtsWebViewTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "AceEtsWebViewTest"
subsystem_name = "arkui"
part_name = "webview"
}
ohos_js_assets("ace_ets_webView_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
......
......@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceNapiEtsTest") {
ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceNapiEtsTest"
subsystem_name = "arkui"
part_name = "napi"
shared_libraries = [ "./entry/src/main/cpp:teststring" ]
}
......
......@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAceStandardTest") {
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceStandardTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_js_assets") {
source_dir = "./src/main/js/default"
......
......@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAceStandardVideoTest") {
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsAceStandardVideoTest"
subsystem_name = "arkui"
part_name = "ace_engine"
}
ohos_js_assets("ace_js_assets") {
js2abc = true
......
......@@ -17,7 +17,7 @@
"package": "com.example.actsbmsaccesstokentest",
"name": ".entry",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -19,7 +19,7 @@
"mainAbility": ".MainAbility",
"srcPath": "",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -485,7 +485,7 @@ export default function actsBmsJsModuleNameTest() {
expect(data.icon).assertEqual("$media:icon");
expect(typeof (data.icon)).assertEqual("string");
expect(data.isVisible).assertEqual(false);
expect(data.deviceTypes[0]).assertEqual("phone");
expect(data.deviceTypes[0]).assertEqual("default");
expect(typeof (data.process)).assertEqual("string");
expect(data.process).assertEqual("com.example.bmsmodulename");
expect(typeof (data.uri)).assertEqual("string");
......@@ -513,7 +513,7 @@ export default function actsBmsJsModuleNameTest() {
expect(info.label).assertEqual("$string:app_name");
expect(typeof (info.labelId)).assertEqual("number");
expect(info.labelId > 0).assertTrue();
expect(info.systemApp).assertEqual(true);
expect(info.systemApp).assertEqual(false);
expect(typeof (info.entryDir)).assertEqual("string");
expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.bmsmodulename/com.example.bmsmodulenamedentry");
expect(typeof (info.process)).assertEqual("string");
......
......@@ -19,7 +19,7 @@
"mainAbility": ".MainAbility",
"srcPath": "",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -237,7 +237,7 @@ export default function actsBmsJsUnPermissionTest() {
expect(data.description).assertEqual("$string:description_mainability");
expect(data.icon).assertEqual("$media:icon");
expect(data.isVisible).assertEqual(true);
expect(data.deviceTypes[0]).assertEqual("phone");
expect(data.deviceTypes[0]).assertEqual("default");
expect(data.process).assertEqual("com.example.actsbmsetsunpermissiontest");
expect(data.uri).assertEqual("");
expect(data.moduleName).assertEqual("entry");
......@@ -275,7 +275,7 @@ export default function actsBmsJsUnPermissionTest() {
expect(info.labelId > 0).assertTrue();
expect(info.labelIndex > 0).assertTrue();
expect(info.labelIndex).assertEqual(info.labelId);
expect(info.systemApp).assertEqual(true);
expect(info.systemApp).assertEqual(false);
expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.actsbmsetsunpermissiontest/com.example.actsbmsetsunpermissiontest");
expect(info.supportedModes).assertEqual(0);
expect(info.process).assertEqual("com.example.actsbmsetsunpermissiontest");
......
......@@ -17,7 +17,7 @@
"package": "com.example.actsbmsgetinfostest",
"name": ".entry",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -158,7 +158,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
expect(data.isVisible).assertEqual(false);
expect(data.permissions.length).assertEqual(0);
expect(data.deviceCapabilities.length).assertEqual(0);
expect(data.deviceTypes[0]).assertEqual('phone');
expect(data.deviceTypes[0]).assertEqual('default');
expect(data.process).assertEqual(SYSTEM_NAME);
expect(data.uri).assertEqual('');
expect(data.bundleName).assertEqual(SYSTEM_NAME);
......
......@@ -17,7 +17,7 @@
"package": "com.example.actsbmshapmoduletest",
"name": ".entry",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -27,7 +27,7 @@ const ICON = '$media:icon';
const ICON_ID = 16777218;
const LABEL = '$string:app_name';
const LABEL_ID = 16777216;
const DEVICE_TYPES = 'phone';
const DEVICE_TYPES = 'default';
const FIRST_SCENE_HAP_NAME = 'com.example.bmsmainabilityfirstscene.MyApplication';
const SECOND_SCENE_HAP_NAME = 'com.example.bmsmainabilitysecondscene.MyApplication';
const THIRD_TWO_HAP_NAME = 'com.example.third2.MyApplication';
......
......@@ -17,7 +17,7 @@
"package": "com.example.actsbmsjstest",
"name": ".entry",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -31,7 +31,7 @@ describe('ActsBmsHasInstalldTest', function () {
it('hasInstalled_0100', 0, async function (done) {
let flag = 0;
pkg.hasInstalled({
bundleName: 'com.ohos.launcher',
bundleName: 'com.example.third2',
success: function success(data) {
console.info('hasInstalled success function in');
flag += 1;
......
......@@ -54,7 +54,7 @@ describe('ActsBmsJsTest', function () {
expect(abilityInfo1.icon).assertEqual("$media:icon");
expect(abilityInfo1.isVisible).assertEqual(true);
expect(abilityInfo1.permissions.length).assertEqual(0);
expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
expect(abilityInfo1.deviceTypes[0]).assertEqual('default');
expect(abilityInfo1.process).assertEqual(BUNDLE_NAME2);
expect(abilityInfo1.uri).assertEqual("");
expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME2);
......@@ -130,7 +130,7 @@ describe('ActsBmsJsTest', function () {
expect(abilityInfo1.icon).assertEqual("$media:icon");
expect(abilityInfo1.isVisible).assertEqual(true);
expect(abilityInfo1.permissions.length).assertEqual(0);
expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
expect(abilityInfo1.deviceTypes[0]).assertEqual('default');
expect(abilityInfo1.process).assertEqual(BUNDLE_NAME4);
expect(abilityInfo1.uri).assertEqual("");
expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME4);
......@@ -173,7 +173,7 @@ describe('ActsBmsJsTest', function () {
expect(abilityInfo1.icon).assertEqual("$media:icon");
expect(abilityInfo1.isVisible).assertEqual(true);
expect(abilityInfo1.permissions.length).assertEqual(0);
expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
expect(abilityInfo1.deviceTypes[0]).assertEqual('default');
expect(abilityInfo1.process).assertEqual(BUNDLE_NAME5);
expect(abilityInfo1.uri).assertEqual("");
expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME5);
......@@ -205,7 +205,7 @@ describe('ActsBmsJsTest', function () {
expect(info.icon).assertEqual("$media:icon");
expect(info.isVisible).assertEqual(true);
expect(info.permissions.length).assertEqual(0);
expect(info.deviceTypes[0]).assertEqual('phone');
expect(info.deviceTypes[0]).assertEqual('default');
expect(info.process).assertEqual(BUNDLE_NAME3);
expect(info.uri).assertEqual("");
expect(info.bundleName).assertEqual(BUNDLE_NAME3);
......
......@@ -17,7 +17,7 @@
"package": "com.example.actsbmsjsunpermissiontest",
"name": ".entry",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.actsbmsmetadatatest",
"name": ".entry",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -6,7 +6,7 @@
"description": "$string:phone_entry_dsc",
"mainElement": "MainAbility",
"deviceTypes": [
"phone"
"default"
],
"deliveryWithInstall": true,
"installationFree": false,
......
......@@ -19,7 +19,7 @@
"srcPath": "",
"mainAbility": "com.open.harmony.packagemag.MainAbility",
"deviceType": [
"phone"
"default"
],
"reqPermissions": [
{
......
......@@ -230,7 +230,7 @@ export default function GetabilityInfo() {
expect(data.isVisible).assertEqual(true);
expect(Array.isArray(data.permissions)).assertEqual(true);
expect(Array.isArray(data.deviceCapabilities)).assertEqual(true);
expect(data.deviceTypes[0]).assertEqual("phone");
expect(data.deviceTypes[0]).assertEqual("default");
expect(typeof (data.process)).assertEqual("string");
expect(data.process).assertEqual("com.open.harmony.packagemag");
expect(typeof (data.uri)).assertEqual("string");
......@@ -268,7 +268,7 @@ export default function GetabilityInfo() {
expect(typeof (info.labelIndex)).assertEqual("number");
expect(info.labelIndex > 0).assertTrue();
expect(info.labelIndex).assertEqual(info.labelId);
expect(info.systemApp).assertEqual(true);
expect(info.systemApp).assertEqual(false);
expect(typeof (info.entryDir)).assertEqual("string");
expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.open.harmony.packagemag/com.open.harmony.packagemag");
expect(typeof (info.supportedModes)).assertEqual("number");
......@@ -287,7 +287,7 @@ export default function GetabilityInfo() {
expect(data.description).assertEqual("$string:mainability_description");
expect(data.icon).assertEqual("$media:icon");
expect(data.isVisible).assertEqual(true);
expect(data.deviceTypes[0]).assertEqual("phone");
expect(data.deviceTypes[0]).assertEqual("default");
expect(data.process).assertEqual("com.example.third1");
expect(data.uri).assertEqual("");
expect(data.moduleName).assertEqual("entry");
......
......@@ -1017,9 +1017,9 @@ export default function QueryExtensionAbilityInfos() {
expect(data[0].applicationInfo.labelId).assertLarger(0);
expect(data[0].applicationInfo.labelIndex).assertLarger(0);
expect(data[0].applicationInfo.labelIndex).assertEqual(data[0].applicationInfo.labelId);
expect(data[0].applicationInfo.systemApp).assertTrue();
expect(data[0].applicationInfo.systemApp).assertFalse();
expect(data[0].applicationInfo.supportedModes).assertEqual(0);
expect(data[0].applicationInfo.process).assertEqual("");
expect(data[0].applicationInfo.process).assertEqual("ohos.acts.bundle.stage");
expect(data[0].applicationInfo.entryDir).assertEqual("/data/app/el1/bundle/public/ohos.acts.bundle.stage/phone");
expect(data[0].applicationInfo.permissions.length).assertEqual(0);
expect(data[0].applicationInfo.moduleSourceDirs[1]).assertEqual("/data/app/el1/bundle/public/ohos.acts.bundle.stage/phone");
......
......@@ -343,7 +343,7 @@ export default function getAllApplicationBundleTest() {
if (data[i].uid !== 0) {
expect(data[i].uid > 0).assertEqual(true);
};
expect(data[i].systemApp).assertEqual(true);
expect(data[i].systemApp).assertEqual(false);
expect(data[i].supportedModes).assertEqual(0);
expect(data[i].process).assertEqual('com.open.harmony.packagemag');
expect(data[i].entryDir).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag' +
......
......@@ -469,7 +469,7 @@ export default function applicationBundleJsunit() {
expect(data.labelId > 0).assertEqual(true);
expect(data.labelIndex > 0).assertEqual(true);
expect(data.labelIndex).assertEqual(data.labelId);
expect(data.systemApp).assertEqual(true);
expect(data.systemApp).assertEqual(false);
expect(data.supportedModes).assertEqual(0);
expect(data.process).assertEqual(BUNDLE_NAME);
expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_NAME + '/' + BUNDLE_NAME);
......@@ -499,7 +499,7 @@ export default function applicationBundleJsunit() {
expect(data.labelId).assertLarger(0);
expect(data.labelIndex).assertLarger(0);
expect(data.labelIndex).assertEqual(data.labelId);
expect(data.systemApp).assertTrue();
expect(data.systemApp).assertFalse();
expect(data.supportedModes).assertEqual(0);
expect(data.process).assertEqual(BUNDLE_NAME);
expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_NAME + '/' + BUNDLE_NAME);
......
......@@ -17,7 +17,7 @@
"package": "com.example.actsbundlemanagertest",
"name": ".entry",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -73,7 +73,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.appInfo.iconId >= 0).assertTrue();
expect(datainfo.appInfo.label).assertEqual("$string:app_name");
expect(datainfo.appInfo.labelId >= 0).assertTrue();
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
expect(datainfo.appInfo.supportedModes).assertEqual(0);
expect(datainfo.installTime).assertLarger(0);
expect(datainfo.updateTime).assertLarger(0);
......@@ -137,7 +137,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.appInfo.iconId >= 0).assertTrue();
expect(datainfo.appInfo.label).assertEqual("$string:app_name");
expect(datainfo.appInfo.labelId >= 0).assertTrue();
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
expect(datainfo.appInfo.supportedModes).assertEqual(0);
expect(datainfo.installTime).assertLarger(0);
expect(datainfo.updateTime).assertLarger(0);
......@@ -185,7 +185,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.appInfo.iconId >= 0).assertTrue();
expect(datainfo.appInfo.label).assertEqual("$string:app_name");
expect(datainfo.appInfo.labelId >= 0).assertTrue();
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
done();
})
......@@ -210,7 +210,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.appInfo.iconId >= 0).assertTrue();
expect(datainfo.appInfo.label).assertEqual("$string:app_name");
expect(datainfo.appInfo.labelId >= 0).assertTrue();
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
done();
}
})
......@@ -248,7 +248,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.appInfo.iconId >= 0).assertTrue();
expect(datainfo.appInfo.label).assertEqual("$string:app_name");
expect(datainfo.appInfo.labelId >= 0).assertTrue();
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
expect(datainfo.appInfo.supportedModes).assertEqual(0);
for (let j = 0; j < datainfo.appInfo.moduleInfos.length; j++) {
expect(datainfo.appInfo.moduleInfos[j].moduleName).assertEqual("entry");
......@@ -293,7 +293,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.appInfo.iconId >= 0).assertTrue();
expect(datainfo.appInfo.label).assertEqual("$string:app_name");
expect(datainfo.appInfo.labelId >= 0).assertTrue();
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
expect(datainfo.appInfo.supportedModes).assertEqual(0);
for (let j = 0; j < datainfo.appInfo.moduleInfos.length; j++) {
expect(datainfo.appInfo.moduleInfos[j].moduleName).assertEqual("entry");
......@@ -398,7 +398,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.appInfo.iconId >= 0).assertTrue();
expect(datainfo.appInfo.label).assertEqual("$string:app_name");
expect(datainfo.appInfo.labelId >= 0).assertTrue();
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
expect(datainfo.appInfo.supportedModes).assertEqual(0);
expect(datainfo.appInfo.enabled).assertEqual(true);
done();
......@@ -425,7 +425,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.appInfo.iconId >= 0).assertTrue();
expect(datainfo.appInfo.label).assertEqual("$string:app_name");
expect(datainfo.appInfo.labelId >= 0).assertTrue();
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
expect(datainfo.appInfo.supportedModes).assertEqual(0);
for (let j = 0; j < datainfo.appInfo.moduleInfos.length; j++) {
expect(datainfo.appInfo.moduleInfos[j].moduleName).assertEqual("entry");
......@@ -460,7 +460,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.versionName.length).assertLarger(0);
expect(datainfo.uid).assertLarger(2099);
expect(datainfo.appInfo.name).assertEqual(NAME1);
expect(datainfo.appInfo.systemApp).assertEqual(true);
expect(datainfo.appInfo.systemApp).assertEqual(false);
expect(datainfo.appInfo.supportedModes).assertEqual(0);
expect(datainfo.appInfo.moduleInfos.length).assertLarger(0);
expect(datainfo.appInfo.enabled).assertEqual(true);
......@@ -492,7 +492,7 @@ describe('ActsBundleManagerTest', function () {
expect(dataInfo.appInfo.iconId >= 0).assertTrue();
expect(dataInfo.appInfo.label).assertEqual("$string:app_name");
expect(dataInfo.appInfo.labelId >= 0).assertTrue();
expect(dataInfo.appInfo.systemApp).assertEqual(true);
expect(dataInfo.appInfo.systemApp).assertEqual(false);
expect(dataInfo.appInfo.supportedModes).assertEqual(0);
expect(dataInfo.updateTime).assertLarger(0);
expect(dataInfo.reqPermissions.length).assertEqual(0);
......@@ -541,7 +541,7 @@ describe('ActsBundleManagerTest', function () {
expect(dataInfo.appInfo.iconId >= 0).assertTrue();
expect(dataInfo.appInfo.label).assertEqual("$string:app_name");
expect(dataInfo.appInfo.labelId >= 0).assertTrue();
expect(dataInfo.appInfo.systemApp).assertEqual(true);
expect(dataInfo.appInfo.systemApp).assertEqual(false);
expect(dataInfo.appInfo.supportedModes).assertEqual(0);
expect(dataInfo.updateTime).assertLarger(0);
expect(dataInfo.reqPermissions.length).assertEqual(0);
......@@ -707,7 +707,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.description).assertEqual(APPLICATION_DESCRIPTION);
expect(datainfo.icon).assertEqual("$media:icon");
expect(datainfo.label).assertEqual("$string:app_name");
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.descriptionId).assertLarger(0);
expect(parseInt(datainfo.iconId)).assertLarger(0);
expect(parseInt(datainfo.labelId)).assertLarger(0);
......@@ -753,7 +753,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.description).assertEqual(APPLICATION_DESCRIPTION);
expect(datainfo.icon).assertEqual("$media:icon");
expect(datainfo.label).assertEqual("$string:app_name");
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.descriptionId).assertLarger(0);
expect(parseInt(datainfo.iconId)).assertLarger(0);
expect(parseInt(datainfo.labelId)).assertLarger(0);
......@@ -792,7 +792,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.description).assertEqual(APPLICATION_DESCRIPTION);
expect(datainfo.icon).assertEqual("$media:icon");
expect(datainfo.label).assertEqual("$string:app_name");
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.descriptionId >= 0).assertTrue();
expect(datainfo.iconId >= 0).assertTrue();
expect(datainfo.labelId >= 0).assertTrue();
......@@ -829,7 +829,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.description).assertEqual(APPLICATION_DESCRIPTION);
expect(datainfo.icon).assertEqual("$media:icon");
expect(datainfo.label).assertEqual("$string:app_name");
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.descriptionId >= 0).assertTrue();
expect(datainfo.iconId >= 0).assertTrue();
expect(datainfo.labelId >= 0).assertTrue();
......@@ -866,7 +866,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.iconId >= 0).assertTrue();
expect(datainfo.label).assertEqual("$string:app_name");
expect(datainfo.labelId >= 0).assertTrue();
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.supportedModes).assertEqual(0);
done();
})
......@@ -890,7 +890,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.iconId >= 0).assertTrue();
expect(datainfo.label).assertEqual("$string:app_name");
expect(datainfo.labelId >= 0).assertTrue();
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.supportedModes).assertEqual(0);
done();
})
......@@ -988,7 +988,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.descriptionId).assertLarger(0);
expect(parseInt(datainfo.iconId)).assertLarger(0);
expect(parseInt(datainfo.labelId)).assertLarger(0);
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.supportedModes).assertEqual(0);
done();
}).catch(err => {
......@@ -1020,7 +1020,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.descriptionId).assertLarger(0);
expect(parseInt(datainfo.iconId)).assertLarger(0);
expect(parseInt(datainfo.labelId)).assertLarger(0);
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.supportedModes).assertEqual(0);
done();
})
......@@ -1043,7 +1043,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.descriptionId >= 0).assertTrue();
expect(parseInt(datainfo.iconId)).assertLarger(0);
expect(parseInt(datainfo.labelId)).assertLarger(0);
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.supportedModes).assertEqual(0);
expect(datainfo.enabled).assertEqual(true);
for (let j = 0; j < datainfo.moduleInfos.length; j++) {
......@@ -1081,7 +1081,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.descriptionId >= 0).assertTrue();
expect(parseInt(datainfo.iconId)).assertLarger(0);
expect(parseInt(datainfo.labelId)).assertLarger(0);
expect(datainfo.systemApp).assertEqual(true);
expect(datainfo.systemApp).assertEqual(false);
expect(datainfo.supportedModes).assertEqual(0);
expect(datainfo.enabled).assertEqual(true);
for (let j = 0; j < datainfo.moduleInfos.length; j++) {
......@@ -1421,7 +1421,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
expect(datainfo.applicationInfo.systemApp).assertEqual(true);
expect(datainfo.applicationInfo.systemApp).assertEqual(false);
expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
expect(datainfo.applicationInfo.enabled).assertEqual(true);
expect(datainfo.metaData.length).assertLarger(0);
......@@ -1480,7 +1480,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
expect(datainfo.applicationInfo.systemApp).assertEqual(true);
expect(datainfo.applicationInfo.systemApp).assertEqual(false);
expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
expect(datainfo.applicationInfo.enabled).assertEqual(true);
expect(datainfo.metaData.length).assertLarger(0);
......@@ -1523,7 +1523,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
expect(datainfo.applicationInfo.systemApp).assertEqual(true);
expect(datainfo.applicationInfo.systemApp).assertEqual(false);
expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
expect(datainfo.applicationInfo.enabled).assertEqual(true);
expect(datainfo.applicationInfo.moduleInfos[0].moduleName).assertEqual("entry");
......@@ -1564,7 +1564,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
expect(datainfo.applicationInfo.systemApp).assertEqual(true);
expect(datainfo.applicationInfo.systemApp).assertEqual(false);
expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
expect(datainfo.applicationInfo.enabled).assertEqual(true);
expect(datainfo.applicationInfo.moduleInfos[0].moduleName).assertEqual("entry");
......@@ -1614,7 +1614,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
expect(datainfo.applicationInfo.systemApp).assertEqual(true);
expect(datainfo.applicationInfo.systemApp).assertEqual(false);
expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.PORTRAIT);
expect(datainfo.orientation).assertEqual(2);
......@@ -1682,7 +1682,7 @@ describe('ActsBundleManagerTest', function () {
expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
expect(datainfo.applicationInfo.systemApp).assertEqual(true);
expect(datainfo.applicationInfo.systemApp).assertEqual(false);
expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
expect(datainfo.orientation).assertEqual(2);
expect(datainfo.applicationInfo.enabled).assertEqual(true);
......
......@@ -19,7 +19,7 @@
"mainAbility": "com.actsbundle.napitest.MainAbility",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "
import bundlendk from 'libbundlendk.so'
const BUNDLE_NAME = "com.actsbundle.napitest"
const FINGER_PRINT = "7B3D8586460A7666621992FD367993D7ECDE40A8FD8E9CF525A48822E9A62655"
const FINGER_PRINT = "8E93863FC32EE238060BF69A9B37E2608FFFB21F93C862DD511CBAC9F30024B5"
export default function budnleNdkNativeTest() {
describe('BundleNdkTest', function () {
......
......@@ -17,7 +17,7 @@
"package": "com.example.bmsaccesstoken3",
"name": ".MyApplication1",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.bmsaccesstoken2",
"name": ".MyApplication1",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.bmsaccesstoken1",
"name": ".MyApplication1",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.bmsaccesstoken2",
"name": ".MyApplication2",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.bmsaccesstoken2",
"name": ".MyApplication1",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -18,7 +18,7 @@
"name": ".BmsThirdBundle5",
"mainAbility": "com.example.third5.AMainAbility",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -20,7 +20,7 @@
"name": "com.example.third1.BmsThirdBundle1",
"colorMode": "light",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -21,7 +21,7 @@
"mainAbility": "com.example.third1.MainAbility",
"colorMode": "dark",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.third4",
"name": ".BmsThirdBundle4",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.c",
"name": ".MyApplication",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.js",
"name": ".MyApplication",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -20,7 +20,7 @@
"name": ".BmsSystemBundle1",
"mainAbility": "com.example.system1.MainAbility",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -20,7 +20,7 @@
"name": ".BmsSystemBundle1",
"mainAbility": "com.example.system2.MainAbility",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.vendor1",
"name": ".BmsVendorBundle1",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
......@@ -17,7 +17,7 @@
"package": "com.example.third2",
"name": ".MyApplication",
"deviceType": [
"phone"
"default"
],
"distro": {
"deliveryWithInstall": true,
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
文件模式从 100644 更改为 100755
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册