From 39add58241a0191b04f01798a45d61d76416ea7f Mon Sep 17 00:00:00 2001 From: jiangwensai Date: Fri, 18 Mar 2022 15:20:38 +0800 Subject: [PATCH] fixed 949db63 from https://gitee.com/jiangwensai/xts_acts/pulls/2624 fix xts Signed-off-by: jiangwensai Change-Id: I83581927fb8da7bdc8785ccffe48dc599576dcec --- .../main/js/test/MangerAbilityJsunit.test.js | 9 ++- .../main/js/test/MangerAbilityJsunit.test.js | 21 ------- .../main/js/test/MangerAbilityJsunit.test.js | 21 ++++--- .../main/js/test/FeatureAbilityJsunit.test.js | 59 +------------------ 4 files changed, 23 insertions(+), 87 deletions(-) diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index 4f70cfd13..1ec7c4d7b 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -219,10 +219,17 @@ describe('ActsAmsCallBackFourthScene', function () { it('Acts_Ams_test_5600', 0, async function (done) { var maxnum = 30; var result = await missionManager.getMissionInfos("", maxnum); + let id = 0; for (var i = 0; i < result.length; i++) { console.info('Acts_Ams_test_5600 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); + if (result[i].want.abilityName != 'com.example.actsamscallbackfourthscene.MainAbility' && + result[i].runningState == 0) { + console.info('5600 id[' + result[i].missionId + "] "); + id = result[i].missionId; + break; + } } - missionManager.clearMission(result[0].missionId, + missionManager.clearMission(id, (error, info) => { console.info('Acts_Ams_test_5600 clearMission error.code \ ' + error.code + ',data [' + info + ']'); diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index 5243c6b66..14c2aba1b 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -225,27 +225,6 @@ describe('ActsAmsTestFifthScene', function () { }); }) - /* - * @tc.number : Acts_Ams_test_0700 - * @tc.name : clearMission : Remove Mission - * @tc.desc : Remove Mission(by Promise) - */ - it('Acts_Ams_test_0700', 0, async function (done) { - var maxnum = 10; - var result = await missionManager.getMissionInfos("", maxnum).catch(err => { - console.log('Acts_Ams_test_0700 getMissionInfos failed: ' + err); - }); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_0700 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - var info = await missionManager.clearMission(result[1].missionId).catch(err => { - console.log('Acts_Ams_test_0700 clearMission failed: ' + err); - expect(err).assertEqual(0); - }); - console.info('Acts_Ams_test_0700 clearMission data [' + info + ']'); - done(); - }) - /* * @tc.number : Acts_Ams_test_1500 * @tc.name : killProcessesByBundleName : Kill Processes By BundleName diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index e959ddf50..923271012 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -197,15 +197,22 @@ describe('ActsAmsTestFourthScene', function () { it('Acts_Ams_test_5500', 0, async function (done) { var maxnum = 30; var result = await missionManager.getMissionInfos("", maxnum); + let id = 0; for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_5500 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - missionManager.clearMission(result[0].missionId, - (error, info) => { - console.info('clearMission error.code:' + error.code ); - done(); + console.info('5500 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); + if (result[i].want.abilityName != 'com.example.actsamstestfourthscene.MainAbility' && + result[i].runningState == 0) { + console.info('5500 id[' + result[i].missionId + "] "); + id = result[i].missionId; + break; } - ); + } + missionManager.clearMission(id).then(data => { + console.info('5500 clearMission data.code:' + data); + done(); + }).catch(err => { + console.info('5500 clearMission error.code:' + err.code); + }); }) /* diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js index 26583a058..dea9bf91a 100755 --- a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js @@ -1298,63 +1298,6 @@ describe('ActsFeatureAbilityTest', function () { done(); }) - /** - * @tc.number: ACTS_StartAbilityForResult_0400 - * @tc.name: StartAbilityForResult : Start other ability for result. - * @tc.desc: Check the return value of the interface (by AsyncCallback) - */ - it('ACTS_StartAbilityForResult_0400', 0, async function (done) { - featureAbility.startAbilityForResult( - { - want: - { - action: "action.system.home", - entities: ["entity.system.home"], - type: "MIMETYPE", - options: { - // indicates the grant to perform read operations on the URI - authReadUriPermission: true, - // indicates the grant to perform write operations on the URI - authWriteUriPermission: true, - // support forward intent result to origin ability - abilityForwardResult: true, - // used for marking the ability start-up is triggered by continuation - abilityContinuation: true, - // specifies whether a component does not belong to ohos - notOhosComponent: true, - // specifies whether an ability is started - abilityFormEnabled: true, - // indicates the grant for possible persisting on the URI. - authPersistableUriPermission: true, - // indicates the grant for possible persisting on the URI. - authPrefixUriPermission: true, - // support distributed scheduling system start up multiple devices - abilitySliceMultiDevice: true, - // indicates that an ability using the service template is started regardless of whether the - // host application has been started. - startForegroundAbility: true, - // install the specified ability if it's not installed. - installOnDemand: true, - // return result to origin ability slice - abilitySliceForwardResult: true, - // install the specified ability with background mode if it's not installed. - installWithBackgroundMode: true - }, - deviceId: "", - bundleName: "com.example.startabilityforresult", - abilityName: "com.example.startabilityforresult.MainAbility", - uri: "" - } - }, - (error, result) => { - console.log('featureAbilityTest ACTS_StartAbilityForResult_0400 first asyncCallback ' + - 'errCode : ' + error + " result: " + result) - checkOnAbilityResult(result); - done(); - } - ); - }) - /** * @tc.number: ACTS_StartAbilityForResult_0500 * @tc.name: StartAbilityForResult : Start other ability for result. @@ -2766,7 +2709,7 @@ describe('ActsFeatureAbilityTest', function () { featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ console.log('ACTS_StartAbility_1400 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data)); - expect(err.code != 0).assertTrue(); + expect(err.code == 0).assertTrue(); done(); }); }catch(error){ -- GitLab