add xts

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

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/config.json

@@ -20,8 +20,7 @@
     "mainAbility": "com.open.harmony.packagemag.MainAbility",
     "deviceType": [
       "tablet",
-      "default",
-      "default"
+      "default"
     ],
     "reqPermissions": [
       {
@@ -53,6 +52,7 @@
           }
         ],
         "visible": true,
+        "orientation": "unspecified",
         "srcPath": "MainAbility",
         "name": ".MainAbility",
         "srcLanguage": "ets",
@@ -82,6 +82,28 @@
         "srcLanguage": "ets",
         "description": "$string:description_serviceability",
         "type": "service"
+      },
+      {
+        "name": ".DataAbility",
+        "srcLanguage": "ets",
+        "srcPath": "MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:DataAbility_desc",
+        "type": "data",
+        "uri": "dataability://com.open.harmony.packagemag.DataAbility"
+      },
+      {
+        "orientation": "followRecent",
+        "formsEnabled": false,
+        "name": ".FollowRecentAbility",
+        "srcLanguage": "ets",
+        "srcPath": "MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:PageAbility1_desc",
+        "label": "$string:PageAbility1_label",
+        "type": "page",
+        "visible": true,
+        "launchType": "standard"
       }
     ],
     "js": [

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

+/**
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or impligetProfileByAbilityEmptyAbilityCalled.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import bundle from '@ohos.bundle.bundleManager';
+import util from "./Utils";
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "hypium/index"
+
+export default function getBundleInfoForSelf() {
+  describe('getBundleInfoForSelf', function () {
+
+    /*
+     * @tc.number: SUB_BMS_APPINFO_QUERY_0124
+     * @tc.name: getBundleInfoForSelfAbilityPro
+     * @tc.desc: Test getBundleInfoForSelf with ability flag(by promise).
+     */
+    it('getBundleInfoForSelfAbilityPro', 0, async function (done) {
+      await bundle.getBundleInfoForSelf(
+        bundle.BundleFlag.GET_BUNDLE_INFO_WITH_HAP_MODULE | bundle.BundleFlag.GET_BUNDLE_INFO_WITH_ABILITY
+      ).then(data => {
+        console.info("AbilityPro" + JSON.stringify(data.hapModulesInfo[0].abilitiesInfo[0]));
+        expect(data.hapModulesInfo[0].abilitiesInfo.length).assertEqual(5);
+        expect(data.hapModulesInfo[0].abilitiesInfo[0].type).assertEqual(3);
+        expect(data.hapModulesInfo[0].abilitiesInfo[0].orientation).assertEqual(0);
+        expect(data.hapModulesInfo[0].abilitiesInfo[1].type).assertEqual(1);
+        expect(data.hapModulesInfo[0].abilitiesInfo[1].orientation).assertEqual(3);
+        expect(data.hapModulesInfo[0].abilitiesInfo[2].type).assertEqual(1);
+        expect(data.hapModulesInfo[0].abilitiesInfo[2].orientation).assertEqual(0);
+        expect(data.hapModulesInfo[0].abilitiesInfo[3].type).assertEqual(2);
+        expect(data.hapModulesInfo[0].abilitiesInfo[3].orientation).assertEqual(0);
+        expect(data.hapModulesInfo[0].abilitiesInfo[4].type).assertEqual(1);
+        expect(data.hapModulesInfo[0].abilitiesInfo[4].orientation).assertEqual(0);
+        console.info("AbilityPro11" + JSON.stringify(data.hapModulesInfo[0].abilitiesInfo[0]));
+        done();
+      }).catch(err => {
+        console.info("getBundleInfoForSelf fail" + JSON.stringify(err));
+        expect(err).assertFail();
+        done();
+      })
+    })
+
+
+  })
+}
\ No newline at end of file

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

@@ -29,8 +29,10 @@ import getWindowPorperties from './getWindowProperties.test.ets';
 import GetSecondModuleTest from './GetSecondModule.test.ets';
 import GetInfoSync from './GetInfoSync.test.ets';
 import GetResourceTest from './GetResourceTest.test.ets';
