!4850 ApplicaitonInfo 新增labelIndex和iconIndex字段

Merge pull request !4850 from junyi233/jun_8_5

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

@@ -558,7 +558,7 @@ export default function actsBmsJsModuleNameTest() {
                 permissions: [], deviceTypes: [], deviceCapabilities: [], readPermission: "", writePermission: "",
                 applicationInfo: {
                     name: "", description: "", descriptionId: 0, systemApp: true, enabled: true, label: "",
-                    labelId: "", icon: "", iconId: "", process: "", supportedModes: 0, moduleSourceDirs: [],
+                    labelId: "", labelIndex: "", icon: "", iconId: "", iconIndex: "", process: "", supportedModes: 0, moduleSourceDirs: [],
                     permissions: [], moduleInfos: [], entryDir: "", codePath: "", metaData: map1, metadata: map2,
                     removable: true, accessTokenId: 0, uid: 0, entityType: "", fingerprint: "",
                     iconResource: resource, labelResource: resource, descriptionResource: resource,

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

@@ -269,8 +269,12 @@ export default function actsBmsJsUnPermissionTest() {
             expect(info.descriptionId).assertEqual(0);
             expect(info.icon).assertEqual("$media:icon");
             expect(info.iconId > 0).assertTrue();
+            expect(info.iconIndex > 0).assertTrue();
+            expect(info.iconIndex).assertEqual(info.iconId);
             expect(info.label).assertEqual("$string:entry_MainAbility");
             expect(info.labelId > 0).assertTrue();
+            expect(info.labelIndex > 0).assertTrue();
+            expect(info.labelIndex).assertEqual(info.labelId);
             expect(info.systemApp).assertEqual(true);
             expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.actsbmsetsunpermissiontest/com.example.actsbmsetsunpermissiontest");
             expect(info.supportedModes).assertEqual(0);

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

@@ -258,10 +258,16 @@ export default function GetabilityInfo() {
             expect(info.icon).assertEqual("$media:icon");
             expect(typeof (info.iconId)).assertEqual("number");
             expect(info.iconId > 0).assertTrue();
+            expect(typeof (info.iconIndex)).assertEqual("number");
+            expect(info.iconIndex > 0).assertTrue();
+            expect(info.iconIndex).assertEqual(info.iconId);
             expect(typeof (info.label)).assertEqual("string");
             expect(info.label).assertEqual("$string:entry_MainAbility");
             expect(typeof (info.labelId)).assertEqual("number");
             expect(info.labelId > 0).assertTrue();
+            expect(typeof (info.labelIndex)).assertEqual("number");
+            expect(info.labelIndex > 0).assertTrue();
+            expect(info.labelIndex).assertEqual(info.labelId);
             expect(info.systemApp).assertEqual(true);
             expect(typeof (info.entryDir)).assertEqual("string");
             expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.open.harmony.packagemag/com.open.harmony.packagemag");

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/IsAbilityEnabledETSUnit.ets

@@ -226,7 +226,7 @@ export default function isAbilityEnabledETSUnit() {
                 permissions: [], deviceTypes: [], deviceCapabilities: [], readPermission: "", writePermission: "",
                 applicationInfo: {
                     name: "", description: "", descriptionId: 0, systemApp: true, enabled: true, label: "",
-                    labelId: "", icon: "", iconId: "", process: "", supportedModes: 0, moduleSourceDirs: [],
+                    labelId: "", labelIndex: "", icon: "", iconId: "", iconIndex: "", process: "", supportedModes: 0, moduleSourceDirs: [],
                     permissions: [], moduleInfos: [], entryDir: "", codePath: "", metaData: map1, metadata: map2,
                     removable: true, accessTokenId: 0, uid: 0, entityType: "", fingerprint: "",
                     iconResource: resource, labelResource: resource, descriptionResource: resource,

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

@@ -1011,8 +1011,12 @@ export default function QueryExtensionAbilityInfos() {
       expect(data[0].applicationInfo.descriptionId).assertLarger(0);
       expect(data[0].applicationInfo.icon).assertEqual("$media:icon");
       expect(data[0].applicationInfo.iconId).assertLarger(0);
+      expect(data[0].applicationInfo.iconIndex).assertLarger(0);
+      expect(data[0].applicationInfo.iconIndex).assertEqual(data[0].applicationInfo.iconId);
       expect(data[0].applicationInfo.label).assertEqual("$string:app_name");
       expect(data[0].applicationInfo.labelId).assertLarger(0);
+      expect(data[0].applicationInfo.labelIndex).assertLarger(0);
+      expect(data[0].applicationInfo.labelIndex).assertEqual(data[0].applicationInfo.labelId);
       expect(data[0].applicationInfo.systemApp).assertTrue();
       expect(data[0].applicationInfo.supportedModes).assertEqual(0);
       expect(data[0].applicationInfo.process).assertEqual("");

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

@@ -301,8 +301,12 @@ export default function getAllApplicationBundleTest() {
                 expect(typeof (data[i].descriptionId)).assertEqual('number');
                 expect(typeof (data[i].icon)).assertEqual('string');
                 expect(typeof (data[i].iconId)).assertEqual('number');
+                expect(typeof (data[i].iconIndex)).assertEqual('number');
+                expect(data[i].iconIndex).assertEqual(data[i].iconId);
                 expect(typeof (data[i].label)).assertEqual('string');
                 expect(typeof (data[i].labelId)).assertEqual('number');
+                expect(typeof (data[i].labelIndex)).assertEqual('number');
+                expect(data[i].labelIndex).assertEqual(data[i].labelId);
                 expect(typeof (data[i].systemApp)).assertEqual('boolean')
                 expect(typeof (data[i].supportedModes)).assertEqual('number');
                 expect(typeof (data[i].process)).assertEqual('string');
@@ -364,8 +368,12 @@ export default function getAllApplicationBundleTest() {
             expect(data.descriptionId).assertLarger(0);
             expect(data.icon).assertEqual('$media:icon');
             expect(data.iconId).assertLarger(0);
+            expect(data.iconIndex).assertLarger(0);
+            expect(data.iconIndex).assertEqual(data.iconId);
             expect(data.label).assertEqual('$string:app_name');
             expect(data.labelId).assertLarger(0);
+            expect(data.labelIndex).assertLarger(0);
+            expect(data.labelIndex).assertEqual(data.labelId);
             expect(data.systemApp).assertFalse();
             expect(data.supportedModes).assertEqual(0);
             expect(data.process).assertEqual(BUNDLE_OTHER);

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

@@ -432,8 +432,12 @@ export default function applicationBundleJsunit() {
             expect(typeof (data.descriptionId)).assertEqual('number');
             expect(typeof (data.icon)).assertEqual('string');
             expect(typeof (data.iconId)).assertEqual('number');
+            expect(typeof (data.iconIndex)).assertEqual('number');
+            expect(data.iconIndex).assertEqual(data.iconId);
             expect(typeof (data.label)).assertEqual('string');
             expect(typeof (data.labelId)).assertEqual('number');
+            expect(typeof (data.labelIndex)).assertEqual('number');
+            expect(data.labelIndex).assertEqual(data.labelId);
             expect(typeof (data.systemApp)).assertEqual('boolean')
             expect(typeof (data.supportedModes)).assertEqual('number');
             expect(typeof (data.process)).assertEqual('string');
@@ -458,9 +462,13 @@ export default function applicationBundleJsunit() {
             expect(data.descriptionId > 0).assertEqual(true);
             expect(data.icon).assertEqual('$media:icon');
             expect(data.iconId > 0).assertEqual(true);
+            expect(data.iconIndex > 0).assertEqual(true);
+            expect(data.iconIndex).assertEqual(data.iconId);
             expect(data.uid > 0).assertEqual(true);
             expect(data.label).assertEqual('$string:entry_MainAbility');
             expect(data.labelId > 0).assertEqual(true);
+            expect(data.labelIndex > 0).assertEqual(true);
+            expect(data.labelIndex).assertEqual(data.labelId);
             expect(data.systemApp).assertEqual(true);
             expect(data.supportedModes).assertEqual(0);
             expect(data.process).assertEqual(BUNDLE_NAME);
@@ -485,8 +493,12 @@ export default function applicationBundleJsunit() {
             expect(data.descriptionId).assertLarger(0);
             expect(data.icon).assertEqual('$media:icon');
             expect(data.iconId).assertLarger(0);
+            expect(data.iconIndex).assertLarger(0);
+            expect(data.iconIndex).assertEqual(data.iconId);
             expect(data.label).assertEqual('$string:entry_MainAbility');
             expect(data.labelId).assertLarger(0);
+            expect(data.labelIndex).assertLarger(0);
+            expect(data.labelIndex).assertEqual(data.labelId);
             expect(data.systemApp).assertTrue();
             expect(data.supportedModes).assertEqual(0);
             expect(data.process).assertEqual(BUNDLE_NAME);
@@ -516,8 +528,12 @@ export default function applicationBundleJsunit() {
           expect(data.descriptionId).assertLarger(0);
           expect(data.icon).assertEqual('$media:icon');
           expect(data.iconId).assertLarger(0);
+          expect(data.iconIndex).assertLarger(0);
+          expect(data.iconIndex).assertEqual(data.iconId);
           expect(data.label).assertEqual('$string:app_name');
           expect(data.labelId).assertLarger(0);
+          expect(data.labelIndex).assertLarger(0);
+          expect(data.labelIndex).assertEqual(data.labelId);
           expect(data.systemApp).assertFalse();
           expect(data.supportedModes).assertEqual(0);
           expect(data.process).assertEqual(BUNDLE_OTHER);

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagertest/src/main/js/test/ExampleJsunit.test.js

@@ -627,6 +627,10 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo[i].description.length >= 0).assertTrue();
                 expect(datainfo[i].icon.length).assertLarger(0);
                 expect(datainfo[i].label.length).assertLarger(0);
+                expect(datainfo[i].iconIndex).assertLarger(0);
+                expect(datainfo[i].labelIndex).assertLarger(0);
+                expect(datainfo[i].iconIndex).assertEqual(datainfo[i].iconId);
+                expect(datainfo[i].labelIndex).assertEqual(datainfo[i].labelId);
             }
             expect(datainfo[i].moduleSourceDirs.length).assertLarger(0);
             expect(datainfo[i].moduleInfos.length).assertLarger(0);