From 96bca9962013a512f54f6297c2a499261bc60a61 Mon Sep 17 00:00:00 2001 From: inter515 Date: Tue, 31 May 2022 16:28:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9done=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: inter515 --- .../js/test/ActsBmsGetBackGroundModes.test.js | 4 +- .../test/GetAbilityLabelJsUnit.test.ets | 223 +++++++----------- .../src/main/js/test/ExampleJsunit.test.js | 45 ++-- 3 files changed, 119 insertions(+), 153 deletions(-) diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsGetBackGroundModes.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsGetBackGroundModes.test.js index bf85eb643..0651d868b 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsGetBackGroundModes.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsGetBackGroundModes.test.js @@ -147,9 +147,9 @@ describe('ActsBmsGetBackGroundModes', function () { }); bundle.getBundleInfo(BUNDLE_NAME2, bundle.BundleFlag.GET_BUNDLE_WITH_ABILITIES, (err, data3) => { expect(data3.abilityInfos[1].backgroundModes).assertEqual(AUDIOPLAYBACK | AUDIORECORDING | LOCATION - | BLUETOOTHINTERACTION | MULTIDEVICECONNECTION | WIFIINTERACTION | VOIP | TASKKEEPING) + | BLUETOOTHINTERACTION | MULTIDEVICECONNECTION | WIFIINTERACTION | VOIP | TASKKEEPING); + done(); }); - done(); }); /* diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/GetAbilityLabelJsUnit.test.ets b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/GetAbilityLabelJsUnit.test.ets index d251ca84f..53e333524 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/GetAbilityLabelJsUnit.test.ets +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/GetAbilityLabelJsUnit.test.ets @@ -19,190 +19,145 @@ import Bundle from '@ohos.bundle'; const BUNDLE_NAME = 'com.open.harmony.packagemag'; const ABILITY_NAME = 'com.open.harmony.packagemag.MainAbility'; const SERVICE_ABILITY_NAME = 'com.open.harmony.packagemag.ServiceAbility'; -const OTHER_BUNDLE_NAME = 'com.ohos.acepackage'; -const OTHER_ABILITY_NAME = 'com.ohos.acepackage.MainAbility'; +const OTHER_BUNDLE_NAME = 'com.example.l3jsdemo'; +const OTHER_ABILITY_NAME = 'com.example.l3jsdemo.MainAbility'; const BUNDLE_NAME_ERROR = 'com.ohos.acepackage.error'; const ABILITY_NAME_ERROR = 'com.ohos.acepackage.error.MainAbility'; export default function getAbilityLabelJsUnit() { - describe('context_getAbilityLabel_test', function () { + describe('getAbilityLabel_test', function () { + /* - * @tc.number: context_getAbilityLabel_test_0100 - * @tc.name: getAbilityLabel : Gets the specified ability label - * @tc.desc: Check the return value of the interface (by promise) - * @tc.level 0 + * @tc.number: getAbilityLabel_test_0100 + * @tc.name: Test getAbilityLabel : Gets the specified ability label + * @tc.desc: Check the return value of the interface */ - it('context_getAbilityLabel_test_0100', 0, async function (done) { - let mData; - let timeOldStamp = await Utils.getNowTime(); + it('getAbilityLabel_test_0100', 0, async function (done) { await Bundle.getAbilityLabel(BUNDLE_NAME, ABILITY_NAME).then((data) => { - let timeNewStamp = Utils.getNowTime(); - Utils.getDurationTime('[context_getAbilityLabel_test_0100]', timeOldStamp, timeNewStamp); - mData = data; - console.info('[context_getAbilityLabel_test_0100] promise data is: ' + JSON.stringify(data)); + expect(data).assertEqual("entry_MainAbility"); }).catch((error) => { - console.info('[context_getAbilityLabel_test_0100] promise error is: ' + error); expect(error).assertFail(); }); - getAbilityLabelSuccess('[context_getAbilityLabel_test_0100]', mData); - done(); - }); - - /* - * @tc.number: context_getAbilityLabel_test_0200 - * @tc.name: getAbilityLabel : Gets the specified ability label - * @tc.desc: Check the return value of the interface (by callback) - * @tc.level 0 - */ - it('context_getAbilityLabel_test_0200', 0, async function (done) { - let timeOldStamp = await Utils.getNowTime(); - let mData; Bundle.getAbilityLabel(BUNDLE_NAME, ABILITY_NAME, (error, data) => { - if (error) { - console.error('[context_getAbilityLabel_test_0200]Operation failed. Cause: ' + JSON.stringify(error)); - expect(error).assertFail(); - } - let timeNewStamp = Utils.getNowTime(); - Utils.getDurationTime('[context_getAbilityLabel_test_0200]', timeOldStamp, timeNewStamp); - mData = data; - console.info('[context_getAbilityLabel_test_0200] callBack error: ' + error); - console.info('[context_getAbilityLabel_test_0200] callBack data is:' + JSON.stringify(data)); + expect(error).assertEqual(undefined); + expect(data).assertEqual("entry_MainAbility"); + done(); }); - await Utils.sleep(2000); - getAbilityLabelSuccess('[context_getAbilityLabel_test_0200]', mData); - done(); }); /* - * @tc.number: context_getAbilityLabel_test_0300 + * @tc.number: getAbilityLabel_test_0200 * @tc.name: getAbilityLabel : Gets the specified ability label - * @tc.desc: Check the return value of the interface (by promise) - * @tc.level 0 + * @tc.desc: Check the return value of the interface */ - it('context_getAbilityLabel_test_0300', 0, async function (done) { + it('getAbilityLabel_test_0200', 0, async function (done) { let timeOldStamp = await Utils.getNowTime(); - let mError; - await Bundle.getAbilityLabel(BUNDLE_NAME_ERROR, ABILITY_NAME_ERROR).then((data) => { + await Bundle.getAbilityLabel(OTHER_BUNDLE_NAME, OTHER_ABILITY_NAME).then((data) => { let timeNewStamp = Utils.getNowTime(); - Utils.getDurationTime('[context_getAbilityLabel_test_0300]', timeOldStamp, timeNewStamp); - console.info('[context_getAbilityLabel_test_0300] promise data is: ' + JSON.stringify(data)); + Utils.getDurationTime('[getAbilityLabel_test_0200]', timeOldStamp, timeNewStamp); + expect(data).assertEqual("bmsfirstright"); }).catch((error) => { + expect(error).assertFail(); + }); + timeOldStamp = await Utils.getNowTime(); + Bundle.getAbilityLabel(OTHER_BUNDLE_NAME, OTHER_ABILITY_NAME, (error, data) => { let timeNewStamp = Utils.getNowTime(); - mError = error; - Utils.getDurationTime('[context_getAbilityLabel_test_0300]', timeOldStamp, timeNewStamp); - console.info('[context_getAbilityLabel_test_0300] promise error is: ' + error); - expect(mError).assertEqual(1); + Utils.getDurationTime('[context_getAbilityLabel_test_0200]', timeOldStamp, timeNewStamp); + expect(data).assertEqual("bmsfirstright"); + expect(error).assertEqual(undefined); + done(); }); - await Utils.sleep(2000); - getAbilityLabelFailure('[context_getAbilityLabel_test_0300]', mError); - done(); }); /* - * @tc.number: context_getAbilityLabel_test_0400 + * @tc.number: getAbilityLabel_test_0300 * @tc.name: getAbilityLabel : Gets the specified ability label - * @tc.desc: Check the return value of the interface (by callback) - * @tc.level 0 + * @tc.desc: Check the return value of the interface */ - it('context_getAbilityLabel_test_0400', 0, async function (done) { - let timeOldStamp = await Utils.getNowTime(); - let mError; - Bundle.getAbilityLabel(BUNDLE_NAME_ERROR, ABILITY_NAME_ERROR, (error, data) => { - if (error !== null) { - console.info('[context_getAbilityLabel_test_0400] callBack error: ' + error); - expect(error).assertEqual(1); - } - let timeNewStamp = Utils.getNowTime(); - Utils.getDurationTime('[context_getAbilityLabel_test_0400]', timeOldStamp, timeNewStamp); - mError = error; - console.info('[context_getAbilityLabel_test_0400] callBack data is:' + JSON.stringify(data)); + it('getAbilityLabel_test_0300', 0, async function (done) { + await Bundle.getAbilityLabel(BUNDLE_NAME, SERVICE_ABILITY_NAME).then((data) => { + expect(error).assertFail(); + }).catch((error) => { + expect(error).assertEqual(1); + }); + Bundle.getAbilityLabel(BUNDLE_NAME, SERVICE_ABILITY_NAME, (error, data) => { + expect(error).assertEqual(1); + expect(data).assertEqual(undefined); + done(); }); - await Utils.sleep(2000); - getAbilityLabelFailure('[context_getAbilityLabel_test_0400]', mError); - done(); }); /* - * @tc.number: context_getAbilityLabel_test_0500 + * @tc.number: getAbilityLabel_test_0400 * @tc.name: getAbilityLabel : Gets the specified ability label - * @tc.desc: Check the return value of the interface (by promise) - * @tc.level 0 + * @tc.desc: Check the return value of the interface */ - it('context_getAbilityLabel_test_0500', 0, async function (done) { - let mData; - let mError = null; + it('getAbilityLabel_test_0400', 0, async function (done) { let timeOldStamp = await Utils.getNowTime(); - await Bundle.getAbilityLabel(OTHER_BUNDLE_NAME, OTHER_ABILITY_NAME).then((data) => { + await Bundle.getAbilityLabel(BUNDLE_NAME_ERROR, ABILITY_NAME_ERROR).then((data) => { + expect(error).assertFail(); + }).catch((error) => { let timeNewStamp = Utils.getNowTime(); - Utils.getDurationTime('[context_getAbilityLabel_test_0500]', timeOldStamp, timeNewStamp); - mData = data; - expect(mData).assertFail(); - console.info('[context_getAbilityLabel_test_0500] promise data is: ' + JSON.stringify(data)); + Utils.getDurationTime('[getAbilityLabel_test_0400]', timeOldStamp, timeNewStamp); + expect(error).assertEqual(1); + }); + await Bundle.getAbilityLabel("", "").then((data) => { + expect(error).assertFail(); }).catch((error) => { - mError = error; - console.info('[context_getAbilityLabel_test_0500] promise error is: ' + error); - getAbilityLabelFailure('[context_getAbilityLabel_test_0500]', mError); + expect(error).assertEqual(1); }); - done(); - }); - - /* - * @tc.number: context_getAbilityLabel_test_0600 - * @tc.name: getAbilityLabel : Gets the specified ability label - * @tc.desc: Check the return value of the interface (by callback) - * @tc.level 0 - */ - it('context_getAbilityLabel_test_0600', 0, async function (done) { - let timeOldStamp = await Utils.getNowTime(); - Bundle.getAbilityLabel(OTHER_BUNDLE_NAME, OTHER_ABILITY_NAME, (error, data) => { + timeOldStamp = await Utils.getNowTime(); + Bundle.getAbilityLabel(BUNDLE_NAME_ERROR, ABILITY_NAME_ERROR, (error, data) => { let timeNewStamp = Utils.getNowTime(); - Utils.getDurationTime('[context_getAbilityLabel_test_0600]', timeOldStamp, timeNewStamp); - console.info('[context_getAbilityLabel_test_0600] callBack error: ' + error); - getAbilityLabelFailure('[context_getAbilityLabel_test_0600]', error); + Utils.getDurationTime('[getAbilityLabel_test_0400]', timeOldStamp, timeNewStamp); + expect(error).assertEqual(1); expect(data).assertEqual(undefined); + Bundle.getAbilityLabel("", "", (error, data) => { + expect(error).assertEqual(1); + expect(data).assertEqual(undefined); + done(); + }); }); - done(); }); /* - * @tc.number: context_getAbilityLabel_test_0700 + * @tc.number: getAbilityLabel_test_0500 * @tc.name: getAbilityLabel : Gets the specified ability label - * @tc.desc: Check the return value of the interface (by callback) - * @tc.level 0 + * @tc.desc: Check the return value of the interface */ - it('context_getAbilityLabel_test_0700', 0, async function (done) { - let timeOldStamp = await Utils.getNowTime(); - let mError; - Bundle.getAbilityLabel(BUNDLE_NAME, SERVICE_ABILITY_NAME, (error, data) => { - let timeNewStamp = Utils.getNowTime(); - Utils.getDurationTime('[context_getAbilityLabel_test_0700]', timeOldStamp, timeNewStamp); - mError = error; - if (mError !== null) { - console.info('[context_getAbilityLabel_test_0600] callBack error: ' + error); - } - console.info('[context_getAbilityLabel_test_0700] callBack data is:' + JSON.stringify(data)); + it('getAbilityLabel_test_0500', 0, async function (done) { + await Bundle.getAbilityLabel(undefined, OTHER_ABILITY_NAME).then((data) => { + expect(error).assertFail(); + }).catch((error) => { + expect(error).assertEqual(2); + }); + await Bundle.getAbilityLabel(OTHER_BUNDLE_NAME, undefined).then((data) => { + expect(error).assertFail(); + }).catch((error) => { + expect(error).assertEqual(2); + }); + await Bundle.getAbilityLabel(undefined, undefined).then((data) => { + expect(error).assertFail(); + }).catch((error) => { + expect(error).assertEqual(2); + }); + Bundle.getAbilityLabel(undefined, OTHER_ABILITY_NAME, (error, data) => { + expect(error).assertEqual(2); + expect(data).assertEqual(undefined); + Bundle.getAbilityLabel(OTHER_BUNDLE_NAME, undefined, (error, data) => { + expect(error).assertEqual(2); + expect(data).assertEqual(undefined); + Bundle.getAbilityLabel(undefined, undefined, (error, data) => { + expect(error).assertEqual(2); + expect(data).assertEqual(undefined); + done(); + }); + }); }); - await Utils.sleep(2000); - getAbilityLabelFailure('[context_getAbilityLabel_test_0700]', mError); - done(); }); - function getAbilityLabelSuccess(msg, data) { - console.log(msg + ' start ' + JSON.stringify(data)); - console.log(msg + ' result ' + data); - expect(typeof (data)).assertEqual('string'); - expect(data).assertEqual("entry_MainAbility"); - } - - function getAbilityLabelFailure(msg, error) { - console.log(msg + ' Failure '); - console.log(msg + ' error ' + JSON.stringify(error)); - expect(typeof (error)).assertEqual('number'); - expect(error).assertEqual(1) - } - }) } \ No newline at end of file diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js index 87f23fb95..5d17643ad 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js @@ -813,23 +813,34 @@ describe('ActsBundleManagerTest', function () { * @tc.name BUNDLE::getApplicationInfo * @tc.desc Test getApplicationInfo interfaces with three haps. */ - it('getApplicationInfo_0300', 0, async function (done) { - demo.getApplicationInfo(NAME3, demo.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, - demo.BundleFlag.GET_BUNDLE_WITH_ABILITIES).then(datainfo => { - expect(datainfo.name).assertEqual(NAME3); - expect(datainfo.label).assertEqual("$string:app_name"); - expect(datainfo.description).assertEqual(DESCRIPTION); - expect(datainfo.icon).assertEqual("$media:icon"); - expect(datainfo.name).assertEqual(NAME3); - expect(datainfo.description).assertEqual(DESCRIPTION); - expect(datainfo.descriptionId >= 0).assertTrue(); - expect(datainfo.icon).assertEqual("$media:icon"); - expect(datainfo.iconId >= 0).assertTrue(); - expect(datainfo.label).assertEqual("$string:app_name"); - expect(datainfo.labelId >= 0).assertTrue(); - expect(datainfo.systemApp).assertEqual(true); - expect(datainfo.supportedModes).assertEqual(0); - }); + it('getApplicationInfo_0300', 0, async function (done) { + let datainfo = await demo.getApplicationInfo(NAME2, + demo.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, USERID); + console.info("getApplicationInfo_0300 result" + JSON.stringify(datainfo)); + expect(typeof datainfo).assertEqual(OBJECT); + expect(datainfo.name.length).assertLarger(0); + expect(datainfo.description.length).assertLarger(0); + expect(datainfo.icon.length).assertLarger(0); + expect(datainfo.label.length).assertLarger(0); + expect(datainfo.moduleSourceDirs.length).assertLarger(0); + expect(datainfo.moduleInfos.length).assertLarger(0); + expect(datainfo.name).assertEqual(NAME2); + expect(datainfo.description).assertEqual(DESCRIPTION); + expect(datainfo.icon).assertEqual("$media:icon"); + expect(datainfo.label).assertEqual("$string:app_name"); + expect(datainfo.systemApp).assertEqual(true); + expect(datainfo.descriptionId >= 0).assertTrue(); + expect(datainfo.iconId >= 0).assertTrue(); + expect(datainfo.labelId >= 0).assertTrue(); + expect(datainfo.supportedModes).assertEqual(0); + expect(datainfo.process).assertEqual(""); + expect(datainfo.enabled).assertEqual(true); + expect(datainfo.flags).assertEqual(0); + expect(datainfo.moduleSourceDirs.length).assertLarger(0); + for (let j = 0; j < datainfo.moduleInfos; j++) { + expect(datainfo.moduleInfos[j].moduleName).assertEqual("entry"); + expect(datainfo.moduleInfos[j].moduleSourceDir.length).assertLarger(0); + } done(); }) -- GitLab