diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/Test.json b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/Test.json index c2172e7bc99691eebd798847a5e79b7806116dd6..1b848ca2d81e2411245eab11aebda1c40c2a49e4 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/Test.json +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/Test.json @@ -4,7 +4,7 @@ "type": "OHJSUnitTest", "test-timeout": "180000", "bundle-name": "ohos.acts.bundle.stage.test", - "module-name": "phone", + "module-name": "testModule", "shell-timeout": "600000", "testcase-timeout": 70000 }, diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetProfileByAbility.test.ets b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetProfileByAbility.test.ets index 5b84529d1b4722954c904f41551ab1e66c0de5e7..7e29b836cb087ae6ae597e42da8bb8fee631297b 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetProfileByAbility.test.ets +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetProfileByAbility.test.ets @@ -8,7 +8,7 @@ * * 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. + * 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. */ @@ -16,8 +16,8 @@ import manager from '@ohos.bundle.bundleManager'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -const MODULE_NAME = "phone" -const MODULE_NAME_TEST = "phone1" +const MODULE_NAME = "testModule" +const MODULE_NAME_TEST = "testModule1" const ABILITY_NAME = "ohos.acts.bundle.stage.test.MainAbility" const ABILITY_NAME1 = "ohos.acts.bundle.stage.test.MainAbility1" const ABILITY_NAME_TEST = "ohos.acts.bundle.stage.test.MainAbilityTest" @@ -170,8 +170,9 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityCallback', 0, async function (done) { manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME, (err, data) => { - console.info('[getProfileByAbilityCallback] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityCallback] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(1); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); done(); @@ -200,12 +201,15 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityEmptyMetaDataCall', 0, async function (done) { manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME, '', (err, data) => { - console.info('[getProfileByAbilityEmptyMetaDataCall] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityEmptyMetaDataCall] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(3); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); expect(typeof data[1]).assertEqual("string"); expect(data[1]).assertEqual(PROFILE_JSON_STRING); + expect(typeof data[2]).assertEqual("string"); + expect(data[2]).assertEqual(PROFILE_JSON_STRING); done(); }); }) @@ -218,8 +222,9 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityPromise', 0, async function (done) { await manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME).then(data => { - console.info('[getProfileByAbilityPromise] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityPromise] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(1); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); done(); @@ -238,7 +243,7 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityInvalidMetaDataPro', 0, async function (done) { await manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME_TEST).then(data => { - console.info('[getProfileByAbilityInvalidMetaDataPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityInvalidMetaDataPro] getProfileByAbility callback data is: ' + JSON.stringify(data)); done() }).catch(err => { console.error('[getProfileByAbilityInvalidMetaDataPro]Operation failed. Cause: ' + JSON.stringify(err)); @@ -255,12 +260,15 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityEmptyMetaDataPro', 0, async function (done) { await manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME, '').then(data => { - console.info('[getProfileByAbilityEmptyMetaDataPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityEmptyMetaDataPro] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(3); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); expect(typeof data[1]).assertEqual("string"); expect(data[1]).assertEqual(PROFILE_JSON_STRING); + expect(typeof data[2]).assertEqual("string"); + expect(data[2]).assertEqual(PROFILE_JSON_STRING); done(); }).catch(err => { console.error('[getProfileByAbilityEmptyMetaDataPro]Operation failed. Cause: ' + JSON.stringify(err)); @@ -277,12 +285,15 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityNoMetaDataPro', 0, async function (done) { await manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME).then(data => { - console.info('[getProfileByAbilityNoMetaDataPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityNoMetaDataPro] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(3); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); expect(typeof data[1]).assertEqual("string"); expect(data[1]).assertEqual(PROFILE_JSON_STRING); + expect(typeof data[2]).assertEqual("string"); + expect(data[2]).assertEqual(PROFILE_JSON_STRING); done(); }).catch(err => { console.error('[getProfileByAbilityNoMetaDataPro]Operation failed. Cause: ' + JSON.stringify(err)); @@ -299,7 +310,7 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityNoProfilePro', 0, async function (done) { await manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME1).then(data => { - console.info('[getProfileByAbilityNoProfilePro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityNoProfilePro] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(data).assertFail() done(); }).catch(err => { @@ -317,7 +328,7 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityNotPrefixPro', 0, async function (done) { await manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME2).then(data => { - console.info('[getProfileByAbilityNotPrefixPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityNotPrefixPro] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(data).assertFail() done(); }).catch(err => { @@ -349,8 +360,9 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityNotSuffixPro', 0, async function (done) { await manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME3).then(data => { - console.info('[getProfileByAbilityNotSuffixPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityNotSuffixPro] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(1); expect(typeof data[0]).assertEqual("string"); done(); }).catch(err => { @@ -368,8 +380,9 @@ export default function getProfileByAbility() { */ it('getProfileByAbilityNotSuffixCall', 0, async function (done) { manager.getProfileByAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME3, (err, data) => { - console.info('[getProfileByAbilityNotSuffixCall] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByAbilityNotSuffixCall] getProfileByAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(1); expect(typeof data[0]).assertEqual("string"); done(); }); diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetProfileByExtensionAbility.test.ets b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetProfileByExtensionAbility.test.ets index 506c80b65bf937ec7b450d84f1d93b0c9428211d..3c54070b9b5379f2d7004219df30bc1de5f5cc80 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetProfileByExtensionAbility.test.ets +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/test/GetProfileByExtensionAbility.test.ets @@ -16,8 +16,8 @@ import manager from '@ohos.bundle.bundleManager'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -const MODULE_NAME = "phone" -const MODULE_NAME_TEST = "phone1" +const MODULE_NAME = "testModule" +const MODULE_NAME_TEST = "testModule1" const ABILITY_NAME = "Form" const ABILITY_NAME1 = "Form1" const ABILITY_NAME_TEST = "FromTest" @@ -170,8 +170,9 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityCallback', 0, async function (done) { manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME, (err, data) => { - console.info('[getProfileByExtensionAbilityCallback] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityCallback] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(1); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); done(); @@ -200,12 +201,15 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityEmptyMetaDataCall', 0, async function (done) { manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME, '', (err, data) => { - console.info('[getProfileByExtensionAbilityEmptyMetaDataCall] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityEmptyMetaDataCall] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(3); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); expect(typeof data[1]).assertEqual("string"); expect(data[1]).assertEqual(PROFILE_JSON_STRING); + expect(typeof data[2]).assertEqual("string"); + expect(data[2]).assertEqual(PROFILE_JSON_STRING); done(); }); }) @@ -218,8 +222,9 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityPromise', 0, async function (done) { await manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME).then(data => { - console.info('[getProfileByExtensionAbilityPromise] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityPromise] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(1); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); done(); @@ -238,7 +243,7 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityInvalidMetaDataPro', 0, async function (done) { await manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME_TEST).then(data => { - console.info('[getProfileByExtensionAbilityInvalidMetaDataPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityInvalidMetaDataPro] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect().assertFail(); done() }).catch(err => { @@ -256,12 +261,15 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityEmptyMetaDataPro', 0, async function (done) { await manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME, '').then(data => { - console.info('[getProfileByExtensionAbilityEmptyMetaDataPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityEmptyMetaDataPro] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(3); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); expect(typeof data[1]).assertEqual("string"); expect(data[1]).assertEqual(PROFILE_JSON_STRING); + expect(typeof data[2]).assertEqual("string"); + expect(data[2]).assertEqual(PROFILE_JSON_STRING); done(); }).catch(err => { console.error('[getProfileByExtensionAbilityEmptyMetaDataPro]Operation failed. Cause: ' + JSON.stringify(err)); @@ -278,12 +286,15 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityNoMetaDataPro', 0, async function (done) { await manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME).then(data => { - console.info('[getProfileByExtensionAbilityNoMetaDataPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityNoMetaDataPro] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(3); expect(typeof data[0]).assertEqual("string"); expect(data[0]).assertEqual(PROFILE_JSON_STRING); expect(typeof data[1]).assertEqual("string"); expect(data[1]).assertEqual(PROFILE_JSON_STRING); + expect(typeof data[2]).assertEqual("string"); + expect(data[2]).assertEqual(PROFILE_JSON_STRING); done(); }).catch(err => { console.error('[getProfileByExtensionAbilityNoMetaDataPro]Operation failed. Cause: ' + JSON.stringify(err)); @@ -300,7 +311,7 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityNoProfilePro', 0, async function (done) { await manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME1).then(data => { - console.info('[getProfileByExtensionAbilityNoProfilePro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityNoProfilePro] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect().assertFail(); done(); }).catch(err => { @@ -318,7 +329,7 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityNotPrefixPro', 0, async function (done) { await manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME2).then(data => { - console.info('[getProfileByExtensionAbilityNotPrefixPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityNotPrefixPro] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect().assertFail(); done(); }).catch(err => { @@ -350,8 +361,9 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityNotSuffixPro', 0, async function (done) { await manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME3).then(data => { - console.info('[getProfileByExtensionAbilityNotSuffixPro] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityNotSuffixPro] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(1); expect(typeof data[0]).assertEqual("string"); done(); }).catch(err => { @@ -369,8 +381,9 @@ export default function getProfileByExtensionAbility() { */ it('getProfileByExtensionAbilityNotSuffixCall', 0, async function (done) { manager.getProfileByExtensionAbility(MODULE_NAME, ABILITY_NAME, METADATA_NAME3, (err, data) => { - console.info('[getProfileByExtensionAbilityNotSuffixCall] getApplicationInfo callback data is: ' + JSON.stringify(data)); + console.info('[getProfileByExtensionAbilityNotSuffixCall] getProfileByExtensionAbility callback data is: ' + JSON.stringify(data)); expect(Array.isArray(data)).assertTrue(); + expect(data.length).assertEqual(1); expect(typeof data[0]).assertEqual("string"); done(); }); diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/module.json b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/module.json index 7c6599d81198b57e5626ec40af99d0231d0ed72c..137f1427c10fed320b2d86371e522bbcf2978f6e 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/module.json +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/module.json @@ -1,9 +1,9 @@ { "module": { - "name": "phone", + "name": "testModule", "type": "entry", "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", + "description": "$string:testModule_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ "default" @@ -16,7 +16,7 @@ { "name": "ohos.acts.bundle.stage.test.MainAbility", "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", + "description": "$string:testModule_entry_main", "icon": "$media:icon", "label": "$string:entry_label", "visible": true, @@ -62,7 +62,7 @@ { "name": "ohos.acts.bundle.stage.test.MainAbility1", "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", + "description": "$string:testModule_entry_main", "icon": "$media:icon", "label": "$string:entry_label", "visible": true, diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/resources/base/element/string.json b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/resources/base/element/string.json index c9962d9e060b2701436e65408ad934b871cd1867..aba81fb881f10cb0ee17a27e82b79cc0ffc7d13e 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/resources/base/element/string.json +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ { "string": [ { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" + "name": "testModule_entry_dsc", + "value": "i am an entry for testModule" }, { - "name": "phone_entry_main", - "value": "the phone entry ability" + "name": "testModule_entry_main", + "value": "the testModule entry ability" }, { "name": "entry_label", diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/resources/base/profile/form_config1.txt b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/resources/base/profile/form_config1.txt index 77beb4dc531093a3800a53eb0afa76f313f55b87..32f9ff7dc213b28017875b2e4679071350a74d1d 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/resources/base/profile/form_config1.txt +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/resources/base/profile/form_config1.txt @@ -1 +1 @@ -{"forms" :[{"colorMode" : "auto","defaultDimension" : "2*2","description" : "$string:16777219","formConfigAbility" : "ability://xxxxx","formVisibleNotify" : false,"isDefault" : true,"name" : "Form_Js","scheduledUpdateTime" : "10:30","src" : "pages/card/index","supportDimensions" :["2*2"],"updateDuration" : 1,"updateEnabled" : true,"window" :{"autoDesignWidth" : true,"designWidth" : 720}}]} \ No newline at end of file +{"src": ["MainAbility/pages/index/index","MainAbility/pages/second/second"]} \ No newline at end of file