diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/Test.json b/ability/ability_runtime/stage/actslifecyclemultihaptest/Test.json index e73cb54310f368beffac1a4996d4bcb66b6b34d4..92ce4d81d393026343e1a6ca15d8928a3188d874 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/Test.json +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/Test.json @@ -1,10 +1,12 @@ { "description": "Configuration for hjunit demo Tests", "driver": { - "type": "JSUnitTest", + "type": "OHJSUnitTest", "test-timeout": "180000", - "package": "com.example.lifecycletest", - "shell-timeout": "600000" + "bundle-name": "com.example.lifecycletest", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 70000 }, "kits": [ { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts index 3bb8dbb83028eb925400a4885612266092c0c89e..047c5575a74fdca6b2a5e9a019ace65b8638a607 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -28,7 +28,7 @@ export default class MainAbility extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility onWindowStageCreate") globalThis.abilityContext = this.context; - windowStage.setUIContent(this.context, "pages/MainAbility_pages", null) + windowStage.setUIContent(this.context, "MainAbility/pages/MainAbility_pages", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility1_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility1_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility1_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility1_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility2_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility2_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility2_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility2_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility3_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility3_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility3_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility3_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility4_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility4_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility4_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility4_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility5_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility5_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility5_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility5_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility6_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility6_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility6_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility6_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility7_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility7_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility7_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility7_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility_pages.ets similarity index 55% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility_pages.ets index 8f859c1002634a98b1cf405373a9388ddd2f30ff..b2da5c11fb27b5480310670e0077ee3c9375e067 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/pages/MainAbility_pages.ets +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility_pages.ets @@ -13,9 +13,10 @@ * 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 list from '../test/ListTest' +import router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../test/List.test' @Entry @Component @@ -24,23 +25,12 @@ 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() - globalThis.abilityWant.parameters.timeout = 20000; - - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - configService.setConfig(globalThis.abilityWant.parameters) - console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) - list(globalThis.abilityContext) - core.execute() + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts index 04f28b5b759f359b441acfa4138434237f03364d..9af9101ac823132af0446eef8d07d1995d5bf161 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -107,7 +107,7 @@ export default class MainAbility1 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility1 onWindowStageCreate") globalThis.ability2Context = this.context; - windowStage.setUIContent(this.context, "pages/MainAbility1_pages", null) + windowStage.setUIContent(this.context, "MainAbility/pages/MainAbility1_pages", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts index cb367630185c2b176b7165c53c129790f66d02f5..65fd8731292ec522d66146f533871d1d21bd0864 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -93,7 +93,7 @@ export default class MainAbility2 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility2 onWindowStageCreate") globalThis.ability3Context = this.context; - windowStage.setUIContent(this.context, "pages/MainAbility2_pages", null) + windowStage.setUIContent(this.context, "MainAbility/pages/MainAbility2_pages", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts index e598541f2e67fa88be13489313f1f7d4bc71253f..33f456c7a929470a5cebdc5a418c77ecbddb24d4 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -121,7 +121,7 @@ export default class MainAbility3 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility3 onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/MainAbility3_pages", null) + windowStage.setUIContent(this.context, "MainAbility/pages/MainAbility3_pages", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts index d8a79c64354540cae374a97643bc6d8da4ce3bcb..789378bea114c47400cfd389b06a73f742655f95 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -86,7 +86,7 @@ export default class MainAbility4 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility4 onWindowStageCreate") globalThis.ability4context = this.context; - windowStage.setUIContent(this.context, "pages/MainAbility4_pages", null) + windowStage.setUIContent(this.context, "MainAbility/pages/MainAbility4_pages", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts index 964c7a17aef12412d0499afee2e6325b81fed579..5bac3c2e41518c7e5f0b3c66da21b1859b86e730 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts @@ -92,7 +92,7 @@ export default class MainAbility5 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility5 onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/MainAbility5_pages", null) + windowStage.setUIContent(this.context, "MainAbility/pages/MainAbility5_pages", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts index 1eaed0febc5c619e2bcf5ece63548a8e8c6121c1..08a80dd11e7ea3a124a5743bae1886b30a63287e 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts @@ -86,7 +86,7 @@ export default class MainAbility6 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility6 onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/MainAbility6_pages", null) + windowStage.setUIContent(this.context, "MainAbility/pages/MainAbility6_pages", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts index 7207a3d3ecd8e27183d49d4fa6ae677fd6e9301b..2feeecd861ddfc9f02adb4fdefbfc78c160d79dd 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts @@ -14,7 +14,7 @@ export default class MainAbility7 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility7 onWindowStageCreate") globalThis.ability7context = this.context; - windowStage.setUIContent(this.context, "pages/MainAbility7_pages", null) + windowStage.setUIContent(this.context, "MainAbility/pages/MainAbility7_pages", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..89a84730505783ba229175ab4b55d37f91a16266 --- /dev/null +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2022 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 Ability from '@ohos.application.Ability' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/pages/index.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..b93567f962921124b282f78c8ef123965d1460c9 --- /dev/null +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2022 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('TestAbility index aboutToAppear') + } + @State message: string = 'Hello World' + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(20) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .width('35%') + .height('5%') + .onClick(()=>{ + }) + } + .width('100%') + } + .height('100%') + } + } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..36d0cf531209dc98342568e93183a68dfed21795 --- /dev/null +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2022 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 TestRunner from '@ohos.application.testRunner' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' + +var abilityDelegator = undefined +var abilityDelegatorArguments = undefined + +function translateParamsToString(parameters) { + const keySet = new Set([ + '-s class', '-s notClass', '-s suite', '-s it', + '-s level', '-s testType', '-s size', '-s timeout', + '-s dryRun' + ]) + let targetParams = ''; + for (const key in parameters) { + if (keySet.has(key)) { + targetParams = `${targetParams} ${key} ${parameters[key]}` + } + } + return targetParams.trim() +} + +async function onAbilityCreateCallback() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.example.lifecycletest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/LifecycleTest.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/LifecycleTest.ets index 2b45f6ae2e15179c9b2dbbc476592cf51acff562..d24f150fbcfeed13867c3c7a2553f91e3c94066b 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/LifecycleTest.ets +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/LifecycleTest.ets @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" - -export default function abilityTest(abilityContext) { +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" +export default function abilityTest() { describe('AbilityTest', function () { @@ -68,7 +67,7 @@ export default function abilityTest(abilityContext) { TAG = "Multihap_LifecycleTest_001"; listKeyTemp = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility4" }, (error, data) => { @@ -78,7 +77,7 @@ export default function abilityTest(abilityContext) { await sleep(1000); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility3" }, (error, data) => { @@ -123,7 +122,7 @@ export default function abilityTest(abilityContext) { TAG = "Multihap_LifecycleTest_002"; listKeyTemp = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility4" }, (error, data) => { @@ -133,7 +132,7 @@ export default function abilityTest(abilityContext) { await sleep(1000); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility4" }, (error, data) => { @@ -143,7 +142,7 @@ export default function abilityTest(abilityContext) { await sleep(1000); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility4" }, (error, data) => { @@ -187,7 +186,7 @@ export default function abilityTest(abilityContext) { TAG = "Multihap_LifecycleTest_003"; listKeyTemp = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility4" }, (error, data) => { @@ -197,7 +196,7 @@ export default function abilityTest(abilityContext) { await sleep(1000); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility5" }, (error, data) => { @@ -207,7 +206,7 @@ export default function abilityTest(abilityContext) { await sleep(1000); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility5" }, (error, data) => { @@ -259,7 +258,7 @@ export default function abilityTest(abilityContext) { listKeyTemp = []; listKeyTemp1 = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility4" }, (error, data) => { @@ -269,7 +268,7 @@ export default function abilityTest(abilityContext) { await sleep(1000); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility6" }, (error, data) => { @@ -279,7 +278,7 @@ export default function abilityTest(abilityContext) { await sleep(1000); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap3MainAbility2" }, (error, data) => { @@ -336,7 +335,7 @@ export default function abilityTest(abilityContext) { listKeyTemp = []; listKeyTemp1 = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility4" }, (error, data) => { @@ -346,7 +345,7 @@ export default function abilityTest(abilityContext) { await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility6" }, (error, data) => { @@ -356,7 +355,7 @@ export default function abilityTest(abilityContext) { await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility7" }, (error, data) => { @@ -416,7 +415,7 @@ export default function abilityTest(abilityContext) { var firstCallbackId; var secondCallbackId; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility7" }, (error, data) => { @@ -426,7 +425,7 @@ export default function abilityTest(abilityContext) { await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility8" }, (error, data) => { @@ -441,7 +440,7 @@ export default function abilityTest(abilityContext) { await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility7" }, (error, data) => { @@ -451,7 +450,7 @@ export default function abilityTest(abilityContext) { await sleep(1000); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility8" }, (error, data) => { @@ -498,7 +497,7 @@ export default function abilityTest(abilityContext) { var callBackId2; var flag; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility6" }, (error, data) => { @@ -507,7 +506,7 @@ export default function abilityTest(abilityContext) { }); setTimeout(function () { - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility9" }, (error, data) => { @@ -548,7 +547,7 @@ export default function abilityTest(abilityContext) { setTimeout(function () { if (flag == 0) { - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility6" }, (error, data) => { @@ -557,7 +556,7 @@ export default function abilityTest(abilityContext) { }); setTimeout(function () { - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility9" }, (error, data) => { @@ -612,7 +611,7 @@ export default function abilityTest(abilityContext) { TAG = "Multihap_LifecycleTest_008"; listKeyTemp = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility4" }, (error, data) => { @@ -622,7 +621,7 @@ export default function abilityTest(abilityContext) { await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility6" }, (error, data) => { @@ -675,7 +674,7 @@ export default function abilityTest(abilityContext) { listKeyTemp = []; listKeyTemp1 = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility4", }, (error, data) => { @@ -684,7 +683,7 @@ export default function abilityTest(abilityContext) { }) await sleep(1000) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility10", }, (error, data) => { @@ -693,7 +692,7 @@ export default function abilityTest(abilityContext) { }) await sleep(1000) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap3MainAbility3", }, (error, data) => { @@ -702,7 +701,7 @@ export default function abilityTest(abilityContext) { }) await sleep(1000) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility10", }, (error, data) => { @@ -711,7 +710,7 @@ export default function abilityTest(abilityContext) { }) await sleep(1000) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap3MainAbility3", }, (error, data) => { @@ -721,7 +720,7 @@ export default function abilityTest(abilityContext) { await sleep(1000) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap2MainAbility10", }, (error, data) => { @@ -730,7 +729,7 @@ export default function abilityTest(abilityContext) { }) await sleep(1000) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap3MainAbility3", }, (error, data) => { @@ -791,7 +790,7 @@ export default function abilityTest(abilityContext) { TAG = "Multihap_LifecycleTest_011"; listKeyTemp = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "MainAbility2", }, (error, data) => { @@ -801,7 +800,7 @@ export default function abilityTest(abilityContext) { await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycletest", abilityName: "Hap4MainAbility1", }, (error, data) => { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/ListTest.ets b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/List.test.ets similarity index 90% rename from ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/ListTest.ets rename to ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/List.test.ets index ae919394f9b4c9181e58bada2d37f06f318f476d..56f6c9cab429f379c9c462caf5bd9fe2c3882cde 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/ListTest.ets +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/List.test.ets @@ -14,8 +14,8 @@ */ import lifecycleTest from './LifecycleTest' -export default function List(context) { +export default function List() { - lifecycleTest(context) + lifecycleTest() } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/resources/base/profile/main_pages.json index dfc704c52405631e5fce73caf849106d9cbb128d..55149e4425ee07d45312d138754715076ff8de87 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/resources/base/profile/main_pages.json +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/resources/base/profile/main_pages.json @@ -1,11 +1,11 @@ { "src": [ - "pages/MainAbility_pages", - "pages/MainAbility1_pages", - "pages/MainAbility2_pages", - "pages/MainAbility3_pages", - "pages/MainAbility4_pages", - "pages/MainAbility5_pages", - "pages/MainAbility6_pages" + "MainAbility/pages/MainAbility_pages", + "MainAbility/pages/MainAbility1_pages", + "MainAbility/pages/MainAbility2_pages", + "MainAbility/pages/MainAbility3_pages", + "MainAbility/pages/MainAbility4_pages", + "MainAbility/pages/MainAbility5_pages", + "MainAbility/pages/MainAbility6_pages" ] } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/Test.json b/ability/ability_runtime/stage/actslifecyclesinglehaptest/Test.json index 916b765f73ce3d1681a2a692f246a265d1e91876..fd1a61a3636e7de8f51867b61227f6102f2525fb 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/Test.json +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/Test.json @@ -1,10 +1,12 @@ { "description": "Configuration for hjunit demo Tests", "driver": { - "type": "JSUnitTest", + "type": "OHJSUnitTest", "test-timeout": "180000", - "package": "com.example.lifecycle_xts", - "shell-timeout": "600000" + "bundle-name": "com.example.lifecycle_xts", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 70000 }, "kits": [ { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts index ded1affab04861ec4b1f6bfac452dfc89cf127ac..0bd8bae9cf466315bddb9dcd0cd2bb977db55340 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts @@ -35,7 +35,7 @@ export default class Hap1MainAbility1 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] Hap1MainAbility1 onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/indexh1a1", null) + windowStage.setUIContent(this.context, "MainAbility/pages/indexh1a1", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts index f8552bfa873dda74f3ee4f1e8de20655996c7cd1..0827cc9ac6130e94f9b41009d09d439b9062898e 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts @@ -36,7 +36,7 @@ export default class Hap1MainAbility2 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] Hap1MainAbility2 onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/indexh1a2", null) + windowStage.setUIContent(this.context, "MainAbility/pages/indexh1a2", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts index 245fde7135b60e4843ac8f1d20ee9021e886f2e3..2f474d0bc3ef5bb5dbc351e345e2c690dfb26bd7 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -28,7 +28,7 @@ export default class MainAbility extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility onWindowStageCreate") globalThis.abilityContext = this.context; - windowStage.setUIContent(this.context, "pages/index", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 61% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index.ets index e279086a082c8f5d1a57617e1ca4b32723468651..c73003d9e31befc78365c0af34d46a5538b8281c 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index.ets @@ -13,29 +13,22 @@ * 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" -import List from '../test/ListTest' +import router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../test/List.test' @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() - globalThis.abilityWant.parameters.timeout = 10000; - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - configService.setConfig(globalThis.abilityWant.parameters); - List(globalThis.abilityContext) - core.execute() + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index1.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index1.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index1.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index1.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index10.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index10.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index10.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index10.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index11.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index11.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index11.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index11.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index12.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index12.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index12.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index12.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index2.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index2.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index2.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index2.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index3.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index3.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index3.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index3.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index4.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index4.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index4.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index4.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index5.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index5.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index5.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index5.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index6.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index6.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index6.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index6.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index7.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index7.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index7.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index7.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index8.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index8.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index8.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index8.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index9.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index9.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/index9.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index9.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/indexh1a1.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/indexh1a1.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/indexh1a1.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/indexh1a1.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/indexh1a2.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/indexh1a2.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/pages/indexh1a2.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/indexh1a2.ets diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts index 6b5430429788fd97d8d91480b4b6bb1dfed11e88..bb7c243e067bdc717fe8e21797a9a4b97192832a 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -118,7 +118,7 @@ export default class MainAbility1 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility1 onWindowStageCreate") globalThis.ability1context = this.context; - windowStage.setUIContent(this.context, "pages/index1", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index1", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts index 5582958aa9fd3e30f5b42fd93c9da0febd492f96..4c6405de0b5d648a536c6c89e5bf39dfa94825d6 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts @@ -103,7 +103,7 @@ export default class MainAbility10 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility10 onWindowStageCreate") globalThis.ability10 = this.context; - windowStage.setUIContent(this.context, "pages/index10", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index10", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts index bdf477073833551e24b29ea235d6d0fd68ffcbcf..3887f3b5f99f588930b262117e3189c474a40367 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts @@ -97,7 +97,7 @@ export default class MainAbility11 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility11 onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/index11", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index11", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts index 88b078eda9a070acfcd8913fddc86db3ee25c986..c49d303ededbf5d74c8c621e4aee32f13816a93b 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts @@ -96,7 +96,7 @@ export default class MainAbility12 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility12 onWindowStageCreate") globalThis.ability12 = this.context; - windowStage.setUIContent(this.context, "pages/index12", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index12", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts index bd6a71c86aae9a16fa940e4ed0443e01faf42cf7..075694f3511d0e2b3f863dff8c8fb8f6955d9fbc 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -28,7 +28,7 @@ export default class MainAbility2 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility2 onWindowStageCreate") globalThis.ability2 = this.context; - windowStage.setUIContent(this.context, "pages/index2", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index2", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 5dfc104413ccd63c272edb797088cb57bda68239..4820224da56666294d08846c5f88391a964bd01a 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -119,7 +119,7 @@ export default class MainAbility3 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility3 onWindowStageCreate") globalThis.ability3 = this.context - windowStage.setUIContent(this.context, "pages/index3", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index3", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts index 8f82d3b5b5f778f71edc160ab196b23b48c86d3d..68c13255ee6e8b1e8514fc10131099b8d699134c 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -119,7 +119,7 @@ export default class MainAbility4 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility4 onWindowStageCreate") globalThis.ability4 = this.context; - windowStage.setUIContent(this.context, "pages/index4", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index4", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts index a37e29a1855d4c7bb890260bd4745ec27364e5e1..490df759094f2aa85623e8ce8dd9fb4277c5440c 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts @@ -28,7 +28,7 @@ export default class MainAbility5 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility5 onWindowStageCreate") globalThis.ability5 = this.context; - windowStage.setUIContent(this.context, "pages/index5", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index5", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts index 7cfa85ef5505885be49dca050c028ce38857447e..77591a4370782bfe46befc3428d3b2e06a7aac7a 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts @@ -28,7 +28,7 @@ export default class MainAbility6 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility6 onWindowStageCreate") globalThis.ability6 = this.context; - windowStage.setUIContent(this.context, "pages/index6", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index6", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts index 2c1b71411769eaf8149ce3f8ac5980967d698ae8..135c385527e66f0944932fb140af84e7be603262 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts @@ -28,7 +28,7 @@ export default class MainAbility7 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility7 onWindowStageCreate") globalThis.ability7 = this.context; - windowStage.setUIContent(this.context, "pages/index7", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index7", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts index b89d465363c62335a345d240448bd8e754d70b91..a49fe06fe3720d1b9f3bf9892ed3262e32354261 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts @@ -28,7 +28,7 @@ export default class MainAbility8 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility8 onWindowStageCreate") globalThis.ability8 = this.context; - windowStage.setUIContent(this.context, "pages/index8", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index8", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts index b2ef7556b6f9237cd4a2020a39dc91831fb2fc6a..76e6fea160c3bbe634d429e1ae8bb39c2cea97eb 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts @@ -28,7 +28,7 @@ export default class MainAbility9 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility9 onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/index9", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index9", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..89a84730505783ba229175ab4b55d37f91a16266 --- /dev/null +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2022 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 Ability from '@ohos.application.Ability' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/pages/index.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..b93567f962921124b282f78c8ef123965d1460c9 --- /dev/null +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2022 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('TestAbility index aboutToAppear') + } + @State message: string = 'Hello World' + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(20) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .width('35%') + .height('5%') + .onClick(()=>{ + }) + } + .width('100%') + } + .height('100%') + } + } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..851b03fd41099db314e64725f941d28893291718 --- /dev/null +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2022 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 TestRunner from '@ohos.application.testRunner' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' + +var abilityDelegator = undefined +var abilityDelegatorArguments = undefined + +function translateParamsToString(parameters) { + const keySet = new Set([ + '-s class', '-s notClass', '-s suite', '-s it', + '-s level', '-s testType', '-s size', '-s timeout', + '-s dryRun' + ]) + let targetParams = ''; + for (const key in parameters) { + if (keySet.has(key)) { + targetParams = `${targetParams} ${key} ${parameters[key]}` + } + } + return targetParams.trim() +} + +async function onAbilityCreateCallback() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.example.lifecycle_xts.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/LifeCycleTest.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/LifeCycleTest.ets index 0793994799a42217aac0ed9e05cfe30c5119bcf3..94e818a3d2ba4eda16b7660bf3252d7cf01a70bb 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/LifeCycleTest.ets +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/LifeCycleTest.ets @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" - -export default function lifecycleTest(abilityContext) { +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" +export default function lifecycleTest() { describe('LifeCycleTest', function () { beforeEach(async function (done) { @@ -84,7 +83,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -139,7 +138,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility1", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -150,7 +149,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -208,7 +207,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility1", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -219,7 +218,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -288,7 +287,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility3", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start3 successful. Data: ' + data); }).catch((error) => { @@ -299,7 +298,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start2 successful. Data: ' + data); }).catch((error) => { @@ -372,7 +371,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility1", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start1 successful. Data: ' + data); }).catch((error) => { @@ -383,7 +382,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility3", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start3 successful. Data: ' + data); }).catch((error) => { @@ -404,7 +403,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility4", } - globalThis.abilityContext.startAbility(str2) + globalThis.globalThis.abilityContext.startAbility(str2) .then((data) => { console.info(TAG + ' start4 successful. Data: ' + data); }).catch((error) => { @@ -449,7 +448,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility1", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start1 successful. Data: ' + data); }).catch((error) => { @@ -460,7 +459,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility5", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start5 successful. Data: ' + data); }).catch((error) => { @@ -472,7 +471,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str2) + globalThis.globalThis.abilityContext.startAbility(str2) .then((data) => { console.info(TAG + ' start2 successful. Data: ' + data); }).catch((error) => { @@ -599,7 +598,7 @@ export default function lifecycleTest(abilityContext) { listKey8.push(abilityname + " onAbilityContinue"); } } - let applicationContext = globalThis.abilityContext.getApplicationContext(); + let applicationContext = globalThis.globalThis.abilityContext.getApplicationContext(); id1 = applicationContext.registerAbilityLifecycleCallback(AbilityLifecycleCallback); console.log(TAG + " registerAbilityLifecycleCallback1 number: " + JSON.stringify(id1)); applicationContext.unregisterAbilityLifecycleCallback(id1, (error, data) => { @@ -648,7 +647,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility1", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -659,7 +658,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -671,7 +670,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -684,7 +683,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -750,7 +749,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility1", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -761,7 +760,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -773,7 +772,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -836,7 +835,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility6", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -851,7 +850,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -889,7 +888,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility7", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -904,7 +903,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility7", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -953,7 +952,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility8", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -968,7 +967,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility8", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1013,7 +1012,7 @@ export default function lifecycleTest(abilityContext) { console.log("------------Singlehap_LifeCycleTest_1300 start-------------"); TAG = "Singlehap_LifeCycleTest_1300"; listKeyTemp = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycle_xts", abilityName: "MainAbility9" }, (error, data) => { @@ -1021,7 +1020,7 @@ export default function lifecycleTest(abilityContext) { ",data: " + JSON.stringify(data)); }); await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycle_xts", abilityName: "Hap1MainAbility1" }, (error, data) => { @@ -1029,7 +1028,7 @@ export default function lifecycleTest(abilityContext) { ",data: " + JSON.stringify(data)); }); await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycle_xts", abilityName: "Hap1MainAbility1" }, (error, data) => { @@ -1070,7 +1069,7 @@ export default function lifecycleTest(abilityContext) { console.log("------------Singlehap_LifeCycleTest_1400 start-------------"); TAG = "Singlehap_LifeCycleTest_1400"; listKeyTemp = []; - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycle_xts", abilityName: "MainAbility9" }, (error, data) => { @@ -1078,7 +1077,7 @@ export default function lifecycleTest(abilityContext) { ",data: " + JSON.stringify(data)); }); await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycle_xts", abilityName: "Hap1MainAbility2" }, (error, data) => { @@ -1086,7 +1085,7 @@ export default function lifecycleTest(abilityContext) { ",data: " + JSON.stringify(data)); }); await sleep(500); - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.lifecycle_xts", abilityName: "Hap1MainAbility2" }, (error, data) => { @@ -1137,7 +1136,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility11", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1148,7 +1147,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1164,7 +1163,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility11", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1175,7 +1174,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1228,7 +1227,7 @@ export default function lifecycleTest(abilityContext) { console.log("------------Singlehap_LifeCycleTest_1600 START-------------"); TAG = "Singlehap_LifeCycleTest_1600"; let code; - abilityContext.getApplicationContext() + globalThis.abilityContext.getApplicationContext() .unregisterAbilityLifecycleCallback(callbackid_NA, (error, data) => { console.log(TAG + ": unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error) + ",data: " + JSON.stringify(data)); @@ -1249,7 +1248,7 @@ export default function lifecycleTest(abilityContext) { console.log("------------Singlehap_LifeCycleTest_1700 START-------------"); TAG = "Singlehap_LifeCycleTest_1700"; let code; - abilityContext.getApplicationContext() + globalThis.abilityContext.getApplicationContext() .unregisterAbilityLifecycleCallback(callbackid_errorNum, (error, data) => { console.log(TAG + ": unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error) + ",data: " + JSON.stringify(data)); @@ -1270,7 +1269,7 @@ export default function lifecycleTest(abilityContext) { console.log("------------Singlehap_LifeCycleTest_1800 START-------------"); TAG = "Singlehap_LifeCycleTest_1800"; let code; - abilityContext.getApplicationContext() + globalThis.abilityContext.getApplicationContext() .unregisterAbilityLifecycleCallback(callbackid_errorType, (error, data) => { console.log(TAG + ": unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error) + ",data: " + JSON.stringify(data)); @@ -1291,7 +1290,7 @@ export default function lifecycleTest(abilityContext) { console.log("------------Singlehap_LifeCycleTest_1900 START-------------"); TAG = "Singlehap_LifeCycleTest_1900"; let code; - abilityContext.getApplicationContext() + globalThis.abilityContext.getApplicationContext() .unregisterAbilityLifecycleCallback(null, (error, data) => { console.log(TAG + ": unregisterAbilityLifecycleCallback success, err: " + JSON.stringify(error) + ",data: " + JSON.stringify(data)); @@ -1317,7 +1316,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility12", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1328,7 +1327,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1360,7 +1359,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility12", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1371,7 +1370,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1429,7 +1428,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility1", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1440,7 +1439,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility12", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1451,7 +1450,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str2) + globalThis.globalThis.abilityContext.startAbility(str2) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1504,7 +1503,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility1", } - globalThis.abilityContext.startAbility(str) + globalThis.globalThis.abilityContext.startAbility(str) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1515,7 +1514,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility12", } - globalThis.abilityContext.startAbility(str1) + globalThis.globalThis.abilityContext.startAbility(str1) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { @@ -1526,7 +1525,7 @@ export default function lifecycleTest(abilityContext) { "bundleName": "com.example.lifecycle_xts", "abilityName": "MainAbility2", } - globalThis.abilityContext.startAbility(str2) + globalThis.globalThis.abilityContext.startAbility(str2) .then((data) => { console.info(TAG + ' start successful. Data: ' + data); }).catch((error) => { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/ListTest.ets b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/List.test.ets similarity index 91% rename from ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/ListTest.ets rename to ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/List.test.ets index 52033a45e09dc7c62a41655a5592dbc594ff722d..a5ca24032b95c2df3b13b42eb77d52f678246aa1 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/ListTest.ets +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/List.test.ets @@ -15,7 +15,7 @@ import LifeCycleTest from './LifeCycleTest' import Test from './Test' -export default function List(context) { - LifeCycleTest(context) +export default function List() { + LifeCycleTest() // Test(context) } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/resources/base/profile/main_pages.json index cb0b24346e7ce5917da687182a8574c14f1d6900..8f499d32407fe2498b34f2a71237818e3c73f61a 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/resources/base/profile/main_pages.json +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/resources/base/profile/main_pages.json @@ -1,19 +1,19 @@ { "src": [ - "pages/index", - "pages/index1", - "pages/index2", - "pages/index3", - "pages/index4", - "pages/index5", - "pages/index6", - "pages/index7", - "pages/index8", - "pages/index9", - "pages/index10", - "pages/index11", - "pages/index12", - "pages/indexh1a1", - "pages/indexh1a2" + "MainAbility/pages/index", + "MainAbility/pages/index1", + "MainAbility/pages/index2", + "MainAbility/pages/index3", + "MainAbility/pages/index4", + "MainAbility/pages/index5", + "MainAbility/pages/index6", + "MainAbility/pages/index7", + "MainAbility/pages/index8", + "MainAbility/pages/index9", + "MainAbility/pages/index10", + "MainAbility/pages/index11", + "MainAbility/pages/index12", + "MainAbility/pages/indexh1a1", + "MainAbility/pages/indexh1a2" ] }