未验证 提交 622c7d4f 编写于 作者: O openharmony_ci 提交者: Gitee

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

Merge pull request !3583 from shilei91/master
......@@ -483,7 +483,7 @@ export default function actsBmsJsModuleNameTest() {
expect(data.isVisible).assertEqual(false);
expect(data.deviceTypes[0]).assertEqual("phone");
expect(typeof (data.process)).assertEqual("string");
expect(data.process).assertEqual("");
expect(data.process).assertEqual("com.example.bmsmodulename");
expect(typeof (data.uri)).assertEqual("string");
expect(data.uri).assertEqual("");
expect(data.moduleName).assertEqual("entry");
......@@ -498,9 +498,9 @@ export default function actsBmsJsModuleNameTest() {
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("");
expect(typeof (info.descriptionId)).assertEqual("number");
expect(info.descriptionId > 0).assertTrue();
expect(info.descriptionId).assertEqual(0);
expect(typeof (info.icon)).assertEqual("string");
expect(info.icon).assertEqual("$media:icon");
expect(typeof (info.iconId)).assertEqual("number");
......@@ -513,7 +513,7 @@ export default function actsBmsJsModuleNameTest() {
expect(typeof (info.entryDir)).assertEqual("string");
expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.bmsmodulename/com.example.bmsmodulenamedentry");
expect(typeof (info.process)).assertEqual("string");
expect(info.process).assertEqual("");
expect(info.process).assertEqual("com.example.bmsmodulename");
expect(Array.isArray(info.permissions)).assertEqual(true);
console.log("---checkDataInfo End--- ");
}
......
......@@ -238,7 +238,7 @@ export default function actsBmsJsUnPermissionTest() {
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.actsbmsetsunpermissiontest");
expect(data.uri).assertEqual("");
expect(data.moduleName).assertEqual("entry");
expect(data.type).assertEqual(1);
......@@ -265,8 +265,8 @@ export default function actsBmsJsUnPermissionTest() {
expect(info.name).assertEqual("com.example.actsbmsetsunpermissiontest");
expect(info.codePath).assertEqual("/data/app/el1/bundle/public/com.example.actsbmsetsunpermissiontest");
expect(info.accessTokenId > 0).assertTrue();
expect(info.description).assertEqual("$string:description_mainability");
expect(info.descriptionId > 0).assertTrue();
expect(info.description).assertEqual("");
expect(info.descriptionId).assertEqual(0);
expect(info.icon).assertEqual("$media:icon");
expect(info.iconId > 0).assertTrue();
expect(info.label).assertEqual("$string:entry_MainAbility");
......@@ -274,7 +274,7 @@ export default function actsBmsJsUnPermissionTest() {
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);
expect(info.process).assertEqual("");
expect(info.process).assertEqual("com.example.actsbmsetsunpermissiontest");
expect(info.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/com.example.actsbmsetsunpermissiontest/com.example.actsbmsetsunpermissiontest");
expect(JSON.stringify(info.metadata)).assertEqual("{}");
expect(JSON.stringify(info.metadata)).assertEqual("{}");
......
......@@ -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");
......
......@@ -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");
......
......@@ -112,6 +112,7 @@
"autoDesignWidth": false
}
}
]
],
"description":"$string:entry_description"
}
}
\ No newline at end of file
......@@ -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("{}");
......
......@@ -356,7 +356,7 @@ export default function getAllApplicationBundleTest() {
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);
}
......@@ -372,7 +372,7 @@ export default function getAllApplicationBundleTest() {
};
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);
......@@ -391,7 +391,7 @@ export default function getAllApplicationBundleTest() {
expect(data.name).assertEqual(BUNDLE_OTHER);
expect(data.codePath).assertEqual(PATH + '/' + BUNDLE_OTHER);
expect(data.accessTokenId).assertLarger(0);
expect(data.description).assertEqual('$string:mainability_description');
expect(data.description).assertEqual('$string:entry_description');
expect(data.descriptionId).assertLarger(0);
expect(data.icon).assertEqual('$media:icon');
expect(data.iconId).assertLarger(0);
......@@ -399,7 +399,7 @@ export default function getAllApplicationBundleTest() {
expect(data.labelId).assertLarger(0);
expect(data.systemApp).assertFalse();
expect(data.supportedModes).assertEqual(0);
expect(data.process).assertEqual("");
expect(data.process).assertEqual(BUNDLE_OTHER);
expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_OTHER + '/' + BUNDLE_OTHER + '.entry');
expect(data.permissions.length).assertEqual(0);
expect(data.moduleSourceDirs.length).assertEqual(1);
......
......@@ -449,7 +449,7 @@ export default function applicationBundleJsunit() {
expect(data.name).assertEqual(BUNDLE_NAME);
expect(data.codePath).assertEqual(PATH + '/' + BUNDLE_NAME);
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);
......@@ -458,7 +458,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(BUNDLE_NAME);
expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_NAME + '/' + BUNDLE_NAME);
expect(data.enabled).assertEqual(true);
expect(data.entityType).assertEqual('unspecified');
......@@ -476,7 +476,7 @@ export default function applicationBundleJsunit() {
expect(data.name).assertEqual(BUNDLE_NAME);
expect(data.codePath).assertEqual(PATH + '/' + BUNDLE_NAME);
expect(data.accessTokenId).assertLarger(0);
expect(data.description).assertEqual('$string:mainability_description');
expect(data.description).assertEqual('$string:entry_description');
expect(data.descriptionId).assertLarger(0);
expect(data.icon).assertEqual('$media:icon');
expect(data.iconId).assertLarger(0);
......@@ -484,7 +484,7 @@ export default function applicationBundleJsunit() {
expect(data.labelId).assertLarger(0);
expect(data.systemApp).assertTrue();
expect(data.supportedModes).assertEqual(0);
expect(data.process).assertEqual("");
expect(data.process).assertEqual(BUNDLE_NAME);
expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_NAME + '/' + BUNDLE_NAME);
expect(data.permissions.length).assertEqual(0);
expect(data.moduleSourceDirs.length).assertEqual(1);
......@@ -507,7 +507,7 @@ export default function applicationBundleJsunit() {
expect(data.name).assertEqual(BUNDLE_OTHER);
expect(data.codePath).assertEqual(PATH + '/' + BUNDLE_OTHER);
expect(data.accessTokenId).assertLarger(0);
expect(data.description).assertEqual('$string:mainability_description');
expect(data.description).assertEqual('$string:entry_description');
expect(data.descriptionId).assertLarger(0);
expect(data.icon).assertEqual('$media:icon');
expect(data.iconId).assertLarger(0);
......@@ -515,7 +515,7 @@ export default function applicationBundleJsunit() {
expect(data.labelId).assertLarger(0);
expect(data.systemApp).assertFalse();
expect(data.supportedModes).assertEqual(0);
expect(data.process).assertEqual("");
expect(data.process).assertEqual(BUNDLE_OTHER);
expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_OTHER + '/' + BUNDLE_OTHER + '.entry');
expect(data.permissions.length).assertEqual(0);
expect(data.moduleSourceDirs.length).assertEqual(1);
......
......@@ -30,6 +30,7 @@ const NAME3 = "com.example.myapplication4"
const NAME4 = "com.example.myapplication5"
const NAME5 = "com.example.myapplication6"
const DESCRIPTION = "$string:mainability_description"
const APPLICATION_DESCRIPTION = "$string:entry_description"
export default function getBundleArchiveInfo() {
......@@ -47,7 +48,7 @@ export default function getBundleArchiveInfo() {
expect(datainfo.versionCode).assertEqual(1)
expect(datainfo.versionName).assertLarger(0)
expect(datainfo.entryModuleName).assertEqual("entry")
expect(datainfo.appInfo.description).assertEqual(DESCRIPTION)
expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION)
expect(datainfo.appInfo.descriptionId >= 0).assertTrue()
expect(datainfo.appInfo.icon).assertEqual("$media:icon")
expect(datainfo.appInfo.iconId >= 0).assertTrue()
......@@ -69,7 +70,7 @@ export default function getBundleArchiveInfo() {
expect(datainfo.versionCode).assertEqual(1)
expect(datainfo.versionName).assertLarger(0)
expect(datainfo.entryModuleName).assertEqual("entry")
expect(datainfo.appInfo.description).assertEqual(DESCRIPTION)
expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION)
expect(datainfo.appInfo.descriptionId >= 0).assertTrue()
expect(datainfo.appInfo.icon).assertEqual("$media:icon")
expect(datainfo.appInfo.iconId >= 0).assertTrue()
......@@ -91,7 +92,7 @@ export default function getBundleArchiveInfo() {
expect(datainfo.versionCode).assertEqual(1)
expect(datainfo.versionName).assertLarger(0)
expect(datainfo.entryModuleName).assertEqual("entry")
expect(datainfo.appInfo.description).assertEqual(DESCRIPTION)
expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION)
expect(datainfo.appInfo.descriptionId >= 0).assertTrue()
expect(datainfo.appInfo.icon).assertEqual("$media:icon")
expect(datainfo.appInfo.iconId >= 0).assertTrue()
......@@ -149,7 +150,7 @@ export default function getBundleArchiveInfo() {
expect(datainfo.versionName).assertEqual("1.0")
expect(datainfo.entryModuleName).assertEqual("entry")
expect(datainfo.appInfo.name).assertEqual(NAME1)
expect(datainfo.appInfo.description).assertEqual(DESCRIPTION)
expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION)
expect(datainfo.appInfo.descriptionId >= 0).assertTrue()
expect(datainfo.appInfo.icon).assertEqual("$media:icon")
expect(datainfo.appInfo.iconId >= 0).assertTrue()
......@@ -186,7 +187,7 @@ export default function getBundleArchiveInfo() {
expect(datainfo.versionCode).assertEqual(1)
expect(datainfo.versionName).assertLarger(0)
expect(datainfo.entryModuleName).assertEqual("entry")
expect(datainfo.appInfo.description).assertEqual(DESCRIPTION)
expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION)
expect(datainfo.appInfo.descriptionId >= 0).assertTrue()
expect(datainfo.appInfo.icon).assertEqual("$media:icon")
expect(datainfo.appInfo.iconId >= 0).assertTrue()
......@@ -210,7 +211,7 @@ export default function getBundleArchiveInfo() {
expect(datainfo.versionCode).assertEqual(1)
expect(datainfo.versionName).assertLarger(0)
expect(datainfo.entryModuleName).assertEqual("entry")
expect(datainfo.appInfo.description).assertEqual(DESCRIPTION)
expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION)
expect(datainfo.appInfo.descriptionId >= 0).assertTrue()
expect(datainfo.appInfo.icon).assertEqual("$media:icon")
expect(datainfo.appInfo.iconId >= 0).assertTrue()
......@@ -275,7 +276,7 @@ export default function getBundleArchiveInfo() {
expect(datainfo.versionName).assertEqual("1.0")
expect(datainfo.entryModuleName).assertEqual("entry")
expect(datainfo.appInfo.name).assertEqual(NAME1)
expect(datainfo.appInfo.description).assertEqual(DESCRIPTION)
expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION)
expect(datainfo.appInfo.descriptionId >= 0).assertTrue()
expect(datainfo.appInfo.icon).assertEqual("$media:icon")
expect(datainfo.appInfo.iconId >= 0).assertTrue()
......@@ -313,7 +314,7 @@ export default function getBundleArchiveInfo() {
expect(datainfo.versionName).assertEqual("1.0")
expect(datainfo.entryModuleName).assertEqual("entry")
expect(datainfo.appInfo.name).assertEqual(NAME1)
expect(datainfo.appInfo.description).assertEqual(DESCRIPTION)
expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION)
expect(datainfo.appInfo.descriptionId >= 0).assertTrue()
expect(datainfo.appInfo.icon).assertEqual("$media:icon")
expect(datainfo.appInfo.iconId >= 0).assertTrue()
......
......@@ -23,6 +23,10 @@
{
"name": "TestAbility_label",
"value": "label"
},
{
"name": "entry_description",
"value": "entry_description"
}
]
}
\ No newline at end of file
......@@ -171,6 +171,7 @@
"grantMode": "system_grant",
"availableScope": ["signature"]
}
]
],
"description":"$string:entry_description"
}
}
\ No newline at end of file
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -102,6 +102,7 @@
"value":"metaDataValue",
"extra":"$string:app_name"
}]
}
},
"description":"$string:entry_description"
}
}
\ No newline at end of file
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册