diff --git a/entry/src/ohosTest/ets/testability/TestAbility.ets b/entry/src/ohosTest/ets/testability/TestAbility.ets index 48f4545..80cfe1f 100644 --- a/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -21,18 +21,25 @@ import testsuite from '../test/List.test'; import window from '@ohos.window'; import Want from '@ohos.app.ability.Want'; import AbilityConstant from '@ohos.app.ability.AbilityConstant'; +import { BusinessError } from '@ohos.base'; export default class TestAbility extends UIAbility { onCreate(want: Want, launchParam: AbilityConstant.LaunchParam) { hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onCreate'); - hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? ''); + try{ + hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? ''); + } catch (err) { + let code: number = (err as BusinessError).code; + let message: string = (err as BusinessError).message; + hilog.info(0x0000, 'testTag', `print want failed: code: ${code}, message: ${message}`); + } hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:' + JSON.stringify(launchParam) ?? ''); - let abilityDelegator: AbilityDelegatorRegistry.AbilityDelegator - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - let abilityDelegatorArguments: AbilityDelegatorRegistry.AbilityDelegatorArgs - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + let abilityDelegator: AbilityDelegatorRegistry.AbilityDelegator; + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator(); + let abilityDelegatorArguments: AbilityDelegatorRegistry.AbilityDelegatorArgs; + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments(); hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!'); - Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite); } onDestroy() { @@ -46,8 +53,7 @@ export default class TestAbility extends UIAbility { hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); return; } - hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', - JSON.stringify(data) ?? ''); + hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); }); } diff --git a/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 9a7ed07..6eb3824 100644 --- a/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -16,46 +16,50 @@ import hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; +import { BusinessError } from '@ohos.base'; -var abilityDelegator = undefined -var abilityDelegatorArguments = undefined +let abilityDelegator = undefined; +let abilityDelegatorArguments = undefined; -async function onAbilityCreateCallback() { +async function onAbilityCreateCallback(): Promise { hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback'); } -async function addAbilityMonitorCallback(err: any) { - hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? ''); +async function addAbilityMonitorCallback(err: BusinessError): Promise { + hilog.info(0x0000, 'testTag', `addAbilityMonitorCallback: code: ${err?.code}, message: ${err?.message}`); } export default class OpenHarmonyTestRunner implements TestRunner { constructor() { } - onPrepare() { + onPrepare(): void { hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare '); } - async onRun() { + async onRun(): Promise { hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run'); - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments(); + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorArguments.bundleName; const testAbilityName = 'TestAbility'; let lMonitor = { abilityName: testAbilityName, onAbilityCreate: onAbilityCreateCallback, }; - abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback); const want = { bundleName: bundleName, abilityName: testAbilityName }; abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator(); - abilityDelegator.startAbility(want, (err: any, data: any) => { - hilog.info(0x0000, 'testTag', 'startAbility : err : %{public}s', JSON.stringify(err) ?? ''); - hilog.info(0x0000, 'testTag', 'startAbility : data : %{public}s', JSON.stringify(data) ?? ''); - }) + try { + abilityDelegator.startAbility(want); + } catch (err) { + let code: number = (err as BusinessError).code; + let message: string = (err as BusinessError).message; + hilog.info(0x0000, 'testTag', `startAbility failed: code: ${code}, message: ${message}`); + } hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end'); } } \ No newline at end of file