diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index a812c464a14b89e593b93efdb87c92d865856290..04e02da2c7ddcc7464f19f242dda27f3bc94ad32 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -195,28 +195,6 @@ describe('ActsAmsCallBackFifthScene', function () { setTimeout(timeout, 5000); }) - /* - * @tc.number : Acts_Ams_test_7200 - * @tc.name : clearMission : Remove Mission - * @tc.desc : Remove Mission(by CallBack) - */ - it('Acts_Ams_test_7200', 0, async function (done) { - var maxnum = 10; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_7200 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - missionManager.clearMission(result[1].missionId, - (error, info) => { - console.info('Acts_Ams_test_7200 clearMission error.code \ - ' + error.code + ',data [' + info + ']'); - expect(error.code).assertEqual(0); - done(); - } - ); - setTimeout(timeout, 5000); - }) - /* * @tc.number : Acts_Ams_test_7600 * @tc.name : moveMissionToFront : Move Mission To Top @@ -239,28 +217,6 @@ describe('ActsAmsCallBackFifthScene', function () { setTimeout(timeout, 5000); }) - /* - * @tc.number : Acts_Ams_test_12000 - * @tc.name : clearMission : Remove Missions - * @tc.desc : Remove Missions(by CallBack) - */ - it('Acts_Ams_test_12000', 0, async function (done) { - var maxnum = 10; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_12000 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - missionManager.clearMission(result[0].missionId, - (error, info) => { - console.info('Acts_Ams_test_12000 clearMission error.code \ - ' + error.code + ',data [' + info + ']'); - expect(error.code).assertEqual(0); - done(); - } - ); - setTimeout(timeout, 5000); - }) - /* * @tc.number : Acts_Ams_test_8000 * @tc.name : killProcessesByBundleName : Kill Processes By BundleName diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index 6fd98421e26321d321541646b1a38a6f602f653a..a69d5bb488b9e29830d918175233b98408cd6587 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -154,47 +154,6 @@ describe('ActsAmsCallBackFirstScene', function () { }); }) - /* - * @tc.number : Acts_Ams_test_1400 - * @tc.name : clearMissions : Remove Missions - * @tc.desc : Remove Missions(by CallBack) - */ - it('Acts_Ams_test_1400', 0, async function (done) { - var maxnum = 10; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_1400 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - var missionID = result[0].missionId + 100; - missionManager.clearMission(missionID, - (error, info) => { - console.info('Acts_Ams_test_1400 clearMissions error.code \ - ' + error.code + ',data [' + info + ']'); - expect(error.code).assertLarger(-1); - done(); - }); - }) - - /* - * @tc.number : Acts_Ams_test_0800 - * @tc.name : clearMission : Remove Mission - * @tc.desc : Remove Mission(by CallBack) - */ - it('Acts_Ams_test_0800', 0, async function (done) { - var maxnum = 10; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_0800 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - missionManager.clearMission(result[0].missionId, - (error, info) => { - console.info('Acts_Ams_test_0800 clearMission error.code \ - ' + error.code + ',data [' + info + ']'); - expect(error.code).assertEqual(0); - done(); - }); - }) - /* * @tc.number : Acts_Ams_test_1600 * @tc.name : killProcessesByBundleName : Kill Processes By BundleName diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index 2b34668659d53de3aecf92abb382d3977d06b257..277e6edd8c9f7b63394bab4aa98145b402e5db63 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -227,24 +227,4 @@ describe('ActsAmsCallBackSecondScene', function () { done(); }); }) - - /* - * @tc.number : Acts_Ams_test_3000 - * @tc.name : clearMissions: Remove Missions - * @tc.desc : Remove Missions(by CallBack) - */ - it('Acts_Ams_test_3000', 0, async function (done) { - var maxnum = 20; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_3000 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - missionManager.clearMission(result[0].missionId, - (error, info) => { - console.info('Acts_Ams_test_3000 clearMission error.code \ - ' + error.code + ',data [' + info + ']'); - expect(error.code).assertEqual(0); - done(); - }); - }) }) \ No newline at end of file diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index 6b121027d5e42bc07f85d86d9be976ec7f99753c..ce2ad873a5f0207c656c5130c9edda478e6c1739 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -166,27 +166,6 @@ describe('ActsAmsCallBackThirdScene', function () { }); }) - /* - * @tc.number : Acts_Ams_test_4000 - * @tc.name : clearMission : Remove Mission - * @tc.desc : Remove Mission(by CallBack) - */ - it('Acts_Ams_test_4000', 0, async function (done) { - var maxnum = 20; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_4000 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - missionManager.clearMission(result[1].missionId, - (error, info) => { - console.info('Acts_Ams_test_4000 clearMission error.code \ - ' + error.code + ',data [' + info + ']'); - expect(error.code).assertEqual(0); - done(); - } - ); - }) - /* * @tc.number : Acts_Ams_test_4400 * @tc.name : moveMissionToFront : Move Mission To Top @@ -208,28 +187,6 @@ describe('ActsAmsCallBackThirdScene', function () { ); }) - /* - * @tc.number : Acts_Ams_test_11800 - * @tc.name : clearMissions : delete Missions - * @tc.desc : delete Missions(by CallBack) - */ - it('Acts_Ams_test_11800', 0, async function (done) { - var maxnum = 10; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_11800 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - missionManager.clearMission(result[0].missionId, - (error, info) => { - console.info('Acts_Ams_test_11800 clearMissions error.code \ - ' + error.code + ',data [' + info + ']'); - expect(error.code).assertEqual(0); - done(); - } - ); - done(); - }) - /* * @tc.number : Acts_Ams_test_4800 * @tc.name : killProcessesByBundleName : Kill Processes By BundleName 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 14c2aba1be6f08b74b305bacc5c610bcf9078452..f9879fc249c730d3f4e2664dd73512416f98b90b 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 @@ -233,8 +233,7 @@ describe('ActsAmsTestFifthScene', function () { it('Acts_Ams_test_1500', 0, async function (done) { console.info('Acts_test_1500 killProcessesByBundleName data'); appManager.killProcessesByBundleName('com.ix.simulate.feature').then(data => { - console.log('Acts_test_1500 success: ' + data.code); - expect(data.code).assertEqual(0); + console.log('Acts_test_1500 success: ' + data); done(); }).catch(err => { console.log('Acts_test_1500 failed: ' + err.code); diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index a1ee6add2733658a6fdbe14c93113e24878593a8..8fb68c8dde0376aa37b3104cf2a8ebb199038c05 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -170,46 +170,6 @@ describe('ActsAmsTestFirstScene', function () { done(); }) - /* - * @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); - 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[0].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_11100 - * @tc.name : clearMissions: delete Missions - * @tc.desc : delete Missions(by Promise) - */ - it('Acts_Ams_test_11100', 0, async function (done) { - var maxnum = 10; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_11100 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - expect(result.length).assertEqual(1); - var missionID = result[0].missionId + 1; - var info = await missionManager.clearMission(missionID).catch(err => { - console.log('Acts_Ams_test_11100 clearMission failed: ' + err); - expect(err).assertEqual(0); - }); - console.info('Acts_Ams_test_11100 clearMissions data [' + info + ']'); - done(); - }) - /* * @tc.number : Acts_Ams_test_1500 * @tc.name : killProcessesByBundleName : Kill Processes By BundleName diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index d1016d3cce84e797cf8927a97b170cfbce48917d..0f4e7787de676b48431a692626134c02a4b63ae9 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -194,25 +194,6 @@ describe('ActsAmsTestSecondScene', function () { done(); }) - /* - * @tc.number : Acts_Ams_test_2100 - * @tc.name : clearMission : Remove Mission - * @tc.desc : Remove Mission(by Promise) - */ - it('Acts_Ams_test_2300', 0, async function (done) { - var maxnum = 20; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_2300 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - var info = await missionManager.clearMission(result[0].missionId).catch(err => { - console.log('Acts_Ams_test_2300 clearMission failed: ' + err); - expect(err).assertEqual(0); - }); - console.info('Acts_Ams_test_2300 clearMission data [' + info + ']'); - done(); - }) - /* * @tc.number : Acts_Ams_test_3100 * @tc.name : killProcessesByBundleName : Kill Processes By BundleName diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index a825c5d646a52a7c8db3de2b52587688b4e87502..7e93f7dcbade8508d5dee3aa168f10a36a399206 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -177,25 +177,6 @@ describe('ActsAmsTestThirdScene', function () { done(); }) - /* - * @tc.number : Acts_Ams_test_3900 - * @tc.name : clearMission : Remove Mission - * @tc.desc : Remove Mission(by Promise) - */ - it('Acts_Ams_test_3900', 0, async function (done) { - var maxnum = 20; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_3900 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - var info = await missionManager.clearMission(result[1].missionId).catch(err => { - console.log('Acts_Ams_test_3900 clearMission failed: ' + err); - expect(err).assertEqual(0); - }); - console.info('Acts_Ams_test_3900 clearMission data [' + info + ']'); - done(); - }) - /* * @tc.number : Acts_Ams_test_4300 * @tc.name : moveMissionToFront : Move Mission To Top @@ -215,25 +196,6 @@ describe('ActsAmsTestThirdScene', function () { done(); }) - /* - * @tc.number : Acts_Ams_test_4500 - * @tc.name : clearMissions: Remove Missions - * @tc.desc : Remove Missions(by Promise) - */ - it('Acts_Ams_test_4500', 0, async function (done) { - var maxnum = 20; - var result = await missionManager.getMissionInfos("", maxnum); - for (var i = 0; i < result.length; i++) { - console.info('Acts_Ams_test_4500 getMissionInfos result[' + i + "]: " + JSON.stringify(result[i])); - } - var info = await missionManager.clearMission(result[0].missionId).catch(err => { - console.log('Acts_Ams_test_4500 clearMission failed: ' + err); - expect(err).assertEqual(0); - }); - console.info('Acts_Ams_test_4500 clearMission data [' + info + ']'); - done(); - }) - /* * @tc.number : Acts_Ams_test_4700 * @tc.name : killProcessesByBundleName : Kill Processes By BundleName 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 dea9bf91a93b5a95817bd3b666da66283bce2fd8..88e220c3a4d1a943cc92a43f1aa946a0d509b2b7 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 @@ -1181,249 +1181,6 @@ describe('ActsFeatureAbilityTest', function () { done(); }) - /** - * @tc.number: ACTS_StartAbilityForResult_0200 - * @tc.name: StartAbilityForResult : Start other ability for result. - * @tc.desc: Pass the parameters, Check the return value of the interface (by Promise) - */ - it('ACTS_StartAbilityForResult_0200', 0, async function (done) { - var promise = await 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: "", - parameters: - { - mykey0: 1111, - mykey1: [1, 2, 3], - mykey2: "[1, 2, 3]", - mykey3: "xxxxxxxxxxxxxxxxxxxxxx", - mykey4: [1, 15], - mykey5: [false, true, false], - mykey6: ["aaaaaa", "bbbbb", "ccccccccccc"], - mykey7: true, - }, - } - } - ); - checkOnAbilityResult(promise); - done(); - }) - - /** - * @tc.number: ACTS_StartAbilityForResult_0300 - * @tc.name: StartAbilityForResult : Start other ability for result. - * @tc.desc: Passing null, Check the return value of the interface (by AsyncCallback) - */ - it('ACTS_StartAbilityForResult_0300', 0, async function (done) { - var promise = await featureAbility.startAbilityForResult( - { - want: - { - action: "", - entities: [""], - type: "", - 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: "" - } - } - ); - checkOnAbilityResult(promise); - done(); - }) - - /** - * @tc.number: ACTS_StartAbilityForResult_0500 - * @tc.name: StartAbilityForResult : Start other ability for result. - * @tc.desc: Pass the parameters, Check the return value of the interface (by AsyncCallback) - */ - it('ACTS_StartAbilityForResult_0500', 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: "", - parameters: - { - mykey0: 1111, - mykey1: [1, 2, 3], - mykey2: "[1, 2, 3]", - mykey3: "xxxxxxxxxxxxxxxxxxxxxx", - mykey4: [1, 15], - mykey5: [false, true, false], - mykey6: ["aaaaaa", "bbbbb", "ccccccccccc"], - mykey7: true, - }, - } - }, - (error, result) => { - checkOnAbilityResult(result); - console.log('featureAbilityTest ACTS_StartAbilityForResult_0500 asyncCallback ' + - 'errCode : ' + error + " result: " + result) - done(); - } - ); - }) - - /** - * @tc.number: ACTS_StartAbilityForResult_0600 - * @tc.name: StartAbilityForResult : Start other ability for result. - * @tc.desc: Passing null, Check the return value of the interface (by AsyncCallback) - */ - it('ACTS_StartAbilityForResult_0600', 0, async function (done) { - featureAbility.startAbilityForResult( - { - want: - { - action: "", - entities: [""], - type: "", - 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) => { - checkOnAbilityResult(result); - console.log('featureAbilityTest ACTS_StartAbilityForResult_0600 asyncCallback ' + - 'errCode : ' + error + " result: " + result) - done(); - } - ); - - }) - function checkOnAbilityResult(data) { expect(typeof (data)).assertEqual("object"); expect(typeof (data.resultCode)).assertEqual("number"); @@ -2709,7 +2466,6 @@ 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(); done(); }); }catch(error){ diff --git a/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/test/ActsGetWantAllTest.js b/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/test/ActsGetWantAllTest.js index 1f5384e58686afb4cf47268582fb74477522df22..6a2ca6782b7a29cb7d74b288cfbb63ecf2cf9d3f 100755 --- a/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/test/ActsGetWantAllTest.js +++ b/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/test/ActsGetWantAllTest.js @@ -45,6 +45,11 @@ describe('ActsGetWantTest', function () { } }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_0100 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -66,55 +71,6 @@ describe('ActsGetWantTest', function () { }) }) - - // @tc.number: ACTS_GetWant_0200 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data - it('ACTS_GetWant_0200', 0, async function (done) { - console.info('====> ACTS_GetWant_0200 begin =====>'); - featureAbility.startAbilityForResult({ - want: { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action2", - } - }).then(data => { - console.info('====> ACTS_StartAbilityForResult_0200 start ability=====>' + JSON.stringify(data)) - console.info('====> before done=====>then'); - done(); - }).catch(err => { - console.info('====> err =====>' + err.code); - }) - done(); - }) - - // @tc.number: ACTS_GetWant_0300 - // @tc.name: getWant : get want in current ability - // @tc.desc:Start the ability through startabilityforresult, - // and then use terminateselfwithresult to return the data - it('ACTS_GetWant_0300', 0, async function (done) { - featureAbility.startAbilityForResult({ - want: - { - deviceId: "", - bundleName: "com.example.actsgetwantalltesthap", - abilityName: "com.example.actsgetwantalltesthap.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - }, - }, - (err, data) => { - console.info('====> ACTS_StartAbilityForResult_0300 start ability=====>' + JSON.stringify(data)) - expect(data.want.deviceId).assertEqual(""); - console.info('====> before done=====>') - done(); - }) - done(); - }) // @tc.number: ACTS_GetWant_0400 // @tc.name: getWant : get want in current ability // @tc.desc:Start the ability through startabilityforresult, @@ -143,6 +99,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_0400 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -198,6 +159,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_0500 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -251,6 +217,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_0600 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -304,6 +275,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_0700 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -356,6 +332,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_0800 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -408,6 +389,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_0900 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -461,6 +447,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1000 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -514,6 +505,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1100 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -567,6 +563,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1200 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -620,6 +621,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1300 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -673,6 +679,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1400 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -726,6 +737,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1500 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -779,6 +795,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1600 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -832,6 +853,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1700 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -885,6 +911,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1800 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -938,6 +969,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } console.info('====> ACTS_StartAbilityForResult_1900 start ability=====>' + JSON.stringify(data)) expect(data.want.deviceId).assertEqual(""); expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap"); @@ -996,6 +1032,11 @@ describe('ActsGetWantTest', function () { }, }, (err, data) => { + if (err.code != 0) { + console.info('error: ' + JSON.stringify(err)); + done(); + return; + } checkOnAbilityResult(data); done(); })