修改userId获取和修改length语法错误

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

appexecfwk/bundle_standard/bundlemanager/actsbmsaccesstokentest/entry/src/main/js/test/ActsBmsAccessTokenTest.test.js

@@ -14,22 +14,34 @@
  */
 
 import bundle from '@ohos.bundle'
-import { describe, it, expect } from 'deccjsunit/index'
+import account from '@ohos.account.osAccount'
+import { describe,beforeAll, it, expect } from 'deccjsunit/index'
 
 const BUNDLE_NAME1 = 'com.example.bmsaccesstoken1';
 const BUNDLE_NAME2 = 'com.example.bmsaccesstoken2';
 const BUNDLE_NAME3 = 'com.example.bmsaccesstoken3';
-const USERID = 100;
+let userId = 0;
 
 describe('ActsBmsAccessTokenTest', function () {
 
+    beforeAll(async function (done) {
+        await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+            console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+            userId = account;
+            done();
+          }).catch(err=>{
+            console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+            done();
+          })
+    });
+
     /*
      * @tc.number: bms_AccessTokenId_0100
      * @tc.name: test accessTokenId
      * @tc.desc: get the accessTokenId
      */
     it('bms_AccessTokenId_0100', 0, async function (done) {
-        await bundle.getApplicationInfo(BUNDLE_NAME1, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID)
+        await bundle.getApplicationInfo(BUNDLE_NAME1, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId)
             .then(applicationInfo => {
                 console.info('accessTokenId: ' + applicationInfo.accessTokenId);
                 expect(applicationInfo.name).assertEqual(BUNDLE_NAME1);

appexecfwk/bundle_standard/bundlemanager/actsbmsetsmodulenametest/entry/src/main/ets/MainAbility/test/ActsBmsEtsModuleNameTest.test.ets

@@ -15,6 +15,7 @@
 
 import bundle from '@ohos.bundle'
 import image from '@ohos.multimedia.image'
+import account from '@ohos.account.osAccount'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 
 const ABILITY_NAME = 'com.example.bmsmodulename.MainAbility';
@@ -24,7 +25,6 @@ const MODULE_NAME2 = 'noModule';
 const MODULE_NAME3 = 'entry';
 const MODULE_NAME4 = undefined;
 const DEFAULT_FLAG = bundle.BundleFlag.GET_BUNDLE_DEFAULT;
-const DEFAULT_USER_ID = 100;
 const SUCCESS_CODE = 0;
 const INVALID_CODE = 1;
 const INVALID_PARAM = 2;
@@ -48,10 +48,22 @@ const ABILITY_INFO_FOUR = {
     moduleName: MODULE_NAME4,
     name: ABILITY_NAME
 };
+let userId = 0;
 
 export default function actsBmsJsModuleNameTest() {
     describe('actsBmsJsModuleNameTest', function () {
 
+        beforeAll(async function (done) {
+            await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+                console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+                userId = account;
+                done();
+              }).catch(err=>{
+                console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+                done();
+              })
+        });
+
         /*
         * @tc.number: GetabilityInfo_0100
         * @tc.name: test getAbilityInfo
@@ -374,7 +386,7 @@ export default function actsBmsJsModuleNameTest() {
                 bundleName: BUNDLE_NAME,
                 abilityName: ABILITY_NAME,
                 moduleName: MODULE_NAME1
-            }, DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
+            }, DEFAULT_FLAG, userId).then(data => {
                 checkDataInfo(data[0]);
                 console.info("'[QueryAbilityByWant_0100]Return data : " + JSON.stringify(data));
             }).catch(err => {
@@ -385,7 +397,7 @@ export default function actsBmsJsModuleNameTest() {
                 bundleName: BUNDLE_NAME,
                 abilityName: ABILITY_NAME,
                 moduleName: MODULE_NAME1
-            }, DEFAULT_FLAG, DEFAULT_USER_ID, (err, data) => {
+            }, DEFAULT_FLAG, userId, (err, data) => {
                 expect(err).assertEqual(SUCCESS_CODE);
                 if (err) {
                     console.error('[QueryAbilityByWant_0100]Operation failed. Err: ' + JSON.stringify(err));
@@ -406,7 +418,7 @@ export default function actsBmsJsModuleNameTest() {
                     bundleName: BUNDLE_NAME,
                     abilityName: ABILITY_NAME,
                     moduleName: MODULE_NAME2
-                }, DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
+                }, DEFAULT_FLAG, userId).then(data => {
                     expect(data).assertFail();
                 }).catch(err => {
                     console.error('[QueryAbilityByWant_0200]Operation failed. Err: ' + JSON.stringify(err));
@@ -416,7 +428,7 @@ export default function actsBmsJsModuleNameTest() {
                     bundleName: BUNDLE_NAME,
                     abilityName: ABILITY_NAME,
                     moduleName: MODULE_NAME2
-                }, DEFAULT_FLAG, DEFAULT_USER_ID, (err, data) => {
+                }, DEFAULT_FLAG, userId, (err, data) => {
                     console.info("'[QueryAbilityByWant_0200]Return data " + JSON.stringify(data));
                     expect(data).assertEqual("QueryAbilityInfos failed");
                     console.error('[QueryAbilityByWant_0200]Operation failed. Err: ' + JSON.stringify(err));
@@ -435,7 +447,7 @@ export default function actsBmsJsModuleNameTest() {
                     bundleName: BUNDLE_NAME,
                     abilityName: ABILITY_NAME,
                     moduleName: MODULE_NAME3
-                }, DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
+                }, DEFAULT_FLAG, userId).then(data => {
                     checkDataInfo(data[0]);
                     console.info("'[QueryAbilityByWant_0300]Return data : " + JSON.stringify(data));
                 }).catch(err => {
@@ -446,7 +458,7 @@ export default function actsBmsJsModuleNameTest() {
                     bundleName: BUNDLE_NAME,
                     abilityName: ABILITY_NAME,
                     moduleName: MODULE_NAME3
-                }, DEFAULT_FLAG, DEFAULT_USER_ID, (err, data) => {
+                }, DEFAULT_FLAG, userId, (err, data) => {
                     expect(err).assertEqual(SUCCESS_CODE);
                     if (err) {
                         console.error('[QueryAbilityByWant_0300]Operation failed. Err: ' + JSON.stringify(err));
@@ -468,10 +480,6 @@ export default function actsBmsJsModuleNameTest() {
                 expect(typeof (data.description)).assertEqual("string");
                 expect(data.icon).assertEqual("$media:icon");
                 expect(typeof (data.icon)).assertEqual("string");
-                expect(data.srcPath).assertEqual("");
-                expect(typeof (data.srcPath)).assertEqual("string");
-                expect(data.srcLanguage).assertEqual("js");
-                expect(typeof (data.srcLanguage)).assertEqual("string");
                 expect(data.isVisible).assertEqual(false);
                 expect(data.deviceTypes[0]).assertEqual("phone");
                 expect(typeof (data.process)).assertEqual("string");

appexecfwk/bundle_standard/bundlemanager/actsbmsetsunpermissiontest/entry/src/main/ets/test/ActsBmsEtsUnPermissionTest.test.ets

@@ -16,6 +16,7 @@
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "hypium/index"
 import bundle from '@ohos.bundle'
 import pkg from '@system.package'
+import account from '@ohos.account.osAccount'
 
 const DEFAULT_FLAG = bundle.BundleFlag.GET_BUNDLE_DEFAULT;
 const INVALID_CODE = 1;
@@ -26,10 +27,22 @@ const BUNDLE_SETTINGS = "com.ohos.settings";
 const ABILITIY_SETTINGS = "com.ohos.settings.MainAbility";
 const BUNDLE_NAME1 = "ohos.acts.bundle.stage";
 const ABILITY_NAME1 = "ExtensionAbility1";
+let userId = 0;
 
 export default function actsBmsJsUnPermissionTest() {
     describe('actsBmsJsUnPermissionTest', function () {
 
+        beforeAll(async function (done) {
+            await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+                console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+                userId = account;
+                done();
+              }).catch(err=>{
+                console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+                done();
+              })
+        });
+
         /**
         * @tc.number    getApplicationInfos_1300
         * @tc.name      getApplicationInfos_1300
@@ -54,12 +67,12 @@ export default function actsBmsJsUnPermissionTest() {
         * @tc.desc      test getBundleInfo
         */
         it('getBundleInfo_2000', 0, async function (done) {
-            await bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, { userId: 100 }).then(data => {
+            await bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, { userId: userId }).then(data => {
                 expect().assertFail();
             }).catch(err => {
                 expect(err).assertEqual(INVALID_CODE);
             });
-            bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, { userId: 100 }, (err, data) => {
+            bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, { userId: userId }, (err, data) => {
                 expect(err).assertEqual(INVALID_CODE);
                 expect(data).assertEqual(undefined);
                 done();
@@ -196,7 +209,7 @@ export default function actsBmsJsUnPermissionTest() {
                     "bundleName": BUNDLE_NAME1,
                     "abilityName": ABILITY_NAME1
                 }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-                100).then(data => {
+                userId).then(data => {
                     expect(data).assertFail();
                 }).catch(err => {
                     expect(err).assertEqual(1);
@@ -206,7 +219,7 @@ export default function actsBmsJsUnPermissionTest() {
                     "bundleName": BUNDLE_NAME1,
                     "abilityName": ABILITY_NAME1
                 }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-                100, (err, data) => {
+                userId, (err, data) => {
                     if (err) {
                         expect(err).assertEqual(1);
                         done();
@@ -224,8 +237,6 @@ export default function actsBmsJsUnPermissionTest() {
             expect(data.label).assertEqual("$string:entry_MainAbility");
             expect(data.description).assertEqual("$string:description_mainability");
             expect(data.icon).assertEqual("$media:icon");
-            expect(data.srcPath).assertEqual("MainAbility");
-            expect(data.srcLanguage).assertEqual("ets");
             expect(data.isVisible).assertEqual(true);
             expect(data.deviceTypes[0]).assertEqual("phone");
             expect(data.process).assertEqual("");
@@ -244,7 +255,6 @@ export default function actsBmsJsUnPermissionTest() {
             expect(data.readPermission).assertEqual("");
             expect(data.writePermission).assertEqual("");
             expect(data.targetAbility).assertEqual("");
-            expect(data.theme).assertEqual("");
             expect(data.metaData.length).assertEqual(0);
             expect(data.metadata.length).assertEqual(0);
             checkApplicationInfo(data.applicationInfo);
@@ -270,7 +280,6 @@ export default function actsBmsJsUnPermissionTest() {
             expect(JSON.stringify(info.metadata)).assertEqual("{}");
             expect(JSON.stringify(info.metadata)).assertEqual("{}");
             expect(info.enabled).assertEqual(true);
-            expect(info.flags).assertEqual(0);
             expect(info.uid).assertLarger(0);
             expect(info.entityType).assertEqual("unspecified");
             expect(info.removable).assertEqual(true);

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

@@ -14,6 +14,7 @@
  */
 
 import bundle from '@ohos.bundle'
+import account from '@ohos.account.osAccount'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit'
 
 const BUNDLE_NAME1 = 'com.example.third1';
@@ -31,7 +32,6 @@ const NUM_TWO = 2;
 const NUM_THREE = 3;
 const NUM_FOUR = 4;
 const NUM_NINE = 9;
-const USERID = 100;
 const DATATRANSFER = 1;
 const AUDIOPLAYBACK = 2;
 const AUDIORECORDING = 4;
@@ -41,9 +41,21 @@ const MULTIDEVICECONNECTION = 32;
 const WIFIINTERACTION = 64;
 const VOIP = 128;
 const TASKKEEPING = 256;
+let userId = 0;
 
 describe('ActsBmsGetBackGroundModes', function () {
 
+    beforeAll(async function (done) {
+        await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+            console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+            userId = account;
+            done();
+        }).catch(err => {
+            console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+            done();
+        })
+    });
+
     /*
     * @tc.number: bms_backGroundModes_0100
     * @tc.name: Get the backgroundModes information of the application through queryAbilityByWant
@@ -58,7 +70,7 @@ describe('ActsBmsGetBackGroundModes', function () {
                 bundleName: BUNDLE_NAME5,
                 abilityName: '',
             },
-        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID);
+        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(NUM_FOUR);
         if (dataInfos.length == NUM_FOUR) {
             expect(dataInfos[NUM_TWO].name).assertEqual(ABILITIY_NAME1);
@@ -67,7 +79,7 @@ describe('ActsBmsGetBackGroundModes', function () {
             expect(dataInfos[NUM_THREE].name).assertEqual(ABILITIY_NAME2);
             expect(dataInfos[NUM_THREE].backgroundModes).assertEqual(DATATRANSFER | VOIP);
         }
-        let bundleInfos = await bundle.getAllBundleInfo(bundle.BundleFlag.GET_BUNDLE_WITH_ABILITIES, USERID);
+        let bundleInfos = await bundle.getAllBundleInfo(bundle.BundleFlag.GET_BUNDLE_WITH_ABILITIES, userId);
         for (let i = 0; i < bundleInfos.length; i++) {
             if (bundleInfos[i].name == BUNDLE_NAME5) {
                 for (let j = 0; j < bundleInfos[i].abilityInfos.length; j++) {
@@ -103,7 +115,7 @@ describe('ActsBmsGetBackGroundModes', function () {
                 bundleName: BUNDLE_NAME6,
                 abilityName: '',
             },
-        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID);
+        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(NUM_NINE);
         for (let i = 0, len = dataInfos.length; i < len; i++) {
             expect(dataInfos[i].backgroundModes).assertEqual(1 << i);
@@ -125,14 +137,14 @@ describe('ActsBmsGetBackGroundModes', function () {
                 bundleName: BUNDLE_NAME2,
                 abilityName: '',
             },
-        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID);
+        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(NUM_TWO);
         if (dataInfos.length == NUM_TWO) {
             expect(dataInfos[1].name).assertEqual(ABILITIY_NAME3)
             expect(dataInfos[1].backgroundModes).assertEqual(AUDIOPLAYBACK | AUDIORECORDING | LOCATION
                 | BLUETOOTHINTERACTION | MULTIDEVICECONNECTION | WIFIINTERACTION | VOIP | TASKKEEPING)
         }
-        bundle.getAllBundleInfo(bundle.BundleFlag.GET_BUNDLE_WITH_ABILITIES, USERID, (err, bundleInfos) => {
+        bundle.getAllBundleInfo(bundle.BundleFlag.GET_BUNDLE_WITH_ABILITIES, userId, (err, bundleInfos) => {
             for (let i = 0; i < bundleInfos.length; i++) {
                 if (bundleInfos[i].name == BUNDLE_NAME2) {
                     for (let j = 0; j < bundleInfos[i].abilityInfos.length; j++) {
@@ -144,12 +156,12 @@ 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);
+                done();
+            });
         });
-        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)
-        });
-        done();
     });
 
     /*
@@ -166,7 +178,7 @@ describe('ActsBmsGetBackGroundModes', function () {
                 bundleName: BUNDLE_NAME4,
                 abilityName: '',
             },
-        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID);
+        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(1);
         if (dataInfos.length == 1) {
             expect(dataInfos[0].name).assertEqual(ABILITIY_NAME4)
@@ -189,7 +201,7 @@ describe('ActsBmsGetBackGroundModes', function () {
                 bundleName: BUNDLE_NAME1,
                 abilityName: '',
             },
-        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID);
+        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(NUM_FOUR);
         if (dataInfos.length == NUM_FOUR) {
             expect(dataInfos[1].name).assertEqual(ABILITIY_NAME5)

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

@@ -13,17 +13,29 @@
  * limitations under the License.
  */
 import bundle from '@ohos.bundle'
+import account from '@ohos.account.osAccount'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit'
 
 const BUNDLE_NAME1 = 'com.example.third1';
 const SYSTEM_NAME = 'com.example.system2';
 const ABILITIY_NAME8 = 'com.example.system2.MainAbility';
-const USERID = 100;
 const ACTION_NAME = 'action.system.home';
 const ENTITY_NAME = 'entity.system.home';
+let userId = 0;
 
 describe('ActsBmsQueryAbilityByWant', function () {
 
+    beforeAll(async function (done) {
+        await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+            console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+            userId = account;
+            done();
+          }).catch(err=>{
+            console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+            done();
+          })
+    });
+
     /*
     * @tc.number: bms_queryAbilityByWant_0100
     * @tc.name:  queryAbilityByWant callback by other callback
@@ -36,7 +48,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
             entities: [ENTITY_NAME],
             bundleName: BUNDLE_NAME1
         }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
-            USERID).then(data => {
+            userId).then(data => {
                 expect(data).assertFail();
             }).catch(err => {
                 expect(err).assertEqual(1);
@@ -46,7 +58,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
             entities: [ENTITY_NAME],
             bundleName: BUNDLE_NAME1
         }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
-            USERID, (err, data) => {
+            userId, (err, data) => {
                 expect(err).assertEqual(1);
                 expect(data).assertEqual("QueryAbilityInfos failed");
                 done();
@@ -66,7 +78,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
                 entities: [ENTITY_NAME]
             },
             bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
-            USERID).then(data => {
+            userId).then(data => {
                 expect(data.length).assertLarger(0);
                 for (let i = 0; i < data.length; ++i) {
                     expect(data[i].applicationInfo.systemApp).assertEqual(true);
@@ -81,7 +93,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
                 entities: [ENTITY_NAME]
             },
             bundle.BundleFlag.GET_ABILITY_INFO_WITH_APPLICATION | bundle.BundleFlag.GET_ABILITY_INFO_SYSTEMAPP_ONLY,
-            USERID, (err, data) => {
+            userId, (err, data) => {
                 if (err) {
                     expect(err).assertFail();
                 }
@@ -115,7 +127,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
                 bundleName: '',
                 abilityName: '',
             },
-        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID);
+        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId);
         expect(dataInfos.length).assertEqual(1);
         cheackAbilityInfos(dataInfos[0]);
         bundle.queryAbilityByWant({
@@ -134,7 +146,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
                 bundleName: '',
                 abilityName: '',
             },
-        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, USERID, (err, data) => {
+        }, bundle.BundleFlag.GET_BUNDLE_DEFAULT, userId, (err, data) => {
             expect(data.length).assertEqual(1);
             cheackAbilityInfos(data[0]);
             done();
@@ -146,8 +158,6 @@ describe('ActsBmsQueryAbilityByWant', function () {
         expect(data.label).assertEqual('$string:app_name');
         expect(data.description).assertEqual('$string:mainability_description');
         expect(data.icon).assertEqual("$media:icon");
-        expect(data.srcPath).assertEqual("");
-        expect(data.srcLanguage).assertEqual("js");
         expect(data.isVisible).assertEqual(false);
         expect(data.permissions.length).assertEqual(0);
         expect(data.deviceCapabilities.length).assertEqual(0);
@@ -169,7 +179,6 @@ describe('ActsBmsQueryAbilityByWant', function () {
         expect(data.readPermission).assertEqual("");
         expect(data.writePermission).assertEqual("");
         expect(data.targetAbility).assertEqual("");
-        expect(data.theme).assertEqual("");
         expect(data.metaData.length).assertEqual(0);
         expect(data.metadata.length).assertEqual(0);
         expect(data.enabled).assertEqual(true);

appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js

@@ -24,7 +24,6 @@ const BUNDLE_NAME6 = "com.example.bmsmainabilitysecondscene";
 const FIRSTMAINABILITY = 'com.example.bmsmainabilityfirstscene.MainAbility';
 const SECONDMAINABILITY = 'com.example.bmsmainabilitysecondscene.MainAbility';
 const MODULE_NAME = 'entry';
-const ICON_PATH = "$media:icon";
 const LABEL = '$string:app_name';
 const DEVICE_TYPES = 'phone';
 
@@ -47,7 +46,6 @@ describe('ActsBmsHapModuleTest', function () {
                 expect(hapModuleInfo.moduleName).assertEqual(MODULE_NAME);
                 expect(hapModuleInfo.description).assertEqual('');
                 expect(hapModuleInfo.descriptionId).assertEqual(0);
-                expect(hapModuleInfo.iconPath).assertEqual(ICON_PATH);
                 expect(hapModuleInfo.icon).assertEqual('');
                 expect(hapModuleInfo.label).assertEqual(LABEL);
                 expect(hapModuleInfo.labelId).assertEqual(0);
@@ -59,7 +57,6 @@ describe('ActsBmsHapModuleTest', function () {
                 expect(hapModuleInfo.mainAbilityName).assertEqual(FIRSTMAINABILITY);
                 expect(hapModuleInfo.mainElementName).assertEqual(FIRSTMAINABILITY);
                 expect(hapModuleInfo.abilityInfo.length).assertLarger(0);
-                expect(hapModuleInfo.colorMode).assertEqual(-1);
                 expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0);
                 expect(hapModuleInfo.metadata.length).assertEqual(0);
                 expect(hapModuleInfo.installationFree).assertEqual(false);
@@ -113,7 +110,6 @@ describe('ActsBmsHapModuleTest', function () {
                 expect(hapModuleInfo.moduleName).assertEqual(MODULE_NAME);
                 expect(hapModuleInfo.description).assertEqual('');
                 expect(hapModuleInfo.descriptionId).assertEqual(0);
-                expect(hapModuleInfo.iconPath).assertEqual(ICON_PATH);
                 expect(hapModuleInfo.icon).assertEqual('');
                 expect(hapModuleInfo.label).assertEqual(LABEL);
                 expect(hapModuleInfo.labelId).assertEqual(0);
@@ -125,7 +121,6 @@ describe('ActsBmsHapModuleTest', function () {
                 expect(hapModuleInfo.mainAbilityName).assertEqual("");
                 expect(hapModuleInfo.mainElementName).assertEqual("");
                 expect(hapModuleInfo.abilityInfo.length).assertLarger(0);
-                expect(hapModuleInfo.colorMode).assertEqual(-1);
                 expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0);
                 expect(hapModuleInfo.metadata.length).assertEqual(0);
                 expect(hapModuleInfo.installationFree).assertEqual(false);
@@ -150,7 +145,6 @@ describe('ActsBmsHapModuleTest', function () {
                 expect(hapModuleInfo.moduleName).assertEqual(MODULE_NAME);
                 expect(hapModuleInfo.description).assertEqual('');
                 expect(hapModuleInfo.descriptionId).assertEqual(0);
-                expect(hapModuleInfo.iconPath).assertEqual(ICON_PATH);
                 expect(hapModuleInfo.icon).assertEqual('');
                 expect(hapModuleInfo.label).assertEqual(LABEL);
                 expect(hapModuleInfo.labelId).assertEqual(0);
@@ -162,7 +156,6 @@ describe('ActsBmsHapModuleTest', function () {
                 expect(hapModuleInfo.mainAbilityName).assertEqual("com.example.third5.AMainAbility");
                 expect(hapModuleInfo.mainElementName).assertEqual("com.example.third5.AMainAbility");
                 expect(hapModuleInfo.abilityInfo.length).assertLarger(0);
-                expect(hapModuleInfo.colorMode).assertEqual(-1);
                 expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0);
                 expect(hapModuleInfo.metadata.length).assertEqual(0);
                 expect(hapModuleInfo.installationFree).assertEqual(false);
@@ -188,7 +181,6 @@ describe('ActsBmsHapModuleTest', function () {
                 expect(hapModuleInfo.moduleName).assertEqual(MODULE_NAME);
                 expect(hapModuleInfo.description).assertEqual('');
                 expect(hapModuleInfo.descriptionId).assertEqual(0);
-                expect(hapModuleInfo.iconPath).assertEqual(ICON_PATH);
                 expect(hapModuleInfo.icon).assertEqual('');
                 expect(hapModuleInfo.label).assertEqual(LABEL);
                 expect(hapModuleInfo.labelId).assertEqual(0);
@@ -200,7 +192,6 @@ describe('ActsBmsHapModuleTest', function () {
                 expect(hapModuleInfo.mainAbilityName).assertEqual("com.example.system1.MainAbility");
                 expect(hapModuleInfo.mainElementName).assertEqual("com.example.system1.MainAbility");
                 expect(hapModuleInfo.abilityInfo.length).assertLarger(0);
-                expect(hapModuleInfo.colorMode).assertEqual(-1);
                 expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0);
                 expect(hapModuleInfo.metadata.length).assertEqual(0);
                 expect(hapModuleInfo.installationFree).assertEqual(false);
@@ -212,7 +203,6 @@ describe('ActsBmsHapModuleTest', function () {
     function checkHapMoudleInfos(info) {
         expect(info.description).assertEqual('');
         expect(info.descriptionId).assertEqual(0);
-        expect(info.iconPath).assertEqual(ICON_PATH);
         expect(info.icon).assertEqual('');
         expect(info.labelId).assertEqual(0);
         expect(info.iconId).assertEqual(0);
@@ -221,7 +211,6 @@ describe('ActsBmsHapModuleTest', function () {
         expect(info.reqCapabilities.length).assertEqual(0);
         expect(info.deviceTypes[0]).assertEqual(DEVICE_TYPES);
         expect(info.abilityInfo.length).assertLarger(0);
-        expect(info.colorMode).assertEqual(-1);
         expect(info.extensionAbilityInfo.length).assertEqual(0);
         expect(info.metadata.length).assertEqual(0);
         expect(info.installationFree).assertEqual(false);

appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js

@@ -48,8 +48,6 @@ describe('ActsBmsJsTest', function () {
             let abilityInfo2 = result.abilityInfos[1];
             expect(abilityInfo1.name).assertEqual(ABILITIY_NAME1);
             expect(abilityInfo2.name).assertEqual(ABILITIY_NAME6);
-            expect(abilityInfo1.srcLanguage).assertEqual('js');
-            expect(abilityInfo1.srcPath).assertEqual('');
             expect(abilityInfo1.label).assertEqual("$string:app_name");
             expect(abilityInfo1.description).assertEqual("$string:mainability_description");
             expect(abilityInfo1.icon).assertEqual("$media:icon");
@@ -75,7 +73,6 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.readPermission).assertEqual("");
             expect(abilityInfo1.writePermission).assertEqual("");
             expect(abilityInfo1.targetAbility).assertEqual("");
-            expect(abilityInfo1.theme).assertEqual("");
             expect(abilityInfo1.metaData.length).assertEqual(0);
             expect(abilityInfo1.metadata.length).assertEqual(0);
             expect(abilityInfo1.enabled).assertEqual(true);
@@ -127,8 +124,6 @@ describe('ActsBmsJsTest', function () {
             console.info("getBundleIno result" + JSON.stringify(result));
             let abilityInfo1 = result.abilityInfos[0];
             expect(abilityInfo1.name).assertEqual(ABILITIY_NAME4);
-            expect(abilityInfo1.srcLanguage).assertEqual('js');
-            expect(abilityInfo1.srcPath).assertEqual('default');
             expect(abilityInfo1.label).assertEqual("$string:app_name");
             expect(abilityInfo1.description).assertEqual("$string:mainability_description");
             expect(abilityInfo1.icon).assertEqual("$media:icon");
@@ -152,7 +147,6 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.readPermission).assertEqual("");
             expect(abilityInfo1.writePermission).assertEqual("");
             expect(abilityInfo1.targetAbility).assertEqual("");
-            expect(abilityInfo1.theme).assertEqual("");
             expect(abilityInfo1.metaData.length).assertEqual(0);
             expect(abilityInfo1.metadata.length).assertEqual(0);
             expect(abilityInfo1.enabled).assertEqual(true);
@@ -173,8 +167,6 @@ describe('ActsBmsJsTest', function () {
             console.info("getBundleIno result" + JSON.stringify(result));
             let abilityInfo1 = result.abilityInfos[0];
             expect(abilityInfo1.name).assertEqual(ABILITIY_NAME5);
-            expect(abilityInfo1.srcLanguage).assertEqual('c++');
-            expect(abilityInfo1.srcPath).assertEqual('default/c++/');
             expect(abilityInfo1.label).assertEqual("$string:app_name");
             expect(abilityInfo1.description).assertEqual("$string:mainability_description");
             expect(abilityInfo1.icon).assertEqual("$media:icon");
@@ -198,7 +190,6 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.readPermission).assertEqual("");
             expect(abilityInfo1.writePermission).assertEqual("");
             expect(abilityInfo1.targetAbility).assertEqual("");
-            expect(abilityInfo1.theme).assertEqual("");
             expect(abilityInfo1.metaData.length).assertEqual(0);
             expect(abilityInfo1.metadata.length).assertEqual(0);
             expect(abilityInfo1.enabled).assertEqual(true);
@@ -208,8 +199,6 @@ describe('ActsBmsJsTest', function () {
 
     function checkAbilityInfos(info) {
         expect(info.name).assertEqual(ABILITIY_NAME2);
-        expect(info.srcLanguage).assertEqual('js');
-        expect(info.srcPath).assertEqual('');
         expect(info.label).assertEqual("$string:app_name");
         expect(info.description).assertEqual("$string:mainability_description");
         expect(info.icon).assertEqual("$media:icon");
@@ -233,7 +222,6 @@ describe('ActsBmsJsTest', function () {
         expect(info.readPermission).assertEqual("");
         expect(info.writePermission).assertEqual("");
         expect(info.targetAbility).assertEqual("");
-        expect(info.theme).assertEqual("");
         expect(info.metaData.length).assertEqual(1);
         expect(info.metaData[0].name).assertEqual("Data5A");
         expect(info.metaData[0].value).assertEqual("float");

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

@@ -14,28 +14,40 @@
  */
 
 import bundle from '@ohos.bundle'
-import { describe, it, expect } from 'deccjsunit/index'
+import account from '@ohos.account.osAccount'
+import { describe, beforeAll, it, expect } from 'deccjsunit/index'
 
 const LAUNCHER_BUNDLE_NAME = 'com.ohos.launcher';
 const LAUNCHER_MAIN_ABILITY = 'com.ohos.launcher.MainAbility';
 const DEFAULT_FLAG = bundle.BundleFlag.GET_BUNDLE_DEFAULT;
-const DEFAULT_USER_ID = 100;
 const INVALID_CODE = 1;
+let userId = 0;
 
 describe('ActsBmsJsUnPermissionTest', function () {
 
+    beforeAll(async function (done) {
+        await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+            console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+            userId = account;
+            done();
+          }).catch(err=>{
+            console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+            done();
+          })
+    });
+
     /*
      * @tc.number: getApplicationInfoTest_100
      * @tc.name: test getApplicationInfo
      * @tc.desc: test getApplicationInfo
      */
     it('getApplicationInfoTest_100', 0, async function (done) {
-        await bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
+        await bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, userId).then(data => {
             expect().assertFail();
         }).catch(err => {
             expect(err).assertEqual(INVALID_CODE);
         });
-        bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, DEFAULT_USER_ID, (err, data) => {
+        bundle.getApplicationInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_FLAG, userId, (err, data) => {
             expect(err).assertEqual(INVALID_CODE);
             expect(data).assertEqual(undefined);
             done();
@@ -48,12 +60,12 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getAllApplicationInfo
      */
     it('getAllApplicationInfoTest_100', 0, async function (done) {
-        await bundle.getAllApplicationInfo(DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
+        await bundle.getAllApplicationInfo(DEFAULT_FLAG, userId).then(data => {
             expect().assertFail();
         }).catch(err => {
             expect(err).assertEqual(INVALID_CODE);
         });
-        bundle.getAllApplicationInfo(DEFAULT_FLAG, DEFAULT_USER_ID, (err, data) => {
+        bundle.getAllApplicationInfo(DEFAULT_FLAG, userId, (err, data) => {
             expect(err).assertEqual(INVALID_CODE);
             expect(data).assertEqual(undefined);
             done();
@@ -66,12 +78,12 @@ describe('ActsBmsJsUnPermissionTest', function () {
      * @tc.desc: test getBundleInfo
      */
     it('getBundleInfoTest_100', 0, async function (done) {
-        await bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_USER_ID).then(data => {
+        await bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, userId).then(data => {
             expect().assertFail();
         }).catch(err => {
             expect(err).assertEqual(INVALID_CODE);
         });
-        bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, DEFAULT_USER_ID, (err, data) => {
+        bundle.getBundleInfo(LAUNCHER_BUNDLE_NAME, userId, (err, data) => {
             expect(err).assertEqual(INVALID_CODE);
             expect(data).assertEqual(undefined);
             done();
@@ -105,7 +117,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
         await bundle.queryAbilityByWant({
             bundleName: LAUNCHER_BUNDLE_NAME,
             abilityName: LAUNCHER_MAIN_ABILITY
-        }, DEFAULT_FLAG, DEFAULT_USER_ID).then(data => {
+        }, DEFAULT_FLAG, userId).then(data => {
             expect().assertFail();
         }).catch(err => {
             expect(err).assertEqual(INVALID_CODE);
@@ -113,7 +125,7 @@ describe('ActsBmsJsUnPermissionTest', function () {
         bundle.queryAbilityByWant({
             bundleName: LAUNCHER_BUNDLE_NAME,
             abilityName: LAUNCHER_MAIN_ABILITY
-        }, DEFAULT_FLAG, DEFAULT_USER_ID, (err, data) => {
+        }, DEFAULT_FLAG, userId, (err, data) => {
             console.info("data ===================:" + data);
             expect(err).assertEqual(INVALID_CODE);
             expect(data).assertEqual("QueryAbilityInfos failed");

appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/entry/src/main/js/test/ActsBmsMetaDataTest.test.js

@@ -14,6 +14,7 @@
  */
 
 import bundle from '@ohos.bundle'
+import account from '@ohos.account.osAccount'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 
 const BUNDLE_NAME1 = 'com.example.third1';
@@ -28,10 +29,21 @@ const ABILITY_NAME3 = 'com.example.noexist.MainAbility';
 const ABILITY_NAME4 = 'com.example.system1.MainAbility';
 const ABILITY_NAME5 = 'com.example.vendor1.MainAbility';
 const ABILITY_NAME6 = 'com.example.l3jsdemo.MainAbility';
-const USERID = 100;
+let userId = 0;
 
 describe('ActsBmsMetaDataTest', function () {
 
+    beforeAll(async function (done) {
+        await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+            console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+            userId = account;
+            done();
+          }).catch(err=>{
+            console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+            done();
+          })
+    });
+
     /*
     * @tc.number: bms_getMetaData_0100
     * @tc.name: test to get meta data for an application.
@@ -42,7 +54,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 "bundleName": BUNDLE_NAME1,
                 "abilityName": ABILITY_NAME1
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID).then(dataInfos => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId).then(dataInfos => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("DataA1");
             expect(metaData[0].value).assertEqual("float");
@@ -54,7 +66,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 "bundleName": BUNDLE_NAME1,
                 "abilityName": ABILITY_NAME1
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID, (err, dataInfos) => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId, (err, dataInfos) => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("DataA1");
             expect(metaData[0].value).assertEqual("float");
@@ -73,7 +85,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 "bundleName": BUNDLE_NAME6,
                 "abilityName": ABILITY_NAME6
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID).then(dataInfos => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId).then(dataInfos => {
             let metaDataInfo = dataInfos[0].metaData;
             expect(metaDataInfo[0].name).assertEqual("Data3");
             expect(metaDataInfo[0].value).assertEqual("float");
@@ -85,7 +97,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 "bundleName": BUNDLE_NAME6,
                 "abilityName": ABILITY_NAME6
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID, (err, dataInfos) => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId, (err, dataInfos) => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("Data3");
             expect(metaData[0].value).assertEqual("float");
@@ -104,7 +116,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 bundleName: BUNDLE_NAME2,
                 abilityName: ABILITY_NAME2,
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID).then(dataInfos => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId).then(dataInfos => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("Data5A");
             expect(metaData[0].value).assertEqual("float");
@@ -116,7 +128,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 "bundleName": BUNDLE_NAME2,
                 "abilityName": ABILITY_NAME2
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID, (err, dataInfos) => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId, (err, dataInfos) => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("Data5A");
             expect(metaData[0].value).assertEqual("float");
@@ -135,7 +147,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 bundleName: BUNDLE_NAME3,
                 abilityName: ABILITY_NAME3,
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID).then(dataInfos => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId).then(dataInfos => {
             expect(dataInfos).assertFail();
         }).catch(err => {
             expect(err).assertEqual(1);
@@ -144,7 +156,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 "bundleName": BUNDLE_NAME3,
                 "abilityName": ABILITY_NAME3
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID, (err, dataInfos) => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId, (err, dataInfos) => {
             expect(err).assertEqual(1);
             expect(dataInfos).assertEqual("QueryAbilityInfos failed");
             done();
@@ -161,7 +173,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 bundleName: BUNDLE_NAME4,
                 abilityName: ABILITY_NAME4,
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID).then(dataInfos => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId).then(dataInfos => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("Data1S");
             expect(metaData[0].value).assertEqual("float");
@@ -173,7 +185,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 "bundleName": BUNDLE_NAME4,
                 "abilityName": ABILITY_NAME4
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID, (err, dataInfos) => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId, (err, dataInfos) => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("Data1S");
             expect(metaData[0].value).assertEqual("float");
@@ -192,7 +204,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 bundleName: BUNDLE_NAME5,
                 abilityName: ABILITY_NAME5,
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID).then(dataInfos => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId).then(dataInfos => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("vendorName");
             expect(metaData[0].value).assertEqual("vendorValue");
@@ -204,7 +216,7 @@ describe('ActsBmsMetaDataTest', function () {
             {
                 "bundleName": BUNDLE_NAME5,
                 "abilityName": ABILITY_NAME5
-            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, USERID, (err, dataInfos) => {
+            }, bundle.BundleFlag.GET_ABILITY_INFO_WITH_METADATA, userId, (err, dataInfos) => {
             let metaData = dataInfos[0].metaData;
             expect(metaData[0].name).assertEqual("vendorName");
             expect(metaData[0].value).assertEqual("vendorValue");

appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/GetabilityInfo.test.ets

@@ -322,7 +322,6 @@ export default function GetabilityInfo() {
             expect(JSON.stringify(info.metaData)).assertEqual("{}");
             expect(JSON.stringify(info.metadata)).assertEqual("{}");
             expect(info.enabled).assertEqual(true);
-            expect(info.flags).assertEqual(0);
             expect(info.uid).assertLarger(0);
             expect(info.entityType).assertEqual("unspecified");
             expect(info.removable).assertEqual(true);

appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/QueryExtensionAbilityInfos.test.ets

@@ -13,8 +13,9 @@
  * limitations under the License.
  */
 
-import bundle from '@ohos.bundle'
-import { describe, it, expect } from 'hypium/index';
+import bundle from '@ohos.bundle';
+import account from '@ohos.account.osAccount';
+import { describe,beforeAll, it, expect } from 'hypium/index';
 
 const BUNDLE_NAME1 = "ohos.acts.bundle.stage";
 const BUNDLE_NAME2 = "com.noexit.com";
@@ -22,11 +23,23 @@ const BUNDLE_NAME3 = 'com.example.third1';
 const ABILITY_NAME1 = "ExtensionAbility1";
 const ABILITY_NAME2 = "noexitAbility";
 const ABILITY_NAME3 = "ServiceAbility";
+let userId = 0;
 
 export default function QueryExtensionAbilityInfos() {
 
   describe('QueryExtensionAbilityInfos', function () {
 
+    beforeAll(async function (done) {
+      await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+          console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+          userId = account;
+          done();
+        }).catch(err=>{
+          console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+          done();
+        })
+  });
+
     /*
   * @tc.number: SUB_BMS_APPINFO_EXTENSION_0001
   * @tc.name: test queryExtensionAbilityInfos api
@@ -66,7 +79,7 @@ export default function QueryExtensionAbilityInfos() {
       await bundle.queryExtensionAbilityInfos({
         "bundleName": BUNDLE_NAME1,
         "abilityName": ABILITY_NAME1
-      }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_PERMISSION, 100).then(data => {
+      }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_PERMISSION, userId).then(data => {
         expect(data[0].bundleName).assertEqual("ohos.acts.bundle.stage");
         expect(data[0].moduleName).assertEqual("phone");
         expect(data[0].name).assertEqual("ExtensionAbility1");
@@ -86,7 +99,7 @@ export default function QueryExtensionAbilityInfos() {
       bundle.queryExtensionAbilityInfos({
         "bundleName": BUNDLE_NAME1,
         "abilityName": ABILITY_NAME1
-      }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_PERMISSION, 100, (err, data) => {
+      }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_PERMISSION, userId, (err, data) => {
         if (err) {
           expect(err).assertFail();
           done();
@@ -120,7 +133,7 @@ export default function QueryExtensionAbilityInfos() {
           "bundleName": BUNDLE_NAME1,
           "abilityName": ABILITY_NAME1
         }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100).then(data => {
+        userId).then(data => {
           expect(data[0].bundleName).assertEqual("ohos.acts.bundle.stage");
           expect(data[0].moduleName).assertEqual("phone");
           expect(data[0].name).assertEqual("ExtensionAbility1");
@@ -142,7 +155,7 @@ export default function QueryExtensionAbilityInfos() {
           "bundleName": BUNDLE_NAME1,
           "abilityName": ABILITY_NAME1
         }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertFail();
             done();
@@ -175,7 +188,7 @@ export default function QueryExtensionAbilityInfos() {
         "bundleName": BUNDLE_NAME1,
         "abilityName": ABILITY_NAME1
       }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_APPLICATION,
-        100).then(data => {
+        userId).then(data => {
           expect(data[0].bundleName).assertEqual("ohos.acts.bundle.stage");
           expect(data[0].moduleName).assertEqual("phone");
           expect(data[0].name).assertEqual("ExtensionAbility1");
@@ -197,7 +210,7 @@ export default function QueryExtensionAbilityInfos() {
         "bundleName": BUNDLE_NAME1,
         "abilityName": ABILITY_NAME1
       }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_APPLICATION,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertFail();
             done();
@@ -231,7 +244,7 @@ export default function QueryExtensionAbilityInfos() {
         {
           "bundleName": BUNDLE_NAME2,
           "abilityName": ABILITY_NAME1
-        }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, 100).then(data => {
+        }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, userId).then(data => {
           expect(data).assertFail();
         }).catch(err => {
           expect(err).assertEqual(1);
@@ -240,7 +253,7 @@ export default function QueryExtensionAbilityInfos() {
         {
           "bundleName": BUNDLE_NAME2,
           "abilityName": ABILITY_NAME1
-        }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, 100, (err, data) => {
+        }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, userId, (err, data) => {
           if (err) {
             expect(err).assertEqual(1);
             done();
@@ -261,7 +274,7 @@ export default function QueryExtensionAbilityInfos() {
         {
           "bundleName": BUNDLE_NAME1,
           "abilityName": ABILITY_NAME2
-        }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, 100).then(data => {
+        }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, userId).then(data => {
           expect(data).assertFail();
         }).catch(err => {
           expect(err).assertEqual(1);
@@ -270,7 +283,7 @@ export default function QueryExtensionAbilityInfos() {
         {
           "bundleName": BUNDLE_NAME1,
           "abilityName": ABILITY_NAME2
-        }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, 100, (err, data) => {
+        }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, userId, (err, data) => {
           if (err) {
             expect(err).assertEqual(1);
             done();
@@ -291,7 +304,7 @@ export default function QueryExtensionAbilityInfos() {
         {
           "bundleName": BUNDLE_NAME1,
           "abilityName": ABILITY_NAME1
-        }, bundle.ExtensionAbilityType.FORM, null, 100).then(data => {
+        }, bundle.ExtensionAbilityType.FORM, null, userId).then(data => {
           expect(data).assertFail();
         }).catch(err => {
           expect(err).assertEqual(1);
@@ -309,7 +322,7 @@ export default function QueryExtensionAbilityInfos() {
         {
           "bundleName": BUNDLE_NAME1,
           "abilityName": ABILITY_NAME1
-        }, bundle.ExtensionAbilityType.FORM, null, 100, (err, data) => {
+        }, bundle.ExtensionAbilityType.FORM, null, userId, (err, data) => {
           expect(err).assertEqual(1);
           expect(data).assertEqual("type mismatch");
           done();
@@ -383,7 +396,7 @@ export default function QueryExtensionAbilityInfos() {
           "bundleName": BUNDLE_NAME1,
           "abilityName": ABILITY_NAME3
         }, bundle.ExtensionAbilityType.SERVICE, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100).then(data => {
+        userId).then(data => {
           expect(data[0].bundleName).assertEqual("ohos.acts.bundle.stage");
           expect(data[0].moduleName).assertEqual("phone");
           expect(data[0].name).assertEqual(ABILITY_NAME3);
@@ -405,7 +418,7 @@ export default function QueryExtensionAbilityInfos() {
           "bundleName": BUNDLE_NAME1,
           "abilityName": ABILITY_NAME3
         }, bundle.ExtensionAbilityType.SERVICE, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertEqual(1);
             done();
@@ -437,7 +450,7 @@ export default function QueryExtensionAbilityInfos() {
       await bundle.queryExtensionAbilityInfos(
         {
           "bundleName": BUNDLE_NAME2
-        }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, 100).then(data => {
+        }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, userId).then(data => {
           expect(data).assertFail();
         }).catch(err => {
           expect(err).assertEqual(1);
@@ -445,7 +458,7 @@ export default function QueryExtensionAbilityInfos() {
       bundle.queryExtensionAbilityInfos(
         {
           "bundleName": BUNDLE_NAME2
-        }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, 100, (err, data) => {
+        }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT, userId, (err, data) => {
           if (err) {
             expect(err).assertEqual(1);
             done();
@@ -467,7 +480,7 @@ export default function QueryExtensionAbilityInfos() {
           "bundleName": BUNDLE_NAME1,
           "action": "actionY"
         }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_PERMISSION,
-        100).then(data => {
+        userId).then(data => {
           expect(data[0].bundleName).assertEqual("ohos.acts.bundle.stage");
           expect(data[0].moduleName).assertEqual("phone");
           expect(data[0].name).assertEqual("ExtensionAbility1");
@@ -489,7 +502,7 @@ export default function QueryExtensionAbilityInfos() {
           "bundleName": BUNDLE_NAME1,
           "action": "actionY"
         }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_PERMISSION,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertFail();
             done();
@@ -522,7 +535,7 @@ export default function QueryExtensionAbilityInfos() {
         "bundleName": BUNDLE_NAME1,
         "action": "actionY12", "uri": "https://www.test.com/query/student/name"
       }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_METADATA,
-        100).then(data => {
+        userId).then(data => {
           expect(data[0].bundleName).assertEqual("ohos.acts.bundle.stage");
           expect(data[0].moduleName).assertEqual("phone");
           expect(data[0].name).assertEqual("ExtensionAbility1");
@@ -544,7 +557,7 @@ export default function QueryExtensionAbilityInfos() {
         "bundleName": BUNDLE_NAME1,
         "action": "actionY12", "uri": "https://www.test.com/query/student/name"
       }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_WITH_METADATA,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertFail();
             done();
@@ -580,7 +593,7 @@ export default function QueryExtensionAbilityInfos() {
           "action": "actionY12",
           "uri": "https://www.test.com/query/teacher/name"
         }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100).then(data => {
+        userId).then(data => {
           expect(data).assertFail();
         }).catch(err => {
           expect(err).assertEqual(1);
@@ -591,7 +604,7 @@ export default function QueryExtensionAbilityInfos() {
           "action": "actionY12",
           "uri": "https://www.test.com/query/teacher/name"
         }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertEqual(1);
             done();
@@ -613,7 +626,7 @@ export default function QueryExtensionAbilityInfos() {
         "action": "",
         "entities": ["entitiesCommon"],
       }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100).then(data => {
+        userId).then(data => {
           expect(data[0].bundleName).assertEqual("ohos.acts.bundle.stage");
           expect(data[0].moduleName).assertEqual("myfeature");
           expect(data[0].name).assertEqual("ExtensionAbilityW");
@@ -635,7 +648,7 @@ export default function QueryExtensionAbilityInfos() {
         "action": "",
         "entities": ["entitiesCommon"]
       }, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertFail();
             done();
@@ -665,14 +678,14 @@ export default function QueryExtensionAbilityInfos() {
     it('SUB_BMS_APPINFO_EXTENSION_0015', 0, async function (done) {
       await bundle.queryExtensionAbilityInfos(
         null, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100).then(data => {
+        userId).then(data => {
           expect(data).assertFail();
         }).catch(err => {
           expect(err).assertEqual(1);
         });
       bundle.queryExtensionAbilityInfos(
         {}, bundle.ExtensionAbilityType.UNSPECIFIED, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertEqual(1);
             done();
@@ -694,7 +707,7 @@ export default function QueryExtensionAbilityInfos() {
         "action": "",
         "entities": ["entitiesCommon"],
       }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100).then(data => {
+        userId).then(data => {
           expect(data[0].bundleName).assertEqual("ohos.acts.bundle.stage");
           expect(data[0].moduleName).assertEqual("phone");
           expect(data[0].name).assertEqual("FormAbility");
@@ -716,7 +729,7 @@ export default function QueryExtensionAbilityInfos() {
         "action": "",
         "entities": ["entitiesCommon"]
       }, bundle.ExtensionAbilityType.FORM, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertFail();
             done();
@@ -750,7 +763,7 @@ export default function QueryExtensionAbilityInfos() {
           "type": "",
           "uri": "https://www.test.com/abbc"
         }, bundle.ExtensionAbilityType.WINDOW, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100).then(data => {
+        userId).then(data => {
           expect(data).assertFail();
         }).catch(err => {
           expect(err).assertEqual(1);
@@ -760,7 +773,7 @@ export default function QueryExtensionAbilityInfos() {
           "type": "",
           "uri": "https://www.test.com/abbc"
         }, bundle.ExtensionAbilityType.WINDOW, bundle.ExtensionFlag.GET_EXTENSION_INFO_DEFAULT,
-        100, (err, data) => {
+        userId, (err, data) => {
           if (err) {
             expect(err).assertEqual(1);
             done();
@@ -850,7 +863,6 @@ export default function QueryExtensionAbilityInfos() {
       expect(JSON.stringify(data[0].applicationInfo.metaData)).assertEqual("{}");
       expect(JSON.stringify(data[0].applicationInfo.metadata)).assertEqual("{}");
       expect(data[0].applicationInfo.enabled).assertTrue();
-      expect(data[0].applicationInfo.flags).assertEqual(0);
       expect(data[0].applicationInfo.uid).assertLarger(0);
       expect(data[0].applicationInfo.entityType).assertEqual("unspecified");
       expect(data[0].applicationInfo.removable).assertTrue();

appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/getAllApplicationInfoJsunit.test.ets

@@ -12,9 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { describe, it, expect } from 'hypium/index';
+import { describe,beforeAll, it, expect } from 'hypium/index';
 import Utils from './Utils';
 import Bundle from '@ohos.bundle';
+import account from '@ohos.account.osAccount';
 
 const TAG_TEST_0100_001 = ' bundle_getAllApplicationInfo_test_0100_001 ';
 const TAG_TEST_0100_002 = ' bundle_getAllApplicationInfo_test_0100_002 ';
@@ -29,12 +30,23 @@ const TAG_TEST_0500_002 = ' bundle_getAllApplicationInfo_test_0500_0010 ';
 const DEFAULT_FLAG = Bundle.BundleFlag.GET_BUNDLE_DEFAULT;
 const BUNDLE_OTHER = 'com.example.third1';
 const PATH = "/data/app/el1/bundle/public";
-const USER_ID_100 = 100;
+let userId = 0;
 
 export default function getAllApplicationBundleTest() {
 
     describe('appInfoTest', function () {
 
+        beforeAll(async function (done) {
+            await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+                console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+                userId = account;
+                done();
+              }).catch(err=>{
+                console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+                done();
+              })
+        });
+
         /**
          * @tc.number: bundle_getApplicationInfo_test_0100_001
          * @tc.name: getApplicationInfo : Obtains based on a given bundle name.
@@ -44,7 +56,7 @@ export default function getAllApplicationBundleTest() {
         it(TAG_TEST_0100_001, 0, async function (done) {
             let startTime = await Utils.getNowTime();
             let data = await Bundle.getAllApplicationInfo(
-                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, USER_ID_100).catch((error) => {
+                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId).catch((error) => {
                     console.info(TAG_TEST_0100_001 + 'UserId promise error is: ' + error);
                     expect(error).assertFail();
                 });
@@ -65,7 +77,7 @@ export default function getAllApplicationBundleTest() {
         it(TAG_TEST_0100_002, 0, async function (done) {
             let startTime = await Utils.getNowTime();
             let data = await Bundle.getAllApplicationInfo(
-                Bundle.BundleFlag.GET_ALL_APPLICATION_INFO, USER_ID_100).catch((error) => {
+                Bundle.BundleFlag.GET_ALL_APPLICATION_INFO, userId).catch((error) => {
                     console.info(TAG_TEST_0100_002 + 'UserId promise error is: ' + error);
                     expect(error).assertFail();
                 });
@@ -86,7 +98,7 @@ export default function getAllApplicationBundleTest() {
         it(TAG_TEST_0100_003, 0, async function (done) {
             let startTime = await Utils.getNowTime();
             let data = await Bundle.getAllApplicationInfo(
-                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_DISABLE, USER_ID_100).catch((error) => {
+                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_DISABLE, userId).catch((error) => {
                     console.info(TAG_TEST_0100_003 + 'UserId promise error is: ' + error);
                     expect(error).assertFail();
                 });
@@ -172,7 +184,7 @@ export default function getAllApplicationBundleTest() {
             let datas;
             let startTime = await Utils.getNowTime();
             Bundle.getAllApplicationInfo(
-                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, USER_ID_100, (error, data) => {
+                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId, (error, data) => {
                     let endTime = Utils.getNowTime();
                     Utils.getDurationTime(TAG_TEST_0300_001, startTime, endTime);
                     if (error) {
@@ -226,7 +238,7 @@ export default function getAllApplicationBundleTest() {
         it(TAG_TEST_0500_002, 0, async function (done) {
             let errors;
             let startTime = await Utils.getNowTime();
-            await Bundle.getAllApplicationInfo('Bundle.BundleFlag.GET_BUNDLE_DEFAULT', USER_ID_100).then((data) => {
+            await Bundle.getAllApplicationInfo('Bundle.BundleFlag.GET_BUNDLE_DEFAULT', userId).then((data) => {
                 console.info(TAG_TEST_0500_002 + 'noUserId promise data is: ' + data);
                 expect(data).assertFail();
             }).catch((error) => {
@@ -328,7 +340,6 @@ export default function getAllApplicationBundleTest() {
                 expect(typeof (data[i].metaData)).assertEqual('object');
                 expect(typeof (data[i].metadata)).assertEqual('object');
                 expect(typeof (data[i].enabled)).assertEqual('boolean');
-                expect(typeof (data[i].flags)).assertEqual('number');
                 expect(typeof (data[i].uid)).assertEqual('number');
                 expect(typeof (data[i].entityType)).assertEqual('string');
                 expect(typeof (data[i].removable)).assertEqual('boolean');
@@ -365,7 +376,6 @@ export default function getAllApplicationBundleTest() {
                     expect(data[i].entryDir).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag' +
                         '/com.open.harmony.packagemag');
                     expect(data[i].enabled).assertEqual(true);
-                    expect(data[i].flags).assertEqual(0);
                     expect(data[i].entityType).assertEqual('unspecified');
                     expect(data[i].removable).assertEqual(true);
                     expect(data[i].moduleInfos[0].moduleName).assertEqual('entry');
@@ -401,7 +411,6 @@ export default function getAllApplicationBundleTest() {
             expect(JSON.stringify(data.metaData)).assertEqual("{}");
             expect(JSON.stringify(data.metadata)).assertEqual("{}");
             expect(data.enabled).assertTrue();
-            expect(data.flags).assertEqual(0);
             expect(data.uid).assertLarger(0);
             expect(data.entityType).assertEqual('unspecified');
             expect(data.removable).assertTrue();

appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/getApplicationInfoJsunit.test.ets

@@ -12,9 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { describe, it, expect } from 'hypium/index';
+import { describe,beforeAll, it, expect } from 'hypium/index';
 import Utils from './Utils';
 import Bundle from '@ohos.bundle';
+import account from '@ohos.account.osAccount';
 
 const TAG_TEST_0100_001 = ' bundle_getApplicationInfo_test_0100_001 ';
 const TAG_TEST_0100_002 = ' bundle_getApplicationInfo_test_0100_002 ';
@@ -34,12 +35,23 @@ const BUNDLE_OTHER = 'com.example.third1';
 const BUNDLE_NOTEXIST = 'com.ohos.package';
 const FLAG_DEFAULT = Bundle.BundleFlag.GET_BUNDLE_DEFAULT;
 const PATH = "/data/app/el1/bundle/public";
-const USER_ID_100 = 100;
+let userId = 0;
 
 export default function applicationBundleJsunit() {
 
     describe('appInfoTest', function () {
 
+        beforeAll(async function (done) {
+            await account.getAccountManager().getOsAccountLocalIdFromProcess().then(account => {
+                console.info("getOsAccountLocalIdFromProcess userid  ==========" + account);
+                userId = account;
+                done();
+              }).catch(err=>{
+                console.info("getOsAccountLocalIdFromProcess err ==========" + JSON.stringify(err));
+                done();
+              })
+        });
+
         /**
          * @tc.number: bundle_getApplicationInfo_test_0100_001
          * @tc.name: getApplicationInfo : Obtains based on a given bundle name.
@@ -49,7 +61,7 @@ export default function applicationBundleJsunit() {
         it(TAG_TEST_0100_001, 0, async function (done) {
             let startTime = await Utils.getNowTime();
             let data = await Bundle.getApplicationInfo(BUNDLE_NAME,
-                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, USER_ID_100).catch((error) => {
+                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId).catch((error) => {
                     console.info(TAG_TEST_0100_001 + 'UserId promise error is: ' + error);
                     expect(error).assertFail();
                 });
@@ -70,7 +82,7 @@ export default function applicationBundleJsunit() {
         it(TAG_TEST_0100_002, 0, async function (done) {
             let startTime = await Utils.getNowTime();
             let data = await Bundle.getApplicationInfo(BUNDLE_NAME,
-                Bundle.BundleFlag.GET_ALL_APPLICATION_INFO, USER_ID_100).catch((error) => {
+                Bundle.BundleFlag.GET_ALL_APPLICATION_INFO, userId).catch((error) => {
                     console.info(TAG_TEST_0100_002 + 'UserId promise error is: ' + error);
                     expect(error).assertFail();
                 });
@@ -91,7 +103,7 @@ export default function applicationBundleJsunit() {
         it(TAG_TEST_0100_003, 0, async function (done) {
             let startTime = await Utils.getNowTime();
             let data = await Bundle.getApplicationInfo(BUNDLE_NAME,
-                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_DISABLE, USER_ID_100).catch((error) => {
+                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_DISABLE, userId).catch((error) => {
                     console.info(TAG_TEST_0100_003 + 'UserId promise error is: ' + error);
                     expect(error).assertFail();
                 });
@@ -178,7 +190,7 @@ export default function applicationBundleJsunit() {
             let datas;
             let startTime = await Utils.getNowTime();
             Bundle.getApplicationInfo(BUNDLE_NAME,
-                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, USER_ID_100, (error, data) => {
+                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId, (error, data) => {
                     let endTime = Utils.getNowTime();
                     Utils.getDurationTime(TAG_TEST_0300_001, startTime, endTime);
                     errors = error;
@@ -233,7 +245,7 @@ export default function applicationBundleJsunit() {
          */
         it(TAG_TEST_0500_002, 0, async function (done) {
             let startTime = await Utils.getNowTime();
-            await Bundle.getApplicationInfo('', 'Bundle.BundleFlag.GET_BUNDLE_DEFAULT', USER_ID_100).then((data) => {
+            await Bundle.getApplicationInfo('', 'Bundle.BundleFlag.GET_BUNDLE_DEFAULT', userId).then((data) => {
                 console.info(TAG_TEST_0500_002 + 'UserId promise data is: ' + data);
                 expect(data).assertFail();
             }).catch((error) => {
@@ -255,7 +267,7 @@ export default function applicationBundleJsunit() {
             let startTime = await Utils.getNowTime();
             let errors
             await Bundle.getApplicationInfo(BUNDLE_NOTEXIST,
-                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, USER_ID_100).then((data) => {
+                Bundle.BundleFlag.GET_APPLICATION_INFO_WITH_PERMISSION, userId).then((data) => {
                     console.info(TAG_TEST_0600_002 + 'other bundleName UserId promise data is: ' + data);
                     expect(data).assertFail();
                 }).catch((error) => {
@@ -394,7 +406,6 @@ export default function applicationBundleJsunit() {
             expect(typeof (data.metaData)).assertEqual('object');
             expect(typeof (data.metadata)).assertEqual('object');
             expect(typeof (data.enabled)).assertEqual('boolean');
-            expect(typeof (data.flags)).assertEqual('number');
             expect(typeof (data.uid)).assertEqual('number');
             expect(typeof (data.entityType)).assertEqual('string');
             expect(typeof (data.removable)).assertEqual('boolean');
@@ -416,7 +427,6 @@ export default function applicationBundleJsunit() {
             expect(data.labelId > 0).assertEqual(true);
             expect(data.systemApp).assertEqual(true);
             expect(data.supportedModes).assertEqual(0);
-            expect(data.flags).assertEqual(0);
             expect(data.process).assertEqual("");
             expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_NAME + '/' + BUNDLE_NAME);
             expect(data.enabled).assertEqual(true);
@@ -455,7 +465,6 @@ export default function applicationBundleJsunit() {
             expect(JSON.stringify(data.metaData)).assertEqual("{}");
             expect(JSON.stringify(data.metadata)).assertEqual("{}");
             expect(data.enabled).assertTrue();
-            expect(data.flags).assertEqual(0);
             expect(data.uid).assertLarger(0);
             expect(data.entityType).assertEqual('unspecified');
             expect(data.removable).assertTrue();
@@ -487,7 +496,6 @@ export default function applicationBundleJsunit() {
           expect(JSON.stringify(data.metaData)).assertEqual("{}");
           expect(JSON.stringify(data.metadata)).assertEqual("{}");
           expect(data.enabled).assertTrue();
-          expect(data.flags).assertEqual(0);
           expect(data.uid).assertLarger(0);
           expect(data.entityType).assertEqual('unspecified');
           expect(data.removable).assertTrue();