From 9739990254587f408549b33e10e1117aef93b221 Mon Sep 17 00:00:00 2001 From: inter515 Date: Mon, 25 Jul 2022 14:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4ts=E6=96=87=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: inter515 --- .../js/test/ActsBmsQueryAbilityByWant.test.js | 1 - .../main/js/test/ActsBmsHapModuleTest.test.js | 16 ---------------- .../entry/src/main/js/test/ActsBmsJsTest.test.js | 3 --- .../ets/MainAbility/test/GetabilityInfo.test.ets | 2 -- .../test/getAllApplicationInfoJsunit.test.ets | 1 - .../test/getApplicationInfoJsunit.test.ets | 1 - .../entry/src/main/js/test/ExampleJsunit.test.js | 1 - 7 files changed, 25 deletions(-) diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsQueryAbilityByWant.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsQueryAbilityByWant.test.js index baedfeb37..3a7b0610a 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsQueryAbilityByWant.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsgetinfostest/entry/src/main/js/test/ActsBmsQueryAbilityByWant.test.js @@ -176,7 +176,6 @@ describe('ActsBmsQueryAbilityByWant', function () { expect(data.writePermission).assertEqual(""); expect(data.targetAbility).assertEqual(""); expect(data.metaData.length).assertEqual(0); - expect(data.metadata.length).assertEqual(0); expect(data.enabled).assertEqual(true); } diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js index 8e928894d..b99bfe7f0 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js @@ -52,10 +52,7 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo.reqCapabilities.length).assertEqual(0); expect(hapModuleInfo.deviceTypes[0]).assertEqual('phone'); expect(hapModuleInfo.mainAbilityName).assertEqual(FIRSTMAINABILITY); - expect(hapModuleInfo.mainElementName).assertEqual(FIRSTMAINABILITY); expect(hapModuleInfo.abilityInfo.length).assertLarger(0); - expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0); - expect(hapModuleInfo.metadata.length).assertEqual(0); expect(hapModuleInfo.installationFree).assertEqual(false); done(); } @@ -82,10 +79,8 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo1.name).assertEqual(BUNDLE_NAME6); expect(hapModuleInfo.moduleName).assertEqual('entry'); expect(hapModuleInfo.mainAbilityName).assertEqual(FIRSTMAINABILITY); - expect(hapModuleInfo.mainElementName).assertEqual(FIRSTMAINABILITY); expect(hapModuleInfo1.moduleName).assertEqual('bmsmainabilitysecondscene'); expect(hapModuleInfo1.mainAbilityName).assertEqual(SECONDMAINABILITY); - expect(hapModuleInfo1.mainElementName).assertEqual(SECONDMAINABILITY); done(); } }); @@ -116,10 +111,7 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo.reqCapabilities.length).assertEqual(0); expect(hapModuleInfo.deviceTypes[0]).assertEqual('phone'); expect(hapModuleInfo.mainAbilityName).assertEqual(""); - expect(hapModuleInfo.mainElementName).assertEqual(""); expect(hapModuleInfo.abilityInfo.length).assertLarger(0); - expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0); - expect(hapModuleInfo.metadata.length).assertEqual(0); expect(hapModuleInfo.installationFree).assertEqual(false); done(); } @@ -151,10 +143,7 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo.reqCapabilities.length).assertEqual(0); expect(hapModuleInfo.deviceTypes[0]).assertEqual('phone'); expect(hapModuleInfo.mainAbilityName).assertEqual("com.example.third5.AMainAbility"); - expect(hapModuleInfo.mainElementName).assertEqual("com.example.third5.AMainAbility"); expect(hapModuleInfo.abilityInfo.length).assertLarger(0); - expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0); - expect(hapModuleInfo.metadata.length).assertEqual(0); expect(hapModuleInfo.installationFree).assertEqual(false); done(); } @@ -187,10 +176,7 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo.reqCapabilities.length).assertEqual(0); expect(hapModuleInfo.deviceTypes[0]).assertEqual('phone'); expect(hapModuleInfo.mainAbilityName).assertEqual("com.example.system1.MainAbility"); - expect(hapModuleInfo.mainElementName).assertEqual("com.example.system1.MainAbility"); expect(hapModuleInfo.abilityInfo.length).assertLarger(0); - expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0); - expect(hapModuleInfo.metadata.length).assertEqual(0); expect(hapModuleInfo.installationFree).assertEqual(false); } done(); @@ -208,8 +194,6 @@ describe('ActsBmsHapModuleTest', function () { expect(info.reqCapabilities.length).assertEqual(0); expect(info.deviceTypes[0]).assertEqual('phone'); expect(info.abilityInfo.length).assertLarger(0); - expect(info.extensionAbilityInfo.length).assertEqual(0); - expect(info.metadata.length).assertEqual(0); expect(info.installationFree).assertEqual(false); } }) \ No newline at end of file diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js index 0024be2ec..c1eeda520 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsJsTest.test.js @@ -74,7 +74,6 @@ describe('ActsBmsJsTest', function () { expect(abilityInfo1.writePermission).assertEqual(""); expect(abilityInfo1.targetAbility).assertEqual(""); expect(abilityInfo1.metaData.length).assertEqual(0); - expect(abilityInfo1.metadata.length).assertEqual(0); expect(abilityInfo1.enabled).assertEqual(true); } done(); @@ -148,7 +147,6 @@ describe('ActsBmsJsTest', function () { expect(abilityInfo1.writePermission).assertEqual(""); expect(abilityInfo1.targetAbility).assertEqual(""); expect(abilityInfo1.metaData.length).assertEqual(0); - expect(abilityInfo1.metadata.length).assertEqual(0); expect(abilityInfo1.enabled).assertEqual(true); } done(); @@ -191,7 +189,6 @@ describe('ActsBmsJsTest', function () { expect(abilityInfo1.writePermission).assertEqual(""); expect(abilityInfo1.targetAbility).assertEqual(""); expect(abilityInfo1.metaData.length).assertEqual(0); - expect(abilityInfo1.metadata.length).assertEqual(0); expect(abilityInfo1.enabled).assertEqual(true); } done(); diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/GetabilityInfo.test.ets b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/GetabilityInfo.test.ets index 61bab6b5d..d16570ca8 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/GetabilityInfo.test.ets +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/GetabilityInfo.test.ets @@ -299,7 +299,6 @@ export default function GetabilityInfo() { expect(data.writePermission).assertEqual(""); expect(data.targetAbility).assertEqual(""); expect(data.metaData.length).assertEqual(0); - expect(data.metadata.length).assertEqual(0); checkApplicationInfo_other(data.applicationInfo); console.log("---checkAbilityInfo_other End--- "); } @@ -320,7 +319,6 @@ export default function GetabilityInfo() { 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("{}"); expect(info.enabled).assertEqual(true); expect(info.uid).assertLarger(0); expect(info.entityType).assertEqual("unspecified"); diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/getAllApplicationInfoJsunit.test.ets b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/getAllApplicationInfoJsunit.test.ets index 13c5f03ef..5b92d85fd 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/getAllApplicationInfoJsunit.test.ets +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/getAllApplicationInfoJsunit.test.ets @@ -243,7 +243,6 @@ export default function applicationBundleJsunit() { expect(typeof (data[i].supportedModes)).assertEqual('number'); expect(typeof (data[i].process)).assertEqual('string'); expect(typeof (data[i].metaData)).assertEqual('object'); - expect(typeof (data[i].metadata)).assertEqual('object'); expect(typeof (data[i].enabled)).assertEqual('boolean'); expect(typeof (data[i].uid)).assertEqual('number'); expect(typeof (data[i].entityType)).assertEqual('string'); diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/getApplicationInfoJsunit.test.ets b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/getApplicationInfoJsunit.test.ets index bd919e7f5..35072fbfa 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/getApplicationInfoJsunit.test.ets +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/MainAbility/test/getApplicationInfoJsunit.test.ets @@ -338,7 +338,6 @@ export default function applicationBundleJsunit() { expect(typeof (data.process)).assertEqual('string'); expect(typeof (data.entryDir)).assertEqual('string'); expect(typeof (data.metaData)).assertEqual('object'); - expect(typeof (data.metadata)).assertEqual('object'); expect(typeof (data.enabled)).assertEqual('boolean'); expect(typeof (data.uid)).assertEqual('number'); expect(typeof (data.entityType)).assertEqual('string'); diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js index 0d85f6635..10da5a1b5 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js @@ -128,7 +128,6 @@ describe('ActsBundleManagerTest', function () { expect(datainfo.reqPermissions.length).assertEqual(0); expect(datainfo.reqPermissionStates.length).assertEqual(0); expect(datainfo.reqPermissionDetails.length).assertEqual(0); - expect(datainfo.extensionAbilityInfo.length).assertEqual(0); expect(datainfo.appInfo.name).assertEqual(NAME1); expect(datainfo.appInfo.description).assertEqual(APPLICATION_DESCRIPTION); expect(datainfo.appInfo.descriptionId >= 0).assertTrue(); -- GitLab