!3613 适配OH API8 JS接口返回值不一致问题

Merge pull request !3613 from shilei91/OpenHarmony-3.1-Release

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

@@ -158,7 +158,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
         expect(data.permissions.length).assertEqual(0);
         expect(data.deviceCapabilities.length).assertEqual(0);
         expect(data.deviceTypes[0]).assertEqual('phone');
-        expect(data.process).assertEqual('');
+        expect(data.process).assertEqual(SYSTEM_NAME);
         expect(data.uri).assertEqual('');
         expect(data.bundleName).assertEqual(SYSTEM_NAME);
         expect(data.moduleName).assertEqual("entry");

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

@@ -54,7 +54,7 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.isVisible).assertEqual(true);
             expect(abilityInfo1.permissions.length).assertEqual(0);
             expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
-            expect(abilityInfo1.process).assertEqual("");
+            expect(abilityInfo1.process).assertEqual(BUNDLE_NAME2);
             expect(abilityInfo1.uri).assertEqual("");
             expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME2);
             expect(abilityInfo1.moduleName).assertEqual("entry");
@@ -130,7 +130,7 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.isVisible).assertEqual(true);
             expect(abilityInfo1.permissions.length).assertEqual(0);
             expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
-            expect(abilityInfo1.process).assertEqual("");
+            expect(abilityInfo1.process).assertEqual(BUNDLE_NAME4);
             expect(abilityInfo1.uri).assertEqual("");
             expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME4);
             expect(abilityInfo1.moduleName).assertEqual("entry");
@@ -173,7 +173,7 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.isVisible).assertEqual(true);
             expect(abilityInfo1.permissions.length).assertEqual(0);
             expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
-            expect(abilityInfo1.process).assertEqual("");
+            expect(abilityInfo1.process).assertEqual(BUNDLE_NAME5);
             expect(abilityInfo1.uri).assertEqual("");
             expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME5);
             expect(abilityInfo1.moduleName).assertEqual("entry");
@@ -205,7 +205,7 @@ describe('ActsBmsJsTest', function () {
         expect(info.isVisible).assertEqual(true);
         expect(info.permissions.length).assertEqual(0);
         expect(info.deviceTypes[0]).assertEqual('phone');
-        expect(info.process).assertEqual("");
+        expect(info.process).assertEqual(BUNDLE_NAME3);
         expect(info.uri).assertEqual("");
         expect(info.bundleName).assertEqual(BUNDLE_NAME3);
         expect(info.moduleName).assertEqual("entry");

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

@@ -85,6 +85,7 @@
           "autoDesignWidth": false
         }
       }
-    ]
+    ],
+    "description":"$string:entry_description"
   }
 }
\ No newline at end of file

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

