提交 1bab33ec 编写于 作者: I inter515

修改queryAbilityByWant的入参类型

Signed-off-by: Ninter515 <ry.renyi@huawei.com>
上级 b09ae847
...@@ -65,11 +65,9 @@ describe('ActsBmsGetBackGroundModes', function () { ...@@ -65,11 +65,9 @@ describe('ActsBmsGetBackGroundModes', function () {
let dataInfos = await bundle.queryAbilityByWant({ let dataInfos = await bundle.queryAbilityByWant({
action: 'action.system.home', action: 'action.system.home',
entities: ['entity.system.home'], entities: ['entity.system.home'],
elementName: {
deviceId: '0', deviceId: '0',
bundleName: BUNDLE_NAME5, bundleName: BUNDLE_NAME5,
abilityName: '', abilityName: ''
},
}, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId); }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
expect(dataInfos.length).assertEqual(NUM_FOUR); expect(dataInfos.length).assertEqual(NUM_FOUR);
if (dataInfos.length == NUM_FOUR) { if (dataInfos.length == NUM_FOUR) {
...@@ -110,11 +108,9 @@ describe('ActsBmsGetBackGroundModes', function () { ...@@ -110,11 +108,9 @@ describe('ActsBmsGetBackGroundModes', function () {
let dataInfos = await bundle.queryAbilityByWant({ let dataInfos = await bundle.queryAbilityByWant({
action: 'action.system.home', action: 'action.system.home',
entities: ['entity.system.home'], entities: ['entity.system.home'],
elementName: {
deviceId: '0', deviceId: '0',
bundleName: BUNDLE_NAME6, bundleName: BUNDLE_NAME6,
abilityName: '', abilityName: ''
},
}, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId); }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
expect(dataInfos.length).assertEqual(NUM_NINE); expect(dataInfos.length).assertEqual(NUM_NINE);
for (let i = 0, len = dataInfos.length; i < len; i++) { for (let i = 0, len = dataInfos.length; i < len; i++) {
...@@ -132,11 +128,9 @@ describe('ActsBmsGetBackGroundModes', function () { ...@@ -132,11 +128,9 @@ describe('ActsBmsGetBackGroundModes', function () {
let dataInfos = await bundle.queryAbilityByWant({ let dataInfos = await bundle.queryAbilityByWant({
action: 'action.system.home', action: 'action.system.home',
entities: ['entity.system.home'], entities: ['entity.system.home'],
elementName: {
deviceId: '0', deviceId: '0',
bundleName: BUNDLE_NAME2, bundleName: BUNDLE_NAME2,
abilityName: '', abilityName: ''
},
}, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId); }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
expect(dataInfos.length).assertEqual(NUM_TWO); expect(dataInfos.length).assertEqual(NUM_TWO);
if (dataInfos.length == NUM_TWO) { if (dataInfos.length == NUM_TWO) {
...@@ -173,11 +167,9 @@ describe('ActsBmsGetBackGroundModes', function () { ...@@ -173,11 +167,9 @@ describe('ActsBmsGetBackGroundModes', function () {
let dataInfos = await bundle.queryAbilityByWant({ let dataInfos = await bundle.queryAbilityByWant({
action: 'action.system.home', action: 'action.system.home',
entities: ['entity.system.home'], entities: ['entity.system.home'],
elementName: {
deviceId: '0', deviceId: '0',
bundleName: BUNDLE_NAME4, bundleName: BUNDLE_NAME4,
abilityName: '', abilityName: ''
},
}, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId); }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
expect(dataInfos.length).assertEqual(1); expect(dataInfos.length).assertEqual(1);
if (dataInfos.length == 1) { if (dataInfos.length == 1) {
...@@ -196,11 +188,9 @@ describe('ActsBmsGetBackGroundModes', function () { ...@@ -196,11 +188,9 @@ describe('ActsBmsGetBackGroundModes', function () {
let dataInfos = await bundle.queryAbilityByWant({ let dataInfos = await bundle.queryAbilityByWant({
action: 'action.system.home', action: 'action.system.home',
entities: ['entity.system.home'], entities: ['entity.system.home'],
elementName: {
deviceId: '0', deviceId: '0',
bundleName: BUNDLE_NAME1, bundleName: BUNDLE_NAME1,
abilityName: '', abilityName: ''
},
}, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId); }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
expect(dataInfos.length).assertEqual(NUM_FOUR); expect(dataInfos.length).assertEqual(NUM_FOUR);
if (dataInfos.length == NUM_FOUR) { if (dataInfos.length == NUM_FOUR) {
......
...@@ -19,6 +19,8 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from ...@@ -19,6 +19,8 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from
const BUNDLE_NAME1 = 'com.example.third1'; const BUNDLE_NAME1 = 'com.example.third1';
const SYSTEM_NAME = 'com.example.system2'; const SYSTEM_NAME = 'com.example.system2';
const ABILITIY_NAME8 = 'com.example.system2.MainAbility'; const ABILITIY_NAME8 = 'com.example.system2.MainAbility';
const ACTION_NAME = 'action.system.home';
const ENTITY_NAME = 'entity.system.home';
let userId = 0; let userId = 0;
describe('ActsBmsQueryAbilityByWant', function () { describe('ActsBmsQueryAbilityByWant', function () {
...@@ -28,7 +30,7 @@ describe('ActsBmsQueryAbilityByWant', function () { ...@@ -28,7 +30,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
console.info("getOsAccountLocalIdFromProcess userid ==========" + account); console.info("getOsAccountLocalIdFromProcess userid ==========" + account);
userId = account; userId = account;
done(); done();
}).catch(err=>{ }).catch(err => {
console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err)); console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
done(); done();
}) })
...@@ -42,8 +44,8 @@ describe('ActsBmsQueryAbilityByWant', function () { ...@@ -42,8 +44,8 @@ describe('ActsBmsQueryAbilityByWant', function () {
*/ */
it('bms_queryAbilityByWant_0100', 0, async function (done) { it('bms_queryAbilityByWant_0100', 0, async function (done) {
await bundle.queryAbilityByWant({ await bundle.queryAbilityByWant({
action: ['action.system.home'], action: ACTION_NAME,
entities: ['entity.system.home'], entities: [ENTITY_NAME],
bundleName: BUNDLE_NAME1 bundleName: BUNDLE_NAME1
}, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY, }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
userId).then(data => { userId).then(data => {
...@@ -52,8 +54,8 @@ describe('ActsBmsQueryAbilityByWant', function () { ...@@ -52,8 +54,8 @@ describe('ActsBmsQueryAbilityByWant', function () {
expect(err).assertEqual(1); expect(err).assertEqual(1);
}); });
bundle.queryAbilityByWant({ bundle.queryAbilityByWant({
action: ['action.system.home'], action: ACTION_NAME,
entities: ['entity.system.home'], entities: [ENTITY_NAME],
bundleName: BUNDLE_NAME1 bundleName: BUNDLE_NAME1
}, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY, }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
userId, (err, data) => { userId, (err, data) => {
...@@ -72,8 +74,8 @@ describe('ActsBmsQueryAbilityByWant', function () { ...@@ -72,8 +74,8 @@ describe('ActsBmsQueryAbilityByWant', function () {
it('bms_queryAbilityByWant_0200', 0, async function (done) { it('bms_queryAbilityByWant_0200', 0, async function (done) {
await bundle.queryAbilityByWant( await bundle.queryAbilityByWant(
{ {
action: ['action.system.home'], action: ACTION_NAME,
entities: ['entity.system.home'] entities: [ENTITY_NAME]
}, },
bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
userId).then(data => { userId).then(data => {
...@@ -87,8 +89,8 @@ describe('ActsBmsQueryAbilityByWant', function () { ...@@ -87,8 +89,8 @@ describe('ActsBmsQueryAbilityByWant', function () {
}); });
bundle.queryAbilityByWant( bundle.queryAbilityByWant(
{ {
action: ['action.system.home'], action: ACTION_NAME,
entities: ['entity.system.home'] entities: [ENTITY_NAME]
}, },
bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
userId, (err, data) => { userId, (err, data) => {
...@@ -110,7 +112,7 @@ describe('ActsBmsQueryAbilityByWant', function () { ...@@ -110,7 +112,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
*/ */
it('bms_queryAbilityByEntities_0300', 0, async function (done) { it('bms_queryAbilityByEntities_0300', 0, async function (done) {
let dataInfos = await bundle.queryAbilityByWant({ let dataInfos = await bundle.queryAbilityByWant({
action: 'action.system.home', action: ACTION_NAME,
entities: ["entity.app.music", entities: ["entity.app.music",
"entity.app.email", "entity.app.email",
"entity.app.contacts", "entity.app.contacts",
...@@ -120,16 +122,14 @@ describe('ActsBmsQueryAbilityByWant', function () { ...@@ -120,16 +122,14 @@ describe('ActsBmsQueryAbilityByWant', function () {
"entity.app.messaging", "entity.app.messaging",
"entity.app.files", "entity.app.files",
"entity.app.gallery"], "entity.app.gallery"],
elementName: {
deviceId: '0', deviceId: '0',
bundleName: '', bundleName: '',
abilityName: '', abilityName: ''
},
}, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId); }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
expect(dataInfos.length).assertEqual(1); expect(dataInfos.length).assertEqual(1);
cheackAbilityInfos(dataInfos[0]); cheackAbilityInfos(dataInfos[0]);
bundle.queryAbilityByWant({ bundle.queryAbilityByWant({
action: 'action.system.home', action: ACTION_NAME,
entities: ["entity.app.music", entities: ["entity.app.music",
"entity.app.email", "entity.app.email",
"entity.app.contacts", "entity.app.contacts",
...@@ -139,11 +139,9 @@ describe('ActsBmsQueryAbilityByWant', function () { ...@@ -139,11 +139,9 @@ describe('ActsBmsQueryAbilityByWant', function () {
"entity.app.messaging", "entity.app.messaging",
"entity.app.files", "entity.app.files",
"entity.app.gallery"], "entity.app.gallery"],
elementName: {
deviceId: '0', deviceId: '0',
bundleName: '', bundleName: '',
abilityName: '', abilityName: ''
},
}, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId, (err, data) => { }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId, (err, data) => {
expect(data.length).assertEqual(1); expect(data.length).assertEqual(1);
cheackAbilityInfos(data[0]); cheackAbilityInfos(data[0]);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册