代码规范修改

Signed-off-by: Ninter515 <ry.renyi@huawei.com>

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

@@ -15,8 +15,17 @@
 import bundle from '@ohos.bundle'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit'
 
-const BUNDLE_PATH1 = '/data/test/bmsThirdBundleTest1.hap';
 const BUNDLE_NAME1 = 'com.example.third1';
+const BUNDLE_PATH1 = ['/data/test/bmsThirdBundleTest1.hap'];
+const SYSTEM_PATH = '/data/test/bmsSystemBundleTest2.hap';
+const SYSTEM_NAME = 'com.example.system2';
+const ABILITIY_NAME8 = 'com.example.system2.MainAbility';
+const USERID = 100;
+let installParam = {
+    userId: 100,
+    installFlag: 1,
+    isKeepData: false
+};
 
 describe('ActsBmsQueryAbilityByWant', function () {
     /*
@@ -25,50 +34,28 @@ describe('ActsBmsQueryAbilityByWant', function () {
     * @tc.desc: 1.queryAbilityByWant callback
     *           2.queryAbilityByWant for third app
     */
-    it('bms_queryAbilityByWant_0100', 0, async function (done){
-        console.info('=====================bms_queryAbilityByWant_0100==================');
-        let bundlePath = [BUNDLE_PATH1]
-        bundle.getBundleInstaller().then(installer => {
+    it('bms_queryAbilityByWant_0100', 0, async function (done) {
+        await bundle.getBundleInstaller().then(installer => {
+            installer.install(BUNDLE_PATH1, installParam, onReceiveinstallEvent);
             function onReceiveinstallEvent(err, data) {
-                console.log('bms_queryAbilityByWant_0100 install called: ' + data)
-                expect(err.code).assertEqual(0);
-                expect(data.status).assertEqual(0);
-                expect(data.statusMessage).assertEqual('SUCCESS');
-    
+                checkInstallOrUninstall(err, data);
                 bundle.queryAbilityByWant({
                     action: ['action.system.home'],
                     entities: ['entity.system.home'],
                     bundleName: BUNDLE_NAME1
-                }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION|bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY, 
-                100, (err, data) => {
-                    if (err) {
-                        console.log('bms_queryAbilityByWant_0100 test query system app err is ' + err)
-                        expect(err).assertEqual(1);
-                    }
-                    installer.uninstall(BUNDLE_NAME1,
-                         {
-                            userId: 100,
-                            installFlag: 1,
-                            isKeepData: false
+                }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
+                    USERID, (err, data) => {
+                        if (err) {
+                            expect(err).assertEqual(1);
                         }
-                    , (err, data) => {
-                        expect(err.code).assertEqual(0);
-                        expect(data.status).assertEqual(0);
-                        expect(data.statusMessage).assertEqual('SUCCESS');
-                        done();
+                        installer.uninstall(BUNDLE_NAME1, installParam, (err, data) => {
+                            checkInstallOrUninstall(err, data);
+                            done();
+                        });
                     });
-                }
-                )
             }
-
-            installer.install(['/data/test/bmsThirdBundleTest1.hap'], 
-            {
-                    userId: 100,
-                    installFlag: 1,
-                    isKeepData: false,
-            }, onReceiveinstallEvent);
-        })
-    })
+        });
+    });
 
     /*
     * @tc.number: bms_queryAbilityByWant_0200
@@ -76,27 +63,63 @@ describe('ActsBmsQueryAbilityByWant', function () {
     * @tc.desc: 1.queryAbilityByWant callback
     *           2.queryAbilityByWant for systemapp
     */
-    it('bms_queryAbilityByWant_0200', 0, async function (done){
-        console.info('=====================bms_queryAbilityByWant_0200==================');
-        bundle.queryAbilityByWant(
+    it('bms_queryAbilityByWant_0200', 0, async function (done) {
+        await bundle.queryAbilityByWant(
             {
                 action: ['action.system.home'],
                 entities: ['entity.system.home']
-            }, 
-            bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION|bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY, 
-        100).then(data => {
-                for(let i = 0; i < data.length; ++i) {
-                    let jsondata = JSON.stringify(data[i]);
-                    console.log('bms_queryAbilityByWant_0200 test query system app ' + jsondata)
-                    expect(data[i].applicationInfo.systemApp).assertEqual(true)
+            },
+            bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
+            USERID).then(data => {
+                for (let i = 0; i < data.length; ++i) {
+                    expect(data[i].applicationInfo.systemApp).assertEqual(true);
                 }
                 done();
             }
-        ).catch(err => {
-            console.log('bms_queryAbilityByWant_0200 test query system app err is ' + err)
-            expect(err).assertFail()
-            done();
-        })
-    })
+            ).catch(err => {
+                expect(err).assertFail();
+                done();
+            });
+    });
+
+    /*
+    * @tc.number: bms_queryAbilityByEntities_0300
+    * @tc.name: Use the implicit query method in queryAbilityByWant to get abilityInfos 
+    * @tc.desc: The entities in the parameter want pass in the new field, and use the implicit query to get abilitInfos
+    */
+    it('bms_queryAbilityByEntities_0300', 0, async function (done) {
+        let installer = await bundle.getBundleInstaller();
+        installer.install([SYSTEM_PATH], installParam, async (err, data) => {
+            checkInstallOrUninstall(err, data);
+            let dataInfos = await bundle.queryAbilityByWant({
+                action: 'action.system.home',
+                entities: ["entity.app.music",
+                    "entity.app.email",
+                    "entity.app.contacts",
+                    "entity.app.maps",
+                    "entity.app.browser",
+                    "entity.app.calendar",
+                    "entity.app.messaging",
+                    "entity.app.files",
+                    "entity.app.gallery"],
+                elementName: {
+                    deviceId: '0',
+                    bundleName: '',
+                    abilityName: '',
+                },
+            }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID);
+            expect(dataInfos.length).assertEqual(1);
+            expect(dataInfos[0].name).assertEqual(ABILITIY_NAME8);
+            installer.uninstall(SYSTEM_NAME, installParam, (err, data) => {
+                checkInstallOrUninstall(err, data);
+                done();
+            });
+        });
+    });
 
+    function checkInstallOrUninstall(err, data) {
+        expect(err.code).assertEqual(0);
+        expect(data.status).assertEqual(0);
+        expect(data.statusMessage).assertEqual('SUCCESS');
+    }
 })
\ No newline at end of file

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

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('./ActsBmsFormsInfoTest.test.js')
 require('./ActsBmsQueryAbilityByWant.test.js') 
 require('./ActsBmsCleanCacheTest.test.js')
-require('./ActsBmsGetBackGroundModes.test.js')
\ No newline at end of file
+require('./ActsBmsGetBackGroundModes.test.js')

appexecfwk/bundle_standard/bundlemanager/actsbmsjsunpermissiontest/entry/src/main/js/test/ActsBmsJsUnPermissionTest.test.js

@@ -15,16 +15,22 @@
 
 import bundle from '@ohos.bundle'
 import innerBundleManager from '@ohos.bundle.innerBundleManager'
-import {describe, it, expect} from 'deccjsunit/index'
+import { describe, it, expect } from 'deccjsunit/index'
 
 const STATUS_INSTALL_PERMISSION_DENIED = 0X44;
 const STATUS_UNINSTALL_PERMISSION_DENIED = 0X45;
-
 const LAUNCHER_BUNDLE_NAME = 'com.ohos.launcher';
 const LAUNCHER_MAIN_ABILITY = 'com.ohos.launcher.MainAbility';
 const DEFAULT_FLAG = 0;
 const DEFAULT_USER_ID = 100;
 const INVALID_CODE = 1;
+const BUNDLE_PATH = ['/data/test/bmsJstest1.hap'];
+const BUNDLE_NAME1 = 'com.example.myapplication1';
+let installParam = {
+    userId: 100,
+    installFlag: 1,
+    isKeepData: false
+};
 
 describe('ActsBmsJsUnPermissionTest', function () {
 
@@ -34,14 +40,8 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test js install
      */
     it('bms_JsInstallPermissionTest_0100', 0, async function (done) {
-        console.info('bms_JsInstallPermissionTest start');
-        let bundlePath = ['/data/test/bmsJstest1.hap'];
         let installer = await bundle.getBundleInstaller();
-        installer.install(bundlePath, {
-            userId: 100,
-            installFlag: 1,
-            isKeepData: false
-        }, OnReceiveInstallEvent);
+        installer.install(BUNDLE_PATH, installParam, OnReceiveInstallEvent);
         async function OnReceiveInstallEvent(err, data) {
             expect(err.code).assertEqual(-1);
             expect(data.status).assertEqual(STATUS_INSTALL_PERMISSION_DENIED);
@@ -56,14 +56,8 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test js uninstall
      */
     it('bms_JsUnInstallPermissionTest_0100', 0, async function (done) {
-        console.info('bms_JsUnInstallPermissionTest start');
-        let bundleName = 'com.example.myapplication1';
         let installer = await bundle.getBundleInstaller();
-        installer.uninstall(bundleName, {
-            userId: 100,
-            installFlag: 1,
-            isKeepData: false
-        }, OnReceiveUnInstallEvent);
+        installer.uninstall(BUNDLE_NAME1, installParam, OnReceiveUnInstallEvent);
         async function OnReceiveUnInstallEvent(err, data) {
             expect(err.code).assertEqual(-1);
             expect(data.status).assertEqual(STATUS_UNINSTALL_PERMISSION_DENIED);
@@ -78,8 +72,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getApplicationInfo
      */
     it('getApplicationInfoTest_100', 0, async function (done) {
-        console.debug('getApplicationInfoTest_100 start');
-        bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
+        await bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -94,8 +87,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getAllApplicationInfo
      */
     it('getAllApplicationInfoTest_100', 0, async function (done) {
-        console.debug('getAllApplicationInfoTest_100 start');
-        bundle.getAllApplicationInfo(DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
+        await bundle.getAllApplicationInfo(DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -110,8 +102,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getBundleInfo
      */
     it('getBundleInfoTest_100', 0, async function (done) {
-        console.debug('getBundleInfoTest_100 start');
-        bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_USER_ID).then(data => {
+        await bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_USER_ID).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -126,8 +117,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getAllBundleInfo
      */
     it('getAllBundleInfoTest_100', 0, async function (done) {
-        console.debug('getAllBundleInfoTest_100 start');
-        bundle.getAllBundleInfo(DEFAULT_FLAG).then(data => {
+        await bundle.getAllBundleInfo(DEFAULT_FLAG).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -142,8 +132,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test queryAbilityByWant
      */
     it('queryAbilityByWantTest_100', 0, async function (done) {
-        console.debug('queryAbilityByWantTest_100 start');
-        bundle.queryAbilityByWant({
+        await bundle.queryAbilityByWant({
             bundleName: LAUNCHER_BUNDLE_NAME,
             abilityName: LAUNCHER_MAIN_ABILITY
         }, DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
@@ -161,8 +150,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getLaunchWantForBundle
      */
     it('getLaunchWantForBundleTest_100', 0, async function (done) {
-        console.debug('getLaunchWantForBundleTest_100 start');
-        bundle.getLaunchWantForBundle(LAUNCHER_BUNDLE_NAME).then(data => {
+        await bundle.getLaunchWantForBundle(LAUNCHER_BUNDLE_NAME).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -177,8 +165,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test setApplicationEnabled
      */
     it('setApplicationEnabledTest_100', 0, async function (done) {
-        console.debug('setApplicationEnabledTest_100 start');
-        bundle.setApplicationEnabled(LAUNCHER_BUNDLE_NAME, false).then(data => {
+        await bundle.setApplicationEnabled(LAUNCHER_BUNDLE_NAME, false).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -193,12 +180,11 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test setAbilityEnabled
      */
     it('setAbilityEnabledTest_100', 0, async function (done) {
-        console.debug('setAbilityEnabledTest_100 start');
         let abilityInfo = {
             bundleName: LAUNCHER_BUNDLE_NAME,
             name: LAUNCHER_MAIN_ABILITY
         };
-        bundle.setAbilityEnabled(abilityInfo, false).then(data => {
+        await bundle.setAbilityEnabled(abilityInfo, false).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -213,8 +199,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getLauncherAbilityInfos
      */
     it('getLauncherAbilityInfosTest_100', 0, async function (done) {
-        console.debug('getLauncherAbilityInfosTest_100 start');
-        innerBundleManager.getLauncherAbilityInfos(LAUNCHER_BUNDLE_NAME, DEFAULT_USER_ID).then(data => {
+        await innerBundleManager.getLauncherAbilityInfos(LAUNCHER_BUNDLE_NAME, DEFAULT_USER_ID).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -229,8 +214,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getAllLauncherAbilityInfos
      */
     it('getAllLauncherAbilityInfosTest_100', 0, async function (done) {
-        console.debug('getAllLauncherAbilityInfosTest_100 start');
-        innerBundleManager.getAllLauncherAbilityInfos(DEFAULT_USER_ID).then(data => {
+        await innerBundleManager.getAllLauncherAbilityInfos(DEFAULT_USER_ID).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -245,8 +229,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getShortcutInfos
      */
     it('getShortcutInfosTest_100', 0, async function (done) {
-        console.debug('getShortcutInfosTest_100 start');
-        innerBundleManager.getShortcutInfos(LAUNCHER_BUNDLE_NAME).then(data => {
+        await innerBundleManager.getShortcutInfos(LAUNCHER_BUNDLE_NAME).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
@@ -262,7 +245,6 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.level   0
      */
     it('getAbilityLabelTest_100', 0, async function (done) {
-        console.debug('[getAbilityLabelTest_100] promise START');
         await bundle.getAbilityLabel(LAUNCHER_BUNDLE_NAME, LAUNCHER_MAIN_ABILITY)
             .then((data) => {
                 expect().assertFail();
@@ -280,14 +262,12 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getAbilityInfo
      */
     it('getAbilityInfo_100', 0, async function (done) {
-        console.debug('getAbilityInfo_100 start');
-        bundle.getAbilityInfo(LAUNCHER_BUNDLE_NAME, LAUNCHER_MAIN_ABILITY).then(data => {
+        await bundle.getAbilityInfo(LAUNCHER_BUNDLE_NAME, LAUNCHER_MAIN_ABILITY).then(data => {
             expect().assertFail();
             done();
         }).catch(err => {
             expect(err).assertEqual(INVALID_CODE);
             done();
         });
-    })
-
+    });
 })