diff --git a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/config.json b/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/config.json deleted file mode 100644 index 174c147b1653522ae8aa2205420166548a30b7a3..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/config.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.acecollaboration", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 7, - "releaseType": "Release", - "target": 7 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.myapplication1", - "name": ".MyApplication", - "mainAbility": ".MainAbility", - "srcPath": "", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "myapplication1", - "moduleType": "feature", - "installationFree": false - }, - "abilities": [ - { - "orientation": "unspecified", - "visible": true, - "srcPath": "MainAbility", - "name": ".MainAbility", - "srcLanguage": "ets", - "icon": "$media:icon", - "description": "$string:description_mainability", - "formsEnabled": false, - "label": "$string:myapplication1_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "mode": { - "syntax": "ets", - "type": "pageAbility" - }, - "pages": [ - "pages/index" - ], - "name": ".MainAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/app.ets deleted file mode 100644 index 7aa1eae37d7e14260b0f22a90c5a5f7560b8f0f2..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/app.ets +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (c) 2021 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 implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export default { - onCreate() { - console.info('Application onCreate') - }, - onDestroy() { - console.info('Application onDestroy') - }, -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/pages/index.ets deleted file mode 100644 index 8e4b3ecd582489a3519ec04ed6fdd4462681e2d5..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/pages/index.ets +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (c) 2021 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 implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import file from '@system.file'; -import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index.ets"; -import testsuite_app1 from "../test/List.test.ets"; -import featureAbility from "@ohos.ability.featureAbility"; - -@Entry -@Component -struct Index { - aboutToAppear() { - console.info("start run testcase!!!!") - const core = Core.getInstance(); - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }); - core.addService('expect', expectExtend); - const reportExtend = new ReportExtend(file); - core.addService('report', reportExtend); - core.init(); - core.subscribeEvent('task', reportExtend); - const configService = core.getDefaultService('config'); - configService.setConfig(this) - testsuite_app1(); - core.execute(); - } - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('myapplication1 page') - .fontSize(50) - .fontWeight(FontWeight.Bold) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/List.test.ets deleted file mode 100644 index e5bd7d594d190f2b30c723d0f93c439f28d27375..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/List.test.ets +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) 2021 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 implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import getHapModuleInfoJsunit_app1 from './getHapModuleInfoJsunit_app1.test.ets'; - -export default function testsuite_app1() { - getHapModuleInfoJsunit_app1(); - -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/Utils.ets b/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/Utils.ets deleted file mode 100644 index 58900ffcdfc72e853714250ae84cda913c6c9947..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/Utils.ets +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (c) 2021 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 implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export default class Utils { - static sleep(time) { - return new Promise((resolve, reject) => { - setTimeout(() => { - resolve(reject) - }, time) - }).then(() => { - console.info(`sleep ${time} over...`) - }) - } - - static getNowTime() { - return new Date().getTime(); - } - - static getDurationTime(msg,startTime, endTime) { - console.info(msg+'Get Interface startTime: ' + startTime); - console.info(msg+'Get Interface endTime: ' + endTime); - var duration = (endTime - startTime) - console.info(msg+'Get Interface Duration: ' + duration); - return duration; - } -} - - - - diff --git a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/getHapModuleInfoJsunit_app1.test.ets b/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/getHapModuleInfoJsunit_app1.test.ets deleted file mode 100644 index 685a71d103d5574b438ddfd73b934ec212570fc2..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/ets/MainAbility/test/getHapModuleInfoJsunit_app1.test.ets +++ /dev/null @@ -1,301 +0,0 @@ -/** - * Copyright (c) 2021 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 implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import {describe, it, expect} from "deccjsunit/index.ets"; -import Utils from './Utils'; -import ability_featureAbility from '@ohos.ability.featureAbility'; - -export default function getHapModuleInfoJsunit() { - describe('appInfoTest', function () { - - /** - * @tc.number: context_getHapModuleInfo_test_0300 - * @tc.name: getHapModuleInfo:Obtains the HapModuleInfo object of the application. - * @tc.desc: Check the return type of the interface (by Promise) - * @tc.level 0 - */ - it('context_getHapModuleInfo_test_0300', 0, async function (done) { - console.info('[context_getHapModuleInfo_test_0300] START'); - await Utils.sleep(1000); - var timeOldStamp = await Utils.getNowTime(); - var context = ability_featureAbility.getContext(); - context.getHapModuleInfo() - .then((data) => { - var timeNewStamp = Utils.getNowTime(); - Utils.getDurationTime('context_getHapModuleInfo_test_0300', timeOldStamp, timeNewStamp); - console.info('[context_getHapModuleInfo_test_0300] data is:' + JSON.stringify(data)); - expect(typeof (data)).assertEqual("object"); - }) - .catch((error) => { - console.error('[context_getHapModuleInfo_test_0300] failed:' + JSON.stringify(error)); - }) - var promise = await context.getHapModuleInfo(); - console.info('---[context_getHapModuleInfo_test_0300] check---'); - checkHapModuleInfo_app('context_getHapModuleInfo_test_0300', promise); - console.info('[context_getHapModuleInfo_test_0300] FINISH'); - done(); - }); - - function checkHapModuleInfo_app(msg, data) { - console.log(msg + "checkHapModuleInfo start " + JSON.stringify(data)); - console.log(msg + "checkHapModuleInfo name : " + data.name); - console.log(msg + "checkHapModuleInfo description : " + data.description); - console.log(msg + "checkHapModuleInfo descriptionId : " + data.descriptionId); - console.log(msg + "checkHapModuleInfo icon : " + data.icon); - console.log(msg + "checkHapModuleInfo label : " + data.label); - console.log(msg + "checkHapModuleInfo labelId : " + data.labelId); - console.log(msg + "checkHapModuleInfo iconId : " + data.iconId); - console.log(msg + "checkHapModuleInfo backgroundImg : " + data.backgroundImg); - console.log(msg + "checkHapModuleInfo supportedModes : " + data.supportedModes); - console.log(msg + "checkHapModuleInfo reqCapabilities length : " + data.reqCapabilities.length); - for (var j = 0; j < data.reqCapabilities.length; j++) { - console.log(msg + "getHapModuleInfo data.reqCapabilities[" + j + "] : " + data.reqCapabilities[j]); - } - console.log(msg + "checkHapModuleInfo deviceTypes length : " + data.deviceTypes.length); - for (var k = 0; k < data.deviceTypes.length; k++) { - console.log(msg + "getHapModuleInfo data.deviceTypes[" + k + "] : " + data.deviceTypes[k]); - } - console.log(msg + "checkHapModuleInfo abilityInfos length : " + data.abilityInfos.length); - console.log(msg + "checkHapModuleInfo moduleName : " + data.moduleName); - console.log(msg + "checkHapModuleInfo mainAbilityName : " + data.mainAbilityName); - console.log(msg + "checkHapModuleInfo installationFree : " + data.installationFree); - - expect(typeof (data)).assertEqual("object"); - expect(typeof (data.name)).assertEqual("string"); - expect(typeof (data.description)).assertEqual("string"); - expect(typeof (data.descriptionId)).assertEqual("number"); - expect(typeof (data.icon)).assertEqual("string"); - expect(typeof (data.label)).assertEqual("string"); - expect(typeof (data.labelId)).assertEqual("number"); - expect(typeof (data.iconId)).assertEqual("number"); - expect(typeof (data.backgroundImg)).assertEqual("string"); - expect(typeof (data.supportedModes)).assertEqual("number"); - expect(Array.isArray(data.reqCapabilities)).assertEqual(true); - expect(Array.isArray(data.deviceTypes)).assertEqual(true); - expect(Array.isArray(data.abilityInfos)).assertEqual(true); - expect(typeof (data.moduleName)).assertEqual("string"); - expect(typeof (data.mainAbilityName)).assertEqual("string"); - expect(typeof (data.installationFree)).assertEqual("boolean"); - expect(data.name).assertEqual("com.example.myapplication1"); - expect(data.description).assertEqual(""); - expect(data.descriptionId).assertEqual(0); - expect(data.icon).assertEqual("$media:icon"); - expect(data.label).assertEqual("$string:myapplication1_MainAbility"); - expect(data.labelId).assertEqual(0); - expect(data.iconId).assertEqual(0); - expect(data.backgroundImg).assertEqual(""); - expect(data.supportedModes).assertEqual(0); - - expect(data.deviceTypes[0]).assertEqual("phone"); - checkAbilityInfo(msg,data.abilityInfos[0]); - - expect(data.moduleName).assertEqual("myapplication1") - expect(data.mainAbilityName).assertEqual(""); - expect(data.installationFree).assertEqual(false); - - console.log(msg + "---checkHapModuleInfo End---"); - } - - function checkAbilityInfo(msg,data) { - console.log(msg+ "checkAbilityInfo start " + JSON.stringify(data)); - console.log(msg+ "checkAbilityInfo bundleName : " + data.bundleName); - console.log(msg+ "checkAbilityInfo name : " + data.name); - console.log(msg+ "checkAbilityInfo label : " + data.label); - console.log(msg+ "checkAbilityInfo description : " + data.description); - console.log(msg+ "checkAbilityInfo icon : " + data.icon); - console.log(msg+ "checkAbilityInfo descriptionId : " + data.descriptionId); - console.log(msg+ "checkAbilityInfo iconId : " + data.iconId); - console.log(msg+ "checkAbilityInfo moduleName : " + data.moduleName); - console.log(msg+ "checkAbilityInfo process : " + data.process); - console.log(msg+ "checkAbilityInfo targetAbility : " + data.targetAbility); - console.log(msg+ "checkAbilityInfo backgroundModes : " + data.backgroundModes); - console.log(msg+ "checkAbilityInfo isVisible : " + data.isVisible); - console.log(msg+ "checkAbilityInfo formEnabled : " + data.formEnabled); - console.log(msg+ "checkAbilityInfo type : " + data.type) - console.log(msg+ "checkAbilityInfo orientation : " + data.orientation); - console.log(msg+ "checkAbilityInfo launchMode : " + data.launchMode); - console.log(msg+ "checkAbilityInfo permissions length : " + data.permissions.length); - for (var j = 0; j < data.permissions.length; j++) { - console.log(msg+ "getAbilityInfo data.permissions[" + j + "] : " + data.permissions[j]); - } - console.log(msg+ "checkAbilityInfo deviceTypes length : " + data.deviceTypes.length); - for (var k = 0; k < data.deviceTypes.length; k++) { - console.log(msg+ "getAbilityInfo data.deviceTypes[" + k + "] : " + data.deviceTypes[k]); - } - console.log(msg+ "checkAbilityInfo deviceCapabilities length : " + data.deviceCapabilities.length); - for (var i = 0; i < data.deviceCapabilities.length; i++) { - console.log(msg+ "getAbilityInfo data.deviceCapabilities[" + i + "] : " + data.deviceCapabilities[i]); - } - console.log(msg+ "checkAbilityInfo readPermission : " + data.readPermission); - console.log(msg+ "checkAbilityInfo writePermission : " + data.writePermission); - console.log(msg+ "checkAbilityInfo formEntity : " + data.formEntity); - console.log(msg+ "checkAbilityInfo minFormHeight : " + data.minFormHeight); - console.log(msg+ "checkAbilityInfo defaultFormHeight : " + data.defaultFormHeight); - console.log(msg+ "checkAbilityInfo minFormWidth : " + data.minFormWidth); - console.log(msg+ "checkAbilityInfo defaultFormWidth : " + data.defaultFormWidth); - console.log(msg+ "checkAbilityInfo uri : " + data.uri); - console.log(msg+ "checkAbilityInfo labelId : " + data.labelId); - console.log(msg+ "checkAbilityInfo subType : " + data.subType); - expect(typeof (data)).assertEqual("object"); - expect(typeof (data.bundleName)).assertEqual("string"); - expect(typeof (data.name)).assertEqual("string"); - expect(typeof (data.label)).assertEqual("string"); - expect(typeof (data.description)).assertEqual("string"); - expect(typeof (data.icon)).assertEqual("string"); - expect(typeof (data.labelId)).assertEqual("number"); - expect(typeof (data.descriptionId)).assertEqual("number"); - expect(typeof (data.iconId)).assertEqual("number"); - expect(typeof (data.moduleName)).assertEqual("string"); - expect(typeof (data.process)).assertEqual("string"); - expect(typeof (data.targetAbility)).assertEqual("string"); - expect(typeof (data.backgroundModes)).assertEqual("number"); - expect(typeof (data.isVisible)).assertEqual("boolean"); - expect(typeof (data.formEnabled)).assertEqual("boolean"); - expect(typeof (data.type)).assertEqual("number"); - expect(typeof (data.subType)).assertEqual("number"); - expect(typeof (data.orientation)).assertEqual("number"); - expect(typeof (data.launchMode)).assertEqual("number"); - expect(Array.isArray(data.permissions)).assertEqual(true); - expect(Array.isArray(data.deviceTypes)).assertEqual(true); - expect(Array.isArray(data.deviceCapabilities)).assertEqual(true); - expect(typeof (data.readPermission)).assertEqual("string"); - expect(typeof (data.writePermission)).assertEqual("string"); - expect(typeof (data.applicationInfo)).assertEqual("object"); - expect(typeof (data.formEntity)).assertEqual("number"); - expect(typeof (data.minFormHeight)).assertEqual("number"); - expect(typeof (data.defaultFormHeight)).assertEqual("number"); - expect(typeof (data.minFormWidth)).assertEqual("number"); - expect(typeof (data.defaultFormWidth)).assertEqual("number"); - expect(typeof (data.uri)).assertEqual("string"); - expect(data.bundleName).assertEqual("com.ohos.acecollaboration"); - expect(data.name).assertEqual("com.example.myapplication1.MainAbility"); - expect(data.label).assertEqual("$string:myapplication1_MainAbility"); - expect(data.description).assertEqual("$string:description_mainability"); - expect(data.icon).assertEqual("$media:icon"); - expect(data.descriptionId > 0).assertTrue(); - expect(data.iconId > 0).assertTrue(); - expect(data.moduleName).assertEqual("myapplication1"); - expect(data.process).assertEqual(""); - expect(data.targetAbility).assertEqual(""); - expect(data.backgroundModes).assertEqual(0); - expect(data.isVisible).assertEqual(true); - expect(data.formEnabled).assertEqual(false); - expect(data.type).assertEqual(1); - expect(data.orientation).assertEqual(0); - expect(data.launchMode).assertEqual(1); - expect(data.deviceTypes[0]).assertEqual("phone"); - expect(data.readPermission).assertEqual(""); - expect(data.writePermission).assertEqual(""); - checkApplicationInfo(msg,data.applicationInfo); - expect(data.formEntity).assertEqual(0); - expect(data.minFormHeight).assertEqual(0); - expect(data.defaultFormHeight).assertEqual(0); - expect(data.minFormWidth).assertEqual(0); - expect(data.defaultFormWidth).assertEqual(0); - expect(data.uri).assertEqual(""); - expect(data.labelId > 0).assertTrue(); - expect(data.subType).assertEqual(0); - console.log(msg+ "---checkAbilityInfo End--- "); - } - - function checkApplicationInfo(msg,info) { - console.log(msg+ "checkApplicationInfo start : " + JSON.stringify(info)); - console.log(msg+ "checkApplicationInfo name : " + info.name); - console.log(msg+ "checkApplicationInfo description : " + info.description); - console.log(msg+ "checkApplicationInfo descriptionId : " + info.descriptionId); - console.log(msg+ "checkApplicationInfo systemApp : " + info.systemApp); - console.log(msg+ "checkApplicationInfo enabled : " + info.enabled); - console.log(msg+ "checkApplicationInfo label : " + info.label); - console.log(msg+ "checkApplicationInfo labelId : " + info.labelId); - console.log(msg+ "checkApplicationInfo icon : " + info.icon); - console.log(msg+ "checkApplicationInfo iconId : " + info.iconId); - console.log(msg+ "checkApplicationInfo process : " + info.process); - console.log(msg+ "checkApplicationInfo supportedModes : " + info.supportedModes); - console.log(msg+ "checkApplicationInfo moduleSourceDirs length : " + info.moduleSourceDirs.length); - for (var j = 0; j < info.moduleSourceDirs.length; j++) { - console.log(msg+ "checkApplicationInfo info.moduleSourceDirs[" + j + "] : " + info.moduleSourceDirs[j]); - } - console.log(msg+ "checkApplicationInfo permissions length : " + info.permissions.length); - for (var k = 0; k < info.permissions.length; k++) { - console.log(msg+ "checkApplicationInfo info.permissions[" + k + "] : " + info.permissions[k]); - } - console.log(msg+ "checkApplicationInfo moduleInfos length : " + info.moduleInfos.length); - for (var i = 0; i < info.moduleInfos.length; i++) { - console.log(msg+ "checkApplicationInfo info.moduleInfos[" + i + "].moduleName : " + info.moduleInfos[i].moduleName); - console.log(msg+ "checkApplicationInfo info.moduleInfos[" + i + "].moduleSourceDir : " + info.moduleInfos[i].moduleSourceDir); - } - console.log(msg+ "checkApplicationInfo entryDir : " + info.entryDir); - expect(typeof (info)).assertEqual("object"); - expect(typeof (info.name)).assertEqual("string"); - expect(typeof (info.description)).assertEqual("string"); - expect(typeof (info.descriptionId)).assertEqual("number"); - expect(typeof (info.systemApp)).assertEqual("boolean"); - expect(typeof (info.enabled)).assertEqual("boolean"); - expect(typeof (info.label)).assertEqual("string"); - expect(typeof (info.labelId)).assertEqual("string"); - expect(typeof (info.icon)).assertEqual("string"); - expect(typeof (info.iconId)).assertEqual("string"); - expect(typeof (info.process)).assertEqual("string"); - expect(typeof (info.supportedModes)).assertEqual("number"); - expect(Array.isArray(info.moduleSourceDirs)).assertEqual(true); - expect(Array.isArray(info.permissions)).assertEqual(true); - expect(Array.isArray(info.moduleInfos)).assertEqual(true); - expect(typeof (info.entryDir)).assertEqual("string"); - expect(info.name).assertEqual("com.ohos.acecollaboration"); - expect(info.description).assertEqual("$string:mainability_description"); - expect(info.descriptionId > 0).assertTrue(); - expect(info.systemApp).assertEqual(true); - expect(info.enabled).assertEqual(true); - expect(info.label).assertEqual("$string:entry_MainAbility"); - expect(info.icon).assertEqual("$media:icon"); - expect(info.process).assertEqual(""); - expect(info.supportedModes).assertEqual(0); - if (info.moduleSourceDirs.length == 1){ - expect(info.moduleInfos[0].moduleName).assertEqual("entry"); - expect(info.moduleInfos[0].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.ohos.acecollaboration"); - }else if(info.moduleSourceDirs.length == 2) { - if (info.moduleInfos[0].moduleName == "myapplication1") { - expect(info.moduleInfos[0].moduleName).assertEqual("myapplication1"); - expect(info.moduleInfos[0].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.example.myapplication1"); - expect(info.moduleInfos[1].moduleName).assertEqual("entry"); - expect(info.moduleInfos[1].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.ohos.acecollaboration"); - }else{ - expect(info.moduleInfos[0].moduleName).assertEqual("myapplication2"); - expect(info.moduleInfos[0].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.example.myapplication2"); - expect(info.moduleInfos[1].moduleName).assertEqual("entry"); - expect(info.moduleInfos[1].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.ohos.acecollaboration"); - } - }else { - expect(info.moduleInfos[0].moduleName).assertEqual("myapplication1"); - expect(info.moduleInfos[0].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.example.myapplication1"); - expect(info.moduleInfos[1].moduleName).assertEqual("myapplication2"); - expect(info.moduleInfos[1].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.example.myapplication2"); - expect(info.moduleInfos[2].moduleName).assertEqual("entry"); - expect(info.moduleInfos[2].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.ohos.acecollaboration"); - } - expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/" + - "com.ohos.acecollaboration/com.ohos.acecollaboration"); - console.log(msg+ "---checkApplicationInfo End--- "); - } - - }) -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/resources/base/element/string.json deleted file mode 100644 index c69dada1a3f8a111a6cfdb7743f45b8449bee1b2..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "myapplication1_MainAbility", - "value": "myapplication1_MainAbility" - }, - { - "name": "description_mainability", - "value": "eTS_Empty Ability" - } - ] -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/aafwk/aafwk_standard/actsabilitymanageretstest/myapplication1/src/main/resources/base/media/icon.png and /dev/null differ