+import getBundleInfoForSelf from './GetBundleInfoForSelf.test.ets';
 
 export default function testsuite() {
+  getBundleInfoForSelf();
   getBundleArchiveInfo();
   queryExtensionAbilityInfos();
   getAbilityIcon();

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

@@ -266,11 +266,13 @@ export default function getBundleInfoForSelf() {
       await bundle.getBundleInfoForSelf(
         bundle.BundleFlag.GET_BUNDLE_INFO_WITH_HAP_MODULE | bundle.BundleFlag.GET_BUNDLE_INFO_WITH_ABILITY
       ).then(data => {
-        console.info("AbilityPro" + JSON.stringify(data.hapModulesInfo[0].abilitiesInfo[0]));
+        for (let count = 0; count < 11; count++) {
+          console.info(count + "AbilityPro::" + JSON.stringify(data.hapModulesInfo[0].abilitiesInfo[count]));
+        }
         checkCommonBundleInfo(data);
         checkCommonHapModuleInfo(data);
         expect(data.appInfo).assertEqual(null);
-        expect(data.hapModulesInfo[0].abilitiesInfo.length).assertEqual(3);
+        expect(data.hapModulesInfo[0].abilitiesInfo.length).assertEqual(11);
         expect(data.hapModulesInfo[0].abilitiesInfo[0].bundleName).assertEqual(BUNDLE_NAME);
         expect(data.hapModulesInfo[0].abilitiesInfo[0].moduleName).assertEqual("testModule");
         expect(data.hapModulesInfo[0].abilitiesInfo[0].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility");
@@ -290,6 +292,8 @@ export default function getBundleInfoForSelf() {
         expect(data.hapModulesInfo[0].abilitiesInfo[0].writePermission).assertEqual("");
         expect(data.hapModulesInfo[0].abilitiesInfo[0].uri).assertEqual("");
         expect(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes.length).assertEqual(2);
+        console.info("AbilityPro" + JSON.stringify(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes[0]));
+        console.info("AbilityPro" + JSON.stringify(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes[1]));
         expect(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes[0]).assertEqual("default");
         expect(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes[1]).assertEqual("tablet");
         expect(data.hapModulesInfo[0].abilitiesInfo[0].applicationInfo).assertEqual(null);
@@ -310,10 +314,36 @@ export default function getBundleInfoForSelf() {
         expect(data.hapModulesInfo[0].abilitiesInfo[0].windowSize.minWindowHeight).assertEqual(0);
         expect(data.hapModulesInfo[0].abilitiesInfo[1].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility1");
         expect(data.hapModulesInfo[0].abilitiesInfo[1].launchType).assertEqual(bundle.LaunchType.STANDARD);
-        expect(data.hapModulesInfo[0].abilitiesInfo[2].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility2");
-        expect(data.hapModulesInfo[0].abilitiesInfo[2].launchType).assertEqual(bundle.LaunchType.SPECIFIED);
+        expect(data.hapModulesInfo[0].abilitiesInfo[1].orientation).assertEqual(1);
+        expect(data.hapModulesInfo[0].abilitiesInfo[2].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility10");
+        expect(data.hapModulesInfo[0].abilitiesInfo[2].orientation).assertEqual(12);
+        expect(data.hapModulesInfo[0].abilitiesInfo[3].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility2");
+        expect(data.hapModulesInfo[0].abilitiesInfo[3].launchType).assertEqual(bundle.LaunchType.SPECIFIED);
+        expect(data.hapModulesInfo[0].abilitiesInfo[3].orientation).assertEqual(4);
+        expect(data.hapModulesInfo[0].abilitiesInfo[4].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility3");
+        expect(data.hapModulesInfo[0].abilitiesInfo[4].orientation).assertEqual(5);
+        expect(data.hapModulesInfo[0].abilitiesInfo[5].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility4");
+        expect(data.hapModulesInfo[0].abilitiesInfo[5].orientation).assertEqual(6);
+        expect(data.hapModulesInfo[0].abilitiesInfo[6].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility5");
+        expect(data.hapModulesInfo[0].abilitiesInfo[6].orientation).assertEqual(7);
+        expect(data.hapModulesInfo[0].abilitiesInfo[7].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility6");
+        expect(data.hapModulesInfo[0].abilitiesInfo[7].orientation).assertEqual(8);
+        expect(data.hapModulesInfo[0].abilitiesInfo[8].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility7");
+        expect(data.hapModulesInfo[0].abilitiesInfo[8].orientation).assertEqual(9);
+        expect(data.hapModulesInfo[0].abilitiesInfo[9].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility8");
+        expect(data.hapModulesInfo[0].abilitiesInfo[9].orientation).assertEqual(10);
+        expect(data.hapModulesInfo[0].abilitiesInfo[10].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility9");
+        expect(data.hapModulesInfo[0].abilitiesInfo[10].orientation).assertEqual(11);
         checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[1])
         checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[2])
+        checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[3])
+        checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[4])
+        checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[5])
+        checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[6])
+        checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[7])
+        checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[8])
+        checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[9])
+        checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[10])
         expect(data.hapModulesInfo[0].extensionAbilitiesInfo.length).assertEqual(0);
         expect(data.hapModulesInfo[0].metadata.length).assertEqual(0);
         expect(data.reqPermissionDetails.length).assertEqual(0);
@@ -341,7 +371,7 @@ export default function getBundleInfoForSelf() {
           checkCommonBundleInfo(data);
           checkCommonHapModuleInfo(data);
           expect(data.appInfo).assertEqual(null);
-          expect(data.hapModulesInfo[0].abilitiesInfo.length).assertEqual(3);
+          expect(data.hapModulesInfo[0].abilitiesInfo.length).assertEqual(11);
           expect(data.hapModulesInfo[0].abilitiesInfo[0].bundleName).assertEqual(BUNDLE_NAME);
           expect(data.hapModulesInfo[0].abilitiesInfo[0].moduleName).assertEqual("testModule");
           expect(data.hapModulesInfo[0].abilitiesInfo[0].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility");
@@ -361,6 +391,8 @@ export default function getBundleInfoForSelf() {
           expect(data.hapModulesInfo[0].abilitiesInfo[0].writePermission).assertEqual("");
           expect(data.hapModulesInfo[0].abilitiesInfo[0].uri).assertEqual("");
           expect(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes.length).assertEqual(2);
+          console.info("AbilityPro" + JSON.stringify(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes[0]));
+          console.info("AbilityPro" + JSON.stringify(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes[1]));
           expect(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes[0]).assertEqual("default");
           expect(data.hapModulesInfo[0].abilitiesInfo[0].deviceTypes[1]).assertEqual("tablet");
           expect(data.hapModulesInfo[0].abilitiesInfo[0].applicationInfo).assertEqual(null);
@@ -381,10 +413,36 @@ export default function getBundleInfoForSelf() {
           expect(data.hapModulesInfo[0].abilitiesInfo[0].windowSize.minWindowHeight).assertEqual(0);
           expect(data.hapModulesInfo[0].abilitiesInfo[1].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility1");
           expect(data.hapModulesInfo[0].abilitiesInfo[1].launchType).assertEqual(bundle.LaunchType.STANDARD);
-          expect(data.hapModulesInfo[0].abilitiesInfo[2].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility2");
-          expect(data.hapModulesInfo[0].abilitiesInfo[2].launchType).assertEqual(bundle.LaunchType.SPECIFIED);
+          expect(data.hapModulesInfo[0].abilitiesInfo[1].orientation).assertEqual(1);
+          expect(data.hapModulesInfo[0].abilitiesInfo[2].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility10");
+          expect(data.hapModulesInfo[0].abilitiesInfo[2].orientation).assertEqual(12);
+          expect(data.hapModulesInfo[0].abilitiesInfo[3].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility2");
+          expect(data.hapModulesInfo[0].abilitiesInfo[3].launchType).assertEqual(bundle.LaunchType.SPECIFIED);
+          expect(data.hapModulesInfo[0].abilitiesInfo[3].orientation).assertEqual(4);
+          expect(data.hapModulesInfo[0].abilitiesInfo[4].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility3");
+          expect(data.hapModulesInfo[0].abilitiesInfo[4].orientation).assertEqual(5);
+          expect(data.hapModulesInfo[0].abilitiesInfo[5].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility4");
+          expect(data.hapModulesInfo[0].abilitiesInfo[5].orientation).assertEqual(6);
+          expect(data.hapModulesInfo[0].abilitiesInfo[6].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility5");
+          expect(data.hapModulesInfo[0].abilitiesInfo[6].orientation).assertEqual(7);
+          expect(data.hapModulesInfo[0].abilitiesInfo[7].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility6");
+          expect(data.hapModulesInfo[0].abilitiesInfo[7].orientation).assertEqual(8);
+          expect(data.hapModulesInfo[0].abilitiesInfo[8].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility7");
+          expect(data.hapModulesInfo[0].abilitiesInfo[8].orientation).assertEqual(9);
+          expect(data.hapModulesInfo[0].abilitiesInfo[9].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility8");
+          expect(data.hapModulesInfo[0].abilitiesInfo[9].orientation).assertEqual(10);
+          expect(data.hapModulesInfo[0].abilitiesInfo[10].name).assertEqual("ohos.acts.bundle.stage.test.MainAbility9");
+          expect(data.hapModulesInfo[0].abilitiesInfo[10].orientation).assertEqual(11);
           checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[1])
           checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[2])
+          checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[3])
+          checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[4])
+          checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[5])
+          checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[6])
+          checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[7])
+          checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[8])
+          checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[9])
+          checkCommonAbilityInfo(data.hapModulesInfo[0].abilitiesInfo[10])
           expect(data.hapModulesInfo[0].extensionAbilitiesInfo.length).assertEqual(0);
           expect(data.hapModulesInfo[0].metadata.length).assertEqual(0);
           expect(data.reqPermissionDetails.length).assertEqual(0);
@@ -639,6 +697,7 @@ export default function getBundleInfoForSelf() {
           expect(data.permissionGrantStates.length).assertEqual(0);
           expect(data.signatureInfo).assertEqual(null);
           expect(err).assertEqual(null);
+          expect(bundle.ExtensionAbilityType.UNSPECIFIED).assertEqual(255);
           done();
         })
     })
@@ -974,6 +1033,8 @@ export default function getBundleInfoForSelf() {
       expect(data.hapModulesInfo[0].descriptionId).assertLarger(0);
       expect(data.hapModulesInfo[0].mainElementName).assertEqual(ABILITY_NAME);
       expect(data.hapModulesInfo[0].deviceTypes.length).assertEqual(2);
+      console.info("checkComm" + JSON.stringify(data.hapModulesInfo[0].deviceTypes[0]));
+      console.info("checkComm" + JSON.stringify(data.hapModulesInfo[0].deviceTypes[1]));
       expect(data.hapModulesInfo[0].deviceTypes[0]).assertEqual("default");
       expect(data.hapModulesInfo[0].deviceTypes[1]).assertEqual("tablet");
       expect(data.hapModulesInfo[0].installationFree).assertFalse();
@@ -994,12 +1055,13 @@ export default function getBundleInfoForSelf() {
       expect(data.process).assertEqual("");
       expect(data.isVisible).assertTrue();
       expect(data.type).assertEqual(1);
-      expect(data.orientation).assertEqual(2);
       expect(data.permissions.length).assertEqual(0);
       expect(data.readPermission).assertEqual("");
       expect(data.writePermission).assertEqual("");
       expect(data.uri).assertEqual("");
       expect(data.deviceTypes.length).assertEqual(2);
+      console.info("checkComm" + JSON.stringify(data.deviceTypes[0]));
+      console.info("checkComm" + JSON.stringify(data.deviceTypes[1]));
       expect(data.deviceTypes[0]).assertEqual("default");
       expect(data.deviceTypes[1]).assertEqual("tablet");
       expect(data.applicationInfo).assertEqual(null);

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

@@ -6,8 +6,8 @@
         "description": "$string:testModule_entry_dsc",
         "mainElement": "ohos.acts.bundle.stage.test.MainAbility",
         "deviceTypes": [
-            "tablet",
-            "default"
+            "default",
+            "tablet"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,
@@ -69,7 +69,7 @@
                 "label": "$string:entry_label",
                 "visible": true,
                 "launchType": "standard",
-                "orientation": "portrait",
+                "orientation": "landscape",
                 "skills": []
             },
             {
@@ -80,7 +80,95 @@
                 "label": "$string:entry_label",
                 "visible": true,
                 "launchType": "specified",
-                "orientation": "portrait",
+                "orientation": "landscape_inverted",
+                "skills": []
+            },
+            {
+                "name": "ohos.acts.bundle.stage.test.MainAbility3",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:testModule_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "launchType": "specified",
+                "orientation": "portrait_inverted",
+                "skills": []
+            },
+            {
+                "name": "ohos.acts.bundle.stage.test.MainAbility4",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:testModule_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "launchType": "specified",
+                "orientation": "auto_rotation",
+                "skills": []
+            },
+            {
+                "name": "ohos.acts.bundle.stage.test.MainAbility5",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:testModule_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "launchType": "specified",
+                "orientation": "auto_rotation_landscape",
+                "skills": []
+            },
+            {
+                "name": "ohos.acts.bundle.stage.test.MainAbility6",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:testModule_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "launchType": "specified",
+                "orientation": "auto_rotation_portrait",
+                "skills": []
+            },
+            {
+                "name": "ohos.acts.bundle.stage.test.MainAbility7",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:testModule_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "launchType": "specified",
+                "orientation": "auto_rotation_restricted",
+                "skills": []
+            },
+            {
+                "name": "ohos.acts.bundle.stage.test.MainAbility8",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:testModule_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "launchType": "specified",
+                "orientation": "auto_rotation_landscape_restricted",
+                "skills": []
+            },
+            {
+                "name": "ohos.acts.bundle.stage.test.MainAbility9",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:testModule_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "launchType": "specified",
+                "orientation": "auto_rotation_portrait_restricted",
+                "skills": []
+            },
+            {
+                "name": "ohos.acts.bundle.stage.test.MainAbility10",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:testModule_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "launchType": "specified",
+                "orientation": "locked",
                 "skills": []
             }
         ],