!9344 【包管理子系统】【master】PUSH类型extension覆盖

Merge pull request !9344 from ry/master

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetBundleInfoForSelf.test.ets

@@ -485,9 +485,9 @@ export default function getBundleInfoForSelf() {
         expect(data.appInfo).assertEqual(null);
         expect(data.hapModulesInfo[0].abilitiesInfo.length).assertEqual(0);
         let extensionList = data.hapModulesInfo[0].extensionAbilitiesInfo
-        expect(extensionList.length).assertEqual(15);
+        expect(extensionList.length).assertEqual(16);
         let count = 0;
-        for (let i = 0;i < 15; i++) {
+        for (let i = 0;i < 16; i++) {
           switch (extensionList[i].name) {
             case "Form":
               console.info("Form" + JSON.stringify(extensionList[i].extensionAbilityType));
@@ -590,10 +590,15 @@ export default function getBundleInfoForSelf() {
               expect(extensionList[i].extensionAbilityType).assertEqual(bundle.ExtensionAbilityType.APP_ACCOUNT_AUTHORIZATION)
               count = count + 15;
               break;
+            case 'push':
+              console.info("push" + JSON.stringify(extensionList[i].extensionAbilityType));
+              expect(extensionList[i].extensionAbilityType).assertEqual(bundle.ExtensionAbilityType.PUSH)
+              count = count + 16;
+              break;
           }
           console.info("count" + JSON.stringify(count));
         }
-        expect(count).assertEqual(120);
+        expect(count).assertEqual(136);
         expect(data.hapModulesInfo[0].metadata.length).assertEqual(0);
         expect(data.reqPermissionDetails.length).assertEqual(0);
         expect(data.permissionGrantStates.length).assertEqual(0);
@@ -621,8 +626,9 @@ export default function getBundleInfoForSelf() {
           expect(data.appInfo).assertEqual(null);
           expect(data.hapModulesInfo[0].abilitiesInfo.length).assertEqual(0);
           let extensionList = data.hapModulesInfo[0].extensionAbilitiesInfo
+          expect(extensionList.length).assertEqual(16);
           let count = 0;
-          for (let i = 0;i < 15; i++) {
+          for (let i = 0;i < 16; i++) {
             switch (extensionList[i].name) {
               case "Form":
                 console.info("Form" + JSON.stringify(extensionList[i].extensionAbilityType));
@@ -725,10 +731,15 @@ export default function getBundleInfoForSelf() {
                 expect(extensionList[i].extensionAbilityType).assertEqual(bundle.ExtensionAbilityType.APP_ACCOUNT_AUTHORIZATION)
                 count = count + 15;
                 break;
+              case 'push':
+                console.info("push" + JSON.stringify(extensionList[i].extensionAbilityType));
+                expect(extensionList[i].extensionAbilityType).assertEqual(bundle.ExtensionAbilityType.PUSH)
+                count = count + 16;
+                break;
             }
             console.info("count" + JSON.stringify(count));
           }
-          expect(count).assertEqual(120);
+          expect(count).assertEqual(136);
           expect(data.hapModulesInfo[0].metadata.length).assertEqual(0);
           expect(data.reqPermissionDetails.length).assertEqual(0);
           expect(data.permissionGrantStates.length).assertEqual(0);

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/module.json

@@ -364,6 +364,17 @@
                 "srcEntrance": "./ets/FormAbility/FormAbility.ts",
                 "type": "appAccountAuthorization",
                 "visible": true
+            },
+            {
+                "description": "$string:form_description",
+                "descriptionId": 16777219,
+                "icon": "$media:icon",
+                "iconId": 16777225,
+                "label": "$string:entry_label",
+                "name": "push",
+                "srcEntrance": "./ets/FormAbility/FormAbility.ts",
+                "type": "push",
+                "visible": true
             }
         ],
         "requestPermissions": [