@@ -232,7 +232,7 @@ export default function GetabilityInfo() {
             expect(Array.isArray(data.deviceCapabilities)).assertEqual(true);
             expect(data.deviceTypes[0]).assertEqual("phone");
             expect(typeof (data.process)).assertEqual("string");
-            expect(data.process).assertEqual("");
+            expect(data.process).assertEqual("com.open.harmony.packagemag");
             expect(typeof (data.uri)).assertEqual("string");
             expect(data.uri).assertEqual("");
             expect(data.moduleName).assertEqual("entry");
@@ -251,7 +251,7 @@ export default function GetabilityInfo() {
             expect(typeof (info.accessTokenId)).assertEqual("number");
             expect(info.accessTokenId > 0).assertTrue();
             expect(typeof (info.description)).assertEqual("string");
-            expect(info.description).assertEqual("$string:mainability_description");
+            expect(info.description).assertEqual("$string:entry_description");
             expect(typeof (info.descriptionId)).assertEqual("number");
             expect(info.descriptionId > 0).assertTrue();
             expect(typeof (info.icon)).assertEqual("string");
@@ -268,7 +268,7 @@ export default function GetabilityInfo() {
             expect(typeof (info.supportedModes)).assertEqual("number");
             expect(info.supportedModes).assertEqual(0);
             expect(typeof (info.process)).assertEqual("string");
-            expect(info.process).assertEqual("");
+            expect(info.process).assertEqual("com.open.harmony.packagemag");
             expect(Array.isArray(info.moduleSourceDirs)).assertEqual(true);
             expect(info.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/com.open.harmony.packagemag/com.open.harmony.packagemag");
             expect(Array.isArray(info.permissions)).assertEqual(true);
@@ -282,7 +282,7 @@ export default function GetabilityInfo() {
             expect(data.icon).assertEqual("$media:icon");
             expect(data.isVisible).assertEqual(true);
             expect(data.deviceTypes[0]).assertEqual("phone");
-            expect(data.process).assertEqual("");
+            expect(data.process).assertEqual("com.example.third1");
             expect(data.uri).assertEqual("");
             expect(data.moduleName).assertEqual("entry");
             expect(data.type).assertEqual(1);
@@ -308,7 +308,7 @@ export default function GetabilityInfo() {
             expect(info.name).assertEqual("com.example.third1");
             expect(info.codePath).assertEqual("/data/app/el1/bundle/public/com.example.third1");
             expect(info.accessTokenId > 0).assertTrue();
-            expect(info.description).assertEqual("$string:mainability_description");
+            expect(info.description).assertEqual("$string:entry_description");
             expect(info.descriptionId > 0).assertTrue();
             expect(info.icon).assertEqual("$media:icon");
             expect(info.iconId > 0).assertTrue();
@@ -317,7 +317,7 @@ export default function GetabilityInfo() {
             expect(info.systemApp).assertEqual(false);
             expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.third1/com.example.third1.entry");
             expect(info.supportedModes).assertEqual(0);
-            expect(info.process).assertEqual("");
+            expect(info.process).assertEqual("com.example.third1");
             expect(info.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/com.example.third1/com.example.third1.entry");
             expect(JSON.stringify(info.metaData)).assertEqual("{}");
             expect(JSON.stringify(info.metadata)).assertEqual("{}");

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

@@ -305,7 +305,7 @@ export default function applicationBundleJsunit() {
                     console.info(msg + JSON.stringify(data[i]));
                     expect(data[i].name).assertEqual('com.open.harmony.packagemag');
                     expect(data[i].codePath).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag');
-                    expect(data[i].description).assertEqual('$string:mainability_description');
+                    expect(data[i].description).assertEqual('$string:entry_description');
                     if (data[i].descriptionId !== 0) {
                         expect(data[i].descriptionId > 0).assertEqual(true);
                     }
@@ -321,7 +321,7 @@ export default function applicationBundleJsunit() {
                     };
                     expect(data[i].systemApp).assertEqual(true);
                     expect(data[i].supportedModes).assertEqual(0);
-                    expect(data[i].process).assertEqual("");
+                    expect(data[i].process).assertEqual('com.open.harmony.packagemag');
                     expect(data[i].entryDir).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag' +
                         '/com.open.harmony.packagemag');
                     expect(data[i].enabled).assertEqual(true);

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

@@ -372,7 +372,7 @@ export default function applicationBundleJsunit() {
             expect(data.name).assertEqual('com.open.harmony.packagemag');
             expect(data.codePath).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag');
             expect(data.accessTokenId > 0).assertEqual(true);
-            expect(data.description).assertEqual('$string:mainability_description');
+            expect(data.description).assertEqual('$string:entry_description');
             expect(data.descriptionId > 0).assertEqual(true);
             expect(data.icon).assertEqual('$media:icon');
             expect(data.iconId > 0).assertEqual(true);
@@ -381,7 +381,7 @@ export default function applicationBundleJsunit() {
             expect(data.labelId > 0).assertEqual(true);
             expect(data.systemApp).assertEqual(true);
             expect(data.supportedModes).assertEqual(0);
-            expect(data.process).assertEqual("");
+            expect(data.process).assertEqual('com.open.harmony.packagemag');
             expect(data.entryDir).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag' +
                 '/com.open.harmony.packagemag');
             expect(data.enabled).assertEqual(true);
@@ -402,7 +402,7 @@ export default function applicationBundleJsunit() {
             expect(data.name).assertEqual('com.open.harmony.packagemag');
             expect(data.codePath).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag');
             expect(data.accessTokenId > 0).assertEqual(true);
-            expect(data.description).assertEqual('$string:mainability_description');
+            expect(data.description).assertEqual('$string:entry_description');
             expect(data.descriptionId > 0).assertEqual(true);
             expect(data.icon).assertEqual('$media:icon');
             expect(data.iconId > 0).assertEqual(true);
@@ -411,7 +411,7 @@ export default function applicationBundleJsunit() {
             expect(data.labelId > 0).assertEqual(true);
             expect(data.systemApp).assertEqual(true);
             expect(data.supportedModes).assertEqual(0);
-            expect(data.process).assertEqual("");
+            expect(data.process).assertEqual('com.open.harmony.packagemag');
             expect(data.entryDir).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag' +
                 '/com.open.harmony.packagemag');
             expect(data.enabled).assertEqual(true);

appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/resources/base/element/string.json

@@ -15,6 +15,10 @@
     {
       "name": "description_serviceability",
       "value": "hap sample empty service"
+    },
+    {
+      "name": "entry_description",
+      "value": "entry_description"
     }
   ]
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/src/main/config.json

@@ -171,6 +171,7 @@
         "grantMode": "system_grant",
         "availableScope": ["signature"]
       }
-    ]
+    ],
+    "description":"$string:entry_description"
   }
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/src/main/js/resources/base/element/string.json

@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+      "name": "entry_description",
+      "value": "entry_description"
     }
   ]
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/config.json

@@ -71,6 +71,7 @@
         "description": "BMS_PERMISSION_MUSIC permission in detail",
         "label": "BMS_PERMISSION_MUSIC permission"
       }
-    ]
+    ],
+    "description":"$string:entry_description"
   }
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/js/resources/base/element/string.json

