diff --git a/appexecfwk/bundle_standard/bundlemanager/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/BUILD.gn index 6160417b9634d61cdab74937a91ace6806cc9f56..1f9064da33b1f74db154c938321489b61ba4ffe4 100755 --- a/appexecfwk/bundle_standard/bundlemanager/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/BUILD.gn @@ -26,7 +26,8 @@ group("bundlemanager") { "actsbmsmoduleusagerecordtest:ActsBmsModuleUsageRecordTest", "actsbundlemanagertest:ActsBundleManagerTest", "actsbundlemanageruninstall:ActsBundleManagerUninstall", - "bmscheckpermissiontest:BmsCheckPermissionTest", + + # "bmscheckpermissiontest:BmsCheckPermissionTest", "sceneProject/bmsgetinfosfifthscene:bmsThirdBundleTest5", "sceneProject/bmsgetinfosfirstscene:bmsThirdBundleTest1", "sceneProject/bmsgetinfosfirstsceneupdate:bmsThirdBundleTestA1", diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/entry/src/main/js/test/ActsBmsAllShortcutInfoTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/entry/src/main/js/test/ActsBmsAllShortcutInfoTest.test.js index 362daa6493c12a1b9ac83320ea2f42fa9f061712..1b68ad63d07c4eeae32b3ef026dd8713b6a5e7ea 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/entry/src/main/js/test/ActsBmsAllShortcutInfoTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/entry/src/main/js/test/ActsBmsAllShortcutInfoTest.test.js @@ -16,7 +16,6 @@ import bundle from '@ohos.bundle' import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' -const TIMEOUT = 1000; const NAMECOUNT = 10000; describe('ActsBmsAllShortcutInfoTest', function () { @@ -29,45 +28,51 @@ describe('ActsBmsAllShortcutInfoTest', function () { it('bms_getAllShortcutInfo_0100', 0, async function (done) { console.info('=====================bms_getAllShortcutInfo_0100=================='); var bundlePath = ['/data/test/bmsThirdBundleTest1.hap']; - await install(bundlePath); var bundleName = 'com.example.third1'; - bundle.getAllShortcutInfo(bundleName).then(async(data) => { - for (var i = 0; i < data.length; i++) { - expect(data[i].id).assertEqual('id.third1'); - console.info('==========data[i].id==========' + data[i].id) - expect(data[i].bundleName).assertEqual('com.example.third1'); - console.info('==========data[i].bundleName==========' + data[i].bundleName) - expect(data[i].hostAbility).assertEqual(""); - console.info('==========data[i].hostAbility==========' + data[i].hostAbility) - expect(data[i].icon).assertEqual('$media:icon'); - console.info('==========data[i].icon==========' + data[i].icon) - expect(data[i].label).assertEqual('$string:app_name'); - console.info('==========data[i].label==========' + data[i].label) - expect(data[i].disableMessage).assertEqual(""); - console.info('==========data[i].disableMessage==========' + data[i].disableMessage) - expect(data[i].isStatic).assertEqual(false); - console.info('==========data[i].isStatic==========' + data[i].isStatic) - expect(data[i].isHomeShortcut).assertEqual(false); - console.info('==========data[i].isHomeShortcut==========' + data[i].isHomeShortcut) - expect(data[i].isEnabled).assertEqual(false); - console.info('==========data[i].isEnabled==========' + data[i].isEnabled) - for (var j = 0; j < data[i].wants.length; j++) { - console.info('==========data[i].wants[j].targetClass==========' + data[i].wants[j].targetClass) - expect(data[i].wants[j].targetClass).assertEqual('com.example.third1.MainAbility'); - console.info('==========data[i].wants[j].targetBundle==========' + data[i].wants[j].targetBundle) - expect(data[i].wants[j].targetBundle).assertEqual('com.example.third1'); + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, OnReceiveInstallEvent); + + async function OnReceiveInstallEvent(err, data) { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + let shortInfos = await bundle.getAllShortcutInfo(bundleName) + expect(typeof shortInfos).assertEqual('object'); + expect(shortInfos.length).assertEqual(1); + for (var i = 0; i < shortInfos.length; i++) { + expect(shortInfos[i].id).assertEqual('id.third1'); + expect(shortInfos[i].bundleName).assertEqual('com.example.third1'); + expect(shortInfos[i].hostAbility).assertEqual(""); + expect(shortInfos[i].icon).assertEqual('$media:icon'); + expect(shortInfos[i].label).assertEqual('$string:app_name'); + expect(shortInfos[i].disableMessage).assertEqual(""); + expect(shortInfos[i].isStatic).assertEqual(false); + expect(shortInfos[i].isHomeShortcut).assertEqual(false); + expect(shortInfos[i].isEnabled).assertEqual(false); + for (var j = 0; j < shortInfos[i].wants.length; j++) { + expect(shortInfos[i].wants[j].targetClass).assertEqual('com.example.third1.MainAbility'); + expect(shortInfos[i].wants[j].targetBundle).assertEqual('com.example.third1'); } } - expect(typeof data).assertEqual('object'); - expect(data.length).assertEqual(1); - checkShortcutIsExist(data, 'id.third1', 'third1'); - await uninstall('com.example.third1'); + checkShortcutIsExist(shortInfos, 'id.third1', 'third1'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, OnReceiveUninstallEvent); done(); - - }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0100==================end'); - }, TIMEOUT) + }; + function OnReceiveUninstallEvent(err, data) { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + }; }); /* @@ -78,18 +83,36 @@ describe('ActsBmsAllShortcutInfoTest', function () { it('bms_getAllShortcutInfo_0200', 0, async function (done) { console.info('=====================bms_getAllShortcutInfo_0200=================='); var bundlePath = ['/data/test/bmsThirdBundleTest1.hap']; - await install(bundlePath); var bundleName = 'com.example.third1'; - bundle.getAllShortcutInfo(bundleName, async(result, data) => { - expect(result.code).assertEqual(0); - expect(data.length).assertEqual(1); - checkShortcutIsExist(data, 'id.third1', 'third1'); - await uninstall('com.example.third1'); - done(); - }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0200==================end'); - }, TIMEOUT) + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, OnReceiveInstallEvent); + + function OnReceiveInstallEvent(err, data) { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + bundle.getAllShortcutInfo(bundleName, async (result, shortcutInfos) => { + expect(result.code).assertEqual(0); + expect(shortcutInfos.length).assertEqual(1); + checkShortcutIsExist(shortcutInfos, 'id.third1', 'third1'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); + } }) /* @@ -102,17 +125,33 @@ describe('ActsBmsAllShortcutInfoTest', function () { console.info('=====================bms_getAllShortcutInfo_0300=================='); var bundleName = 'com.example.third1'; var bundlePath = ['/data/test/bmsThirdBundleTest1.hap', '/data/test/bmsThirdBundleTest3.hap']; - await install(bundlePath); - var data = await bundle.getAllShortcutInfo(bundleName); - expect(typeof data).assertEqual('object'); - expect(data.length).assertEqual(2); - checkShortcutIsExist(data, 'id.third1', 'third1'); - checkShortcutIsExist(data, 'id.third3', 'third3'); - await uninstall('com.example.third1'); - done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0300==================end'); - }, TIMEOUT) + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + var shortInfos = await bundle.getAllShortcutInfo(bundleName); + expect(typeof shortInfos).assertEqual('object'); + expect(shortInfos.length).assertEqual(2); + checkShortcutIsExist(shortInfos, 'id.third1', 'third1'); + checkShortcutIsExist(shortInfos, 'id.third3', 'third3'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); }) /* @@ -123,19 +162,35 @@ describe('ActsBmsAllShortcutInfoTest', function () { it('bms_getAllShortcutInfo_0400', 0, async function (done) { console.info('=====================bms_getAllShortcutInfo_0400=================='); var bundlePath = ['/data/test/bmsThirdBundleTest1.hap', '/data/test/bmsThirdBundleTest3.hap']; - await install(bundlePath); var bundleName = 'com.example.third1'; - bundle.getAllShortcutInfo(bundleName, async (result, data) => { - expect(result.code).assertEqual(0); - expect(data.length).assertEqual(2); - checkShortcutIsExist(data, 'id.third1', 'third1'); - checkShortcutIsExist(data, 'id.third3', 'third3'); - await uninstall('com.example.third1'); - done(); + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + bundle.getAllShortcutInfo(bundleName, async (result, shortInfos) => { + expect(result.code).assertEqual(0); + expect(shortInfos.length).assertEqual(2); + checkShortcutIsExist(shortInfos, 'id.third1', 'third1'); + checkShortcutIsExist(shortInfos, 'id.third3', 'third3'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0400==================end'); - }, TIMEOUT) }) /* @@ -149,9 +204,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { expect(typeof data).assertEqual('object'); expect(data.length).assertEqual(0); done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0500==================end'); - }, TIMEOUT) }) /* @@ -167,9 +219,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { expect(data.length).assertEqual(0); done(); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0600==================end'); - }, TIMEOUT) }) /* @@ -182,35 +231,60 @@ describe('ActsBmsAllShortcutInfoTest', function () { it('bms_getAllShortcutInfo_0700', 0, async function (done) { console.info('=====================bms_getAllShortcutInfo_0700=================='); var bundlePath1 = ['/data/test/bmsThirdBundleTest1.hap']; - await install(bundlePath1); var bundleName = 'com.example.third1'; var bundlePath2 = ['/data/test/bmsThirdBundleTestA1.hap']; - await install(bundlePath2); - var data = await bundle.getAllShortcutInfo(bundleName); - expect(typeof data).assertEqual('object'); - expect(data.length).assertEqual(1); - for (var i = 0; i < data.length; i++) { - expect(typeof data[i]).assertEqual('object'); - expect(typeof data[i].id).assertEqual('string'); - expect(data[i].id).assertEqual('id.thirdA1'); - expect(typeof data[i].disableMessage).assertEqual('string'); - expect(typeof data[i].isStatic).assertEqual('boolean'); - expect(typeof data[i].isHomeShortcut).assertEqual('boolean'); - expect(typeof data[i].isEnabled).assertEqual('boolean'); - expect(typeof data[i].hostAbility).assertEqual('string'); - expect(typeof data[i].wants).assertEqual('object') - if (typeof data[i].wants != 'undefined' && Object.keys(data[i].wants).length != 0) { - for (var j = 0; j < data[i].wants.length; j++) { - expect(data[i].wants[j].targetClass).assertEqual('com.example.third1.AMainAbility'); - expect(data[i].wants[j].targetBundle).assertEqual('com.example.third1'); - } + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath1, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - } - await uninstall('com.example.third1') - done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0700==================end'); - }, TIMEOUT) + }, async (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + installer.install(bundlePath2, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + var shortInfos = await bundle.getAllShortcutInfo(bundleName); + expect(typeof shortInfos).assertEqual('object'); + expect(shortInfos.length).assertEqual(1); + for (var i = 0; i < shortInfos.length; i++) { + expect(typeof shortInfos[i]).assertEqual('object'); + expect(typeof shortInfos[i].id).assertEqual('string'); + expect(shortInfos[i].id).assertEqual('id.thirdA1'); + expect(typeof shortInfos[i].disableMessage).assertEqual('string'); + expect(typeof shortInfos[i].isStatic).assertEqual('boolean'); + expect(typeof shortInfos[i].isHomeShortcut).assertEqual('boolean'); + expect(typeof shortInfos[i].isEnabled).assertEqual('boolean'); + expect(typeof shortInfos[i].hostAbility).assertEqual('string'); + expect(typeof shortInfos[i].wants).assertEqual('object') + if (typeof shortInfos[i].wants != 'undefined' && Object.keys(shortInfos[i].wants).length != 0) { + for (var j = 0; j < shortInfos[i].wants.length; j++) { + expect(shortInfos[i].wants[j].targetClass).assertEqual('com.example.third1.AMainAbility'); + expect(shortInfos[i].wants[j].targetBundle).assertEqual('com.example.third1'); + } + } + } + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); + }); }) /* @@ -222,35 +296,60 @@ describe('ActsBmsAllShortcutInfoTest', function () { console.info('=====================bms_getAllShortcutInfo_0800=================='); var bundleName = 'com.example.third1'; var bundlePath1 = ['/data/test/bmsThirdBundleTest1.hap']; - await install(bundlePath1); var bundlePath2 = ['/data/test/bmsThirdBundleTestA1.hap']; - await install(bundlePath2); - bundle.getAllShortcutInfo(bundleName, async (result, data) => { - expect(result.code).assertEqual(0); - expect(data.length).assertEqual(1); - for (var i = 0; i < data.length; i++) { - expect(typeof data[i]).assertEqual('object'); - expect(typeof data[i].id).assertEqual('string'); - expect(data[i].id).assertEqual('id.thirdA1'); - expect(typeof data[i].disableMessage).assertEqual('string'); - expect(typeof data[i].isStatic).assertEqual('boolean'); - expect(typeof data[i].isHomeShortcut).assertEqual('boolean'); - expect(typeof data[i].isEnabled).assertEqual('boolean'); - expect(typeof data[i].hostAbility).assertEqual('string'); - expect(typeof data[i].wants).assertEqual('object') - if (typeof data[i].wants != 'undefined' && Object.keys(data[i].wants).length != 0) { - for (var j = 0; j < data[i].wants.length; j++) { - expect(data[i].wants[j].targetClass).assertEqual('com.example.third1.AMainAbility'); - expect(data[i].wants[j].targetBundle).assertEqual('com.example.third1'); - } - } + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath1, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - await uninstall('com.example.third1'); - done(); + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + installer.install(bundlePath2, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + bundle.getAllShortcutInfo(bundleName, async (result, shortInfos) => { + expect(result.code).assertEqual(0); + expect(shortInfos.length).assertEqual(1); + for (var i = 0; i < shortInfos.length; i++) { + expect(typeof shortInfos[i]).assertEqual('object'); + expect(typeof shortInfos[i].id).assertEqual('string'); + expect(shortInfos[i].id).assertEqual('id.thirdA1'); + expect(typeof shortInfos[i].disableMessage).assertEqual('string'); + expect(typeof shortInfos[i].isStatic).assertEqual('boolean'); + expect(typeof shortInfos[i].isHomeShortcut).assertEqual('boolean'); + expect(typeof shortInfos[i].isEnabled).assertEqual('boolean'); + expect(typeof shortInfos[i].hostAbility).assertEqual('string'); + expect(typeof shortInfos[i].wants).assertEqual('object') + if (typeof shortInfos[i].wants != 'undefined' && Object.keys(shortInfos[i].wants).length != 0) { + for (var j = 0; j < shortInfos[i].wants.length; j++) { + expect(shortInfos[i].wants[j].targetClass).assertEqual('com.example.third1.AMainAbility'); + expect(shortInfos[i].wants[j].targetBundle).assertEqual('com.example.third1'); + } + } + } + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); + }); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0800==================end'); - }, TIMEOUT) }) /* @@ -262,15 +361,29 @@ describe('ActsBmsAllShortcutInfoTest', function () { console.info('=====================bms_getAllShortcutInfo_0900=================='); var bundleName = 'com.example.third2'; var bundlePath = ['/data/test/bmsThirdBundleTest2.hap']; - await install(bundlePath); - var data = await bundle.getAllShortcutInfo(bundleName); - expect(typeof data).assertEqual('object'); - expect(data.length).assertEqual(0); - await uninstall('com.example.third2') - done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_0900==================end'); - }, TIMEOUT) + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + var shortcutInfos = await bundle.getAllShortcutInfo(bundleName); + expect(typeof shortcutInfos).assertEqual('object'); + expect(shortcutInfos.length).assertEqual(0); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); }) /* @@ -282,16 +395,32 @@ describe('ActsBmsAllShortcutInfoTest', function () { console.info('=====================bms_getAllShortcutInfo_1000=================='); var bundleName = 'com.example.third2'; var bundlePath = ['/data/test/bmsThirdBundleTest2.hap']; - await install(bundlePath); - bundle.getAllShortcutInfo(bundleName, async (result, data) => { - expect(result.code).assertEqual(0); - expect(data.length).assertEqual(0); - await uninstall('com.example.third2'); - done(); + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + bundle.getAllShortcutInfo(bundleName, async (result, shortcutInfos) => { + expect(result.code).assertEqual(0); + expect(shortcutInfos.length).assertEqual(0); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1000==================end'); - }, TIMEOUT) }) /* @@ -307,9 +436,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { expect(data.length).assertEqual(1); checkShortcutIsExist(data, 'id.system1', 'system1'); done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1100==================end'); - }, TIMEOUT) }) /* @@ -326,9 +452,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { checkShortcutIsExist(data, 'id.system1', 'system1'); done(); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1200==================end'); - }, TIMEOUT) }) /* @@ -344,9 +467,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { expect(data.length).assertEqual(1); checkShortcutIsExist(data, 'id.vendor1', 'vendor1'); done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1300==================end'); - }, TIMEOUT) }) /* @@ -363,9 +483,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { checkShortcutIsExist(data, 'id.vendor1', 'vendor1'); done(); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1400==================end'); - }, TIMEOUT) }) /* @@ -378,19 +495,31 @@ describe('ActsBmsAllShortcutInfoTest', function () { it('bms_getAllShortcutInfo_1500', 0, async function (done) { console.info('=====================bms_getAllShortcutInfo_1500=================='); var bundlePath = ['/data/test/bmsThirdBundleTest1.hap']; - await install(bundlePath); var bundleName = 'com.example.third1'; - var data = await bundle.getAllShortcutInfo(bundleName); - expect(typeof data).assertEqual('object'); - expect(data.length).assertEqual(1); - checkShortcutIsExist(data, 'id.third1', 'third1'); - await uninstall('com.example.third1'); - var info = await bundle.getAllShortcutInfo(bundleName); - expect(info.length).assertEqual(0); - done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1500==================end'); - }, TIMEOUT) + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + var shortcutInfos = await bundle.getAllShortcutInfo(bundleName); + checkShortcutIsExist(shortcutInfos, 'id.third1', 'third1'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + var shortcutInfos = await bundle.getAllShortcutInfo(bundleName); + expect(shortcutInfos.length).assertEqual(0); + done(); + }); + }); }) /* @@ -401,21 +530,35 @@ describe('ActsBmsAllShortcutInfoTest', function () { it('bms_getAllShortcutInfo_1600', 0, async function (done) { console.info('=====================bms_getAllShortcutInfo_1600=================='); var bundlePath = ['/data/test/bmsThirdBundleTest1.hap']; - await install(bundlePath); var bundleName = 'com.example.third1'; - var data = await bundle.getAllShortcutInfo(bundleName); - expect(typeof data).assertEqual('object'); - expect(data.length).assertEqual(1); - checkShortcutIsExist(data, 'id.third1', 'third1'); - await uninstall('com.example.third1'); - bundle.getAllShortcutInfo(bundleName, async(result, data) => { - expect(result.code).assertEqual(-1); - expect(data.length).assertEqual(0); - done(); + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + var data = await bundle.getAllShortcutInfo(bundleName); + expect(typeof data).assertEqual('object'); + expect(data.length).assertEqual(1); + checkShortcutIsExist(data, 'id.third1', 'third1'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + bundle.getAllShortcutInfo(bundleName, async (result, data) => { + expect(result.code).assertEqual(-1); + expect(data.length).assertEqual(0); + done(); + }); + }); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1600==================end'); - }, TIMEOUT) }) /* @@ -427,17 +570,33 @@ describe('ActsBmsAllShortcutInfoTest', function () { console.info('=====================bms_getAllShortcutInfo_1700=================='); var bundleName = 'com.example.third4'; var bundlePath = ['/data/test/bmsThirdBundleTest4.hap']; - await install(bundlePath); - var data = await bundle.getAllShortcutInfo(bundleName); - expect(typeof data).assertEqual('object'); - expect(data.length).assertEqual(2); - checkShortcutIsExist(data, 'id.third4A', 'third4A'); - checkShortcutIsExist(data, 'id.third4B', 'third4B'); - await uninstall('com.example.third4') - done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1700==================end'); - }, TIMEOUT) + let installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + var shortcutInfos = await bundle.getAllShortcutInfo(bundleName); + expect(typeof shortcutInfos).assertEqual('object'); + expect(shortcutInfos.length).assertEqual(2); + checkShortcutIsExist(shortcutInfos, 'id.third4A', 'third4A'); + checkShortcutIsExist(shortcutInfos, 'id.third4B', 'third4B'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); }) /* @@ -448,19 +607,31 @@ describe('ActsBmsAllShortcutInfoTest', function () { it('bms_getAllShortcutInfo_1800', 0, async function (done) { console.info('=====================bms_getAllShortcutInfo_1800=================='); var bundleName = 'com.example.third4'; - var bundlePath = ['/data/test/bmsThirdBundleTest4.hap']; - await install(bundlePath); - bundle.getAllShortcutInfo(bundleName, async (result, data) => { - expect(result.code).assertEqual(0); - expect(data.length).assertEqual(2); - checkShortcutIsExist(data, 'id.third4A', 'third4A'); - checkShortcutIsExist(data, 'id.third4B', 'third4B'); - await uninstall('com.example.third4'); - done(); + let installer = await bundle.getBundleInstaller(); + installer.install(['/data/test/bmsThirdBundleTest4.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + bundle.getAllShortcutInfo(bundleName, async (result, shortcutInfos) => { + expect(result.code).assertEqual(0); + expect(shortcutInfos.length).assertEqual(2); + checkShortcutIsExist(shortcutInfos, 'id.third4A', 'third4A'); + checkShortcutIsExist(shortcutInfos, 'id.third4B', 'third4B'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.statusMessage).assertEqual("SUCCESS"); + done(); + }); + }); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1800==================end'); - }, TIMEOUT) }) /* @@ -475,9 +646,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { expect(data.length).assertEqual(0); done(); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_1900==================end'); - }, TIMEOUT) }) /* @@ -493,9 +661,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { expect(data.length).assertEqual(0); done(); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_2000==================end'); - }, TIMEOUT) }) /* @@ -513,9 +678,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { expect(typeof data).assertEqual('object'); expect(data.length).assertEqual(0); done(); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_2100==================end'); - }, TIMEOUT) }) /* @@ -534,9 +696,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { expect(data.length).assertEqual(0); done(); }); - setTimeout(function () { - console.info('=====================bms_getAllShortcutInfo_2200==================end'); - }, TIMEOUT) }) function checkShortcutInfo(dataInfo, name) { @@ -562,38 +721,6 @@ describe('ActsBmsAllShortcutInfoTest', function () { } } } - - async function install(bundlePath) { - let result = await bundle.getBundleInstaller(); - result.install(bundlePath, { - param: { - userId: 0, - installFlag: 1, - isKeepData: false - } - }, OnReceiveInstallEvent); - - function OnReceiveInstallEvent(err, data) { - expect(data.status).assertEqual(0); - expect(data.statusMessage).assertEqual("SUCCESS"); - }; - } - async function uninstall(bundleName) { - let result = await bundle.getBundleInstaller(); - result.uninstall(bundleName, { - param: { - userId: 0, - installFlag: 1, - isKeepData: false - } - }, OnReceiveUninstallEvent); - - function OnReceiveUninstallEvent(err, data) { - expect(data.status).assertEqual(0); - expect(data.statusMessage).assertEqual("SUCCESS"); - }; - } - function checkShortcutIsExist(dataInfo, shortcutId, testName) { let info = new Map(); for (var i = 0, len = dataInfo.length; i < len; i++) { diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmscheckpermissiontest/entry/src/main/js/test/ActsBmsCheckPermissionTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmscheckpermissiontest/entry/src/main/js/test/ActsBmsCheckPermissionTest.test.js index 84d28abd669322c47c64213e0a32144a99c84c35..8b6233adcce80efb679e4fb53a4bfa2938f73aeb 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmscheckpermissiontest/entry/src/main/js/test/ActsBmsCheckPermissionTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmscheckpermissiontest/entry/src/main/js/test/ActsBmsCheckPermissionTest.test.js @@ -19,7 +19,6 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from const BUNDLE_NAME = 'com.example.actsbmscheckpermissiontest'; const PERMISSION_ONE = 'com.permission.PERMISSION_A'; const PERMISSION_TWO = 'com.permission.PERMISSION_B'; -const TIMEOUT = 1000; const NAMECOUNT = 10000; describe('ActsBmsCheckPermissionTest', function () { @@ -34,9 +33,6 @@ describe('ActsBmsCheckPermissionTest', function () { var data = await bundle.checkPermission(BUNDLE_NAME, PERMISSION_ONE) expect(data).assertEqual(0); done(); - setTimeout(function () { - console.info('=====================bms_checkPermission_0100==================end'); - }, TIMEOUT) }) /* @@ -51,9 +47,6 @@ describe('ActsBmsCheckPermissionTest', function () { expect(data).assertEqual(0); done(); }) - setTimeout(function () { - console.info('=====================bms_checkPermission_0200==================end'); - }, TIMEOUT) }) /* @@ -67,9 +60,6 @@ describe('ActsBmsCheckPermissionTest', function () { var data = await bundle.checkPermission('', PERMISSION_ONE) expect(data).assertEqual(-1); done(); - setTimeout(function () { - console.info('=====================bms_checkPermission_0300==================end'); - }, TIMEOUT) }) /* @@ -85,9 +75,6 @@ describe('ActsBmsCheckPermissionTest', function () { expect(data).assertEqual(-1); done(); }) - setTimeout(function () { - console.info('=====================bms_checkPermission_0400==================end'); - }, TIMEOUT) }) /* @@ -101,9 +88,6 @@ describe('ActsBmsCheckPermissionTest', function () { var data = await bundle.checkPermission(BUNDLE_NAME, '') expect(data).assertEqual(-1); done(); - setTimeout(function () { - console.info('=====================bms_checkPermission_0500==================end'); - }, TIMEOUT) }) /* @@ -119,9 +103,6 @@ describe('ActsBmsCheckPermissionTest', function () { expect(data).assertEqual(-1); done(); }) - setTimeout(function () { - console.info('=====================bms_checkPermission_0600==================end'); - }, TIMEOUT) }) /* @@ -135,9 +116,6 @@ describe('ActsBmsCheckPermissionTest', function () { var data = await bundle.checkPermission(BUNDLE_NAME, '@\n,. 。测试@abc1^%12345') expect(data).assertEqual(-1); done(); - setTimeout(function () { - console.info('=====================bms_checkPermission_0700==================end'); - }, TIMEOUT) }) /* @@ -153,9 +131,6 @@ describe('ActsBmsCheckPermissionTest', function () { expect(data).assertEqual(-1); done(); }) - setTimeout(function () { - console.info('=====================bms_checkPermission_0800==================end'); - }, TIMEOUT) }) /* @@ -169,9 +144,6 @@ describe('ActsBmsCheckPermissionTest', function () { var data = await bundle.checkPermission('@\n,. 。测试@abc1^%12345', PERMISSION_ONE) expect(data).assertEqual(-1); done(); - setTimeout(function () { - console.info('=====================bms_checkPermission_0900==================end'); - }, TIMEOUT) }) /* @@ -187,9 +159,6 @@ describe('ActsBmsCheckPermissionTest', function () { expect(data).assertEqual(-1); done(); }) - setTimeout(function () { - console.info('=====================bms_checkPermission_1000==================end'); - }, TIMEOUT) }) /* @@ -207,9 +176,6 @@ describe('ActsBmsCheckPermissionTest', function () { var data = await bundle.checkPermission(BUNDLE_NAME, permissionName) expect(data).assertEqual(-1); done(); - setTimeout(function () { - console.info('=====================bms_checkPermission_1100==================end'); - }, TIMEOUT) }) /* @@ -229,9 +195,6 @@ describe('ActsBmsCheckPermissionTest', function () { expect(data).assertEqual(-1); done(); }) - setTimeout(function () { - console.info('=====================bms_checkPermission_1200==================end'); - }, TIMEOUT) }) /* @@ -249,9 +212,6 @@ describe('ActsBmsCheckPermissionTest', function () { var data = await bundle.checkPermission(bundleName, PERMISSION_ONE) expect(data).assertEqual(-1); done(); - setTimeout(function () { - console.info('=====================bms_checkPermission_1300==================end'); - }, TIMEOUT) }) /* @@ -271,9 +231,6 @@ describe('ActsBmsCheckPermissionTest', function () { expect(data).assertEqual(-1); done(); }) - setTimeout(function () { - console.info('=====================bms_checkPermission_1400==================end'); - }, TIMEOUT) }) /* @@ -287,9 +244,6 @@ describe('ActsBmsCheckPermissionTest', function () { var data = await bundle.checkPermission(BUNDLE_NAME, PERMISSION_TWO) expect(data).assertEqual(0); done(); - setTimeout(function () { - console.info('=====================bms_checkPermission_1500==================end'); - }, TIMEOUT) }) /* @@ -305,8 +259,5 @@ describe('ActsBmsCheckPermissionTest', function () { expect(data).assertEqual(0); done(); }) - setTimeout(function () { - console.info('=====================bms_checkPermission_1600==================end'); - }, TIMEOUT) }) }) \ No newline at end of file diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js index 5cf3ea6eb4532b921678abcf6c58086bef1f26a6..e6509a3d7df7d603167e319cc7bc70b7ab5e03e1 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js @@ -16,8 +16,6 @@ import bundle from '@ohos.bundle' import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' -const TIMEOUT = 2000; - describe('ActsBmsHapModuleTest', function () { /* @@ -27,52 +25,63 @@ describe('ActsBmsHapModuleTest', function () { */ it('bms_getHapModuleInfo_0100', 0, async function (done) { console.debug('===========begin bms_getHapModuleInfo_0100===========') - await install(['/data/test/bmsMainAbilityFirstScene.hap']); + var bundlePath = ['/data/test/bmsMainAbilityFirstScene.hap']; let bundleName = 'com.example.bmsmainabilityfirstscene'; - let ret = false - bundle.getBundleInfo(bundleName, 1, callback); - async function callback(err, data) { - console.debug('=======get bundle========' + JSON.stringify(data)); - expect(data.hapModuleInfo.length).assertEqual(1); - if (data.hapModuleInfo.length > 0) { - let hapModuleInfo = data.hapModuleInfo[0]; - console.debug('=======get hapModule========' + JSON.stringify(hapModuleInfo)) - console.debug('=======get hapModule mainAbilityName========' + hapModuleInfo.mainAbilityName) - expect(hapModuleInfo.moduleName).assertEqual('entry'); - expect(hapModuleInfo.mainAbilityName).assertEqual('com.example.bmsmainabilityfirstscene.MainAbility'); - expect(hapModuleInfo.name).assertEqual('com.example.bmsmainabilityfirstscene'); - expect(hapModuleInfo.description).assertEqual(''); - expect(hapModuleInfo.descriptionId).assertEqual(0); - expect(hapModuleInfo.icon).assertEqual(''); - expect(hapModuleInfo.label).assertEqual('$string:app_name'); - expect(hapModuleInfo.labelId).assertEqual(0); - expect(hapModuleInfo.iconId).assertEqual(0); - expect(hapModuleInfo.backgroundImg).assertEqual(''); - expect(hapModuleInfo.supportedModes).assertEqual(0); - console.info('===============hapModuleInfo.reqCapabilities==========' + JSON.stringify(hapModuleInfo.reqCapabilities)) - expect(typeof hapModuleInfo.reqCapabilities).assertEqual('object'); - expect(hapModuleInfo.deviceTypes).assertEqual('phone'); - console.info('===============hapModuleInfo.abilityInfo==========' + JSON.stringify(hapModuleInfo.abilityInfo)) - expect(typeof hapModuleInfo.abilityInfo).assertEqual('object'); - expect(hapModuleInfo.moduleName).assertEqual('entry'); - expect(hapModuleInfo.mainAbilityName).assertEqual('com.example.bmsmainabilityfirstscene.MainAbility'); - expect(hapModuleInfo.installationFree).assertEqual(false); - for (let i = 0, len = hapModuleInfo.reqCapabilities.length; i < len; i++) { - console.debug('=======get reqCapabilities========' + JSON.stringify(hapModuleInfo.reqCapabilities[i])); - expect(hapModuleInfo.reqCapabilities[i]).assertEqual(''); - } - for (let j = 0, len = hapModuleInfo.abilityInfo.length; j < len; j++) { - console.debug('=======get abilityInfo========' + JSON.stringify(hapModuleInfo.abilityInfo[j])) - expect(hapModuleInfo.abilityInfo[j].name).assertEqual('com.example.bmsmainabilityfirstscene.MainAbility'); + var installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, onReceiveInstallEvent); + function onReceiveInstallEvent(err, data) { + expect(err.code).assertEqual(0); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + bundle.getBundleInfo(bundleName, 1, callback); + async function callback(err, result) { + expect(result.hapModuleInfo.length).assertEqual(1); + if (result.hapModuleInfo.length > 0) { + let hapModuleInfo = result.hapModuleInfo[0]; + expect(hapModuleInfo.moduleName).assertEqual('entry'); + expect(hapModuleInfo.mainAbilityName).assertEqual('com.example.bmsmainabilityfirstscene.MainAbility'); + expect(hapModuleInfo.name).assertEqual('com.example.bmsmainabilityfirstscene'); + expect(hapModuleInfo.description).assertEqual(''); + expect(hapModuleInfo.descriptionId).assertEqual(0); + expect(hapModuleInfo.icon).assertEqual(''); + expect(hapModuleInfo.label).assertEqual('$string:app_name'); + expect(hapModuleInfo.labelId).assertEqual(0); + expect(hapModuleInfo.iconId).assertEqual(0); + expect(hapModuleInfo.backgroundImg).assertEqual(''); + expect(hapModuleInfo.supportedModes).assertEqual(0); + console.info('===============hapModuleInfo.reqCapabilities==========' + JSON.stringify(hapModuleInfo.reqCapabilities)) + expect(typeof hapModuleInfo.reqCapabilities).assertEqual('object'); + // expect(hapModuleInfo.deviceTypes).assertEqual('phone'); + console.info('===============hapModuleInfo.abilityInfo==========' + JSON.stringify(hapModuleInfo.abilityInfo)) + expect(typeof hapModuleInfo.abilityInfo).assertEqual('object'); + expect(hapModuleInfo.moduleName).assertEqual('entry'); + expect(hapModuleInfo.mainAbilityName).assertEqual('com.example.bmsmainabilityfirstscene.MainAbility'); + expect(hapModuleInfo.installationFree).assertEqual(false); + for (let i = 0, len = hapModuleInfo.reqCapabilities.length; i < len; i++) { + expect(hapModuleInfo.reqCapabilities[i]).assertEqual(''); + } + for (let j = 0, len = hapModuleInfo.abilityInfo.length; j < len; j++) { + expect(hapModuleInfo.abilityInfo[j].name).assertEqual('com.example.bmsmainabilityfirstscene.MainAbility'); + } } - ret = true; + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); } - await uninstall(bundleName); - done(); } - setTimeout(function () { - expect(ret).assertTrue(); - }, TIMEOUT); }); /* @@ -82,33 +91,41 @@ describe('ActsBmsHapModuleTest', function () { */ it('bms_getHapModuleInfo_0200', 0, async function (done) { console.debug('===========begin bms_getHapModuleInfo_0200===========') - await install(['/data/test/bmsMainAbilityFirstScene.hap']); - await install(['/data/test/bmsMainAbilitySecondScene.hap']); - let ret = false + var bundlePath = ['/data/test/bmsMainAbilityFirstScene.hap', '/data/test/bmsMainAbilitySecondScene.hap']; let bundleName = 'com.example.bmsmainabilityfirstscene'; let firstMainAbility = 'com.example.bmsmainabilityfirstscene.MainAbility'; let secondMainAbility = 'com.example.bmsmainabilitysecondscene.MainAbility'; - bundle.getBundleInfo(bundleName, 1, async (err, data) => { - console.debug('=======hapModule length========' + data.hapModuleInfo.length); - expect(data.hapModuleInfo.length).assertEqual(2); - for (let i = 0, len = data.hapModuleInfo.length; i < len; i++) { - console.debug('=======get hapModule========' + JSON.stringify(data.hapModuleInfo[i])) - console.debug('=======get hapModule mainAbilityName========' + data.hapModuleInfo[i].mainAbilityName); - checkHapModuleInfo(data.hapModuleInfo[i]); - } - if (data.hapModuleInfo.length == 2) { - expect(data.hapModuleInfo[0].mainAbilityName).assertEqual(firstMainAbility); - expect(data.hapModuleInfo[0].moduleName).assertEqual('entry'); - expect(data.hapModuleInfo[1].mainAbilityName).assertEqual(secondMainAbility); - expect(data.hapModuleInfo[1].moduleName).assertEqual('bmsmainabilitysecondscene'); + var installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - await uninstall(bundleName); - ret = true; - done(); - }) - setTimeout(function () { - expect(ret).assertTrue(); - }, TIMEOUT); + }, async (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + bundle.getBundleInfo(bundleName, 1, async (err, result) => { + expect(result.hapModuleInfo.length).assertEqual(2); + if (result.hapModuleInfo.length == 2) { + expect(result.hapModuleInfo[0].mainAbilityName).assertEqual(firstMainAbility); + expect(result.hapModuleInfo[0].moduleName).assertEqual('entry'); + checkHapModuleInfo(result.hapModuleInfo[0]); + expect(result.hapModuleInfo[1].mainAbilityName).assertEqual(secondMainAbility); + expect(result.hapModuleInfo[1].moduleName).assertEqual('bmsmainabilitysecondscene'); + checkHapModuleInfo(result.hapModuleInfo[1]); + } + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); + }); + }); }) /* @@ -118,25 +135,52 @@ describe('ActsBmsHapModuleTest', function () { */ it('bms_getHapModuleInfo_0300', 0, async function (done) { console.debug('===========begin bms_getHapModuleInfo_0300===========') - await install(['/data/test/bmsThirdBundleTest2.hap']); + var bundlePath = ['/data/test/bmsThirdBundleTest2.hap']; let bundleName = 'com.example.third2'; - let ret = false; - bundle.getBundleInfo(bundleName, 1,).then(async (data) => { - console.debug('=======get hapModule========' + JSON.stringify(data)) - expect(data.hapModuleInfo.length).assertEqual(1); - if (data.hapModuleInfo.length > 0) { - console.debug('=======get hapModule mainAbilityName========' + data.hapModuleInfo[0].mainAbilityName) - expect(data.hapModuleInfo[0].mainAbilityName).assertEqual(''); - expect(data.hapModuleInfo[0].moduleName).assertEqual('entry'); - checkHapModuleInfo(data.hapModuleInfo[0]); - ret = true; + var installer = await bundle.getBundleInstaller(); + console.log('========install========' + typeof installer); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - await uninstall(bundleName); - done(); - }) - setTimeout(function () { - expect(ret).assertTrue(); - }, TIMEOUT); + }, onReceiveInstallEvent); + function onReceiveInstallEvent(err, data) { + console.info('========install Finish========'); + expect(typeof err).assertEqual('object'); + expect(err.code).assertEqual(0); + expect(typeof data).assertEqual('object'); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + bundle.getBundleInfo(bundleName, 1,).then(async (result) => { + console.debug('=======get hapModule========' + JSON.stringify(result)) + expect(result.hapModuleInfo.length).assertEqual(1); + if (result.hapModuleInfo.length > 0) { + console.debug('=======get hapModule mainAbilityName========' + result.hapModuleInfo[0].mainAbilityName) + expect(result.hapModuleInfo[0].mainAbilityName).assertEqual(''); + expect(result.hapModuleInfo[0].moduleName).assertEqual('entry'); + checkHapModuleInfo(result.hapModuleInfo[0]); + } + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, onReceiveUninstallEvent); + + function onReceiveUninstallEvent(err, data) { + console.info('========uninstall Finish========'); + expect(typeof err).assertEqual('object'); + expect(err.code).assertEqual(0); + expect(typeof data).assertEqual('object'); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + } + }); + } }) /* @@ -146,57 +190,99 @@ describe('ActsBmsHapModuleTest', function () { */ it('bms_getHapModuleInfo_0400', 0, async function (done) { console.debug('===========begin bms_getHapModuleInfo_0400===========') - await install(['/data/test/bmsThirdBundleTest5.hap']); + var bundlePath = ['/data/test/bmsThirdBundleTest5.hap']; let bundleName = 'com.example.third5'; - let ret = true; - bundle.getBundleInfo(bundleName, 1, async (err, data) => { - console.debug('=======get hapModule========' + JSON.stringify(data)) - expect(data.hapModuleInfo.length).assertEqual(1); - if (data.hapModuleInfo.length == 1) { - console.debug('=======get hapModule mainAbilityName========' + data.hapModuleInfo[0].mainAbilityName) - expect(data.hapModuleInfo[0].mainAbilityName).assertEqual('com.example.third5.AMainAbility'); - expect(data.hapModuleInfo[0].moduleName).assertEqual('entry'); - checkHapModuleInfo(data.hapModuleInfo[0]); - ret = true; + var installer = await bundle.getBundleInstaller(); + console.log('========install========' + typeof installer); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - await uninstall(bundleName); - done(); + }, (err, data) => { + console.info('========install Finish========'); + expect(typeof err).assertEqual('object'); + expect(err.code).assertEqual(0); + expect(typeof data).assertEqual('object'); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + bundle.getBundleInfo(bundleName, 1, async (err, result) => { + console.debug('=======get hapModule========' + JSON.stringify(result)) + expect(result.hapModuleInfo.length).assertEqual(1); + if (result.hapModuleInfo.length == 1) { + expect(result.hapModuleInfo[0].mainAbilityName).assertEqual('com.example.third5.AMainAbility'); + expect(result.hapModuleInfo[0].moduleName).assertEqual('entry'); + checkHapModuleInfo(result.hapModuleInfo[0]); + } + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, onReceiveUninstallEvent); + + function onReceiveUninstallEvent(err, data) { + ; + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + } + }); }) - setTimeout(function () { - expect(ret).assertTrue(); - }, TIMEOUT); }) - /* + /* * @tc.number: bms_getHapModuleInfo_0500 * @tc.name: get the hapModuleInfo of the upgraded hap package from an application through getBundleInfo * @tc.desc: get the module information of the mainAbility upgrade hap */ it('bms_getHapModuleInfo_0500', 0, async function (done) { console.debug('===========begin bms_getHapModuleInfo_0500===========') - await install(['/data/test/bmsThirdBundleTest1.hap']); - await install(['/data/test/bmsThirdBundleTestA1.hap']); + var bundlePath1 = ['/data/test/bmsThirdBundleTest1.hap']; + var bundlePath2 = ['/data/test/bmsThirdBundleTestA1.hap']; let bundleName = 'com.example.third1'; - let ret = false - bundle.getBundleInfo(bundleName, 1, callback); - async function callback(err, data) { - console.debug('=======get bundle========' + JSON.stringify(data)); - expect(data.hapModuleInfo.length).assertEqual(1); - if (data.hapModuleInfo.length == 1) { - let hapModuleInfo = data.hapModuleInfo[0]; - console.debug('=======get hapModule========' + JSON.stringify(hapModuleInfo)) - console.debug('=======get hapModule mainAbilityName========' + hapModuleInfo.mainAbilityName) + var installer = await bundle.getBundleInstaller(); + installer.install(bundlePath1, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(err.code).assertEqual(0); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + installer.install(bundlePath2, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + bundle.getBundleInfo(bundleName, 1, callback); + }) + }) + function callback(err, result) { + expect(result.hapModuleInfo.length).assertEqual(1); + if (result.hapModuleInfo.length == 1) { + let hapModuleInfo = result.hapModuleInfo[0]; expect(hapModuleInfo.moduleName).assertEqual('entry'); expect(hapModuleInfo.mainAbilityName).assertEqual('com.example.third1.AMainAbility'); checkHapModuleInfo(hapModuleInfo); } - await uninstall(bundleName); - ret = true; - done(); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }) } - setTimeout(function () { - expect(ret).assertTrue(); - }, TIMEOUT); }); /* @@ -207,11 +293,8 @@ describe('ActsBmsHapModuleTest', function () { it('bms_getHapModuleInfo_0600', 0, async function (done) { console.debug('===========begin bms_getHapModuleInfo_0600===========') let bundleName = 'com.example.system1'; - let ret = false bundle.getBundleInfo(bundleName, 1, callback); function callback(err, data) { - console.debug('=======get bundle========' + JSON.stringify(data)); - console.debug('=======data.hapModuleInfo.length========' + data.hapModuleInfo.length); expect(data.hapModuleInfo.length).assertEqual(1); if (data.hapModuleInfo.length == 1) { let hapModuleInfo = data.hapModuleInfo[0]; @@ -220,17 +303,12 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo.moduleName).assertEqual('entry'); expect(hapModuleInfo.mainAbilityName).assertEqual('com.example.system1.MainAbility'); checkHapModuleInfo(hapModuleInfo); - ret = true; } done(); } - setTimeout(function () { - expect(ret).assertTrue(); - }, TIMEOUT); }); function checkHapModuleInfo(dataInfo) { - console.debug('========begin check hapModuleInfo========') expect(typeof dataInfo.name).assertEqual('string'); expect(typeof dataInfo.description).assertEqual('string'); expect(typeof dataInfo.descriptionId).assertEqual('number'); @@ -247,44 +325,4 @@ describe('ActsBmsHapModuleTest', function () { expect(typeof dataInfo.mainAbilityName).assertEqual('string'); expect(typeof dataInfo.installationFree).assertEqual('boolean'); } - - async function install(bundlePath) { - var installer = await bundle.getBundleInstaller(); - console.log('========install========' + typeof installer); - installer.install(bundlePath, { - param: { - userId: 0, - installFlag: 1, - isKeepData: false - } - }, onReceiveInstallEvent); - function onReceiveInstallEvent(err, data) { - console.info('========install Finish========'); - expect(typeof err).assertEqual('object'); - expect(err.code).assertEqual(0); - expect(typeof data).assertEqual('object'); - expect(data.status).assertEqual(0); - expect(data.statusMessage).assertEqual('SUCCESS'); - } - } - - async function uninstall(bundleName) { - var installer = await bundle.getBundleInstaller(); - installer.uninstall(bundleName, { - param: { - userId: 0, - installFlag: 1, - isKeepData: false - } - }, onReceiveUninstallEvent); - - function onReceiveUninstallEvent(err, data) { - console.info('========uninstall Finish========'); - expect(typeof err).assertEqual('object'); - expect(err.code).assertEqual(0); - expect(typeof data).assertEqual('object'); - expect(data.status).assertEqual(0); - expect(data.statusMessage).assertEqual('SUCCESS'); - } - } }) \ No newline at end of file diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js index b864c838cf5282058bdd5e5868f5eb55e54f23dc..5a1dd2a2a6ae66d715566eea2f97255948fe63d8 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js @@ -14,11 +14,7 @@ */ import bundle from '@ohos.bundle' import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' - -const TIMEOUT = 3000; - describe('ActsBmsJsTest', function () { - /* * @tc.number: bms_getJsAbility_0100 * @tc.name: test the multi js ability @@ -29,20 +25,43 @@ describe('ActsBmsJsTest', function () { console.info('=====================bms_getJsAbility_0100=================='); let bundleName = 'com.example.third2'; let abilityName = 'com.example.third2.MainAbility'; - await install(['/data/test/bmsThirdBundleTest2.hap']); - let data = await bundle.getBundleInfo(bundleName, 1); - expect(data.abilityInfo.length).assertEqual(1); - if(data.abilityInfo.length == 1){ - console.debug('========check abilityName ========' + JSON.stringify(data.abilityInfo)); - expect(data.abilityInfo[0].name).assertEqual(abilityName); - expect(data.abilityInfo[0].srcLanguage).assertEqual('js'); - expect(data.abilityInfo[0].srcPath).assertEqual(''); + var installer = await bundle.getBundleInstaller(); + installer.install(['/data/test/bmsThirdBundleTest2.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, onReceiveInstallEvent); + + async function onReceiveInstallEvent(err, data) { + console.info('========install Finish========'); + expect(typeof err).assertEqual('object'); + expect(err.code).assertEqual(0); + expect(typeof data).assertEqual('object'); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + let result = await bundle.getBundleInfo(bundleName, 1); + expect(result.abilityInfo.length).assertEqual(1); + if (result.abilityInfo.length == 1) { + console.debug('========check abilityName ========' + JSON.stringify(result.abilityInfo)); + expect(result.abilityInfo[0].name).assertEqual(abilityName); + expect(result.abilityInfo[0].srcLanguage).assertEqual('js'); + expect(result.abilityInfo[0].srcPath).assertEqual(''); + } + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + console.info('========uninstall Finish========'); + expect(err.code).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); } - await uninstall(bundleName); - done(); - setTimeout(function () { - console.info('=====================bms_getJsAbility_0100==================end'); - }, TIMEOUT) }) /* @@ -56,24 +75,46 @@ describe('ActsBmsJsTest', function () { var bundleName = 'com.example.third5'; let abilityName1 = 'com.example.third5.AMainAbility'; let abilityName2 = 'com.example.third5.BMainAbility'; - await install(['/data/test/bmsThirdBundleTest5.hap']); - let data = await bundle.getBundleInfo(bundleName, 1) - console.debug('==========bundleInfo==========' + JSON.stringify(data)) - expect(data.abilityInfo.length).assertEqual(2); - if(data.abilityInfo.length == 2){ - console.debug('========check abilityName ========' + JSON.stringify(data.abilityInfo)); - expect(data.abilityInfo[0].name).assertEqual(abilityName1); - expect(data.abilityInfo[0].srcLanguage).assertEqual('js'); - expect(data.abilityInfo[0].srcPath).assertEqual(''); - expect(data.abilityInfo[1].name).assertEqual(abilityName2); - expect(data.abilityInfo[1].srcLanguage).assertEqual('js'); - expect(data.abilityInfo[1].srcPath).assertEqual(''); + var installer = await bundle.getBundleInstaller(); + installer.install(['/data/test/bmsThirdBundleTest5.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, onReceiveInstallEvent); + + async function onReceiveInstallEvent(err, data) { + console.info('========install Finish========'); + expect(typeof err).assertEqual('object'); + expect(err.code).assertEqual(0); + expect(typeof data).assertEqual('object'); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + let result = await bundle.getBundleInfo(bundleName, 1) + console.debug('==========bundleInfo==========' + JSON.stringify(result)) + expect(result.abilityInfo.length).assertEqual(2); + if (result.abilityInfo.length == 2) { + console.debug('========check abilityName ========' + JSON.stringify(result.abilityInfo)); + expect(result.abilityInfo[0].name).assertEqual(abilityName1); + expect(result.abilityInfo[0].srcLanguage).assertEqual('js'); + expect(result.abilityInfo[0].srcPath).assertEqual(''); + expect(result.abilityInfo[1].name).assertEqual(abilityName2); + expect(result.abilityInfo[1].srcLanguage).assertEqual('js'); + expect(result.abilityInfo[1].srcPath).assertEqual(''); + } + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(err.code).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); } - await uninstall(bundleName); - done(); - setTimeout(function () { - console.info('=====================bms_getJsAbility_0200==================end'); - }, TIMEOUT) }) /* @@ -86,20 +127,43 @@ describe('ActsBmsJsTest', function () { console.info('=====================bms_getJsAbility_0300=================='); let bundleName = 'com.example.js'; let abilityName = 'com.example.js.MainAbility'; - await install(['/data/test/bmsThirdBundleJs.hap']); - let data = await bundle.getBundleInfo(bundleName, 1); - expect(data.abilityInfo.length).assertEqual(1); - if(data.abilityInfo.length == 1){ - console.debug('========check abilityName ========' + JSON.stringify(data.abilityInfo)); - expect(data.abilityInfo[0].name).assertEqual(abilityName); - expect(data.abilityInfo[0].srcLanguage).assertEqual('js'); - expect(data.abilityInfo[0].srcPath).assertEqual('default'); + var installer = await bundle.getBundleInstaller(); + installer.install(['/data/test/bmsThirdBundleJs.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, onReceiveInstallEvent); + + async function onReceiveInstallEvent(err, data) { + console.info('========install Finish========'); + expect(typeof err).assertEqual('object'); + expect(err.code).assertEqual(0); + expect(typeof data).assertEqual('object'); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + let result = await bundle.getBundleInfo(bundleName, 1); + expect(result.abilityInfo.length).assertEqual(1); + if (result.abilityInfo.length == 1) { + console.debug('========check abilityName ========' + JSON.stringify(result.abilityInfo)); + expect(result.abilityInfo[0].name).assertEqual(abilityName); + expect(result.abilityInfo[0].srcLanguage).assertEqual('js'); + expect(result.abilityInfo[0].srcPath).assertEqual('default'); + } + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + console.info('========uninstall Finish========'); + expect(err.code).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); } - await uninstall(bundleName); - done(); - setTimeout(function () { - console.info('=====================bms_getJsAbility_0300==================end'); - }, TIMEOUT) }) /* @@ -112,25 +176,8 @@ describe('ActsBmsJsTest', function () { console.info('=====================bms_getJsAbility_0400=================='); let bundleName = 'com.example.c'; let abilityName = '.MainAbility'; - await install(['/data/test/bmsThirdBundleC.hap']); - let data = await bundle.getBundleInfo(bundleName, 1); - expect(data.abilityInfo.length).assertEqual(1); - if(data.abilityInfo.length == 1){ - console.debug('========check abilityName ========' + JSON.stringify(data.abilityInfo)); - expect(data.abilityInfo[0].name).assertEqual(abilityName); - expect(data.abilityInfo[0].srcLanguage).assertEqual('c++'); - expect(data.abilityInfo[0].srcPath).assertEqual('default/c++/'); - } - await uninstall(bundleName); - done(); - setTimeout(function () { - console.info('=====================bms_getJsAbility_0300==================end'); - }, TIMEOUT) - }) - - async function install(bundlePath) { var installer = await bundle.getBundleInstaller(); - installer.install(bundlePath, { + installer.install(['/data/test/bmsThirdBundleC.hap'], { param: { userId: 0, installFlag: 1, @@ -138,33 +185,33 @@ describe('ActsBmsJsTest', function () { } }, onReceiveInstallEvent); - function onReceiveInstallEvent(err, data) { + async function onReceiveInstallEvent(err, data) { console.info('========install Finish========'); expect(typeof err).assertEqual('object'); expect(err.code).assertEqual(0); expect(typeof data).assertEqual('object'); expect(data.status).assertEqual(0); expect(data.statusMessage).assertEqual('SUCCESS'); - } - } - async function uninstall(bundleName) - { - var installer = await bundle.getBundleInstaller(); - installer.uninstall(bundleName, { - param: { - userId: 0, - installFlag: 1, - isKeepData: false + let result = await bundle.getBundleInfo(bundleName, 1); + expect(result.abilityInfo.length).assertEqual(1); + if (result.abilityInfo.length == 1) { + console.debug('========check abilityName ========' + JSON.stringify(result.abilityInfo)); + expect(result.abilityInfo[0].name).assertEqual(abilityName); + expect(result.abilityInfo[0].srcLanguage).assertEqual('c++'); + expect(result.abilityInfo[0].srcPath).assertEqual('default/c++/'); } - }, onReceiveUninstallEvent); - - function onReceiveUninstallEvent(err, data) { - console.info('========uninstall Finish========'); - expect(typeof err).assertEqual('object'); - expect(err.code).assertEqual(0); - expect(typeof data).assertEqual('object'); - expect(data.status).assertEqual(0); - expect(data.statusMessage).assertEqual('SUCCESS'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + console.info('========uninstall Finish========'); + expect(err.code).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); } - } + }) }) \ No newline at end of file diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/Test.json b/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/Test.json index 7e569872c0cd4525fd4815e9fe88a7c9f8fb86d3..e9266235cf80487cb153fd248a9acb76562f2941 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/Test.json +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/Test.json @@ -9,8 +9,8 @@ "kits": [ { "test-file-name": [ - "ActsBmsKitTest.hap", - "bmsThirdBundleTest1.hap" + "bmsThirdBundleTest1.hap", + "ActsBmsKitTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/entry/src/main/js/test/ActsBmsKitTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/entry/src/main/js/test/ActsBmsKitTest.test.js index 44ae79c5811a0e055d1891f9adc8010ad1384aa8..e87ef0441e355f869c6b5ca92db0752137e1977e 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/entry/src/main/js/test/ActsBmsKitTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmskittest/entry/src/main/js/test/ActsBmsKitTest.test.js @@ -18,7 +18,6 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from import featureAbility from '@ohos.ability.featureability' import commonEvent from '@ohos.commonevent' -const TIMEOUT = 2000; const STRESSLEVEL = 20; const BUNDLE_NAME = 'com.example.actsbmskittest'; const PERMISSION_NAME = 'com.permission.PERMISSION_A'; @@ -64,9 +63,6 @@ describe('ActsBmsKitTest', function () { } } ) - setTimeout(function () { - console.info('==================beforeAll==================end'); - }, TIMEOUT) }) /* * @tc.number: ActsBmsKit_getAllShortcutInfo_0100 @@ -85,9 +81,6 @@ describe('ActsBmsKitTest', function () { break; } done(); - setTimeout(function () { - console.info('==================ActsBmsKit_getAllShortcutInfo_0100==================end'); - }, TIMEOUT) }); /* @@ -112,9 +105,6 @@ describe('ActsBmsKitTest', function () { } }) } - setTimeout(function () { - console.info('=====================ActsBmsKit_getAllShortcutInfo_0200==================end'); - }, TIMEOUT) }) /* @@ -133,9 +123,6 @@ describe('ActsBmsKitTest', function () { } } done(); - setTimeout(function () { - console.info('=====================ActsBmsKit_checkPermission_0100==================end'); - }, TIMEOUT) }) /* @@ -159,9 +146,6 @@ describe('ActsBmsKitTest', function () { } }) } - setTimeout(function () { - console.info('=====================ActsBmsKit_checkPermission_0200==================end'); - }, TIMEOUT) }) /* @@ -213,9 +197,6 @@ describe('ActsBmsKitTest', function () { count++; }); } - setTimeout(function () { - console.debug('==========ActsBmsKit_getModuleUsageRecordTest_0200==================end'); - }, TIMEOUT) }) function checkModuleUsageRecord(data, caseName) { console.debug('======================check ModuleUsageRecord begin=========================='); @@ -226,21 +207,21 @@ describe('ActsBmsKitTest', function () { console.debug('=============bundleName is=========' + JSON.stringify(data[i].bundleName)); expect(data[i].bundleName.length).assertLarger(0); console.debug('=============appLabelId==============' + JSON.stringify(data[i].appLabelId)); - expect(data[i].appLabelId).assertLarger(0); + expect(data[i].appLabelId >= 0).assertTrue(); console.debug('=============name==============' + JSON.stringify(data[i].name)); expect(data[i].name.length).assertLarger(0); console.debug('=============labelId==============' + JSON.stringify(data[i].labelId)); - expect(data[i].labelId >=0 ).assertTrue(); + expect(data[i].labelId >= 0).assertTrue(); console.debug('=============descriptionId==============' + JSON.stringify(data[i].descriptionId)); expect(data[i].descriptionId).assertEqual(0); console.debug('=============abilityName==============' + JSON.stringify(data[i].abilityName)); expect(data[i].abilityName.length).assertLarger(0); console.debug('=============abilityLabelId==============' + JSON.stringify(data[i].abilityLabelId)); - expect(data[i].abilityLabelId).assertLarger(0); + expect(data[i].abilityLabelId >= 0).assertTrue(); console.debug('===========abilityDescriptionId===========' + JSON.stringify(data[i].abilityDescriptionId)); - expect(data[i].abilityDescriptionId).assertLarger(0); + expect(data[i].abilityDescriptionId >= 0).assertTrue(); console.debug('=============abilityIconId==============' + JSON.stringify(data[i].abilityIconId)); - expect(data[i].abilityIconId).assertLarger(0); + expect(data[i].abilityIconId >= 0).assertTrue(); console.debug('=============launchedCount==============' + JSON.stringify(data[i].launchedCount)); expect(data[i].launchedCount).assertLarger(0); console.debug('=============lastLaunchTime==============' + JSON.stringify(data[i].lastLaunchTime)); diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/entry/src/main/js/test/ActsBmsMetaDataTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/entry/src/main/js/test/ActsBmsMetaDataTest.test.js index 0da129041caa7045270921dc91f48b9e31b66fc9..b1496461e3a8cc4d51e88b68a4bef918aeffd072 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/entry/src/main/js/test/ActsBmsMetaDataTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/entry/src/main/js/test/ActsBmsMetaDataTest.test.js @@ -16,8 +16,6 @@ import bundle from '@ohos.bundle' import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' -const TIMEOUT = 1000; - describe('ActsBmsMetaDataTest', function () { /* @@ -27,57 +25,51 @@ describe('ActsBmsMetaDataTest', function () { */ it('bms_getMetaData_0100', 0, async function (done) { console.info('=====================bms_getMetaData_0100=================='); - await install(['/data/test/bmsThirdBundleTest1.hap']) - await install(['/data/test/bmsThirdBundleTest3.hap']) + var bundlePath = ['/data/test/bmsThirdBundleTest1.hap', '/data/test/bmsThirdBundleTest3.hap'] + var installer = await bundle.getBundleInstaller(); let abilityName1 = 'com.example.third1.MainAbility'; let abilityName2 = 'com.example.third3.MainAbility'; - let dataMap1 = new Map(); - let dataMap2 = new Map(); - var dataInfos = await bundle.queryAbilityByWant({ - want: { - action: 'action.system.home', - entities: ['entity.system.home'], - elementName: { - deviceId: '0', - bundleName: 'com.example.third1', - abilityName: abilityName1, - }, + let dataMap = new Map(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - }, 0, 0) - for (let i = 0, len = dataInfos.length; i < len; i++) { - dataMap1.set(dataInfos[i].name, dataInfos[i].metaData) - } - expect(dataMap1.has(abilityName1)).assertTrue(); - expect(dataMap1.has(abilityName2)).assertTrue(); - if (dataMap1.has(abilityName1) && dataMap1.has(abilityName2)) { - checkMetaData(dataMap1.get(abilityName1), 'Data1'); - checkMetaData(dataMap1.get(abilityName2), 'Data3'); - } - dataInfos = await bundle.queryAbilityByWant({ - want: { - action: 'action.system.home', - entities: ['entity.system.home'], - elementName: { - deviceId: '0', - bundleName: 'com.example.third1', - abilityName: abilityName2, - }, + }, async (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + var dataInfos = await bundle.queryAbilityByWant({ + want: { + action: 'action.system.home', + entities: ['entity.system.home'], + elementName: { + deviceId: '0', + bundleName: 'com.example.third1', + abilityName: 'com.example.third1.MainAbility', + }, + } + }, 0, 0) + for (let i = 0, len = dataInfos.length; i < len; i++) { + dataMap.set(dataInfos[i].name, dataInfos[i].metaData) } - }, 0, 0) - for (let i = 0, len = dataInfos.length; i < len; i++) { - dataMap2.set(dataInfos[i].name, dataInfos[i].metaData) - } - expect(dataMap2.has(abilityName1)).assertTrue(); - expect(dataMap2.has(abilityName2)).assertTrue(); - if (dataMap2.has(abilityName1) && dataMap2.has(abilityName2)) { - checkMetaData(dataMap2.get(abilityName1), 'Data1'); - checkMetaData(dataMap2.get(abilityName2), 'Data3'); - } - await uninstall('com.example.third1'); - done(); - setTimeout(function () { - console.debug('============bms_getMetaData_0100===========') - }, TIMEOUT); + expect(dataMap.has(abilityName1)).assertTrue(); + expect(dataMap.has(abilityName2)).assertTrue(); + if (dataMap.has(abilityName1) && dataMap.has(abilityName2)) { + checkMetaData(dataMap.get(abilityName1), 'Data1'); + checkMetaData(dataMap.get(abilityName2), 'Data3'); + } + installer.uninstall('com.example.third1', { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); + }); + }) /* @@ -87,37 +79,59 @@ describe('ActsBmsMetaDataTest', function () { */ it('bms_getMetaData_0200', 0, async function (done) { console.info('=====================bms_getMetaData_0200=================='); - await install(['/data/test/bmsThirdBundleTest1.hap']) - await install(['/data/test/bmsThirdBundleTest3.hap']) - await install(['/data/test/bmsThirdBundleTestA1.hap']) + var bundlePath1 = ['/data/test/bmsThirdBundleTest1.hap'] + var bundlePath2 = ['/data/test/bmsThirdBundleTestA1.hap'] let dataMap = new Map(); let abilityName1 = 'com.example.third1.AMainAbility'; - let abilityName2 = 'com.example.third3.MainAbility'; - var dataInfos = await bundle.queryAbilityByWant({ - want: { - action: 'action.system.home', - entities: ['entity.system.home'], - elementName: { - deviceId: '0', - bundleName: 'com.example.third1', - abilityName: 'com.example.third1.AMainAbility', - }, + var installer = await bundle.getBundleInstaller(); + installer.install(bundlePath1, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - }, 0, 0) - for (let i = 0, len = dataInfos.length; i < len; i++) { - dataMap.set(dataInfos[i].name, dataInfos[i].metaData) - } - expect(dataMap.has(abilityName1)).assertTrue(); - expect(dataMap.has(abilityName2)).assertTrue(); - if (dataMap.has(abilityName1) && dataMap.has(abilityName2)) { - checkMetaData(dataMap.get(abilityName1), 'DataA1'); - checkMetaData(dataMap.get(abilityName2), 'Data3'); - } - await uninstall('com.example.third1'); - done(); - setTimeout(function () { - console.debug('============bms_getMetaData_0200===========') - }, TIMEOUT); + }, async (err, data) => { + expect(err.code).assertEqual(0); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + installer.install(bundlePath2, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + var dataInfos = await bundle.queryAbilityByWant({ + want: { + action: 'action.system.home', + entities: ['entity.system.home'], + elementName: { + deviceId: '0', + bundleName: 'com.example.third1', + abilityName: 'com.example.third1.AMainAbility', + }, + } + }, 0, 0) + for (let i = 0, len = dataInfos.length; i < len; i++) { + dataMap.set(dataInfos[i].name, dataInfos[i].metaData) + } + expect(dataMap.has(abilityName1)).assertTrue(); + if (dataMap.has(abilityName1)) { + checkMetaData(dataMap.get(abilityName1), 'DataA1'); + } + installer.uninstall('com.example.third1', { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); + }) + }) }) /* @@ -127,26 +141,42 @@ describe('ActsBmsMetaDataTest', function () { */ it('bms_getMetaData_0300', 0, async function (done) { console.info('=====================bms_getMetaData_0300=================='); - await install(['/data/test/bmsThirdBundleTest1.hap']) - await uninstall('com.example.third1'); - var dataInfos = await bundle.queryAbilityByWant({ - want: { - action: 'action.system.home', - entities: ['entity.system.home'], - elementName: { - deviceId: '0', - bundleName: 'com.example.third1', - abilityName: 'com.example.third1.MainAbility', - }, + var bundlePath = ['/data/test/bmsThirdBundleTest1.hap'] + let bundleName = 'com.example.third1'; + var installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - }, 0, 0) - console.info('==========abilityInfo is ==========' + dataInfos); - console.info('==========abilityInfo is ==========' + JSON.stringify(dataInfos)); - expect(dataInfos.length).assertEqual(0); - done(); - setTimeout(function () { - console.debug('============bms_getMetaData_0300===========') - }, TIMEOUT); + }, (err, data) => { + expect(err.code).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + installer.uninstall(bundleName, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + expect(err.code).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + var dataInfos = await bundle.queryAbilityByWant({ + want: { + action: 'action.system.home', + entities: ['entity.system.home'], + elementName: { + deviceId: '0', + bundleName: 'com.example.third1', + abilityName: 'com.example.third1.MainAbility', + }, + } + }, 0, 0); + expect(dataInfos.length).assertEqual(0); + done(); + }); + }); }) /* @@ -156,35 +186,53 @@ describe('ActsBmsMetaDataTest', function () { */ it('bms_getMetaData_0400', 0, async function (done) { console.info('=====================bms_getMetaData_0400=================='); - await install(['/data/test/bmsThirdBundleTest5.hap']); + var bundlePath = ['/data/test/bmsThirdBundleTest5.hap'] let dataMap = new Map(); let abilityName1 = 'com.example.third5.AMainAbility'; let abilityName2 = 'com.example.third5.BMainAbility'; - var dataInfos = await bundle.queryAbilityByWant({ - want: { - action: 'action.system.home', - entities: ['entity.system.home'], - elementName: { - deviceId: '0', - bundleName: 'com.example.third5', - abilityName: 'com.example.third5.AMainAbility', - }, + var installer = await bundle.getBundleInstaller(); + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - }, 0, 0) - for (let i = 0, len = dataInfos.length; i < len; i++) { - dataMap.set(dataInfos[i].name, dataInfos[i].metaData) - } - expect(dataMap.has(abilityName1)).assertTrue(); - expect(dataMap.has(abilityName2)).assertTrue(); - if (dataMap.has(abilityName1) && dataMap.has(abilityName2)) { - checkMetaData(dataMap.get(abilityName1), 'Data5A'); - checkMetaData(dataMap.get(abilityName2), 'Data5B'); + }, onReceiveinstallEvent); + async function onReceiveinstallEvent(err, data) { + expect(err.code).assertEqual(0);; + expect(data.statusMessage).assertEqual('SUCCESS'); + var dataInfos = await bundle.queryAbilityByWant({ + want: { + action: 'action.system.home', + entities: ['entity.system.home'], + elementName: { + deviceId: '0', + bundleName: 'com.example.third5', + abilityName: 'com.example.third5.AMainAbility', + }, + } + }, 0, 0) + for (let i = 0, len = dataInfos.length; i < len; i++) { + dataMap.set(dataInfos[i].name, dataInfos[i].metaData) + } + expect(dataMap.has(abilityName1)).assertTrue(); + expect(dataMap.has(abilityName2)).assertTrue(); + if (dataMap.has(abilityName1) && dataMap.has(abilityName2)) { + checkMetaData(dataMap.get(abilityName1), 'Data5A'); + checkMetaData(dataMap.get(abilityName2), 'Data5B'); + } + installer.uninstall('com.example.third5', { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + expect(err.code).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }) } - await uninstall('com.example.third5'); - done(); - setTimeout(function () { - console.debug('============bms_getMetaData_0400===========') - }, TIMEOUT); }) /* @@ -205,13 +253,8 @@ describe('ActsBmsMetaDataTest', function () { }, } }, 0, 0) - console.info('==========abilityInfo is ==========' + dataInfos); - console.info('==========abilityInfo is ==========' + JSON.stringify(dataInfos)); expect(dataInfos.length).assertEqual(0); done(); - setTimeout(function () { - console.debug('============bms_getMetaData_0500===========') - }, TIMEOUT); }) /* @@ -233,7 +276,7 @@ describe('ActsBmsMetaDataTest', function () { abilityName: 'com.example.system1.MainAbility', }, } - }, 0, 0) + }, 0, 0); for (let i = 0, len = dataInfos.length; i < len; i++) { dataMap.set(dataInfos[i].name, dataInfos[i].metaData) } @@ -242,9 +285,6 @@ describe('ActsBmsMetaDataTest', function () { checkMetaData(dataMap.get(abilityName1), 'Data1S'); } done(); - setTimeout(function () { - console.debug('============bms_getMetaData_0600===========') - }, TIMEOUT); }) /* @@ -266,7 +306,7 @@ describe('ActsBmsMetaDataTest', function () { abilityName: 'com.example.vendor1.MainAbility', }, } - }, 0, 0) + }, 0, 0); for (let i = 0, len = dataInfos.length; i < len; i++) { dataMap.set(dataInfos[i].name, dataInfos[i].metaData) } @@ -282,7 +322,7 @@ describe('ActsBmsMetaDataTest', function () { console.debug('=====customizeDatas length=====' + customizeDatas.length); for (let i = 0; i < parameters.length; i++) { expect(parameters[i].description).assertEqual('$string:mainability_description'); - expect(parameters[i].name).assertEqual("Data1V"+i); + expect(parameters[i].name).assertEqual("Data1V" + i); expect(parameters[i].type).assertEqual('float'); } for (let i = 0; i < results.length; i++) { @@ -297,88 +337,35 @@ describe('ActsBmsMetaDataTest', function () { } } done(); - setTimeout(function () { - console.debug('============bms_getMetaData_0700===========') - }, TIMEOUT); }) function checkMetaData(data, name) { - console.info('==========MetaData is==========' + JSON.stringify(data)); var parameters = data.parameters; var results = data.results; var customizeDatas = data.customizeDatas; expect(typeof parameters).assertEqual('object'); expect(typeof results).assertEqual('object'); expect(typeof customizeDatas).assertEqual('object'); - console.info('==========parameters.length is==========' + parameters.length); - console.info('==========results.length is==========' + results.length); - console.info('==========customizeDatas.length is==========' + customizeDatas.length); expect(parameters.length).assertLarger(0); expect(results.length).assertLarger(0); expect(customizeDatas.length).assertLarger(0); for (let i = 0; i < parameters.length; i++) { - console.info('==========Parameter description is==========' + parameters[i].description); expect(typeof parameters[i].description).assertEqual('string'); - console.info('==========Parameter name is==========' + parameters[i].name); expect(typeof parameters[i].name).assertEqual('string'); expect(parameters[i].name).assertEqual(name); - console.info('==========Parameter type is==========' + parameters[i].type); expect(typeof parameters[i].type).assertEqual('string'); } for (let i = 0; i < results.length; i++) { - console.info('==========Results description is==========' + results[i].description); expect(typeof results[i].description).assertEqual('string'); - console.info('==========Results name is==========' + results[i].name); expect(typeof results[i].name).assertEqual('string'); expect(results[i].name).assertEqual(name); - console.info('==========Results type is==========' + results[i].type); expect(typeof results[i].type).assertEqual('string'); } for (let i = 0; i < customizeDatas.length; i++) { - console.info('==========CustomizeData name is==========' + customizeDatas[i].name); expect(typeof customizeDatas[i].name).assertEqual('string'); - console.info('==========CustomizeData value is==========' + customizeDatas[i].value); expect(typeof customizeDatas[i].value).assertEqual('string'); expect(customizeDatas[i].name).assertEqual(name); - console.info('==========CustomizeData extra is==========' + customizeDatas[i].extra); expect(typeof customizeDatas[i].extra).assertEqual('string'); } } - async function install(bundlePath) { - var installer = await bundle.getBundleInstaller(); - installer.install(bundlePath, { - param: { - userId: 0, - installFlag: 1, - isKeepData: false - } - }, onReceiveinstallEvent); - function onReceiveinstallEvent(err, data) { - console.info('========install Finish========'); - expect(typeof err).assertEqual('object'); - expect(err.code).assertEqual(0); - expect(typeof data).assertEqual('object'); - expect(data.status).assertEqual(0); - expect(data.statusMessage).assertEqual('SUCCESS'); - } - } - - async function uninstall(bundleName) { - var installer = await bundle.getBundleInstaller(); - installer.uninstall(bundleName, { - param: { - userId: 0, - installFlag: 1, - isKeepData: false - } - }, onReceiveinstallEvent); - function onReceiveinstallEvent(err, data) { - console.info('========uninstall Finish========'); - expect(typeof err).assertEqual('object'); - expect(err.code).assertEqual(0); - expect(typeof data).assertEqual('object'); - expect(data.status).assertEqual(0); - expect(data.statusMessage).assertEqual('SUCCESS'); - } - } }) \ No newline at end of file diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js index 7c9776685111019f35a38640fe5286ce11490f62..234927da55a8e0394fe98d1921e107884a47d852 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/src/main/js/test/ActsBmsModuleUsageRecordTest.test.js @@ -15,46 +15,74 @@ import bundle from '@ohos.bundle' import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' import featureAbility from '@ohos.ability.featureability' +import commonEvent from '@ohos.commonevent' +var subscriberInfo_0100 = { + events: ['ACTS_Third1_Publish_CommonEvent'], +}; const BUNDLE_NAME = 'com.example.third1'; const NUM_TWO = 2; const NUM_TEN = 10; const INVALID_NUM = -1; -const TIMEOUT = 1000; -const EVENTTIMEOUT = 2000; +const START_ABILITY_TIMEOUT = 3000; +const START_RECORD = 900; var START_COUNT = 1; var RECORD_COUNT = 0; describe('ActsBmsModuleUsageRecordTest', function () { beforeAll(async (done) => { - console.debug('=======before all install========'); - await install(['/data/test/bmsThirdBundleTest1.hap']) - console.debug('=======start ability========') - sleep(TIMEOUT); - await featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.example.third1", - abilityName: "com.example.third1.MainAbility" - }, - }, - ); - sleep(TIMEOUT); - let records = await bundle.getModuleUsageRecords(1000); - RECORD_COUNT = records.length; - for (let i = 0, len = records.length; i < len; i++) { - if (records[i].bundleName == 'com.example.third1') { - START_COUNT = records[i].launchedCount; + var subscriber; + let id; + async function subscribeCallBack(err, data) { + clearTimeout(id); + console.debug('=====subscribeCallBack=====' + data.event); + let records = await bundle.getModuleUsageRecords(START_RECORD); + RECORD_COUNT = records.length; + for (let i = 0, len = records.length; i < len; i++) { + if (records[i].bundleName == 'com.example.third1') { + START_COUNT = records[i].launchedCount; + } } + commonEvent.unsubscribe(subscriber, unSubscribeCallback); + console.debug('=====subscribeCallBack end====='); + done(); } - done(); - setTimeout(function () { - console.debug('=======before all install finish========'); - }, TIMEOUT) + commonEvent.createSubscriber(subscriberInfo_0100).then((data) => { + console.debug('====>Create Subscriber====>'); + subscriber = data; + commonEvent.subscribe(subscriber, subscribeCallBack); + }) + function unSubscribeCallback(err, data) { + console.debug('====>UnSubscribe CallBack====>'); + done(); + } + function timeout() { + console.debug('=====timeout======'); + commonEvent.unsubscribe(subscriber, unSubscribeCallback) + done(); + } + console.debug('=======start ability========') + let installer = await bundle.getBundleInstaller(); + installer.install(['/data/test/bmsThirdBundleTest1.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + console.debug('========install Finish========'); + id = setTimeout(timeout, START_ABILITY_TIMEOUT); + await featureAbility.startAbility( + { + want: + { + bundleName: 'com.example.third1', + abilityName: 'com.example.third1.MainAbility' + } + } + ) + }); }) - /* * @tc.number: bms_getModuleUsageRecordTest_0100 * @tc.name: getModuleUsageRecord(maxNum) @@ -64,55 +92,29 @@ describe('ActsBmsModuleUsageRecordTest', function () { it('bms_getModuleUsageRecordTest_0100', 0, async function (done) { console.debug('=====================bms_getModuleUsageRecordTest_0100=================='); let records = await bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TWO); - checkModuleUsageRecord(records, 'bms_getModuleUsageRecordTest_0100'); + checkModuleUsageRecord(records); let dataMap = new Map(); for (let i = 0, length = records.length; i < length; i++) { console.debug('=============bundleName is=========' + JSON.stringify(records[i].bundleName)); dataMap.set(records[i].bundleName, records[i]); } - let data = dataMap.get(BUNDLE_NAME); - console.debug('=============data is=========' + JSON.stringify(data)); - console.debug('=============bundleName is=========' + JSON.stringify(data.bundleName)); - expect(data.bundleName).assertEqual('com.example.third1'); - console.debug('=============appLabelId==============' + JSON.stringify(data.appLabelId)); - expect(data.appLabelId).assertLarger(0); - console.debug('=============name==============' + JSON.stringify(data.name)); - expect(data.name).assertEqual('entry'); - console.debug('=============labelId==============' + JSON.stringify(data.labelId)); - expect(data.labelId >= 0).assertTrue(); - console.debug('=============descriptionId==============' + JSON.stringify(data.descriptionId)); - expect(data.descriptionId).assertEqual(0); - console.debug('=============abilityName==============' + JSON.stringify(data.abilityName)); - expect(data.abilityName).assertEqual('com.example.third1.MainAbility'); - console.debug('=============abilityLabelId==============' + JSON.stringify(data.abilityLabelId)); - expect(data.abilityLabelId).assertLarger(0); - console.debug('===========abilityDescriptionId===========' + JSON.stringify(data.abilityDescriptionId)); - expect(data.abilityDescriptionId).assertLarger(0); - console.debug('=============abilityIconId==============' + JSON.stringify(data.abilityIconId)); - expect(data.abilityIconId).assertLarger(0); - console.debug('=============launchedCount==============' + JSON.stringify(data.launchedCount)); - expect(data.launchedCount).assertLarger(0); - console.debug('=============lastLaunchTime==============' + JSON.stringify(data.lastLaunchTime)); - expect(data.lastLaunchTime).assertLarger(0); - console.debug('=============isRemoved==============' + JSON.stringify(data.isRemoved)); - expect(data.isRemoved).assertEqual(false); - expect(data.installationFreeSupported).assertEqual(false); - - var result = checkIsExist(records, BUNDLE_NAME); - expect(result).assertEqual(true); - if (result) { - let counts = new Map(); - console.debug('======LaunchedCount======' + START_COUNT); - for (let i = 0, length = records.length; i < length; i++) { - counts.set(records[i].bundleName, records[i].launchedCount); - console.debug('=============launchedCount is=========' + records[i].launchedCount); - } - expect(counts.get(BUNDLE_NAME)).assertEqual(START_COUNT); + if (dataMap.has(BUNDLE_NAME)) { + let data = dataMap.get(BUNDLE_NAME); + expect(data.bundleName).assertEqual('com.example.third1'); + expect(data.appLabelId >= 0).assertTrue(); + expect(data.name).assertEqual('entry'); + expect(data.labelId >= 0).assertTrue(); + expect(data.descriptionId).assertEqual(0); + expect(data.abilityName).assertEqual('com.example.third1.MainAbility'); + expect(data.abilityLabelId >= 0).assertTrue(); + expect(data.abilityDescriptionId >= 0).assertTrue(); + expect(data.abilityIconId >= 0).assertTrue(); + expect(data.launchedCount).assertEqual(START_COUNT); + expect(data.lastLaunchTime).assertLarger(0); + expect(data.isRemoved).assertEqual(false); + expect(data.installationFreeSupported).assertEqual(false); } done(); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0100==================end'); - }, EVENTTIMEOUT) }) /* @@ -124,23 +126,11 @@ describe('ActsBmsModuleUsageRecordTest', function () { console.debug('=====================bms_getModuleUsageRecordTest_0200=================='); bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TWO, (err, data) => { expect(err.code).assertEqual(0); - checkModuleUsageRecord(data, 'bms_getModuleUsageRecordTest_0200'); + checkModuleUsageRecord(data); var result = checkIsExist(data, BUNDLE_NAME); expect(result).assertEqual(true); - if (result) { - let counts = new Map(); - console.debug('======LaunchedCount======' + START_COUNT); - for (let i = 0, length = data.length; i < length; i++) { - counts.set(data[i].bundleName, data[i].launchedCount); - console.debug('=============launchedCount is=========' + data[i].launchedCount); - } - expect(counts.get(BUNDLE_NAME)).assertEqual(START_COUNT); - } done(); }); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0200==================end'); - }, TIMEOUT) }) /* @@ -152,7 +142,7 @@ describe('ActsBmsModuleUsageRecordTest', function () { console.debug('=====================bms_getModuleUsageRecordTest_0300=================='); bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TWO, (err, data) => { expect(err.code).assertEqual(0); - checkModuleUsageRecord(data, 'bms_getModuleUsageRecordTest_0300'); + checkModuleUsageRecord(data); var result = checkIsExist(data, BUNDLE_NAME); expect(result).assertEqual(true); if (result) { @@ -166,9 +156,6 @@ describe('ActsBmsModuleUsageRecordTest', function () { } done(); }); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0300==================end'); - }, TIMEOUT) }) /* @@ -179,7 +166,7 @@ describe('ActsBmsModuleUsageRecordTest', function () { it('bms_getModuleUsageRecordTest_0400', 0, async function (done) { console.debug('=====================bms_getModuleUsageRecordTest_0400=================='); var records = await bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TWO); - checkModuleUsageRecord(records, 'bms_getModuleUsageRecordTest_0400'); + checkModuleUsageRecord(records); var result = checkIsExist(records, BUNDLE_NAME); expect(result).assertEqual(true); if (result) { @@ -193,9 +180,6 @@ describe('ActsBmsModuleUsageRecordTest', function () { expect(counts.get(BUNDLE_NAME)).assertEqual(START_COUNT); } done(); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0400==================end'); - }, TIMEOUT) }) /* @@ -206,18 +190,38 @@ describe('ActsBmsModuleUsageRecordTest', function () { */ it('bms_getModuleUsageRecordTest_0500', 0, async function (done) { console.debug('=====================bms_getModuleUsageRecordTest_0500=================='); - await uninstall(BUNDLE_NAME); - sleep(TIMEOUT); - console.debug('===================uninstall third1===================='); - var records = await bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TWO) - checkModuleUsageRecord(records, 'bms_getModuleUsageRecordTest_0500'); - var result = checkIsExist(records, BUNDLE_NAME); - expect(result).assertEqual(false); - await install(['/data/test/bmsThirdBundleTest1.hap']); - done(); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0500==================end'); - }, TIMEOUT) + var installer = await bundle.getBundleInstaller(); + installer.uninstall(BUNDLE_NAME, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, onReceiveinstallEvent); + + async function onReceiveinstallEvent(err, data) { + console.debug('========uninstall Finish========'); + expect(err.code).assertEqual(0); + expect(data.status).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + console.debug('========data.statusMessage========' + data.statusMessage); + var records = await bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TWO) + checkModuleUsageRecord(records); + var result = checkIsExist(records, BUNDLE_NAME); + expect(result).assertEqual(false); + installer.install(['/data/test/bmsThirdBundleTest1.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + console.debug('========install Finish========'); + expect(err.code).assertEqual(0); + expect(data.statusMessage).assertEqual('SUCCESS'); + done(); + }); + } }) /* @@ -228,19 +232,30 @@ describe('ActsBmsModuleUsageRecordTest', function () { */ it('bms_getModuleUsageRecordTest_0600', 0, async function (done) { console.debug('=====================bms_getModuleUsageRecordTest_0600=================='); - await uninstall(BUNDLE_NAME); - sleep(TIMEOUT); - await bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TWO, async (err, data) => { - expect(err.code).assertEqual(0); - checkModuleUsageRecord(data, 'bms_getModuleUsageRecordTest_0600'); - var result = checkIsExist(data, BUNDLE_NAME); - expect(result).assertEqual(false); - await install(['/data/test/bmsThirdBundleTest1.hap']); - done(); + var installer = await bundle.getBundleInstaller(); + installer.uninstall(BUNDLE_NAME, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TWO, async (funcErr, moduleUsageRecord) => { + expect(funcErr.code).assertEqual(0); + var result = checkIsExist(moduleUsageRecord, BUNDLE_NAME); + expect(result).assertEqual(false); + installer.install(['/data/test/bmsThirdBundleTest1.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + done(); + }); + + }); }); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0600==================end'); - }, TIMEOUT) }) /* @@ -252,13 +267,10 @@ describe('ActsBmsModuleUsageRecordTest', function () { console.debug('=====================bms_getModuleUsageRecordTest_0700=================='); await bundle.getModuleUsageRecords(INVALID_NUM, (err, data) => { console.debug('============err.code==========' + err.code); - expect(err.code).assertEqual(0); + expect(err.code).assertEqual(-1); expect(data.length).assertEqual(0); done(); }); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0700==================end'); - }, TIMEOUT) }) /* @@ -271,9 +283,6 @@ describe('ActsBmsModuleUsageRecordTest', function () { var data = await bundle.getModuleUsageRecords(INVALID_NUM); expect(data.length).assertEqual(0); done(); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0800==================end'); - }, TIMEOUT) }) /* @@ -285,13 +294,10 @@ describe('ActsBmsModuleUsageRecordTest', function () { console.debug('=====================bms_getModuleUsageRecordTest_0900=================='); await bundle.getModuleUsageRecords(0, (err, data) => { console.debug('============err.code==========' + err.code); - expect(err.code).assertEqual(0); + expect(err.code).assertEqual(-1); expect(data.length).assertEqual(0); done(); }); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_0900==================end'); - }, TIMEOUT) }) /* @@ -304,9 +310,6 @@ describe('ActsBmsModuleUsageRecordTest', function () { var data = await bundle.getModuleUsageRecords(0); expect(data.length).assertEqual(0); done(); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_1000==================end'); - }, TIMEOUT) }) /* @@ -317,29 +320,27 @@ describe('ActsBmsModuleUsageRecordTest', function () { */ it('bms_getModuleUsageRecordTest_1100', 0, async function (done) { console.debug('=====================bms_getModuleUsageRecordTest_1100=================='); - await uninstall(BUNDLE_NAME); - sleep(TIMEOUT); - var bundlePath = ['/data/test/bmsThirdBundleTest1.hap'] - await install(bundlePath); - sleep(TIMEOUT); - console.debug('===================install third1===================='); - var records = await bundle.getModuleUsageRecords(NUM_TEN) - checkModuleUsageRecord(records, 'bms_getModuleUsageRecordTest_1100'); - var result = checkIsExist(records, BUNDLE_NAME); - expect(result).assertEqual(true); - if (result) { - let counts = new Map(); - console.debug('======LaunchedCount======' + START_COUNT); - for (let i = 0, length = records.length; i < length; i++) { - counts.set(records[i].bundleName, records[i].launchedCount); - console.debug('=============launchedCount is=========' + records[i].launchedCount); + var installer = await bundle.getBundleInstaller(); + installer.uninstall(BUNDLE_NAME, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - expect(counts.get(BUNDLE_NAME)).assertEqual(START_COUNT); - } - done(); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_1100==================end'); - }, TIMEOUT) + }, (err, data) => { + var bundlePath = ['/data/test/bmsThirdBundleTest1.hap']; + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + var records = await bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TEN) + expect(checkLaunchCount(records, BUNDLE_NAME, START_COUNT)).assertEqual(true); + done(); + }); + }); }) /* @@ -350,30 +351,29 @@ describe('ActsBmsModuleUsageRecordTest', function () { */ it('bms_getModuleUsageRecordTest_1200', 0, async function (done) { console.debug('=====================bms_getModuleUsageRecordTest_1200=================='); - await uninstall(BUNDLE_NAME); - sleep(TIMEOUT); - var bundlePath = ['/data/test/bmsThirdBundleTest1.hap'] - await install(bundlePath); - sleep(TIMEOUT); - await bundle.getModuleUsageRecords(NUM_TEN, (err, data) => { - expect(err.code).assertEqual(0); - checkModuleUsageRecord(data, 'bms_getModuleUsageRecordTest_1200'); - var result = checkIsExist(data, BUNDLE_NAME); - expect(result).assertEqual(true); - if (result) { - let counts = new Map(); - console.debug('======LaunchedCount======' + START_COUNT); - for (let i = 0, length = data.length; i < length; i++) { - counts.set(data[i].bundleName, data[i].launchedCount); - console.debug('=============launchedCount is=========' + data[i].launchedCount); - } - expect(counts.get(BUNDLE_NAME)).assertEqual(START_COUNT); + var installer = await bundle.getBundleInstaller(); + installer.uninstall(BUNDLE_NAME, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - done(); - }) - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_1200==================end'); - }, TIMEOUT) + }, (err, data) => { + var bundlePath = ['/data/test/bmsThirdBundleTest1.hap'] + installer.install(bundlePath, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TEN, (err, records) => { + expect(err.code).assertEqual(0); + expect(checkLaunchCount(records, BUNDLE_NAME, START_COUNT)).assertEqual(true); + done(); + }) + }); + }); }) /* * @tc.number: bms_getModuleUsageRecordTest_1300 @@ -383,42 +383,60 @@ describe('ActsBmsModuleUsageRecordTest', function () { */ it('bms_getModuleUsageRecordTest_1300', 0, async function (done) { console.debug('=====================bms_getModuleUsageRecordTest_1300=================='); - await uninstall(BUNDLE_NAME); - sleep(TIMEOUT); - var bundlePath = ['/data/test/bmsThirdBundleTest1.hap'] - await install(bundlePath); - sleep(TIMEOUT); - console.debug('=======start ability========') - await featureAbility.startAbility( - { - want: - { - bundleName: 'com.example.third1', - abilityName: 'com.example.third1.MainAbility' - } + var subscriber; + let id; + async function subscribeCallBack(err, data) { + clearTimeout(id); + START_COUNT += 1; + expect(data.event).assertEqual('ACTS_Third1_Publish_CommonEvent'); + await bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TEN, (err, records) => { + expect(err.code).assertEqual(0); + var result = checkLaunchCount(records, BUNDLE_NAME, START_COUNT); + expect(result).assertEqual(true); + commonEvent.unsubscribe(subscriber, unSubscribeCallback); + done(); + }) + } + commonEvent.createSubscriber(subscriberInfo_0100).then((data) => { + console.debug('====>Create Subscriber====>'); + subscriber = data; + commonEvent.subscribe(subscriber, subscribeCallBack); + }) + function unSubscribeCallback(err, data) { + done(); + } + function timeout() { + console.debug('=====timeout======'); + commonEvent.unsubscribe(subscriber, unSubscribeCallback) + done(); + } + let installer = await bundle.getBundleInstaller(); + installer.uninstall(BUNDLE_NAME, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - ) - sleep(TIMEOUT); - START_COUNT += 1; - await bundle.getModuleUsageRecords(NUM_TEN, (err, data) => { - expect(err.code).assertEqual(0); - checkModuleUsageRecord(data, 'bms_getModuleUsageRecordTest_1300'); - var result = checkIsExist(data, BUNDLE_NAME); - expect(result).assertEqual(true); - if (result) { - let counts = new Map(); - console.debug('======LaunchedCount======' + START_COUNT); - for (let i = 0, length = data.length; i < length; i++) { - counts.set(data[i].bundleName, data[i].launchedCount); - console.debug('=============launchedCount is=========' + data[i].launchedCount); + }, (err, data) => { + installer.install(['/data/test/bmsThirdBundleTest1.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false } - expect(counts.get(BUNDLE_NAME)).assertEqual(START_COUNT); - } - done(); - }) - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_1300==================end'); - }, TIMEOUT) + }, async (err, data) => { + id = setTimeout(timeout, START_ABILITY_TIMEOUT); + await featureAbility.startAbility( + { + want: + { + bundleName: 'com.example.third1', + abilityName: 'com.example.third1.MainAbility' + } + } + ) + }); + }); }) /* * @tc.number: bms_getModuleUsageRecordTest_1400 @@ -428,52 +446,129 @@ describe('ActsBmsModuleUsageRecordTest', function () { */ it('bms_getModuleUsageRecordTest_1400', 0, async function (done) { console.debug('=====================bms_getModuleUsageRecordTest_1400=================='); - await uninstall(BUNDLE_NAME); - sleep(TIMEOUT); - var bundlePath = ['/data/test/bmsThirdBundleTest1.hap'] - await install(bundlePath); - sleep(TIMEOUT); - console.debug('=======start ability========') - await featureAbility.startAbility( - { - want: - { - bundleName: 'com.example.third1', - abilityName: 'com.example.third1.MainAbility' - } - } - ) - sleep(TIMEOUT); - START_COUNT += 1; - console.debug('=======start ability result========' + result); - var records = await bundle.getModuleUsageRecords(NUM_TEN) - checkModuleUsageRecord(records, 'bms_getModuleUsageRecordTest_1400'); - var result = checkIsExist(records, BUNDLE_NAME); - expect(result).assertEqual(true); - if (result) { - let counts = new Map(); - console.debug('======LaunchedCount======' + START_COUNT); - for (let i = 0, length = records.length; i < length; i++) { - counts.set(records[i].bundleName, records[i].launchedCount); - console.debug('=============launchedCount is=========' + records[i].launchedCount); - } - expect(counts.get(BUNDLE_NAME)).assertEqual(START_COUNT); + var subscriber; + let id; + async function subscribeCallBack(err, data) { + clearTimeout(id); + START_COUNT += 1; + expect(data.event).assertEqual('ACTS_Third1_Publish_CommonEvent'); + var records = await bundle.getModuleUsageRecords(RECORD_COUNT + NUM_TEN) + expect(checkLaunchCount(records, BUNDLE_NAME, START_COUNT)).assertEqual(true); + commonEvent.unsubscribe(subscriber, unSubscribeCallback); + done(); + } + commonEvent.createSubscriber(subscriberInfo_0100).then((data) => { + console.debug('====>Create Subscriber====>'); + subscriber = data; + commonEvent.subscribe(subscriber, subscribeCallBack); + }) + function unSubscribeCallback(err, data) { + done(); + } + function timeout() { + console.debug('=====timeout======'); + commonEvent.unsubscribe(subscriber, unSubscribeCallback) + done(); } + let installer = await bundle.getBundleInstaller(); + installer.uninstall(BUNDLE_NAME, { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, (err, data) => { + installer.install(['/data/test/bmsThirdBundleTest1.hap'], { + param: { + userId: 0, + installFlag: 1, + isKeepData: false + } + }, async (err, data) => { + console.debug('========install Finish========'); + id = setTimeout(timeout, START_ABILITY_TIMEOUT); + await featureAbility.startAbility( + { + want: + { + bundleName: 'com.example.third1', + abilityName: 'com.example.third1.MainAbility' + } + } + ) + }); + }); + }) + + /* + * @tc.number: bms_getModuleUsageRecordTest_1500 + * @tc.name: getModuleUsageRecord(maxNum, callback: AsyncCallback>) + * @tc.desc: test getModuleUsageRecord with the critical value + */ + it('bms_getModuleUsageRecordTest_1500', 0, async function (done) { + console.debug('=====================bms_getModuleUsageRecordTest_1500=================='); + await bundle.getModuleUsageRecords(1000, (err, records) => { + expect(err.code).assertEqual(0); + console.info('============data length_1500===========' + records.length); + checkModuleUsageRecord(records); + expect(checkIsExist(records, BUNDLE_NAME)).assertTrue(); + done(); + }); + }) + + /* + * @tc.number: bms_getModuleUsageRecordTest_1600 + * @tc.name: getModuleUsageRecord(maxNum, callback: AsyncCallback>) + * @tc.desc: test getModuleUsageRecord with the critical value + */ + it('bms_getModuleUsageRecordTest_1600', 0, async function (done) { + console.debug('=====================bms_getModuleUsageRecordTest_1600=================='); + var records = await bundle.getModuleUsageRecords(1000); + console.info('============data length_1600===========' + records.length); + checkModuleUsageRecord(records); + expect(checkIsExist(records, BUNDLE_NAME)).assertTrue(); + done(); + }) + + /* + * @tc.number: bms_getModuleUsageRecordTest_1700 + * @tc.name: getModuleUsageRecord(maxNum, callback: AsyncCallback>) + * @tc.desc: test getModuleUsageRecord with the invalid parameter + */ + it('bms_getModuleUsageRecordTest_1700', 0, async function (done) { + console.debug('=====================bms_getModuleUsageRecordTest_1700=================='); + await bundle.getModuleUsageRecords(1001, (err, data) => { + console.debug('============err.code==========' + err.code); + expect(err.code).assertEqual(-1); + console.info('============data length_1700===========' + data.length); + expect(data.length).assertEqual(0); + done(); + }); + }) + + /* + * @tc.number: bms_getModuleUsageRecordTest_1800 + * @tc.name: getModuleUsageRecord(maxNum, callback: AsyncCallback>) + * @tc.desc: test getModuleUsageRecord with the invalid parameter + */ + it('bms_getModuleUsageRecordTest_1800', 0, async function (done) { + console.debug('=====================bms_getModuleUsageRecordTest_1800=================='); + var data = await bundle.getModuleUsageRecords(1001); + console.info('============data length_1800===========' + data.length); + expect(data.length).assertEqual(0); done(); - setTimeout(function () { - console.debug('=====================bms_getModuleUsageRecordTest_1400==================end'); - }, TIMEOUT) }) - function checkModuleUsageRecord(data, caseName) { + + + function checkModuleUsageRecord(data) { console.debug('======================check ModuleUsageRecord begin=========================='); - console.debug(caseName + ' ==========record length is ========== ' + data.length); expect(data.length).assertLarger(0); for (let i = 0, length = data.length; i < length; i++) { console.debug('=======All Info========' + JSON.stringify(data[i])); console.debug('=============bundleName is=========' + JSON.stringify(data[i].bundleName)); expect(data[i].bundleName.length).assertLarger(0); console.debug('=============appLabelId==============' + JSON.stringify(data[i].appLabelId)); - expect(data[i].appLabelId).assertLarger(0); + expect(data[i].appLabelId >= 0).assertTrue(); console.debug('=============name==============' + JSON.stringify(data[i].name)); expect(data[i].name.length).assertLarger(0); console.debug('=============labelId==============' + JSON.stringify(data[i].labelId)); @@ -483,11 +578,11 @@ describe('ActsBmsModuleUsageRecordTest', function () { console.debug('=============abilityName==============' + JSON.stringify(data[i].abilityName)); expect(data[i].abilityName.length).assertLarger(0); console.debug('=============abilityLabelId==============' + JSON.stringify(data[i].abilityLabelId)); - expect(data[i].abilityLabelId).assertLarger(0); + expect(data[i].abilityLabelId >= 0).assertTrue(); console.debug('===========abilityDescriptionId===========' + JSON.stringify(data[i].abilityDescriptionId)); - expect(data[i].abilityDescriptionId).assertLarger(0); + expect(data[i].abilityDescriptionId >= 0).assertTrue(); console.debug('=============abilityIconId==============' + JSON.stringify(data[i].abilityIconId)); - expect(data[i].abilityIconId).assertLarger(0); + expect(data[i].abilityIconId >= 0).assertTrue(); console.debug('=============launchedCount==============' + JSON.stringify(data[i].launchedCount)); expect(data[i].launchedCount).assertLarger(0); console.debug('=============lastLaunchTime==============' + JSON.stringify(data[i].lastLaunchTime)); @@ -500,66 +595,43 @@ describe('ActsBmsModuleUsageRecordTest', function () { function checkIsExist(data, bundleName) { let bundles = new Map(); for (let i = 0, length = data.length; i < length; i++) { - console.debug('=============bundleName is=========' + JSON.stringify(data[i].bundleName)); bundles.set(data[i].bundleName, data[i]); } if (bundles.has(bundleName)) { - console.debug(bundleName + ' is exist'); return true; } else { - console.debug(bundleName + ' is not exist'); return false; } } - async function install(bundlePath) { - var installer = await bundle.getBundleInstaller(); - installer.install(bundlePath, { - param: { - userId: 0, - installFlag: 1, - isKeepData: false - } - }, onReceiveinstallEvent); - function onReceiveinstallEvent(err, data) { - console.debug('========install Finish========'); - expect(typeof err).assertEqual('object'); - expect(err.code).assertEqual(0); - expect(typeof data).assertEqual('object'); - expect(data.status).assertEqual(0); - expect(data.statusMessage).assertEqual('SUCCESS'); + function checkLaunchCount(data, bundleName, count) { + let i = 0; + for (let length = data.length; i < length; i++) { + if (data[i].bundleName == bundleName) { + expect(data[i].launchedCount).assertEqual(count); + return true; + } + } + if (i == data.length) { + return false; } } - async function uninstall(bundleName) { - var installer = await bundle.getBundleInstaller(); - installer.uninstall(bundleName, { + + afterAll(async (done) => { + console.debug('=======after all install========'); + let installer = await bundle.getBundleInstaller(); + installer.uninstall(BUNDLE_NAME, { param: { userId: 0, installFlag: 1, isKeepData: false } - }, onReceiveinstallEvent); - - function onReceiveinstallEvent(err, data) { - console.debug('========uninstall Finish========'); + }, (err, data) => { expect(err.code).assertEqual(0); - expect(typeof data).assertEqual('object'); expect(data.status).assertEqual(0); expect(data.statusMessage).assertEqual('SUCCESS'); - console.debug('========data.statusMessage========' + data.statusMessage); - } - } - afterAll(async (done) => { - console.debug('=======after all install========'); - let bundleName = 'com.example.third1' - uninstall(bundleName); + }); done(); }) - function sleep(delay) { - var start = (new Date()).getTime(); - while ((new Date()).getTime() - start < delay) { - continue; - } - } }) \ No newline at end of file