未验证 提交 32b93c4e 编写于 作者: O openharmony_ci 提交者: Gitee

!5782 【FA接口优化】bms napi接口改造xts适配

Merge pull request !5782 from xinking129/master
...@@ -298,7 +298,7 @@ export default function actsBmsJsModuleNameTest() { ...@@ -298,7 +298,7 @@ export default function actsBmsJsModuleNameTest() {
expect(err).assertFail(); expect(err).assertFail();
}); });
bundle.isAbilityEnabled(abilityInfo, (err, data) => { bundle.isAbilityEnabled(abilityInfo, (err, data) => {
expect(err).assertEqual(SUCCESS_CODE); expect(err.code).assertEqual(SUCCESS_CODE);
if (err) { if (err) {
console.error('[isAbilityEnabledEmptyModule]Operation failed. Err: ' + JSON.stringify(err)); console.error('[isAbilityEnabledEmptyModule]Operation failed. Err: ' + JSON.stringify(err));
} }
...@@ -327,7 +327,7 @@ export default function actsBmsJsModuleNameTest() { ...@@ -327,7 +327,7 @@ export default function actsBmsJsModuleNameTest() {
if (err) { if (err) {
console.error('[isAbilityEnabledInvalidModule]Operation failed. Err: ' + JSON.stringify(err)); console.error('[isAbilityEnabledInvalidModule]Operation failed. Err: ' + JSON.stringify(err));
} }
expect(err).assertEqual(SUCCESS_CODE); expect(err.code).assertEqual(SUCCESS_CODE);
console.info("'[isAbilityEnabledInvalidModule]Return data: " + JSON.stringify(data)); console.info("'[isAbilityEnabledInvalidModule]Return data: " + JSON.stringify(data));
done(); done();
}); });
...@@ -349,7 +349,7 @@ export default function actsBmsJsModuleNameTest() { ...@@ -349,7 +349,7 @@ export default function actsBmsJsModuleNameTest() {
expect(err).assertFail(); expect(err).assertFail();
}); });
bundle.isAbilityEnabled(abilityInfo, (err, data) => { bundle.isAbilityEnabled(abilityInfo, (err, data) => {
expect(err).assertEqual(SUCCESS_CODE); expect(err.code).assertEqual(SUCCESS_CODE);
if (err) { if (err) {
console.error('[isAbilityEnabledHasModule]Operation failed. Err: ' + JSON.stringify(err)); console.error('[isAbilityEnabledHasModule]Operation failed. Err: ' + JSON.stringify(err));
} }
...@@ -371,14 +371,14 @@ export default function actsBmsJsModuleNameTest() { ...@@ -371,14 +371,14 @@ export default function actsBmsJsModuleNameTest() {
expect(data).assertFail(); expect(data).assertFail();
}).catch((err) => { }).catch((err) => {
console.error('[isAbilityEnabledUndefinedModule]Operation failed. Err: ' + JSON.stringify(err)); console.error('[isAbilityEnabledUndefinedModule]Operation failed. Err: ' + JSON.stringify(err));
expect(err).assertEqual(INVALID_PARAM); expect(err.code).assertEqual(INVALID_PARAM);
}); });
bundle.isAbilityEnabled(abilityInfo, (err, data) => { bundle.isAbilityEnabled(abilityInfo, (err, data) => {
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
if (err) { if (err) {
console.error('[isAbilityEnabledUndefinedModule]Operation failed. Err: ' + JSON.stringify(err)); console.error('[isAbilityEnabledUndefinedModule]Operation failed. Err: ' + JSON.stringify(err));
} }
expect(err).assertEqual(INVALID_PARAM); expect(err.code).assertEqual(INVALID_PARAM);
console.info("'[isAbilityEnabledUndefinedModule]Return data: " + JSON.stringify(data)); console.info("'[isAbilityEnabledUndefinedModule]Return data: " + JSON.stringify(data));
done(); done();
}); });
......
...@@ -51,10 +51,10 @@ export default function actsBmsJsUnPermissionTest() { ...@@ -51,10 +51,10 @@ export default function actsBmsJsUnPermissionTest() {
await bundle.getAllApplicationInfo(DEFAULT_FLAG).then(data => { await bundle.getAllApplicationInfo(DEFAULT_FLAG).then(data => {
expect().assertFail(); expect().assertFail();
}).catch(err => { }).catch(err => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
}); });
bundle.getAllApplicationInfo(DEFAULT_FLAG, (err, data) => { bundle.getAllApplicationInfo(DEFAULT_FLAG, (err, data) => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
done(); done();
}); });
...@@ -87,10 +87,10 @@ export default function actsBmsJsUnPermissionTest() { ...@@ -87,10 +87,10 @@ export default function actsBmsJsUnPermissionTest() {
await bundle.getApplicationInfo(BUNDLE_NAME_OTHER, DEFAULT_FLAG).then(data => { await bundle.getApplicationInfo(BUNDLE_NAME_OTHER, DEFAULT_FLAG).then(data => {
expect().assertFail(); expect().assertFail();
}).catch(err => { }).catch(err => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
}); });
bundle.getApplicationInfo(BUNDLE_NAME_OTHER, DEFAULT_FLAG, (err, data) => { bundle.getApplicationInfo(BUNDLE_NAME_OTHER, DEFAULT_FLAG, (err, data) => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
done(); done();
}); });
......
...@@ -46,10 +46,10 @@ describe('ActsBmsJsUnPermissionTest', function () { ...@@ -46,10 +46,10 @@ describe('ActsBmsJsUnPermissionTest', function () {
await bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, userId).then(data => { await bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, userId).then(data => {
expect().assertFail(); expect().assertFail();
}).catch(err => { }).catch(err => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
}); });
bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, userId, (err, data) => { bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, userId, (err, data) => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
done(); done();
}); });
...@@ -64,10 +64,10 @@ describe('ActsBmsJsUnPermissionTest', function () { ...@@ -64,10 +64,10 @@ describe('ActsBmsJsUnPermissionTest', function () {
await bundle.getAllApplicationInfo(DEFAULT_FLAG, userId).then(data => { await bundle.getAllApplicationInfo(DEFAULT_FLAG, userId).then(data => {
expect().assertFail(); expect().assertFail();
}).catch(err => { }).catch(err => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
}); });
bundle.getAllApplicationInfo(DEFAULT_FLAG, userId, (err, data) => { bundle.getAllApplicationInfo(DEFAULT_FLAG, userId, (err, data) => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
done(); done();
}); });
...@@ -143,10 +143,10 @@ describe('ActsBmsJsUnPermissionTest', function () { ...@@ -143,10 +143,10 @@ describe('ActsBmsJsUnPermissionTest', function () {
await bundle.getLaunchWantForBundle(LAUNCHER_BUNDLE_NAME).then(data => { await bundle.getLaunchWantForBundle(LAUNCHER_BUNDLE_NAME).then(data => {
expect().assertFail(); expect().assertFail();
}).catch(err => { }).catch(err => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
}); });
bundle.getLaunchWantForBundle(LAUNCHER_BUNDLE_NAME, (err, data) => { bundle.getLaunchWantForBundle(LAUNCHER_BUNDLE_NAME, (err, data) => {
expect(err).assertEqual(INVALID_CODE); expect(err.code).assertEqual(INVALID_CODE);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
done(); done();
}); });
......
...@@ -44,7 +44,7 @@ export default function getLaunchWantForBundle() { ...@@ -44,7 +44,7 @@ export default function getLaunchWantForBundle() {
expect(err).assertFail(); expect(err).assertFail();
}); });
bundleMgr.getLaunchWantForBundle(NAME1, (err, res) => { bundleMgr.getLaunchWantForBundle(NAME1, (err, res) => {
expect(err).assertEqual(0); expect(err.code).assertEqual(0);
expect(res.bundleName).assertEqual(NAME1); expect(res.bundleName).assertEqual(NAME1);
expect(res.abilityName).assertEqual(ABILITYNAME1); expect(res.abilityName).assertEqual(ABILITYNAME1);
expect(res.deviceId).assertEqual(''); expect(res.deviceId).assertEqual('');
...@@ -74,7 +74,7 @@ export default function getLaunchWantForBundle() { ...@@ -74,7 +74,7 @@ export default function getLaunchWantForBundle() {
expect(err).assertFail(); expect(err).assertFail();
}); });
bundleMgr.getLaunchWantForBundle(NAME2, (err, res) => { bundleMgr.getLaunchWantForBundle(NAME2, (err, res) => {
expect(err).assertEqual(0); expect(err.code).assertEqual(0);
expect(res.bundleName).assertEqual(NAME2); expect(res.bundleName).assertEqual(NAME2);
expect(res.abilityName).assertEqual(ABILITYNAME2); expect(res.abilityName).assertEqual(ABILITYNAME2);
expect(res.deviceId).assertEqual(''); expect(res.deviceId).assertEqual('');
...@@ -96,11 +96,11 @@ export default function getLaunchWantForBundle() { ...@@ -96,11 +96,11 @@ export default function getLaunchWantForBundle() {
await bundleMgr.getLaunchWantForBundle(NAME3).then(res => { await bundleMgr.getLaunchWantForBundle(NAME3).then(res => {
expect().assertFail(); expect().assertFail();
}).catch(err => { }).catch(err => {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
}); });
bundleMgr.getLaunchWantForBundle(NAME3, (err, res) => { bundleMgr.getLaunchWantForBundle(NAME3, (err, res) => {
if (err) { if (err) {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
done(); done();
return; return;
} }
...@@ -122,11 +122,11 @@ export default function getLaunchWantForBundle() { ...@@ -122,11 +122,11 @@ export default function getLaunchWantForBundle() {
await bundleMgr.getLaunchWantForBundle(null).then(res => { await bundleMgr.getLaunchWantForBundle(null).then(res => {
expect().assertFail(); expect().assertFail();
}).catch(err => { }).catch(err => {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
}); });
bundleMgr.getLaunchWantForBundle(null, (err, res) => { bundleMgr.getLaunchWantForBundle(null, (err, res) => {
if (err) { if (err) {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
done(); done();
return; return;
} }
......
...@@ -176,7 +176,7 @@ export default function GetResourceTest() { ...@@ -176,7 +176,7 @@ export default function GetResourceTest() {
} else { } else {
expect().assertFail(); expect().assertFail();
} }
expect(err).assertEqual(0) expect(err.code).assertEqual(0)
done(); done();
}) })
}); });
...@@ -291,7 +291,7 @@ export default function GetResourceTest() { ...@@ -291,7 +291,7 @@ export default function GetResourceTest() {
expect(applicationInfo.descriptionResource.bundleName).assertEqual(BUNDLE_NAME) expect(applicationInfo.descriptionResource.bundleName).assertEqual(BUNDLE_NAME)
expect(applicationInfo.descriptionResource.moduleName).assertEqual(MODULE_NAME) expect(applicationInfo.descriptionResource.moduleName).assertEqual(MODULE_NAME)
expect(applicationInfo.descriptionResource.id).assertLarger(0) expect(applicationInfo.descriptionResource.id).assertLarger(0)
expect(err).assertEqual(0) expect(err.code).assertEqual(0)
done(); done();
}) })
}); });
......
...@@ -73,7 +73,7 @@ export default function isAbilityEnabledETSUnit() { ...@@ -73,7 +73,7 @@ export default function isAbilityEnabledETSUnit() {
}); });
timeOldStamp = await Utils.getNowTime(); timeOldStamp = await Utils.getNowTime();
Bundle.isAbilityEnabled(abilityInfo, (error, data) => { Bundle.isAbilityEnabled(abilityInfo, (error, data) => {
if (error) { if (error.code != 0) {
expect(error).assertFail(); expect(error).assertFail();
} }
let timeNewStamp = Utils.getNowTime(); let timeNewStamp = Utils.getNowTime();
...@@ -114,16 +114,16 @@ export default function isAbilityEnabledETSUnit() { ...@@ -114,16 +114,16 @@ export default function isAbilityEnabledETSUnit() {
expect(error).assertFail(); expect(error).assertFail();
}); });
Bundle.isAbilityEnabled(abilityInfo1, (error, data) => { Bundle.isAbilityEnabled(abilityInfo1, (error, data) => {
expect(error).assertEqual(0); expect(error.code).assertEqual(0);
expect(data).assertFalse(); expect(data).assertFalse();
Bundle.isAbilityEnabled(abilityInfo2, (error, data) => { Bundle.isAbilityEnabled(abilityInfo2, (error, data) => {
expect(error).assertEqual(0); expect(error.code).assertEqual(0);
expect(data).assertFalse(); expect(data).assertFalse();
Bundle.isAbilityEnabled(abilityInfo3, (error, data) => { Bundle.isAbilityEnabled(abilityInfo3, (error, data) => {
expect(error).assertEqual(0); expect(error.code).assertEqual(0);
expect(data).assertFalse(); expect(data).assertFalse();
Bundle.isAbilityEnabled(abilityInfo7, (error, data) => { Bundle.isAbilityEnabled(abilityInfo7, (error, data) => {
expect(error).assertEqual(0); expect(error.code).assertEqual(0);
expect(data).assertFalse(); expect(data).assertFalse();
done(); done();
}); });
...@@ -144,26 +144,26 @@ export default function isAbilityEnabledETSUnit() { ...@@ -144,26 +144,26 @@ export default function isAbilityEnabledETSUnit() {
Bundle.isAbilityEnabled(abilityInfo4).then((data) => { Bundle.isAbilityEnabled(abilityInfo4).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(2); expect(error.code).assertEqual(2);
}); });
Bundle.isAbilityEnabled(abilityInfo5).then((data) => { Bundle.isAbilityEnabled(abilityInfo5).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(2); expect(error.code).assertEqual(2);
}); });
Bundle.isAbilityEnabled(abilityInfo6).then((data) => { Bundle.isAbilityEnabled(abilityInfo6).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(2); expect(error.code).assertEqual(2);
}); });
Bundle.isAbilityEnabled(abilityInfo4, (error, data) => { Bundle.isAbilityEnabled(abilityInfo4, (error, data) => {
expect(error).assertEqual(2); expect(error.code).assertEqual(2);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
Bundle.isAbilityEnabled(abilityInfo5, (error, data) => { Bundle.isAbilityEnabled(abilityInfo5, (error, data) => {
expect(error).assertEqual(2); expect(error.code).assertEqual(2);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
Bundle.isAbilityEnabled(abilityInfo6, (error, data) => { Bundle.isAbilityEnabled(abilityInfo6, (error, data) => {
expect(error).assertEqual(2); expect(error.code).assertEqual(2);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
done(); done();
}); });
...@@ -184,7 +184,7 @@ export default function isAbilityEnabledETSUnit() { ...@@ -184,7 +184,7 @@ export default function isAbilityEnabledETSUnit() {
expect(error).assertFail(); expect(error).assertFail();
}); });
Bundle.isAbilityEnabled(abilityInfo, (error, data) => { Bundle.isAbilityEnabled(abilityInfo, (error, data) => {
expect(error).assertEqual(0); expect(error.code).assertEqual(0);
expect(data).assertTrue(); expect(data).assertTrue();
done(); done();
}); });
......
...@@ -42,7 +42,7 @@ export default function IsApplicationEnabledETSUnit() { ...@@ -42,7 +42,7 @@ export default function IsApplicationEnabledETSUnit() {
Bundle.isApplicationEnabled(BUNDLE_NAME, (error, data) => { Bundle.isApplicationEnabled(BUNDLE_NAME, (error, data) => {
let timeNewStamp = Utils.getNowTime(); let timeNewStamp = Utils.getNowTime();
Utils.getDurationTime('[context_isApplicationEnabled_test_0200]', timeOldStamp, timeNewStamp); Utils.getDurationTime('[context_isApplicationEnabled_test_0200]', timeOldStamp, timeNewStamp);
expect(error).assertEqual(undefined); expect(error.code).assertEqual(0);
expect(data).assertTrue(); expect(data).assertTrue();
done(); done();
}); });
...@@ -67,16 +67,16 @@ export default function IsApplicationEnabledETSUnit() { ...@@ -67,16 +67,16 @@ export default function IsApplicationEnabledETSUnit() {
await Bundle.isApplicationEnabled(undefined).then((data) => { await Bundle.isApplicationEnabled(undefined).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(2); expect(error.code).assertEqual(2);
}); });
Bundle.isApplicationEnabled(BUNDLE_NAME_ERROR, (error, data) => { Bundle.isApplicationEnabled(BUNDLE_NAME_ERROR, (error, data) => {
expect(error).assertEqual(undefined); expect(error.code).assertEqual(0);
expect(data).assertFalse(); expect(data).assertFalse();
Bundle.isApplicationEnabled("", (error, data) => { Bundle.isApplicationEnabled("", (error, data) => {
expect(error).assertEqual(undefined); expect(error.code).assertEqual(0);
expect(data).assertFalse(); expect(data).assertFalse();
Bundle.isApplicationEnabled(undefined, (error, data) => { Bundle.isApplicationEnabled(undefined, (error, data) => {
expect(error).assertEqual(2); expect(error.code).assertEqual(2);
expect(data).assertEqual(undefined); expect(data).assertEqual(undefined);
done(); done();
}); });
...@@ -98,7 +98,7 @@ export default function IsApplicationEnabledETSUnit() { ...@@ -98,7 +98,7 @@ export default function IsApplicationEnabledETSUnit() {
}); });
timeOldStamp = await Utils.getNowTime(); timeOldStamp = await Utils.getNowTime();
Bundle.isApplicationEnabled(BUNDLE_NAME_OTHER, (error, data) => { Bundle.isApplicationEnabled(BUNDLE_NAME_OTHER, (error, data) => {
expect(error).assertEqual(undefined); expect(error.code).assertEqual(0);
expect(data).assertTrue(); expect(data).assertTrue();
done(); done();
}); });
......
...@@ -187,7 +187,7 @@ export default function getAllApplicationBundleTest() { ...@@ -187,7 +187,7 @@ export default function getAllApplicationBundleTest() {
Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId, (error, data) => { Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId, (error, data) => {
let endTime = Utils.getNowTime(); let endTime = Utils.getNowTime();
Utils.getDurationTime(TAG_TEST_0300_001, startTime, endTime); Utils.getDurationTime(TAG_TEST_0300_001, startTime, endTime);
if (error) { if (error.code != 0) {
expect(error).assertFail(); expect(error).assertFail();
console.info(TAG_TEST_0300_001 + 'UserId callBack error: ' + error); console.info(TAG_TEST_0300_001 + 'UserId callBack error: ' + error);
} }
...@@ -214,7 +214,7 @@ export default function getAllApplicationBundleTest() { ...@@ -214,7 +214,7 @@ export default function getAllApplicationBundleTest() {
Bundle.getAllApplicationInfo(Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, (error, data) => { Bundle.getAllApplicationInfo(Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, (error, data) => {
let endTime = Utils.getNowTime(); let endTime = Utils.getNowTime();
Utils.getDurationTime(TAG_TEST_0400_001, startTime, endTime); Utils.getDurationTime(TAG_TEST_0400_001, startTime, endTime);
if (error) { if (error.code != 0) {
expect(error).assertFail(); expect(error).assertFail();
console.info(TAG_TEST_0400_001 + 'UserId callBack error: ' + error); console.info(TAG_TEST_0400_001 + 'UserId callBack error: ' + error);
} }
...@@ -249,7 +249,7 @@ export default function getAllApplicationBundleTest() { ...@@ -249,7 +249,7 @@ export default function getAllApplicationBundleTest() {
expect(error).assertFail(); expect(error).assertFail();
}); });
Bundle.getAllApplicationInfo(DEFAULT_FLAG, (err, data) => { Bundle.getAllApplicationInfo(DEFAULT_FLAG, (err, data) => {
expect(err).assertEqual(0); expect(err.code).assertEqual(0);
expect(data.length).assertLarger(10); expect(data.length).assertLarger(10);
let flag = 0; let flag = 0;
for(let i in data){ for(let i in data){
...@@ -272,19 +272,17 @@ export default function getAllApplicationBundleTest() { ...@@ -272,19 +272,17 @@ export default function getAllApplicationBundleTest() {
await Bundle.getAllApplicationInfo(null).then((data) => { await Bundle.getAllApplicationInfo(null).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
}); });
await Bundle.getAllApplicationInfo(undefined).then((data) => { await Bundle.getAllApplicationInfo(undefined).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
}); });
Bundle.getAllApplicationInfo(undefined, (err, data) => { Bundle.getAllApplicationInfo(undefined, (err, data) => {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
expect(data).assertEqual("type mismatch");
Bundle.getAllApplicationInfo(null, (err, data) => { Bundle.getAllApplicationInfo(null, (err, data) => {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
expect(data).assertEqual("type mismatch");
done(); done();
}); });
}); });
......
...@@ -195,7 +195,7 @@ export default function applicationBundleJsunit() { ...@@ -195,7 +195,7 @@ export default function applicationBundleJsunit() {
let endTime = Utils.getNowTime(); let endTime = Utils.getNowTime();
Utils.getDurationTime(TAG_TEST_0300_001, startTime, endTime); Utils.getDurationTime(TAG_TEST_0300_001, startTime, endTime);
errors = error; errors = error;
if (errors) { if (errors.code != 0) {
expect(errors).assertFail(); expect(errors).assertFail();
console.info(TAG_TEST_0300_001 + 'UserId callBack error: ' + error); console.info(TAG_TEST_0300_001 + 'UserId callBack error: ' + error);
} }
...@@ -223,7 +223,7 @@ export default function applicationBundleJsunit() { ...@@ -223,7 +223,7 @@ export default function applicationBundleJsunit() {
Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, (error, data) => { Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, (error, data) => {
let endTime = Utils.getNowTime(); let endTime = Utils.getNowTime();
errors = error; errors = error;
if (errors) { if (errors.code != 0) {
expect(errors).assertFail(); expect(errors).assertFail();
console.info(TAG_TEST_0400_001 + 'UserId callBack error: ' + error); console.info(TAG_TEST_0400_001 + 'UserId callBack error: ' + error);
} }
...@@ -232,7 +232,7 @@ export default function applicationBundleJsunit() { ...@@ -232,7 +232,7 @@ export default function applicationBundleJsunit() {
datas = data; datas = data;
}); });
await Utils.sleep(2000); await Utils.sleep(2000);
console.info(TAG_TEST_0400_001 + 'noUserId callBack data is: ' + JSON.stringify(datas)); console.info(TAG_TEST_0400_001 + 'noUserId callBack datas is: ' + JSON.stringify(datas));
expectData(TAG_TEST_0400_001, datas); expectData(TAG_TEST_0400_001, datas);
getApplicationInfoSuccess(TAG_TEST_0400_001, datas); getApplicationInfoSuccess(TAG_TEST_0400_001, datas);
done(); done();
...@@ -254,7 +254,7 @@ export default function applicationBundleJsunit() { ...@@ -254,7 +254,7 @@ export default function applicationBundleJsunit() {
}).catch((error) => { }).catch((error) => {
console.info(TAG_TEST_0600_002 + 'other bundleName UserId promise error is: ' + error); console.info(TAG_TEST_0600_002 + 'other bundleName UserId promise error is: ' + error);
errors = error errors = error
expect(errors).assertEqual(1); expect(errors.code).assertEqual(1);
}); });
let endTime = Utils.getNowTime(); let endTime = Utils.getNowTime();
Utils.getDurationTime(TAG_TEST_0600_002, startTime, endTime); Utils.getDurationTime(TAG_TEST_0600_002, startTime, endTime);
...@@ -284,7 +284,7 @@ export default function applicationBundleJsunit() { ...@@ -284,7 +284,7 @@ export default function applicationBundleJsunit() {
console.info(TAG_TEST_0600_003 + 'noUserId promise data is: ' + data); console.info(TAG_TEST_0600_003 + 'noUserId promise data is: ' + data);
expectData(TAG_TEST_0600_003, data); expectData(TAG_TEST_0600_003, data);
getApplicationInfoSuccess_plus(TAG_TEST_0600_003, data); getApplicationInfoSuccess_plus(TAG_TEST_0600_003, data);
expect(err).assertEqual(0); expect(err.code).assertEqual(0);
done(); done();
}); });
}); });
...@@ -303,7 +303,7 @@ export default function applicationBundleJsunit() { ...@@ -303,7 +303,7 @@ export default function applicationBundleJsunit() {
}); });
Bundle.getApplicationInfo(BUNDLE_OTHER, FLAG_DEFAULT, (err, data) => { Bundle.getApplicationInfo(BUNDLE_OTHER, FLAG_DEFAULT, (err, data) => {
console.info('noUserId promise data is: ' + data); console.info('noUserId promise data is: ' + data);
expect(err).assertEqual(0); expect(err.code).assertEqual(0);
getApplicationInfoSuccessOther(data); getApplicationInfoSuccessOther(data);
done(); done();
}); });
...@@ -319,7 +319,7 @@ export default function applicationBundleJsunit() { ...@@ -319,7 +319,7 @@ export default function applicationBundleJsunit() {
await Bundle.getApplicationInfo(BUNDLE_NOTEXIST, FLAG_DEFAULT).then((data) => { await Bundle.getApplicationInfo(BUNDLE_NOTEXIST, FLAG_DEFAULT).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
let endTime = Utils.getNowTime(); let endTime = Utils.getNowTime();
Utils.getDurationTime(TAG_TEST_0600_001, startTime, endTime); Utils.getDurationTime(TAG_TEST_0600_001, startTime, endTime);
}); });
...@@ -327,7 +327,7 @@ export default function applicationBundleJsunit() { ...@@ -327,7 +327,7 @@ export default function applicationBundleJsunit() {
await Bundle.getApplicationInfo(BUNDLE_NOTEXIST, FLAG_DEFAULT, (err, data) => { await Bundle.getApplicationInfo(BUNDLE_NOTEXIST, FLAG_DEFAULT, (err, data) => {
let endTime = Utils.getNowTime(); let endTime = Utils.getNowTime();
Utils.getDurationTime(TAG_TEST_0600_001, startTime, endTime); Utils.getDurationTime(TAG_TEST_0600_001, startTime, endTime);
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
expect(JSON.stringify(data)).assertEqual(undefined); expect(JSON.stringify(data)).assertEqual(undefined);
done(); done();
}); });
...@@ -342,27 +342,25 @@ export default function applicationBundleJsunit() { ...@@ -342,27 +342,25 @@ export default function applicationBundleJsunit() {
await Bundle.getApplicationInfo('', FLAG_DEFAULT).then((data) => { await Bundle.getApplicationInfo('', FLAG_DEFAULT).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
}); });
await Bundle.getApplicationInfo(null, FLAG_DEFAULT).then((data) => { await Bundle.getApplicationInfo(null, FLAG_DEFAULT).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
}); });
await Bundle.getApplicationInfo(BUNDLE_NAME, null).then((data) => { await Bundle.getApplicationInfo(BUNDLE_NAME, null).then((data) => {
expect(data).assertFail(); expect(data).assertFail();
}).catch((error) => { }).catch((error) => {
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
}); });
Bundle.getApplicationInfo('', FLAG_DEFAULT, (err, data) => { Bundle.getApplicationInfo('', FLAG_DEFAULT, (err, data) => {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
expect(JSON.stringify(data)).assertEqual(undefined); expect(JSON.stringify(data)).assertEqual(undefined);
Bundle.getApplicationInfo(null, FLAG_DEFAULT, (err, data) => { Bundle.getApplicationInfo(null, FLAG_DEFAULT, (err, data) => {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
expect(data).assertEqual("type mismatch");
Bundle.getApplicationInfo(BUNDLE_NAME, null, (err, data) => { Bundle.getApplicationInfo(BUNDLE_NAME, null, (err, data) => {
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
expect(data).assertEqual("type mismatch");
done(); done();
}); });
}); });
...@@ -393,7 +391,7 @@ export default function applicationBundleJsunit() { ...@@ -393,7 +391,7 @@ export default function applicationBundleJsunit() {
Bundle.getApplicationInfo(BUNDLE_NAME, Bundle.getApplicationInfo(BUNDLE_NAME,
Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_CERTIFICATE_FINGERPRINT, (error, data) => { Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_CERTIFICATE_FINGERPRINT, (error, data) => {
expect(data.fingerprint).assertEqual(TEST_DEMO); expect(data.fingerprint).assertEqual(TEST_DEMO);
expect(error).assertEqual(0); expect(error.code).assertEqual(0);
done(); done();
}); });
}); });
......
...@@ -114,7 +114,7 @@ export default function getBundleArchiveInfo() { ...@@ -114,7 +114,7 @@ export default function getBundleArchiveInfo() {
done() done()
}).catch(err => { }).catch(err => {
console.info("getBundleArchiveInfo fail" + JSON.stringify(err)) console.info("getBundleArchiveInfo fail" + JSON.stringify(err))
expect(err).assertEqual(1) expect(err.code).assertEqual(1)
done() done()
}) })
}) })
...@@ -131,7 +131,7 @@ export default function getBundleArchiveInfo() { ...@@ -131,7 +131,7 @@ export default function getBundleArchiveInfo() {
done() done()
}).catch(err => { }).catch(err => {
console.info("getBundleArchiveInfo fail" + JSON.stringify(err)) console.info("getBundleArchiveInfo fail" + JSON.stringify(err))
expect(err).assertEqual(1) expect(err.code).assertEqual(1)
done() done()
}) })
}) })
...@@ -232,7 +232,7 @@ export default function getBundleArchiveInfo() { ...@@ -232,7 +232,7 @@ export default function getBundleArchiveInfo() {
function OnReceiveEvent(err, datainfo) { function OnReceiveEvent(err, datainfo) {
if (err) { if (err) {
console.info("getBundleArchiveInfo error" + JSON.stringify(err)); console.info("getBundleArchiveInfo error" + JSON.stringify(err));
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
done(); done();
return; return;
} }
...@@ -252,7 +252,7 @@ export default function getBundleArchiveInfo() { ...@@ -252,7 +252,7 @@ export default function getBundleArchiveInfo() {
function OnReceiveEvent(err, datainfo) { function OnReceiveEvent(err, datainfo) {
if (err) { if (err) {
console.info("getBundleArchiveInfo error" + JSON.stringify(err)); console.info("getBundleArchiveInfo error" + JSON.stringify(err));
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
done(); done();
return; return;
} }
......
...@@ -739,7 +739,7 @@ describe('ActsBundleManagerTest', function () { ...@@ -739,7 +739,7 @@ describe('ActsBundleManagerTest', function () {
await demo.getApplicationInfo(NAME1, await demo.getApplicationInfo(NAME1,
demo.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION | demo.BundleFlag.GET_APPLICATION_INFO_WITH_METADATA, demo.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION | demo.BundleFlag.GET_APPLICATION_INFO_WITH_METADATA,
userId, (error, datainfo) => { userId, (error, datainfo) => {
if (error) { if (error.code != 0) {
console.info("testGetApplicationInfoMetaDataCallback fail:" + JSON.stringify(error)); console.info("testGetApplicationInfoMetaDataCallback fail:" + JSON.stringify(error));
expect(error).assertFail(); expect(error).assertFail();
done(); done();
...@@ -909,7 +909,7 @@ describe('ActsBundleManagerTest', function () { ...@@ -909,7 +909,7 @@ describe('ActsBundleManagerTest', function () {
done(); done();
}).catch(err => { }).catch(err => {
console.info("testGetApplicationInfoNotExistCallback err" + JSON.stringify(err)); console.info("testGetApplicationInfoNotExistCallback err" + JSON.stringify(err));
expect(err).assertEqual(1); expect(err.code).assertEqual(1);
done(); done();
}); });
}) })
...@@ -924,7 +924,7 @@ describe('ActsBundleManagerTest', function () { ...@@ -924,7 +924,7 @@ describe('ActsBundleManagerTest', function () {
userId, (error, datainfo) => { userId, (error, datainfo) => {
if (error) { if (error) {
console.info("testGetApplicationInfoNotExistPromise fail" + JSON.stringify(error)); console.info("testGetApplicationInfoNotExistPromise fail" + JSON.stringify(error));
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
done(); done();
return; return;
} }
...@@ -947,7 +947,7 @@ describe('ActsBundleManagerTest', function () { ...@@ -947,7 +947,7 @@ describe('ActsBundleManagerTest', function () {
done(); done();
}).catch(error => { }).catch(error => {
console.info("testGetApplicationInfoInvalidParamPromise err" + JSON.stringify(error)); console.info("testGetApplicationInfoInvalidParamPromise err" + JSON.stringify(error));
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
done(); done();
}); });
}) })
...@@ -962,7 +962,7 @@ describe('ActsBundleManagerTest', function () { ...@@ -962,7 +962,7 @@ describe('ActsBundleManagerTest', function () {
userId, (error, datainfo) => { userId, (error, datainfo) => {
if (error) { if (error) {
console.info("testGetApplicationInfoInvalidParamCallback fail" + JSON.stringify(error)); console.info("testGetApplicationInfoInvalidParamCallback fail" + JSON.stringify(error));
expect(error).assertEqual(1); expect(error.code).assertEqual(1);
done(); done();
return; return;
} }
...@@ -1005,7 +1005,7 @@ describe('ActsBundleManagerTest', function () { ...@@ -1005,7 +1005,7 @@ describe('ActsBundleManagerTest', function () {
*/ */
it('testGetApplicationInfoDifferentParamCallback', 0, async function (done) { it('testGetApplicationInfoDifferentParamCallback', 0, async function (done) {
await demo.getApplicationInfo(NAME1, demo.BundleFlag.GET_BUNDLE_DEFAULT, userId, (error, datainfo) => { await demo.getApplicationInfo(NAME1, demo.BundleFlag.GET_BUNDLE_DEFAULT, userId, (error, datainfo) => {
if (error) { if (error.code != 0) {
console.info("testGetApplicationInfoDifferentParamCallback fail" + JSON.stringify(error)); console.info("testGetApplicationInfoDifferentParamCallback fail" + JSON.stringify(error));
expect(error).assertFail(); expect(error).assertFail();
done(); done();
...@@ -1066,7 +1066,7 @@ describe('ActsBundleManagerTest', function () { ...@@ -1066,7 +1066,7 @@ describe('ActsBundleManagerTest', function () {
it('testGetApplicationInfoCallback', 0, async function (done) { it('testGetApplicationInfoCallback', 0, async function (done) {
await demo.getApplicationInfo(NAME1, demo.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId, await demo.getApplicationInfo(NAME1, demo.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId,
(error, datainfo) => { (error, datainfo) => {
if (error) { if (error.code != 0) {
console.info("testGetApplicationInfoCallback fail:" + JSON.stringify(error)); console.info("testGetApplicationInfoCallback fail:" + JSON.stringify(error));
expect(error).assertFail(); expect(error).assertFail();
done(); done();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册