@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+      "name": "entry_description",
+      "value": "entry_description"
     }
   ]
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/config.json

@@ -70,6 +70,7 @@
         "description": "BMS_PERMISSION_CAMERA permission in detail",
         "label": "BMS_PERMISSION_CAMERA permission"
       }
-    ]
+    ],
+    "description":"$string:entry_description"
   }
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/js/resources/base/element/string.json

@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+      "name": "entry_description",
+      "value": "entry_description"
     }
   ]
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/config.json

@@ -102,6 +102,7 @@
         "value":"metaDataValue",
         "extra":"$string:app_name"
       }]
-    }
+    },
+    "description":"$string:entry_description"
   }
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/js/resources/base/element/string.json

@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+      "name": "entry_description",
+      "value": "entry_description"
     }
   ]
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/config.json

@@ -69,6 +69,7 @@
         "description": "BMS_PERMISSION_WECHAT permission in detail",
         "label": "BMS_PERMISSION_WECHAT permission"
       }
-    ]
+    ],
+    "description":"$string:entry_description"
   }
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/js/resources/base/element/string.json

@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+      "name": "entry_description",
+      "value": "entry_description"
     }
   ]
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/config.json

@@ -76,6 +76,7 @@
         "description": "BMS_PERMISSION_MUSIC permission in detail",
         "label": "BMS_PERMISSION_MUSIC permission"
       }
-    ]
+    ],
+    "description":"$string:entry_description"
   }
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/js/resources/base/element/string.json

@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+      "name": "entry_description",
+      "value": "entry_description"
     }
   ]
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/config.json

@@ -69,6 +69,7 @@
         "description": "BMS_PERMISSION_CAMERA permission in detail",
         "label": "BMS_PERMISSION_CAMERA permission"
       }
-    ]
+    ],
+    "description":"$string:entry_description"
   }
 }
\ No newline at end of file

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/js/resources/base/element/string.json

@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+      "name": "entry_description",
+      "value": "entry_description"
     }
   ]
 }
\ No newline at end of file