From 3219d55d47e4495a2e29ff52d423dd3c7653d520 Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Tue, 23 Aug 2022 16:35:25 +0800 Subject: [PATCH] =?UTF-8?q?XTS=E6=B5=8B=E8=AF=95=E5=A5=97UN/FAILED?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../main/js/test/MangerAbilityJsunit.test.js | 1 + .../src/main/ets/MainAbility2/MainAbility2.ts | 4 +-- .../src/main/ets/MainAbility3/MainAbility3.ts | 4 +-- .../entry/src/main/ets/test/Ability.test.ets | 30 +++++++++---------- 12 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/js/test/MangerAbilityJsunit.test.js index 748877217..b814a3c48 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -35,6 +35,7 @@ export default function ActsAmsCallBackFirstScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/js/test/MangerAbilityJsunit.test.js index 5e71586a7..233c0b837 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -86,6 +86,7 @@ export default function ActsAmsCallBackFourthScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/js/test/MangerAbilityJsunit.test.js index 6080fed29..62d7cf423 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -52,6 +52,7 @@ export default function ActsAmsCallBackSecondScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/js/test/MangerAbilityJsunit.test.js index 4b642e9ef..bac786495 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -52,6 +52,7 @@ export default function ActsAmsCallBackThirdScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/js/test/MangerAbilityJsunit.test.js index a7c742da9..cd2c8ac41 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -106,6 +106,7 @@ export default function ActsAmsTestFifthScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/js/test/MangerAbilityJsunit.test.js index 2b105766e..b5e048c7b 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -40,6 +40,7 @@ export default function ActsAmsTestFirstScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/js/test/MangerAbilityJsunit.test.js index 9417fe93f..9798b6946 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -106,6 +106,7 @@ export default function ActsAmsTestFourthScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/js/test/MangerAbilityJsunit.test.js index 5ff92b663..269eef315 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -62,6 +62,7 @@ export default function ActsAmsTestSecondScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/js/test/MangerAbilityJsunit.test.js index 430102507..cb06a6e77 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -63,6 +63,7 @@ export default function ActsAmsTestThirdScene() { ' + error.code + ', data length [' + data.length + ']'); } ); + sleep(500); done(); }); diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 18a480f20..819778e4a 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -16,7 +16,7 @@ import Ability from '@ohos.application.Ability' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_StartAbility_0100_CommonEvent====>"); - globalThis.abilityContext.terminateSelf().then(()=>{ + globalThis.abilityContext2.terminateSelf().then(()=>{ commonEvent.publish("ACTS_TerminateSelf_CommonEvent", PublishCallBackTwo); console.debug("====>publish ACTS_TerminateSelf_CommonEvent finish====>") }); @@ -40,7 +40,7 @@ export default class MainAbility2 extends Ability { onWindowStageCreate(windowStage) { // Main window is created, set main page for this ability console.log("MainAbility2 onWindowStageCreate") - globalThis.abilityContext = this.context + globalThis.abilityContext2 = this.context windowStage.setUIContent(this.context, "MainAbility/pages/index/second", null) commonEvent.publish("ACTS_InterfaceMultiUsers_0100_Start_CommonEvent", PublishCallBackOne); } diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 901087341..7d1f0f3d2 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -28,9 +28,9 @@ export default class MainAbility3 extends Ability { onWindowStageCreate(windowStage) { // Main window is created, set main page for this ability console.log("MainAbility3 onWindowStageCreate") - globalThis.abilityContext = this.context + globalThis.abilityContext3 = this.context windowStage.setUIContent(this.context, "MainAbility/pages/index/second", null) - globalThis.abilityContext.terminateSelfWithResult( + globalThis.abilityContext3.terminateSelfWithResult( { resultCode:1, want:{ diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/test/Ability.test.ets index 46d99db91..fdfab03ef 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/test/Ability.test.ets @@ -44,35 +44,33 @@ export default function killProcessWithAccountTest() { beforeEach(async (done) => { - console.log('======>beforeEach killProcessWithAccountTest<======='); + console.log('======>beforeEach killProcessWithAccountTest<=======' + flag); if(flag == false){ - setTimeout(()=>{ - globalThis.abilityContext.startAbilityWithAccount( + setTimeout(async ()=>{ + await globalThis.abilityContext.startAbilityWithAccount( { bundleName: 'com.acts.killprocesswithaccountpackage', abilityName: 'com.acts.killprocesswithaccountpackage.MainAbility' - }, ACCOUNT_ID, - { - windowMode: 2, - displayId: 1 - }).then(() => { + }, ACCOUNT_ID).then(() => { console.log(" ====>ACTS_KillProcessWithAccount startability ====> success! ") - done(); + }).catch((error) => { + console.log(" ====>ACTS_KillProcessWithAccount startability ====> error: " + JSON.stringify(error)) }) + sleep(500); + done(); },1000) }else{ - globalThis.abilityContext.startAbilityWithAccount( + await globalThis.abilityContext.startAbilityWithAccount( { bundleName: 'com.acts.killprocesswithaccountpackage', abilityName: 'com.acts.killprocesswithaccountpackage.MainAbility' - }, ACCOUNT_ID, - { - windowMode: 2, - displayId: 1 - }).then(() => { + }, ACCOUNT_ID).then(() => { console.log(" ====>ACTS_KillProcessWithAccount startability ====> success! ") - done(); + }).catch((error) => { + console.log(" ====>ACTS_KillProcessWithAccount startability ====> error: " + JSON.stringify(error)) }) + sleep(500); + done(); } }) -- GitLab