From 5928ecd8f877ba54e5e75700d818a95499cb5657 Mon Sep 17 00:00:00 2001 From: jiyong_sd Date: Mon, 1 Aug 2022 11:51:33 +0800 Subject: [PATCH] Adapt to the new framework Signed-off-by: jiyong_sd Change-Id: I35e061b6637585c8c51b0bf3d530f6d9f014f66e --- .../apicover/apicoverhaptest/Test.json | 8 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../pages/MainAbility_pages.ets | 30 +++---- .../src/main/ets/TestAbility/TestAbility.ts | 50 ++++++++++++ .../src/main/ets/TestAbility/pages/index.ets | 48 ++++++++++++ .../ets/TestRunner/OpenHarmonyTestRunner.ts | 78 +++++++++++++++++++ .../main/ets/test/ApiCoverAbility.test.ets | 48 ++++++------ .../ets/test/ContextEnvironmentTest.test.ets | 2 +- .../ets/test/{ListTest.ets => List.test.ets} | 8 +- .../src/main/ets/test/VerificationTest.ets | 24 +++--- .../src/main/ets/test/WantAgentCover.test.ets | 6 +- .../resources/base/profile/main_pages.json | 2 +- .../actsamsprocessmultiinstancetest/Test.json | 10 ++- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../{ => MainAbility}/pages/index/index.ets | 30 +++---- .../{ => MainAbility}/pages/second/second.ets | 0 .../src/main/ets/TestAbility/TestAbility.ts | 50 ++++++++++++ .../src/main/ets/TestAbility/pages/index.ets | 48 ++++++++++++ .../ets/TestRunner/OpenHarmonyTestRunner.ts | 78 +++++++++++++++++++ .../entry/src/main/ets/test/Ability.test.ets | 30 +++---- .../entry/src/main/ets/test/List.test.ets | 4 +- .../resources/base/profile/main_pages.json | 4 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- 23 files changed, 450 insertions(+), 114 deletions(-) rename ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/{ => MainAbility}/pages/MainAbility_pages.ets (55%) create mode 100644 ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/TestAbility.ts create mode 100644 ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/pages/index.ets create mode 100644 ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/{ListTest.ets => List.test.ets} (87%) rename ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/{ => MainAbility}/pages/index/index.ets (60%) rename ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/{ => MainAbility}/pages/second/second.ets (100%) create mode 100644 ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/TestAbility.ts create mode 100644 ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/pages/index.ets create mode 100644 ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts diff --git a/ability/ability_runtime/apicover/apicoverhaptest/Test.json b/ability/ability_runtime/apicover/apicoverhaptest/Test.json index b315fe95b..87505c034 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/Test.json +++ b/ability/ability_runtime/apicover/apicoverhaptest/Test.json @@ -1,10 +1,12 @@ { "description": "Configuration for hjunit demo Tests", "driver": { - "type": "JSUnitTest", + "type": "OHJSUnitTest", "test-timeout": "180000", - "package": "com.example.apicoverhaptest", - "shell-timeout": "600000" + "bundle-name": "com.example.apicoverhaptest", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 70000 }, "kits": [ { diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/MainAbility.ts index 65885eb43..83be6c5a2 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -30,7 +30,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/apicover/apicoverhaptest/entry/src/main/ets/pages/MainAbility_pages.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/pages/MainAbility_pages.ets similarity index 55% rename from ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/pages/MainAbility_pages.ets rename to ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/pages/MainAbility_pages.ets index 50269f6de..ecf02975d 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/pages/MainAbility_pages.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/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" -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/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 000000000..89a847305 --- /dev/null +++ b/ability/ability_runtime/apicover/apicoverhaptest/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/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/pages/index.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 000000000..b93567f96 --- /dev/null +++ b/ability/ability_runtime/apicover/apicoverhaptest/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/apicover/apicoverhaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 000000000..5a587ba74 --- /dev/null +++ b/ability/ability_runtime/apicover/apicoverhaptest/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.apicoverhaptest.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/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets index 2471dd5d6..7d18d34f7 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets @@ -12,7 +12,7 @@ * 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" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' import formProvider from '@ohos.application.formProvider'; import FormInfo from '@ohos.application.formInfo'; @@ -24,7 +24,7 @@ var array = new Array(); function sleep(time) { return new Promise((resolve)=>setTimeout(resolve,time)); } -export default function ApiCoverTest(abilityContext) { +export default function ApiCoverTest() { describe('ApiCoverTestTest', function () { /* @@ -39,7 +39,7 @@ export default function ApiCoverTest(abilityContext) { bundleName: "com.example.extensionapitest", abilityName: "FirstExtension1" }; - await abilityContext.startServiceExtensionAbility(want).then((data) => { + await globalThis.abilityContext.startServiceExtensionAbility(want).then((data) => { console.log('Ability: startServiceExtensionAbility success:' + JSON.stringify(data)); expect("case execute failed").assertEqual(data); }).catch((error) => { @@ -61,7 +61,7 @@ export default function ApiCoverTest(abilityContext) { bundleName: "com.example.extensionapitest1", abilityName: "FirstExtension" }; - await abilityContext.stopServiceExtensionAbility(want).then((data) => { + await globalThis.abilityContext.stopServiceExtensionAbility(want).then((data) => { console.log(`Ability: stopServiceExtensionAbility success: ${JSON.stringify(data)}`); expect("case execute failed").assertEqual(data); }).catch((error) => { @@ -83,7 +83,7 @@ export default function ApiCoverTest(abilityContext) { bundleName: "com.example.extensionapitest", abilityName: "FirstExtension" }; - await abilityContext.startServiceExtensionAbilityWithAccount(want, 999).then((data) => { + await globalThis.abilityContext.startServiceExtensionAbilityWithAccount(want, 999).then((data) => { console.log(`Ability: startServiceExtensionAbilityWithAccount success: ${JSON.stringify(data)}`); expect("case execute failed").assertEqual("data"); }).catch((error) => { @@ -105,7 +105,7 @@ export default function ApiCoverTest(abilityContext) { bundleName: "com.example.extensionapitest", abilityName: "FirstExtension" }; - await abilityContext.stopServiceExtensionAbilityWithAccount(want, 999).then((data) => { + await globalThis.abilityContext.stopServiceExtensionAbilityWithAccount(want, 999).then((data) => { console.log(`Ability: stopServiceExtensionAbilityWithAccount success: ${JSON.stringify(data)}`); expect("case execute failed").assertEqual(data); }).catch((error) => { @@ -127,7 +127,7 @@ export default function ApiCoverTest(abilityContext) { bundleName: "com.example.extensionapitest", abilityName: "FirstExtension1" } - await abilityContext.startServiceExtensionAbility(want, (err, data) => { + await globalThis.abilityContext.startServiceExtensionAbility(want, (err, data) => { if (err.code) { console.error(`Ability: startServiceExtensionAbility failed: ${JSON.stringify(err)}`); expect(EXTENSION_INFO_ERR).assertEqual(err.code); @@ -151,7 +151,7 @@ export default function ApiCoverTest(abilityContext) { bundleName: "com.example.extensionapitest1", abilityName: "FirstExtension" }; - await abilityContext.stopServiceExtensionAbility(want, (err, data) => { + await globalThis.abilityContext.stopServiceExtensionAbility(want, (err, data) => { if (err.code) { console.error(`Ability: stopServiceExtensionAbility failed: ${JSON.stringify(err)}`); expect(EXTENSION_INFO_ERR).assertEqual(err.code); @@ -176,7 +176,7 @@ export default function ApiCoverTest(abilityContext) { bundleName: "com.example.extensionapitest", abilityName: "FirstExtension" }; - await abilityContext.startServiceExtensionAbilityWithAccount(want, 999, (err, data) => { + await globalThis.abilityContext.startServiceExtensionAbilityWithAccount(want, 999, (err, data) => { if (err.code) { console.error(`Ability: startServiceExtensionAbilityWithAccount failed: ${JSON.stringify(err)}`); expect(USERID_ERR).assertEqual(err.code); @@ -200,7 +200,7 @@ export default function ApiCoverTest(abilityContext) { bundleName: "com.example.extensionapitest", abilityName: "FirstExtension" }; - abilityContext.stopServiceExtensionAbilityWithAccount(want, 999, (err, data) => { + globalThis.abilityContext.stopServiceExtensionAbilityWithAccount(want, 999, (err, data) => { if (err.code) { console.error(`Ability: stopServiceExtensionAbilityWithAccount failed: ${JSON.stringify(err)}`); expect(USERID_ERR).assertEqual(err.code); @@ -219,17 +219,17 @@ export default function ApiCoverTest(abilityContext) { * @tc.level 3 */ it('SUB_AA_AMS_Context_0100', 0, async function (done) { - expect("/data/storage/el2/base/haps/phone/cache").assertEqual(abilityContext.cacheDir) - expect("/data/storage/el2/base/haps/phone/temp").assertEqual(abilityContext.tempDir) - expect("/data/storage/el2/base/haps/phone/files").assertEqual(abilityContext.filesDir) - expect("/data/storage/el2/database/phone").assertEqual(abilityContext.databaseDir) - expect("/data/storage/el2/base/haps/phone/preferences").assertEqual(abilityContext.preferencesDir) - expect("/data/storage/el1/bundle").assertEqual(abilityContext.bundleCodeDir) - expect("/data/storage/el2/distributedfiles").assertEqual(abilityContext.distributedFilesDir) - expect(1).assertEqual(abilityContext.area) - let moduleContext = abilityContext.createModuleContext("module1") + expect("/data/storage/el2/base/haps/phone/cache").assertEqual(globalThis.abilityContext.cacheDir) + expect("/data/storage/el2/base/haps/phone/temp").assertEqual(globalThis.abilityContext.tempDir) + expect("/data/storage/el2/base/haps/phone/files").assertEqual(globalThis.abilityContext.filesDir) + expect("/data/storage/el2/database/phone").assertEqual(globalThis.abilityContext.databaseDir) + expect("/data/storage/el2/base/haps/phone/preferences").assertEqual(globalThis.abilityContext.preferencesDir) + expect("/data/storage/el1/bundle").assertEqual(globalThis.abilityContext.bundleCodeDir) + expect("/data/storage/el2/distributedfiles").assertEqual(globalThis.abilityContext.distributedFilesDir) + expect(1).assertEqual(globalThis.abilityContext.area) + let moduleContext = globalThis.abilityContext.createModuleContext("module1") expect("/data/storage/el2/base/cache").assertEqual(moduleContext.cacheDir) - abilityContext.resourceManager.getConfiguration((err, data) => { + globalThis.abilityContext.resourceManager.getConfiguration((err, data) => { if(err == undefined){ console.log(`Ability: getConfiguration success: ${JSON.stringify(data)}`); console.log(`Ability: getConfiguration success: JSON.stringify(data.direction)`); @@ -249,14 +249,14 @@ export default function ApiCoverTest(abilityContext) { * @tc.level 3 */ it('SUB_AA_AMS_Context_0200', 0, async function (done) { - await abilityContext.eventHub.on("contextEvent", func1) - abilityContext.eventHub.emit("contextEvent", "aa", "bb") + await globalThis.abilityContext.eventHub.on("contextEvent", func1) + globalThis.abilityContext.eventHub.emit("contextEvent", "aa", "bb") await sleep(500) expect("aa").assertEqual(array[0]) expect("bb").assertEqual(array[1]) array = [] - await abilityContext.eventHub.off("contextEvent", func1) - abilityContext.eventHub.emit("contextEvent", "cc", "dd") + await globalThis.abilityContext.eventHub.off("contextEvent", func1) + globalThis.abilityContext.eventHub.emit("contextEvent", "cc", "dd") await sleep(500) expect(array.length).assertEqual(0) array = []; diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ContextEnvironmentTest.test.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ContextEnvironmentTest.test.ets index de69fff7f..66112e138 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ContextEnvironmentTest.test.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ContextEnvironmentTest.test.ets @@ -12,7 +12,7 @@ * 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" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' var TAG: string = '' export default function ContextEnvironmentTest(applicationContext) { diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ListTest.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/List.test.ets similarity index 87% rename from ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ListTest.ets rename to ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/List.test.ets index ae9b5e903..23781d4ad 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ListTest.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/List.test.ets @@ -18,10 +18,10 @@ import verificationTest from './VerificationTest' import wantAgentCover from './WantAgentCover.test' import contextEnvironmentTest from './ContextEnvironmentTest.test'; -export default function List(context) { +export default function List() { - apiCoverAbility(context) - verificationTest(context) - wantAgentCover(context) + apiCoverAbility() + verificationTest() + wantAgentCover() contextEnvironmentTest(globalThis.applicationContext) } \ No newline at end of file diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets index d3a338cab..6a1ba6268 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets @@ -12,14 +12,14 @@ * 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" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' import commonEvent from '@ohos.commonEvent'; import AbilityConstant from "@ohos.application.AbilityConstant"; import appManager from "@ohos.application.appManager"; import wantConstant from '@ohos.ability.wantConstant'; var TAG -export default function verificationTest(abilityContext){ +export default function verificationTest(){ describe('VerificationTestTest', function() { @@ -62,7 +62,7 @@ export default function verificationTest(abilityContext){ bundleName: 'ohos.acts.aafwk.test.fasupplement', abilityName: 'ohos.acts.aafwk.test.fasupplement.MainAbility' } - abilityContext.startAbility(wantNum).then((data) => { + globalThis.abilityContext.startAbility(wantNum).then((data) => { console.info(TAG + "startAbility data = " + JSON.stringify(data)); }).catch((err) => { console.info(TAG + "startAbility err = " + JSON.stringify(err)); @@ -125,7 +125,7 @@ export default function verificationTest(abilityContext){ bundleName: 'ohos.acts.aafwk.test.stagesupplement', abilityName: 'MainAbility3' } - abilityContext.startAbility(wantNum).then((data) => { + globalThis.abilityContext.startAbility(wantNum).then((data) => { console.info(TAG + "startAbility data = " + JSON.stringify(data)); }).catch((err) => { console.info(TAG + "startAbility err = " + JSON.stringify(err)); @@ -202,7 +202,7 @@ export default function verificationTest(abilityContext){ bundleName: 'ohos.acts.aafwk.test.stagesupplement', abilityName: 'MainAbility4' } - abilityContext.startAbility(wantNum).then((data) => { + globalThis.abilityContext.startAbility(wantNum).then((data) => { console.info(TAG + "startAbility data = " + JSON.stringify(data)); }).catch((err) => { console.info(TAG + "startAbility err = " + JSON.stringify(err)); @@ -258,7 +258,7 @@ export default function verificationTest(abilityContext){ bundleName: 'ohos.acts.aafwk.test.fasupplement', abilityName: 'ohos.acts.aafwk.test.fasupplement.MainAbility2' } - abilityContext.startAbility(wantNum).then((data) => { + globalThis.abilityContext.startAbility(wantNum).then((data) => { console.info(TAG + "startAbility data = " + JSON.stringify(data)); }).catch((err) => { console.info(TAG + "startAbility err = " + JSON.stringify(err)); @@ -285,14 +285,14 @@ export default function verificationTest(abilityContext){ let label = undefined let code1 = 0 let code2 = 0 - abilityContext.setMissionLabel(label).then((data) => { + globalThis.abilityContext.setMissionLabel(label).then((data) => { console.info(TAG + "setMissionLabel data = " + JSON.stringify(data)); }).catch((err) => { code1 = err.code console.info(TAG + "setMissionLabel err = " + JSON.stringify(err)); }); - abilityContext.setMissionLabel(label, (err, data) => { + globalThis.abilityContext.setMissionLabel(label, (err, data) => { code2 = err.code console.info(TAG + "setMissionLabel err = " + JSON.stringify(err)); console.info(TAG + "setMissionLabel data = " + JSON.stringify(data)); @@ -352,7 +352,7 @@ export default function verificationTest(abilityContext){ bundleName: 'ohos.acts.aafwk.test.stagesupplement', abilityName: 'MainAbility5' } - abilityContext.startAbility(wantNum).then((data) => { + globalThis.abilityContext.startAbility(wantNum).then((data) => { console.info(TAG + "startAbility data = " + JSON.stringify(data)); }).catch((err) => { console.info(TAG + "startAbility err = " + JSON.stringify(err)); @@ -415,8 +415,8 @@ export default function verificationTest(abilityContext){ bundleName: 'ohos.acts.aafwk.test.stagesupplement', abilityName: 'MainAbility9' } - abilityContext.startAbility(wantNum).then((data) => { - value = abilityContext.restoreWindowStage(undefined); + globalThis.abilityContext.startAbility(wantNum).then((data) => { + value = globalThis.abilityContext.restoreWindowStage(undefined); console.info(TAG + "startAbility data = " + JSON.stringify(data) + ";" + JSON.stringify(data)); }).catch((err) => { console.info(TAG + "startAbility err = " + JSON.stringify(err)); @@ -475,7 +475,7 @@ export default function verificationTest(abilityContext){ bundleName: 'ohos.acts.aafwk.test.stagesupplement', abilityName: 'MainAbility10' } - abilityContext.startAbility(wantNum).then((data) => { + globalThis.abilityContext.startAbility(wantNum).then((data) => { console.info(TAG + "startAbility data = " + JSON.stringify(data)); }).catch((err) => { console.info(TAG + "startAbility err = " + JSON.stringify(err)); diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/WantAgentCover.test.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/WantAgentCover.test.ets index 4ed62d1f5..03f08edb4 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/WantAgentCover.test.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/WantAgentCover.test.ets @@ -12,11 +12,11 @@ * 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" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' import wantAgent from '@ohos.wantAgent'; var TAG -export default function wantAgentCoverTest(abilityContext) { +export default function wantAgentCoverTest() { describe('WantAgentTest', function () { /* @@ -29,7 +29,7 @@ export default function wantAgentCoverTest(abilityContext) { TAG = 'SUB_AA_OpenHarmony_WantAgentCover_0100 ==>'; try { - let status:any = abilityContext.stageMode + let status:any = globalThis.abilityContext.stageMode let code1 = undefined var wantAgentInfo = { wants: [ diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/resources/base/profile/main_pages.json index dfdf94057..81691245b 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/resources/base/profile/main_pages.json +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/resources/base/profile/main_pages.json @@ -1,5 +1,5 @@ { "src": [ - "pages/MainAbility_pages" + "MainAbility/pages/MainAbility_pages" ] } \ No newline at end of file diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/Test.json index 797855ab7..12dcc4940 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/Test.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/Test.json @@ -1,10 +1,12 @@ { "description": "Configuration for hjunit demo Tests", "driver": { - "type": "JSUnitTest", - "test-timeout": "120000", - "package": "com.example.processmultiinstance", - "shell-timeout": "300000" + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.example.processmultiinstance", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 70000 }, "kits": [ { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts index 10dd9a1ea..5d9cb94eb 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -30,7 +30,7 @@ export default class MainAbility extends Ability { // Main window is created, set main page for this ability console.log("MainAbility onWindowStageCreate") globalThis.abilityContext = this.context - windowStage.setUIContent(this.context, "pages/index/index", null) + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) } onWindowStageDestroy() { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/pages/index/index.ets b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/pages/index/index.ets similarity index 60% rename from ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/pages/index/index.ets rename to ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/pages/index/index.ets index 37b86f509..bebda07c2 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/pages/index/index.ets +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -12,10 +12,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" -import testsuite from "../../test/List.test.ets" +import router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' @Entry @@ -24,22 +24,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() - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) - globalThis.abilityWant.parameters.timeout = 70000; - configService.setConfig(globalThis.abilityWant.parameters) - testsuite(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/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/pages/second/second.ets similarity index 100% rename from ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/pages/second/second.ets rename to ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/pages/second/second.ets diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 000000000..89a847305 --- /dev/null +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/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/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/pages/index.ets b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 000000000..b93567f96 --- /dev/null +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/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/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 000000000..ef159ca0a --- /dev/null +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/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.processmultiinstance.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/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/test/Ability.test.ets index 84d48fea8..860b27fab 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/test/Ability.test.ets @@ -35,7 +35,7 @@ var processNameA = "com.example.multiinstancehapa"; var processNameB = "com.example.multiinstancehapb"; var processNameC = "com.example.multiinstancehapc"; -export default function abilityTest(abilityContext) { +export default function abilityTest() { describe('ActsProcessMultiInstanceTest', function () { afterEach(async (done) => { @@ -138,14 +138,14 @@ export default function abilityTest(abilityContext) { done(); } } - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapba.MainAbility", }, (err, data) => { console.log('ACTS_Process_MultiInstance_0100 - startAbilityhapba: ' + JSON.stringify(err) + ", " + JSON.stringify(data)) }) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbb.MainAbility", }, (err, data) => { @@ -247,14 +247,14 @@ export default function abilityTest(abilityContext) { done(); } } - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbc.MainAbility", }, (err, data) => { console.log('ACTS_Process_MultiInstance_0200 - startAbilityhapbc: ' + JSON.stringify(err) + ", " + JSON.stringify(data)) }) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbd.MainAbility", }, (err, data) => { @@ -361,14 +361,14 @@ export default function abilityTest(abilityContext) { done(); } } - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbd.MainAbility", }, (err, data) => { console.log('ACTS_Process_MultiInstance_0300 - startAbilityhapbd: ' + JSON.stringify(err) + ", " + JSON.stringify(data)) }) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbe.MainAbility", }, (err, data) => { @@ -472,14 +472,14 @@ export default function abilityTest(abilityContext) { done(); } } - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapba.MainAbility", }, (err, data) => { console.log('ACTS_Process_MultiInstance_0400 - startAbilityhapba: ' + JSON.stringify(err) + ", " + JSON.stringify(data)) }) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbf.MainAbility", }, (err, data) => { @@ -583,14 +583,14 @@ export default function abilityTest(abilityContext) { done(); } } - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapa", abilityName: "com.example.multiinstancehapaa.MainAbility", }, (err, data) => { console.log('ACTS_Process_MultiInstance_0500 - startAbilityhapaa: ' + JSON.stringify(err) + ", " + JSON.stringify(data)) }) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbe.MainAbility", }, (err, data) => { @@ -697,14 +697,14 @@ export default function abilityTest(abilityContext) { done(); } } - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapa", abilityName: "com.example.multiinstancehapaa.MainAbility", }, (err, data) => { console.log('ACTS_Process_MultiInstance_0600 - startAbilityhapaa: ' + JSON.stringify(err) + ", " + JSON.stringify(data)) }) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbf.MainAbility", }, (err, data) => { @@ -810,14 +810,14 @@ export default function abilityTest(abilityContext) { done(); } } - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapa", abilityName: "com.example.multiinstancehapab.MainAbility", }, (err, data) => { console.log('ACTS_Process_MultiInstance_0700 - startAbilityhapab: ' + JSON.stringify(err) + ", " + JSON.stringify(data)) }) - abilityContext.startAbility({ + globalThis.abilityContext.startAbility({ bundleName: "com.example.multiinstancehapb", abilityName: "com.example.multiinstancehapbc.MainAbility", }, (err, data) => { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/test/List.test.ets b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/test/List.test.ets index 882f978e7..f6a5bd8d9 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/test/List.test.ets +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/test/List.test.ets @@ -15,8 +15,8 @@ import abilityTest from './Ability.test.ets' -export default function testsuite(context) { +export default function testsuite() { - abilityTest(context) + abilityTest() } \ No newline at end of file diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/resources/base/profile/main_pages.json index 6898b31d2..02221db61 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/resources/base/profile/main_pages.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/resources/base/profile/main_pages.json @@ -1,6 +1,6 @@ { "src": [ - "pages/index/index", - "pages/second/second" + "MainAbility/pages/index/index", + "MainAbility/pages/second/second" ] } \ No newline at end of file diff --git a/barrierfree/accessibilityconfig/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityconfig/entry/src/main/ets/TestAbility/TestAbility.ts index a8203eae9..59ddb82ad 100644 --- a/barrierfree/accessibilityconfig/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityconfig/entry/src/main/ets/TestAbility/TestAbility.ts @@ -14,7 +14,7 @@ */ import Ability from '@ohos.application.Ability' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -import { Hypium } from 'hypium/index' +import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' export default class TestAbility extends Ability { -- GitLab