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 748877217560592fb5bb32eedb9a3937d77b4e33..b814a3c48f1fbb89d334e63fb426017b1ea77f25 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 5e71586a799730bb64528b6d1def624ca8636485..233c0b837a9e4880b907a3f2c44e8ba1338d2cce 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 6080fed293892ae69748f515f217c1b61e9fea95..62d7cf423e47430eb466c0ef988b3d38aa8f7e72 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 4b642e9ef4da6fc68f45291b8e583d6dc246a9b4..bac786495b7ebd19092a4fba1662ffe91cb1780b 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 a7c742da9e01284faf958a25d6c7368e9b8756b1..cd2c8ac41c0d679330dd64880fa495a0ebd88e3a 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 2b105766e4898cff986987abc760a17b43b1422b..b5e048c7bb701440d937285437e27c94876013a7 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 9417fe93f1b1430d4440ba8a03269b4eb2bfa759..9798b69468e54beb678d552dd17d17a592d7a943 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 5ff92b663c942f72845a1e3bad60da82ba4678ac..269eef31564c74029663c2d168a33315e6663f80 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 43010250798084c322da8b728638a6ceeca0c69b..cb06a6e770b862da2a1d832425f4e18079524a9a 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 18a480f20d7c4dbac48ace298cc2713946da095c..819778e4a382140881d768693896cdd98f927b70 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 901087341aa196125ecf69cd1b61963ec6d09489..7d1f0f3d280bcb813d90bbe85a15a06296cd54e3 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 46d99db918d22083aeb81000ad5b9d751d9dcfa0..fdfab03ef658f7c572dd10cf99bc13cbb716b05f 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(); } })