From cac26bdc327731bc856672506eaec2e5a025ea8a Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Wed, 28 Sep 2022 20:35:58 +0800 Subject: [PATCH] =?UTF-8?q?XTS=E5=86=BB=E7=BB=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- .../entry/src/main/ets/test/Ability.test.ets | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 3 +- .../entry/src/main/ets/test/Ability.test.ets | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../ets/test/AbilityStageMonitor.test.ets | 20 +++++++++- .../entry/src/main/ets/test/Ability.test.ets | 40 +++++++++++-------- 7 files changed, 48 insertions(+), 23 deletions(-) diff --git a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/test/Ability.test.ets index c19ba35c7..22c198f9a 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/test/Ability.test.ets @@ -27,7 +27,7 @@ export default function abilityTest() { bundleName: "com.example.aacommandprintonetest", abilityName: "MainAbility" } - await globalThis.abilityTestContext.startAbility(wantInfo).then((data) => { + await globalThis.abilityContext.startAbility(wantInfo).then((data) => { console.log("ActsAACommandPrinOneTest startAbility data : " + JSON.stringify(data)); }).catch((err) => { console.log("ActsAACommandPrinOneTest startAbility err : " + JSON.stringify(err)); diff --git a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/test/Ability.test.ets index e7fa1a449..e65d90aeb 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/test/Ability.test.ets @@ -25,7 +25,7 @@ export default function abilityTest() { bundleName: "com.example.aacommandprintsynctest", abilityName: "MainAbility" } - await globalThis.abilityTestContext.startAbility(wantInfo).then((data) => { + await globalThis.abilityContext.startAbility(wantInfo).then((data) => { console.log("ActsAACommandPrintSyncTest startAbility data : " + JSON.stringify(data)); }).catch((err) => { console.log("ActsAACommandPrintSyncTest startAbility err : " + JSON.stringify(err)); diff --git a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/MainAbility/MainAbility.ts index 56c4ba65e..7d4790bc0 100644 --- a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -32,6 +32,7 @@ async function startAbilityTest(TAG, context) { export default class MainAbility extends Ability { async onCreate(want, launchParam) { + globalThis.abilityContext = this.context; console.log('MainAbility onCreate') let cmd: any let abilityDelegatorArguments: any @@ -315,8 +316,6 @@ export default class MainAbility extends Ability { onWindowStageCreate(windowStage) { console.log('MainAbility onWindowStageCreate') windowStage.setUIContent(this.context, 'pages/index', null) - - globalThis.abilityContext = this.context; } onWindowStageDestroy() { diff --git a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/test/Ability.test.ets index b71df96d3..31c993846 100644 --- a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/test/Ability.test.ets @@ -28,7 +28,7 @@ export default function abilityTest() { bundleName: "com.example.aacommandtest", abilityName: "MainAbility" } - await globalThis.abilityTestContext.startAbility(wantInfo).then((data) => { + await globalThis.abilityContext.startAbility(wantInfo).then((data) => { console.log("ActsAACommandTest startAbility data : " + JSON.stringify(data)); }).catch((err) => { console.log("ActsAACommandTest startAbility err : " + JSON.stringify(err)); diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/TestAbility/TestAbility.ts index aed2de264..d1317f99b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -19,6 +19,7 @@ import testsuite from '../test/List.test' export default class TestAbility extends Ability { onCreate(want, launchParam) { + globalThis.abilityContext = this.context; console.info('TestAbility onCreate') let abilityDelegatorArguments: any let abilityDelegator: any @@ -34,7 +35,6 @@ export default class TestAbility extends Ability { onWindowStageCreate(windowStage) { console.log('TestAbility onWindowStageCreate') windowStage.setUIContent(this.context, 'TestAbility/pages/index', null) - globalThis.abilityContext = this.context; } onWindowStageDestroy() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/test/AbilityStageMonitor.test.ets b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/test/AbilityStageMonitor.test.ets index 5f04d0fe4..8bdca59c2 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/test/AbilityStageMonitor.test.ets +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/test/AbilityStageMonitor.test.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { describe, it, expect } from '@ohos/hypium' +import { describe, it, expect, afterEach } from '@ohos/hypium' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' let abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator(); @@ -37,6 +37,24 @@ function test(time) { export default function abilityStageMonitorTest() { describe('ActsAbilityTest', function () { + afterEach(async (done) => { + console.log("SUB_AA_AbilityStageMonitor afterEach called"); + let wantInfo = { + bundleName: "com.example.abilitystagemonitortest", + abilityName: "TestAbility" + } + await globalThis.abilityContext.startAbility(wantInfo).then((data) => { + console.log("SUB_AA_AbilityStageMonitor startAbility data : " + JSON.stringify(data)); + }).catch((err) => { + console.log("SUB_AA_AbilityStageMonitor startAbility err : " + JSON.stringify(err)); + }) + + setTimeout(function () { + console.log("SUB_AA_AbilityStageMonitor afterEach called"); + done(); + }, 1000); + }) + /** * @tc.number: SUB_AA_AbilityStageMonitor_0100 * @tc.name: Call waitAbilityStageMonitor in the form of callback, and enter the monitor diff --git a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/test/Ability.test.ets index 31a1abf9d..175aa0c3f 100644 --- a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/test/Ability.test.ets @@ -15,6 +15,7 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import commonEvent from '@ohos.commonEvent' +import backgroundTaskManager from '@ohos.backgroundTaskManager'; let subscriberInfo = { events: ['onCreateMain_To_Test_CommonEvent', @@ -38,22 +39,29 @@ let flagNewWant = false; export default function abilityTest() { describe('ActsNewWantTest', function () { - afterEach(async (done) => { - console.log("ACTS_NewWant afterEach called"); - let wantInfo = { - bundleName: "com.example.newwanttest", - abilityName: "com.example.newwanttest.MainAbility" - } - await globalThis.abilityTestContext.startAbility(wantInfo).then((data) => { - console.log("ACTS_NewWant startAbility data : " + JSON.stringify(data)); - }).catch((err) => { - console.log("ACTS_NewWant startAbility err : " + JSON.stringify(err)); - }) - - setTimeout(function () { - console.log("ACTS_NewWant afterEach end"); - done(); - }, 1000); + let TAG1 = 'ACTS_NewWant_Test : ' + let id = undefined; + beforeAll(async (done) => { + console.log(TAG1 + "beforeAll called"); + let myReason = 'test ActsNewWantTest'; + let delayInfo = backgroundTaskManager.requestSuspendDelay(myReason, () => { + console.log(TAG1 + "Request suspension delay will time out."); + }) + id = delayInfo.requestId; + console.log(TAG1 + "requestId is : " + id); + setTimeout(function () { + console.log(TAG1 + "beforeAll end"); + done(); + }, 1000); + }) + + afterAll(async (done) => { + console.log(TAG1 + "afterAll called"); + backgroundTaskManager.cancelSuspendDelay(id); + setTimeout(function () { + console.log(TAG1 + "afterAll end"); + done(); + }, 1000); }) /** -- GitLab