!3538 修改queryAbilityByWant的入参类型

Merge pull request !3538 from ry/master

appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsGetBackGroundModes.test.js

@@ -65,11 +65,9 @@ describe('ActsBmsGetBackGroundModes', function () {
         let dataInfos = await bundle.queryAbilityByWant({
             action: 'action.system.home',
             entities: ['entity.system.home'],
-            elementName: {
             deviceId: '0',
             bundleName: BUNDLE_NAME5,
-                abilityName: '',
-            },
+            abilityName: ''
         }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(NUM_FOUR);
         if (dataInfos.length == NUM_FOUR) {
@@ -110,11 +108,9 @@ describe('ActsBmsGetBackGroundModes', function () {
         let dataInfos = await bundle.queryAbilityByWant({
             action: 'action.system.home',
             entities: ['entity.system.home'],
-            elementName: {
             deviceId: '0',
             bundleName: BUNDLE_NAME6,
-                abilityName: '',
-            },
+            abilityName: ''
         }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(NUM_NINE);
         for (let i = 0, len = dataInfos.length; i < len; i++) {
@@ -132,11 +128,9 @@ describe('ActsBmsGetBackGroundModes', function () {
         let dataInfos = await bundle.queryAbilityByWant({
             action: 'action.system.home',
             entities: ['entity.system.home'],
-            elementName: {
             deviceId: '0',
             bundleName: BUNDLE_NAME2,
-                abilityName: '',
-            },
+            abilityName: ''
         }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(NUM_TWO);
         if (dataInfos.length == NUM_TWO) {
@@ -173,11 +167,9 @@ describe('ActsBmsGetBackGroundModes', function () {
         let dataInfos = await bundle.queryAbilityByWant({
             action: 'action.system.home',
             entities: ['entity.system.home'],
-            elementName: {
             deviceId: '0',
             bundleName: BUNDLE_NAME4,
-                abilityName: '',
-            },
+            abilityName: ''
         }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(1);
         if (dataInfos.length == 1) {
@@ -196,11 +188,9 @@ describe('ActsBmsGetBackGroundModes', function () {
         let dataInfos = await bundle.queryAbilityByWant({
             action: 'action.system.home',
             entities: ['entity.system.home'],
-            elementName: {
             deviceId: '0',
             bundleName: BUNDLE_NAME1,
-                abilityName: '',
-            },
+            abilityName: ''
         }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(NUM_FOUR);
         if (dataInfos.length == NUM_FOUR) {

appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsQueryAbilityByWant.test.js

@@ -30,7 +30,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
             console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
             userId = account;
             done();
-          }).catch(err=>{
+        }).catch(err => {
             console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
             done();
         })
@@ -44,7 +44,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
     */
     it('bms_queryAbilityByWant_0100', 0, async function (done) {
         await bundle.queryAbilityByWant({
-            action: [ACTION_NAME],
+            action: ACTION_NAME,
             entities: [ENTITY_NAME],
             bundleName: BUNDLE_NAME1
         }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
@@ -54,7 +54,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
                 expect(err).assertEqual(1);
             });
         bundle.queryAbilityByWant({
-            action: [ACTION_NAME],
+            action: ACTION_NAME,
             entities: [ENTITY_NAME],
             bundleName: BUNDLE_NAME1
         }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
@@ -74,7 +74,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
     it('bms_queryAbilityByWant_0200', 0, async function (done) {
         await bundle.queryAbilityByWant(
             {
-                action: [ACTION_NAME],
+                action: ACTION_NAME,
                 entities: [ENTITY_NAME]
             },
             bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
@@ -89,7 +89,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
             });
         bundle.queryAbilityByWant(
             {
-                action: [ACTION_NAME],
+                action: ACTION_NAME,
                 entities: [ENTITY_NAME]
             },
             bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
@@ -122,11 +122,9 @@ describe('ActsBmsQueryAbilityByWant', function () {
                 "entity.app.messaging",
                 "entity.app.files",
                 "entity.app.gallery"],
-            elementName: {
             deviceId: '0',
             bundleName: '',
-                abilityName: '',
-            },
+            abilityName: ''
         }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(1);
         cheackAbilityInfos(dataInfos[0]);
@@ -141,11 +139,9 @@ describe('ActsBmsQueryAbilityByWant', function () {
                 "entity.app.messaging",
                 "entity.app.files",
                 "entity.app.gallery"],
-            elementName: {
             deviceId: '0',
             bundleName: '',
-                abilityName: '',
-            },
+            abilityName: ''
         }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId, (err, data) => {
             expect(data.length).assertEqual(1);
             cheackAbilityInfos(data[0]);