diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/js/test/MangerAbilityJsunit.test.js b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/js/test/MangerAbilityJsunit.test.js index cdbfb07bf2a21de7eeb65e730e297391cd31764f..b408a51cb9072e27416c3068740116f11beba364 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/js/test/MangerAbilityJsunit.test.js +++ b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/js/test/MangerAbilityJsunit.test.js @@ -132,7 +132,7 @@ export default function ActsAmsCallBackFifthScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 97e42e908f8b66d93827331e8c42ebeeace6d0fe..8ac9a7a9f65ac72a58604fe236639f1b8193cd19 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 @@ -76,7 +76,7 @@ export default function ActsAmsCallBackFirstScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 0019c3985a815880ee77632e93767c458f3764f2..22a09251cebfc17fae051958a3118f34822ba058 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 @@ -127,7 +127,7 @@ export default function ActsAmsCallBackFourthScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 ec967a4a9bced6e26c7b2b27e38cdb4f8543a163..7504917e82cc3f8dd5200eff673f5a78eb31cd71 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 @@ -93,7 +93,7 @@ export default function ActsAmsCallBackSecondScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 2f01f033ac0234a466a6f2c096292e38e966c3cf..73e38f1d867e0ff2b460c4a132af2dee32a57dc5 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 @@ -87,7 +87,7 @@ export default function ActsAmsCallBackThirdScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 f45e6131a079dc378f59cebf661896d47af06017..626f1768767648cb7b9839a0fff01f0d4f8f3e9d 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 @@ -144,7 +144,7 @@ export default function ActsAmsTestFifthScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 f7a92b9000abcdd224800ffbd13636bfffd90484..f9c23f87d6cf4aab8780b7854a350774b4be271f 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 @@ -78,7 +78,7 @@ export default function ActsAmsTestFirstScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 85272fd597763d821ee117fbe1cdf13a6b4b510b..653b348c19f209179cad082234e39c0094c0727b 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 @@ -144,7 +144,7 @@ export default function ActsAmsTestFourthScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 a8075e657b17ef98392437d50214307da90ec8c7..cd3271250dde0a01c282a971c56e0e2f3dc55ace 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 @@ -100,7 +100,7 @@ export default function ActsAmsTestSecondScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); 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 19bfe09592268acb2cb4025bab0a78c330e6b8a4..b3182e82432c9fa9087f977cafd115b7e77253f2 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 @@ -102,7 +102,7 @@ export default function ActsAmsTestThirdScene() { expect(typeof (info[i].processName)).assertEqual("string"); expect(info[i].processName.length).assertLarger(0); expect(Array.isArray(info[i].bundleNames)).assertEqual(true); - expect(info[i].bundleNames.length).assertEqual(0); + expect(info[i].bundleNames.length).assertLarger(0); expect(typeof (info[i].uid)).assertEqual("number"); expect(info[i].uid).assertLarger(0); diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets index 1bfa470ffeddebcbf2804efb75c7ba5d5d79ee44..8900920f2b6d09f286a3ce78cacba975eb152dfa 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets @@ -212,7 +212,7 @@ export default function abilityTest(abilityContext) { expect(data.formEnabled).assertEqual(false); expect(data.type).assertEqual(1); expect(data.subType).assertEqual(0); - expect(data.orientation).assertEqual(0); + expect(data.orientation).assertEqual(2); expect(data.launchMode).assertEqual(0); expect(data.permissions.length).assertEqual(0); expect(data.deviceTypes[0]).assertEqual("phone"); diff --git a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js index ab3ae014c4a2ac97447e382af9de41ac7febb61f..ec265d48eb772f40f07b730c3c7e308e13eddff3 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js @@ -21,45 +21,72 @@ import wantAgent from '@ohos.wantAgent'; import particleAbility from '@ohos.ability.particleAbility' import backgroundTaskManager from '@ohos.backgroundTaskManager' -const CREATELOCALDIR = "/data/storage/el2/base/haps/entry"; const START_ABILITY_TIMEOUT = 4000; const TERMINATE_ABILITY_TIMEOUT = 1000; const TIMEOUT = 1000; -const errCode = 1; -var subscriberInfoActsStartAbility0100 = { +let subscriberInfo_ACTS_StartAbility_0100 = { events: ["ACTS_StartAbility_0100_CommonEvent"], }; -var subscriberInfoActsStartAbility0200 = { +let subscriberInfo_ACTS_StartAbility_0200 = { events: ["ACTS_StartAbility_0200_CommonEvent"], }; -var subscriberInfoActsStartAbility0300 = { +let subscriberInfo_ACTS_StartAbility_0300 = { events: ["ACTS_StartAbility_0300_CommonEvent"], }; -var subscriberInfoActsStartAbility0400 = { +let subscriberInfo_ACTS_StartAbility_0400 = { events: ["ACTS_StartAbility_0400_CommonEvent"], }; -var subscriberInfoActsStartAbility0500 = { +let subscriberInfo_ACTS_StartAbility_0500 = { events: ["ACTS_StartAbility_0500_CommonEvent"], }; -var subscriberInfoActsStartAbility0600 = { +let subscriberInfo_ACTS_StartAbility_0600 = { events: ["ACTS_StartAbility_0600_CommonEvent"], }; -var subscriberInfoStartAbilityTen = { +let subscriberInfoStartAbilityTen = { events: ["ACTS_StartAbility_1000_CommonEvent"], }; -var subscriberInfoStartAbilityThirteen = { +let subscriberInfoStartAbilityThirteen = { events: ["ACTS_StartAbility_1300_CommonEvent"], }; -var subscriberInfoTerminateAbilityTwo = { +let subscriberInfo_ACTS_StartAbilityForResult_0100 = { + events: ["ACTS_StartAbilityForResult_0100_CommonEvent"], +}; +let subscriberInfo_ACTS_StartAbilityForResult_0200 = { + events: ["ACTS_StartAbilityForResult_0200_CommonEvent"], +}; +let subscriberInfo_ACTS_StartAbilityForResult_0300 = { + events: ["ACTS_StartAbilityForResult_0300_CommonEvent"], +}; +let subscriberInfo_ACTS_StartAbilityForResult_0400 = { + events: ["ACTS_StartAbilityForResult_0400_CommonEvent"], +}; +let subscriberInfo_ACTS_StartAbilityForResult_0500 = { + events: ["ACTS_StartAbilityForResult_0500_CommonEvent"], +}; +let subscriberInfoStartAbilityForResultSix = { + events: ["ACTS_StartAbilityForResult_0600_CommonEvent"], +}; +let subscriberInfo_ACTS_TerminateAbility_0100 = { + events: ["ACTS_TerminateAbility_0100_CommonEvent", + "ACTS_TerminateAbility_0100_Return"], +}; +let subscriberInfoTerminateAbilityTwo = { events: ["ACTS_TerminateAbility_0200_CommonEvent", "ACTS_TerminateAbility_0200_Return"], }; -var subscriberInfoActsGetCallingBundle0100 = { +let subscriberInfo_ACTS_FinishWithResult_0100 = { + events: ["ACTS_FinishWithResult_0100_CommonEvent"], +}; +let subscriberInfo_ACTS_GetCallingBundle_0100 = { events: ["ACTS_GetCallingBundle_0100_CommonEvent", "com.example.actsfeatureabilitytest.promise", "com.example.actsfeatureabilitytest.callback"], }; +function sleep(time) { + return new Promise((resolve)=>setTimeout(resolve,time)); +} + describe('ActsFeatureAbilityTest', function () { beforeAll(function() { @@ -98,344 +125,6 @@ describe('ActsFeatureAbilityTest', function () { setTimeout(() => {}, 500); }) - /* - * @tc.name:Acts_ContinuousTask_0100 - * @tc.desc:verify new startBackgroundrunning interface promise mode work properly - * @tc.type: FUNC - * @tc.require: SR000GGT7U AR000GH6ER AR000GH6EM AR000GH6EN AR000GH6EO - */ - it("Acts_ContinuousTask_0100", 0, async function (done) { - console.log("Acts_ContinuousTask_0100 start"); - let wantAgentInfo = { - wants: [ - { - bundleName: "com.example.actsfeatureabilitytest", - abilityName: "com.example.actsfeatureabilitytest.MainAbility" - } - ], - operationType: 2, - requestCode: 0, - wantAgentFlags: [3] - }; - wantAgent.getWantAgent(wantAgentInfo).then((data) => { - backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(), - backgroundTaskManager.BackgroundMode.DATA_TRANSFER, data).then(() => { - console.log("Acts_ContinuousTask_0100 startBackgroundRunning success"); - expect(true).assertTrue(); - setTimeout(() => { - done(); - }, 500); - }).catch((err) => { - expect(false).assertTrue(); - console.log("Acts_ContinuousTask_0100 startBackgroundRunning failure"); - setTimeout(() => { - done(); - }, 500); - }); - }); - }) - - /* - * @tc.name:Acts_ContinuousTask_0200 - * @tc.desc:verify new startBackgroundrunning interface callback mode work properly - * @tc.type: FUNC - * @tc.require: SR000GGT7T AR000GH6ER AR000GH6EP AR000GJ9PR AR000GH6G8 - */ - it("Acts_ContinuousTask_0200", 0, async function (done) { - console.log("Acts_ContinuousTask_0200 start"); - function conTaskCallback(err, data) { - if (err) { - console.info('Acts_ContinuousTask_0200 startBackgroundRunning failed'); - expect(false).assertTrue(); - } else { - console.info('Acts_ContinuousTask_0200 startBackgroundRunning succeed'); - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - } - let wantAgentInfo = { - wants: [ - { - bundleName: "com.example.actsfeatureabilitytest", - abilityName: "com.example.actsfeatureabilitytest.MainAbility" - } - ], - operationType: 2, - requestCode: 0, - wantAgentFlags: [3] - }; - wantAgent.getWantAgent(wantAgentInfo).then((data) => { - backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(), - backgroundTaskManager.BackgroundMode.DATA_TRANSFER, data, conTaskCallback); - }); - }) - - /* - * @tc.name:Acts_ContinuousTask_0300 - * @tc.desc:verify old startBackgroundrunning interface promise mode work properly - * @tc.type: FUNC - * @tc.require: SR000GGT7V AR000GH6ER AR000GH6EM AR000GH6G9 AR000GH56K - */ - it("Acts_ContinuousTask_0300", 0, async function (done) { - console.log("Acts_ContinuousTask_0300 start"); - let wantAgentInfo = { - wants: [ - { - bundleName: "com.example.actsfeatureabilitytest", - abilityName: "com.example.actsfeatureabilitytest.MainAbility" - } - ], - operationType: 2, - requestCode: 0, - wantAgentFlags: [3] - }; - wantAgent.getWantAgent(wantAgentInfo).then((data) => { - let basicContent = { - title: "title", - text: "text" - }; - - let notificationContent = { - contentType: notification.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT, - normal: basicContent - }; - - let request = { - content: notificationContent, - wantAgent: data - } - - let id = 1; - - particleAbility.startBackgroundRunning(id, request).then((data) => { - console.log("Acts_ContinuousTask_0300 startBackgroundRunning success"); - expect(true).assertTrue(); - setTimeout(() => { - done(); - }, 500); - }).catch((err) => { - expect(false).assertTrue(); - console.log("Acts_ContinuousTask_0300 startBackgroundRunning failure"); - setTimeout(() => { - done(); - }, 500); - }); - }); - }) - - /* - * @tc.name:Acts_ContinuousTask_0400 - * @tc.desc:verify old startBackgroundrunning interface callback mode work properly - * @tc.type: FUNC - * @tc.require: SR000GGT81 AR000GH6ER AR000GH6EM AR000GH6G9 AR000GH6ET - */ - it("Acts_ContinuousTask_0400", 0, async function (done) { - console.log("Acts_ContinuousTask_0400 start"); - function conTaskCallback(err, data) { - if (err) { - console.info('Acts_ContinuousTask_0400 startBackgroundRunning failure'); - expect(false).assertTrue(); - } else { - console.info('Acts_ContinuousTask_0400 startBackgroundRunning success'); - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - } - let wantAgentInfo = { - wants: [ - { - bundleName: "com.example.actsfeatureabilitytest", - abilityName: "com.example.actsfeatureabilitytest.MainAbility" - } - ], - operationType: 2, - requestCode: 0, - wantAgentFlags: [3] - }; - wantAgent.getWantAgent(wantAgentInfo).then((data) => { - let basicContent = { - title: "title", - text: "text" - }; - - let notificationContent = { - contentType: notification.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT, - normal: basicContent - }; - - let request = { - content: notificationContent, - wantAgent: data - } - - let id = 1; - - particleAbility.startBackgroundRunning(id, request, conTaskCallback); - }); - }) - - /* - * @tc.name:Acts_ContinuousTask_0500 - * @tc.desc:verify new api stopBackgroundrunning interface promise mode work properly - * @tc.type: FUNC - * @tc.require: SR000GGT7U AR000GH6ES AR000GH6EM AR000GH6EN AR000GH6EO - */ - it("Acts_ContinuousTask_0500", 0, async function (done) { - console.log("Acts_ContinuousTask_0500 start"); - let wantAgentInfo = { - wants: [ - { - bundleName: "com.example.actsfeatureabilitytest", - abilityName: "com.example.actsfeatureabilitytest.MainAbility" - } - ], - operationType: 2, - requestCode: 0, - wantAgentFlags: [3] - }; - wantAgent.getWantAgent(wantAgentInfo).then((data) => { - backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(), - backgroundTaskManager.BackgroundMode.DATA_TRANSFER, data).then((data) => { - backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext()).then((data) => { - console.log("Acts_ContinuousTask_0500 cancelBackgroundRunning success"); - expect(true).assertTrue(); - setTimeout(() => { - done(); - }, 500); - }).catch((err) => { - expect(false).assertTrue(); - console.log("Acts_ContinuousTask_0500 cancelBackgroundRunning failure"); - setTimeout(() => { - done(); - }, 500); - }); - }) - }); - }) - - /* - * @tc.name:Acts_ContinuousTask_0600 - * @tc.desc:verify new api stopBackgroundrunning interface callback mode work properly - * @tc.type: FUNC - * @tc.require: SR000GGT7T AR000GH6ES AR000GH6EP AR000GJ9PR AR000GH6G8 - */ - it("Acts_ContinuousTask_0600", 0, async function (done) { - console.log("Acts_ContinuousTask_0600 start"); - function conTaskCallback(err, data) { - if (err) { - console.info('Acts_ContinuousTask_0600 startBackgroundRunning failure'); - expect(false).assertTrue(); - } else { - console.info('Acts_ContinuousTask_0600 startBackgroundRunning success'); - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - } - let wantAgentInfo = { - wants: [ - { - bundleName: "com.example.actsfeatureabilitytest", - abilityName: "com.example.actsfeatureabilitytest.MainAbility" - } - ], - operationType: 2, - requestCode: 0, - wantAgentFlags: [3] - }; - wantAgent.getWantAgent(wantAgentInfo).then((data) => { - backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(), - backgroundTaskManager.BackgroundMode.DATA_TRANSFER, data).then((data) => { - backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext(), conTaskCallback); - }) - }); - }) - - /* - * @tc.name:Acts_ContinuousTask_0700 - * @tc.desc:verify old api cancelBackgroundrunning interface promise mode work properly - * @tc.type: FUNC - * @tc.require: SR000GGT7V AR000GH6ES AR000GH6EM AR000GH6G9 AR000GH56K - */ - it("Acts_ContinuousTask_0700", 0, async function (done) { - console.log("Acts_ContinuousTask_0700 start"); - let wantAgentInfo = { - wants: [ - { - bundleName: "com.example.actsfeatureabilitytest", - abilityName: "com.example.actsfeatureabilitytest.MainAbility" - } - ], - operationType: 2, - requestCode: 0, - wantAgentFlags: [3] - }; - await wantAgent.getWantAgent(wantAgentInfo).then((data) => { - particleAbility.startBackgroundRunning(data); - setTimeout(()=>{ - }, 500); - }); - - particleAbility.cancelBackgroundRunning().then(() => { - console.log("Acts_ContinuousTask_0700 cancelBackgroundRunning success"); - expect(true).assertTrue(); - setTimeout(() => { - done(); - }, 500); - }).catch( (err) => { - expect(false).assertTrue(); - console.log("Acts_ContinuousTask_0700 cancelBackgroundRunning failure"); - setTimeout(() => { - done(); - }, 500); - }); - }) - - /* - * @tc.name:Acts_ContinuousTask_0800 - * @tc.desc:verify old cancelBackgroundrunning interface callback mode work properly - * @tc.type: FUNC - * @tc.require: SR000GGT81 AR000GH6ES AR000GH6EM AR000GH6G9 AR000GH6ET - */ - it("Acts_ContinuousTask_0800", 0, async function (done) { - console.log("Acts_ContinuousTask_0800 start"); - function conTaskCallback(err, data) { - if (err) { - console.info('Acts_ContinuousTask_0800 startBackgroundRunning failure'); - expect(false).assertTrue(); - } else { - console.info('Acts_ContinuousTask_0800 startBackgroundRunning success'); - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - } - let wantAgentInfo = { - wants: [ - { - bundleName: "com.example.actsfeatureabilitytest", - abilityName: "com.example.actsfeatureabilitytest.MainAbility" - } - ], - operationType: 2, - requestCode: 0, - wantAgentFlags: [3] - }; - await wantAgent.getWantAgent(wantAgentInfo).then((data) => { - particleAbility.startBackgroundRunning(data); - setTimeout(()=>{ - }, 500); - }); - - particleAbility.cancelBackgroundRunning(conTaskCallback); - }) - /** * @tc.number: ACTS_wantConstant_0100 * @tc.name: wantConstant : Check specific enum @@ -446,10 +135,8 @@ describe('ActsFeatureAbilityTest', function () { expect(wantconstant.Action.ACTION_DIAL).assertEqual("ohos.want.action.dial"); expect(wantconstant.Action.ACTION_SEARCH).assertEqual("ohos.want.action.search"); expect(wantconstant.Action.ACTION_WIRELESS_SETTINGS).assertEqual("ohos.settings.wireless"); - expect(wantconstant.Action.ACTION_MANAGE_APPLICATIONS_SETTINGS) - .assertEqual("ohos.settings.manage.applications"); - expect(wantconstant.Action.ACTION_APPLICATION_DETAILS_SETTINGS) - .assertEqual("ohos.settings.application.details"); + expect(wantconstant.Action.ACTION_MANAGE_APPLICATIONS_SETTINGS).assertEqual("ohos.settings.manage.applications"); + expect(wantconstant.Action.ACTION_APPLICATION_DETAILS_SETTINGS).assertEqual("ohos.settings.application.details"); expect(wantconstant.Action.ACTION_SET_ALARM).assertEqual("ohos.want.action.setAlarm"); expect(wantconstant.Action.ACTION_SHOW_ALARMS).assertEqual("ohos.want.action.showAlarms"); expect(wantconstant.Action.ACTION_SNOOZE_ALARM).assertEqual("ohos.want.action.snoozeAlarm"); @@ -482,7 +169,7 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by Promise) */ it('ACTS_GetContext_0100', 0, async function (done) { - var promise = await featureAbility.getContext() + let promise = await featureAbility.getContext() expect(typeof (promise)).assertEqual("object"); done(); }) @@ -493,14 +180,10 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by Promise) */ it('ACTS_HasWindowFocus_0100', 0, async function (done) { - var promise = featureAbility.hasWindowFocus(); - expect(typeof (promise)).assertEqual("object"); - var info = await featureAbility.hasWindowFocus(); + let info = await featureAbility.hasWindowFocus(); expect(info).assertEqual(true); + console.info('====> ACTS_HasWindowFocus_0100 end=====>') done(); - setTimeout(function () { - console.info('====> ACTS_HasWindowFocus_0100 =====>') - }, TIMEOUT) }) /** @@ -509,18 +192,15 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by AsyncCallback) */ it('ACTS_HasWindowFocus_0300', 0, async function (done) { - var result = featureAbility.hasWindowFocus( + let result = featureAbility.hasWindowFocus( (err, data) => { - console.log("hasWindowFocus asyncCallback code: " + err.code + " data: " + data); + console.info("hasWindowFocus asyncCallback code: " + err.code + " data: " + data); expect(err.code).assertEqual(0); expect(data).assertTrue(); done() } ); console.info('AceApplication : hasWindowFocus : ' + result); - setTimeout(function () { - console.info('====> ACTS_HasWindowFocus_0300 =====>') - }, TIMEOUT) }) /* @@ -532,7 +212,7 @@ describe('ActsFeatureAbilityTest', function () { it("ACTS_StartAbility_1000",0, async function(done){ console.info("------------------logMessage ACTS_StartAbility_1000-------------------"); try{ - var Subscriber; + let Subscriber; let id; function SubscribeCallBack(err, data) { @@ -567,17 +247,17 @@ describe('ActsFeatureAbilityTest', function () { abilityName: "com.example.startability.MainAbility", uri: "xxxxx", } - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ - console.log('ACTS_StartAbility_1000 asyncCallback errCode : ' + JSON.stringify(err) + console.info('ACTS_StartAbility_1000 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data)); expect(err.code == 0).assertTrue(); }); }catch(error){ - console.log("ACTS_StartAbility_1000 : error = " + error); + console.info("ACTS_StartAbility_1000 : error = " + error); } }) @@ -587,7 +267,7 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by Promise) */ it('ACTS_StartAbility_0100', 0, async function (done) { - var Subscriber; + let Subscriber; let id; function SubscribeCallBack(err, data) { @@ -598,7 +278,7 @@ describe('ActsFeatureAbilityTest', function () { done(); } - commonEvent.createSubscriber(subscriberInfoActsStartAbility0100).then(async (data) => { + commonEvent.createSubscriber(subscriberInfo_ACTS_StartAbility_0100).then(async (data) => { console.debug("====>Create Subscriber====>"); Subscriber = data; await commonEvent.subscribe(Subscriber, SubscribeCallBack); @@ -617,7 +297,7 @@ describe('ActsFeatureAbilityTest', function () { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - var promise = await featureAbility.startAbility( + let promise = await featureAbility.startAbility( { want: { @@ -669,7 +349,7 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Pass the parameters, Check the return value of the interface (by Promise) */ it('ACTS_StartAbility_0200', 0, async function (done) { - var Subscriber; + let Subscriber; let id; function SubscribeCallBack(err, data) { @@ -680,7 +360,7 @@ describe('ActsFeatureAbilityTest', function () { done(); } - commonEvent.createSubscriber(subscriberInfoActsStartAbility0200).then(async (data) => { + commonEvent.createSubscriber(subscriberInfo_ACTS_StartAbility_0200).then(async (data) => { console.debug("====>Create Subscriber====>"); Subscriber = data; await commonEvent.subscribe(Subscriber, SubscribeCallBack); @@ -700,7 +380,7 @@ describe('ActsFeatureAbilityTest', function () { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug('=======wait id======'); - var promise = await featureAbility.startAbility( + let promise = await featureAbility.startAbility( { want: { @@ -763,7 +443,7 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Passing null, Check the return value of the interface (by Promise) */ it('ACTS_StartAbility_0300', 0, async function (done) { - var Subscriber; + let Subscriber; let id; function SubscribeCallBack(err, data) { @@ -774,7 +454,7 @@ describe('ActsFeatureAbilityTest', function () { done(); } - commonEvent.createSubscriber(subscriberInfoActsStartAbility0300).then(async (data) => { + commonEvent.createSubscriber(subscriberInfo_ACTS_StartAbility_0300).then(async (data) => { console.debug("====>Create Subscriber====>"); Subscriber = data; await commonEvent.subscribe(Subscriber, SubscribeCallBack); @@ -793,7 +473,7 @@ describe('ActsFeatureAbilityTest', function () { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - var promise = await featureAbility.startAbility( + let promise = await featureAbility.startAbility( { want: { @@ -845,7 +525,7 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by AsyncCallback) */ it('ACTS_StartAbility_0400', 0, async function (done) { - var Subscriber; + let Subscriber; let id; function SubscribeCallBack(err, data) { @@ -856,7 +536,7 @@ describe('ActsFeatureAbilityTest', function () { done(); } - commonEvent.createSubscriber(subscriberInfoActsStartAbility0400).then(async (data) => { + commonEvent.createSubscriber(subscriberInfo_ACTS_StartAbility_0400).then(async (data) => { console.debug("====>Create Subscriber====>"); Subscriber = data; await commonEvent.subscribe(Subscriber, SubscribeCallBack); @@ -875,7 +555,7 @@ describe('ActsFeatureAbilityTest', function () { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - var result = featureAbility.startAbility( + let result = featureAbility.startAbility( { want: { @@ -918,7 +598,7 @@ describe('ActsFeatureAbilityTest', function () { }, }, (error, data) => { - console.log('featureAbilityTest startAbility asyncCallback errCode : ' + error + " data: " + data) + console.info('featureAbilityTest startAbility asyncCallback errCode : ' + error + " data: " + data) }, ); @@ -930,7 +610,7 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Pass the parameters, Check the return value of the interface (by AsyncCallback) */ it('ACTS_StartAbility_0500', 0, async function (done) { - var Subscriber; + let Subscriber; let id; function SubscribeCallBack(err, data) { @@ -941,7 +621,7 @@ describe('ActsFeatureAbilityTest', function () { done(); } - commonEvent.createSubscriber(subscriberInfoActsStartAbility0500).then(async (data) => { + commonEvent.createSubscriber(subscriberInfo_ACTS_StartAbility_0500).then(async (data) => { console.debug("====>Create Subscriber====>"); Subscriber = data; await commonEvent.subscribe(Subscriber, SubscribeCallBack); @@ -960,7 +640,7 @@ describe('ActsFeatureAbilityTest', function () { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - var result = featureAbility.startAbility( + let result = featureAbility.startAbility( { want: { @@ -1014,7 +694,7 @@ describe('ActsFeatureAbilityTest', function () { }, }, (error, data) => { - console.log('featureAbilityTest startAbility asyncCallback errCode : ' + error + " data: " + data) + console.info('featureAbilityTest startAbility asyncCallback errCode : ' + error + " data: " + data) }, ); @@ -1026,7 +706,7 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Passing null, Check the return value of the interface (by AsyncCallback) */ it('ACTS_StartAbility_0600', 0, async function (done) { - var Subscriber; + let Subscriber; let id; function SubscribeCallBack(err, data) { @@ -1037,7 +717,7 @@ describe('ActsFeatureAbilityTest', function () { done(); } - commonEvent.createSubscriber(subscriberInfoActsStartAbility0600).then(async (data) => { + commonEvent.createSubscriber(subscriberInfo_ACTS_StartAbility_0600).then(async (data) => { console.debug("====>Create Subscriber====>"); Subscriber = data; await commonEvent.subscribe(Subscriber, SubscribeCallBack); @@ -1056,7 +736,7 @@ describe('ActsFeatureAbilityTest', function () { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - var result = featureAbility.startAbility( + let result = featureAbility.startAbility( { want: { @@ -1099,7 +779,7 @@ describe('ActsFeatureAbilityTest', function () { }, }, (error, data) => { - console.log('featureAbilityTest startAbility asyncCallback errCode : ' + error + " data: " + data) + console.info('featureAbilityTest startAbility asyncCallback errCode : ' + error + " data: " + data) }, ); @@ -1111,7 +791,7 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by promise) */ it('ACTS_TerminateAbility_0200', 0, async function (done) { - var Subscriber; + let Subscriber; let id; let events = new Map(); @@ -1147,9 +827,9 @@ describe('ActsFeatureAbilityTest', function () { commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) done(); } - console.log('=====start ability====='); + console.info('=====start ability====='); id = setTimeout(timeout, START_ABILITY_TIMEOUT); - var promise = featureAbility.startAbility( + let promise = featureAbility.startAbility( { want: { @@ -1167,76 +847,9 @@ describe('ActsFeatureAbilityTest', function () { expect(typeof (promise)).assertEqual("object"); }) - // checkAbilityName - function checkAbilityName(info) { - console.log("AbilityName name : " + info); - expect(typeof (info)).assertEqual("string"); - expect(info).assertEqual("com.example.actsfeatureabilitytest.MainAbility"); - } - - /** - * @tc.number: ACTS_GetAbilityName_0100 - * @tc.name: GetAbilityName : Obtains the class name in this ability name, without the prefixed bundle name. - * @tc.desc: Check the return type of the interface (by Promise) - */ - it('ACTS_GetAbilityName_0100', 0, async function (done) { - var promise = featureAbility.getAbilityName(); - expect(typeof (promise)).assertEqual("object"); - var info = await featureAbility.getAbilityName(); - checkAbilityName(info); - done(); - setTimeout(function () { - console.info('====> ACTS_GetAbilityName_0100 =====>') - }, TIMEOUT) - }) - - /** - * @tc.number: ACTS_GetAbilityName_0200 - * @tc.name: GetAbilityName : Obtains the class name in this ability name, without the prefixed bundle name. - * @tc.desc: Check the return type of the interface (by AsyncCallback) - */ - it('ACTS_GetAbilityName_0200', 0, async function (done) { - var result = featureAbility.getAbilityName( - (err, data) => { - checkAbilityName(data); - done() - } - ); - setTimeout(function () { - console.info('====> ACTS_GetAbilityName_0200 =====>') - }, TIMEOUT) - }) - // checkApplicationInfo function checkApplicationInfo(info) { - console.log("getApplicationInfo : " + info) - console.log("name : " + info.name); - console.log("description : " + info.description); - console.log("descriptionId : " + info.descriptionId); - console.log("systemApp : " + info.systemApp); - console.log("enabled : " + info.enabled); - console.log("label : " + info.label); - console.log("labelId : " + info.labelId); - console.log("icon : " + info.icon); - console.log("iconId : " + info.iconId); - console.log("process : " + info.process); - console.log("supportedModes : " + info.supportedModes); - - console.log("moduleSourceDirs length : " + info.moduleSourceDirs.length); - for (var j = 0; j < info.moduleSourceDirs.length; j++) { - console.log("info.moduleSourceDirs[" + j + "] : " + info.moduleSourceDirs[j]); - } - console.log("permissions length : " + info.permissions.length); - for (var j = 0; j < info.permissions.length; j++) { - console.log("info.permissions[" + j + "] : " + info.permissions[j]); - } - console.log("moduleInfos length : " + info.moduleInfos.length); - for (var j = 0; j < info.moduleInfos.length; j++) { - console.log("info.moduleInfos[" + j + "].moduleName : " + info.moduleInfos[j].moduleName); - console.log("info.moduleInfos[" + j + "].moduleSourceDir : " + info.moduleInfos[j].moduleSourceDir); - } - console.log("entryDir : " + info.entryDir); - + console.info("getApplicationInfo : " + info) expect(typeof (info)).assertEqual("object"); expect(typeof (info.name)).assertEqual("string"); expect(typeof (info.description)).assertEqual("string"); @@ -1272,6 +885,7 @@ describe('ActsFeatureAbilityTest', function () { "com.example.actsfeatureabilitytest/com.example.actsfeatureabilitytest"); expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/" + "com.example.actsfeatureabilitytest/com.example.actsfeatureabilitytest"); + console.info("getApplicationInfo : end") } /** @@ -1280,15 +894,17 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return type of the interface (by Promise) */ it('ACTS_GetApplicationInfo_0100', 0, async function (done) { - var context = featureAbility.getContext(); - var promise = context.getApplicationInfo(); - expect(typeof (promise)).assertEqual("object"); - var info = await context.getApplicationInfo(); - checkApplicationInfo(info); - done(); - setTimeout(function () { - console.info('====> ACTS_GetApplicationInfo_0100 =====>') - }, TIMEOUT) + let context = featureAbility.getContext(); + await context.getApplicationInfo().then((data)=>{ + checkApplicationInfo(data); + console.info("ACTS_GetApplicationInfo_0100 info :" + JSON.stringify(data)) + console.info('====> ACTS_GetApplicationInfo_0100 end=====>') + done(); + }).catch((err)=>{ + console.info('====> ACTS_GetApplicationInfo_0100 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }); }) /** @@ -1297,24 +913,26 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by AsyncCallback) */ it('ACTS_GetApplicationInfo_0200', 0, async function (done) { - var context = featureAbility.getContext() - var result = context.getApplicationInfo( + let context = featureAbility.getContext() + context.getApplicationInfo( (err, data) => { - checkApplicationInfo(data); - done() + if(err.code != 0){ + console.info('====> ACTS_GetApplicationInfo_0200 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }else{ + console.info('====> ACTS_GetApplicationInfo_0200 data=====>' + JSON.stringify(data)) + checkApplicationInfo(data); + done() + } } ); - setTimeout(function () { - console.info('====> ACTS_GetApplicationInfo_0200 =====>') - }, TIMEOUT) + await sleep(1000) }) // checkProcessInfo function checkProcessInfo(info) { - console.log("checkProcessInfo ProcessInfo: " + info); - console.log("checkProcessInfo processName : " + info.processName); - console.log("checkProcessInfo pid : " + info.pid); - + console.info("checkProcessInfo ProcessInfo: " + info); expect(typeof (info)).assertEqual("object"); expect(typeof (info.processName)).assertEqual("string"); expect(typeof (info.pid)).assertEqual("number"); @@ -1327,15 +945,17 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return type of the interface (by promise) */ it('ACTS_GetProcessInfo_0100', 0, async function (done) { - var context = featureAbility.getContext() - var promise = context.getProcessInfo(); - expect(typeof (promise)).assertEqual("object"); - var info = await context.getProcessInfo(); - checkProcessInfo(info); - done(); - setTimeout(function () { - console.info('====> ACTS_GetProcessInfo_0100 =====>') - }, TIMEOUT) + let context = featureAbility.getContext() + await context.getProcessInfo().then((data)=>{ + checkProcessInfo(data); + console.info("ACTS_GetProcessInfo_0100 info :" + JSON.stringify(data)) + console.info('====> ACTS_GetProcessInfo_0100 end=====>') + done(); + }).catch((err)=>{ + console.info('====> ACTS_GetProcessInfo_0100 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }); }) /** @@ -1344,27 +964,26 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return type of the interface (by AsyncCallback) */ it('ACTS_GetProcessInfo_0200', 0, async function (done) { - var context = featureAbility.getContext() - var result = context.getProcessInfo( + let context = featureAbility.getContext() + context.getProcessInfo( (err, data) => { - checkProcessInfo(data); - done() + if(err.code != 0){ + console.info('====> ACTS_GetProcessInfo_0200 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }else{ + console.info('====> ACTS_GetProcessInfo_0200 data=====>' + JSON.stringify(data)) + checkProcessInfo(data); + done() + } } ); - setTimeout(function () { - console.info('====> ACTS_GetProcessInfo_0200 =====>') - }, TIMEOUT) + await sleep(1000) }) // checkElementName function checkElementName(info) { - console.log("getElementName : " + info); - console.log("deviceId : " + info.deviceId); - console.log("bundleName : " + info.bundleName); - console.log("abilityName : " + info.abilityName); - console.log("uri : " + info.uri); - console.log("shortName : " + info.shortName); - + console.info("getElementName : " + info); expect(typeof (info)).assertEqual("object"); expect(typeof (info.deviceId)).assertEqual("string"); expect(typeof (info.bundleName)).assertEqual("string"); @@ -1377,6 +996,7 @@ describe('ActsFeatureAbilityTest', function () { expect(info.abilityName).assertEqual("com.example.actsfeatureabilitytest.MainAbility"); expect(info.uri).assertEqual(""); expect(info.shortName).assertEqual(""); + console.info("getElementName : end"); } /** @@ -1385,15 +1005,17 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by promise) */ it('ACTS_GetElementName_0100', 0, async function (done) { - var context = featureAbility.getContext() - var promise = context.getElementName(); - expect(typeof (promise)).assertEqual("object"); - var info = await context.getElementName(); - checkElementName(info); - done(); - setTimeout(function () { - console.info('====> ACTS_GetElementName_0100 =====>') - }, TIMEOUT) + let context = featureAbility.getContext() + await context.getElementName().then((data)=>{ + checkElementName(data); + console.info("ACTS_GetElementName_0100 info :" + JSON.stringify(data)) + console.info('====> ACTS_GetElementName_0100 end=====>') + done() + }).catch((err)=>{ + console.info('====> ACTS_GetElementName_0100 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }); }) /** @@ -1402,21 +1024,26 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by AsyncCallback) */ it('ACTS_GetElementName_0200', 0, async function (done) { - var context = featureAbility.getContext() - var result = context.getElementName( + let context = featureAbility.getContext() + context.getElementName( (err, data) => { - checkElementName(data); - done() + if(err.code != 0){ + console.info('====> ACTS_GetProcessInfo_0200 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }else{ + console.info('====> ACTS_GetProcessInfo_0200 data=====>' + JSON.stringify(data)) + checkElementName(data); + done() + } } ); - setTimeout(function () { - console.info('====> ACTS_GetElementName_0200 =====>') - }, TIMEOUT) + await sleep(1000) }) // checkAppType function checkAppType(info) { - console.log("AppType : " + info); + console.info("AppType : " + info); expect(typeof (info)).assertEqual("string"); expect(info).assertEqual("system"); } @@ -1427,14 +1054,16 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by promise) */ it('ACTS_GetAppType_0100', 0, async function (done) { - var promise = featureAbility.getAppType(); - expect(typeof (promise)).assertEqual("object"); - var info = await featureAbility.getAppType(); - checkAppType(info); - done(); - setTimeout(function () { - console.info('====> ACTS_GetAppType_0100 =====>') - }, TIMEOUT) + await featureAbility.getContext().getAppType().then((data)=>{ + checkAppType(data); + console.info("ACTS_GetAppType_0100 getAppType info :" + JSON.stringify(data)) + console.info('====> ACTS_GetAppType_0100 end=====>') + done(); + }).catch((err)=>{ + console.info('====> ACTS_GetAppType_0100 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }); }) /** @@ -1443,59 +1072,27 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by AsyncCallback) */ it('ACTS_GetAppType_0200', 0, async function (done) { - var result = featureAbility.getAppType( - (err, data) => { - checkAppType(data); + let tempInfo; + featureAbility.getContext().getAppType((err, data) => { + if(err.code != 0){ + expect().assertFail() done() - } - ); + }else{ + tempInfo = data + } + }); + console.info("ACTS_GetAppType_0200 getAppType callback info :" + JSON.stringify(tempInfo)) setTimeout(function () { + console.info('====> ACTS_GetAppType_0200 =====>' + JSON.stringify(tempInfo)) + checkAppType(tempInfo); console.info('====> ACTS_GetAppType_0200 =====>') + done() }, TIMEOUT) }) // checkAbilityInfo function checkAbilityInfo(data) { - console.log("checkAbilityInfo start " + data); - console.log("checkAbilityInfo bundleName : " + data.bundleName); - console.log("checkAbilityInfo name : " + data.name); - console.log("checkAbilityInfo label : " + data.label); - console.log("checkAbilityInfo description : " + data.description); - console.log("checkAbilityInfo icon : " + data.icon); - console.log("checkAbilityInfo labelId : " + data.labelId); - console.log("checkAbilityInfo descriptionId : " + data.descriptionId); - console.log("checkAbilityInfo iconId : " + data.iconId); - console.log("checkAbilityInfo moduleName : " + data.moduleName); - console.log("checkAbilityInfo process : " + data.process); - console.log("checkAbilityInfo isVisible : " + data.isVisible); - console.log("checkAbilityInfo type : " + data.type) - console.log("checkAbilityInfo orientation : " + data.orientation); - console.log("checkAbilityInfo launchMode : " + data.launchMode); - console.log("checkAbilityInfo uri : " + data.uri); - console.log("checkAbilityInfo promise readPermission : " + data.readPermission); - console.log("checkAbilityInfo writePermission : " + data.writePermission); - console.log("checkAbilityInfo formEntity : " + data.formEntity); - console.log("checkAbilityInfo minFormHeight : " + data.minFormHeight); - console.log("checkAbilityInfo defaultFormHeight : " + data.defaultFormHeight); - console.log("checkAbilityInfo minFormWidth : " + data.minFormWidth); - console.log("checkAbilityInfo defaultFormWidth : " + data.defaultFormWidth); - console.log("checkAbilityInfo targetAbility : " + data.targetAbility); - console.log("checkAbilityInfo backgroundModes : " + data.backgroundModes); - console.log("checkAbilityInfo subType : " + data.subType); - console.log("checkAbilityInfo formEnabled : " + data.formEnabled); - - console.log("checkAbilityInfo permissions length : " + data.permissions.length); - for (var j = 0; j < data.permissions.length; j++) { - console.log("getAbilityInfo data.permissions[" + j + "] : " + data.permissions[j]); - } - console.log("checkAbilityInfo deviceTypes length : " + data.deviceTypes.length); - for (var j = 0; j < data.deviceTypes.length; j++) { - console.log("getAbilityInfo data.deviceTypes[" + j + "] : " + data.deviceTypes[j]); - } - console.log("checkAbilityInfo deviceCapabilities length : " + data.deviceCapabilities.length); - for (var j = 0; j < data.deviceCapabilities.length; j++) { - console.log("getAbilityInfo data.deviceCapabilities[" + j + "] : " + data.deviceCapabilities[j]); - } + console.info("checkAbilityInfo start " + data); expect(typeof (data)).assertEqual("object"); expect(typeof (data.bundleName)).assertEqual("string"); @@ -1561,7 +1158,7 @@ describe('ActsFeatureAbilityTest', function () { expect(data.defaultFormWidth).assertEqual(0); expect(data.uri).assertEqual("uriTest"); - console.log("checkAbilityInfo end " + data); + console.info("checkAbilityInfo end " + data); } /** @@ -1570,15 +1167,15 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by promise) */ it('ACTS_GetAbilityInfo_0100', 0, async function (done) { - var promise = featureAbility.getAbilityInfo(); - expect(typeof (promise)).assertEqual("object"); - - var info = await featureAbility.getAbilityInfo(); - checkAbilityInfo(info); - done(); - setTimeout(function () { - console.info('====> ACTS_GetAbilityInfo_0100 =====>') - }, TIMEOUT) + await featureAbility.getContext().getAbilityInfo().then((data)=>{ + checkAbilityInfo(data); + console.info('====> ACTS_GetAbilityInfo_0100 data=====>' + JSON.stringify(data)) + done() + }).catch((err)=>{ + console.info('====> ACTS_GetAbilityInfo_0100 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }); }) /** @@ -1587,42 +1184,28 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by AsyncCallback) */ it('ACTS_GetAbilityInfo_0200', 0, async function (done) { - var result = featureAbility.getAbilityInfo( + let tempInfo; + featureAbility.getContext().getAbilityInfo( (err, data) => { - checkAbilityInfo(data); - done() + if(err.code != 0){ + expect().assertFail() + done() + }else{ + tempInfo = data + } } ); setTimeout(function () { + console.info('====> ACTS_GetAbilityInfo_0200 =====>' + JSON.stringify(tempInfo)) + checkAbilityInfo(tempInfo); console.info('====> ACTS_GetAbilityInfo_0200 =====>') + done() }, TIMEOUT) }) // checkHapModuleInfo function checkHapModuleInfo(data) { - console.log("checkHapModuleInfo start " + data); - console.log("checkHapModuleInfo name : " + data.name); - console.log("checkHapModuleInfo description : " + data.description); - console.log("checkHapModuleInfo descriptionId : " + data.descriptionId); - console.log("checkHapModuleInfo icon : " + data.icon); - console.log("checkHapModuleInfo label : " + data.label); - console.log("checkHapModuleInfo labelId : " + data.labelId); - console.log("checkHapModuleInfo iconId : " + data.iconId); - console.log("checkHapModuleInfo backgroundImg : " + data.backgroundImg); - console.log("checkHapModuleInfo supportedModes : " + data.supportedModes); - console.log("checkHapModuleInfo reqCapabilities length : " + data.reqCapabilities.length); - for (var j = 0; j < data.reqCapabilities.length; j++) { - console.log("getHapModuleInfo data.reqCapabilities[" + j + "] : " + data.reqCapabilities[j]); - } - console.log("checkHapModuleInfo deviceTypes length : " + data.deviceTypes.length); - for (var j = 0; j < data.deviceTypes.length; j++) { - console.log("getHapModuleInfo data.deviceTypes[" + j + "] : " + data.deviceTypes[j]); - } - console.log("checkHapModuleInfo abilityInfos length : " + data.abilityInfos.length); - console.log("checkHapModuleInfo moduleName : " + data.moduleName); - console.log("checkHapModuleInfo mainAbilityName : " + data.mainAbilityName); - console.log("checkHapModuleInfo installationFree : " + data.installationFree); - + console.info("checkHapModuleInfo start " + data); expect(typeof (data)).assertEqual("object"); expect(typeof (data.name)).assertEqual("string"); expect(typeof (data.description)).assertEqual("string"); @@ -1639,7 +1222,6 @@ describe('ActsFeatureAbilityTest', function () { expect(typeof (data.moduleName)).assertEqual("string"); expect(typeof (data.mainAbilityName)).assertEqual("string"); expect(typeof (data.installationFree)).assertEqual("boolean"); - expect(data.name).assertEqual("com.example.actsfeatureabilitytest"); expect(data.description).assertEqual("descriptionTest"); expect(data.descriptionId).assertEqual(0); @@ -1649,15 +1231,13 @@ describe('ActsFeatureAbilityTest', function () { expect(data.iconId).assertEqual(0); expect(data.backgroundImg).assertEqual(""); expect(data.supportedModes).assertEqual(0); - expect(data.reqCapabilities[0]).assertEqual("reqCapabilitiesTest1"); expect(data.reqCapabilities[1]).assertEqual("reqCapabilitiesTest2"); expect(data.deviceTypes[0]).assertEqual("phone"); expect(data.moduleName).assertEqual("entry") expect(data.mainAbilityName).assertEqual(""); expect(data.installationFree).assertEqual(false); - - console.log("checkHapModuleInfo end " + data); + console.info("checkHapModuleInfo end " + data); } /** @@ -1666,14 +1246,16 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by promise) */ it('ACTS_GetHapModuleInfo_0100', 0, async function (done) { - var promise = featureAbility.getHapModuleInfo(); - expect(typeof (promise)).assertEqual("object"); - var info = await featureAbility.getHapModuleInfo(); - checkHapModuleInfo(info); - done(); - setTimeout(function () { - console.info('====> ACTS_GetHapModuleInfo_0100 =====>') - }, TIMEOUT) + await featureAbility.getContext().getHapModuleInfo().then((data)=>{ + checkHapModuleInfo(data); + console.info('====> ACTS_GetHapModuleInfo_0100 data=====>' + JSON.stringify(data)) + done(); + }).catch((err)=>{ + console.info('====> ACTS_GetHapModuleInfo_0100 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }); + }) /** @@ -1682,20 +1264,26 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by AsyncCallback) */ it('ACTS_GetHapModuleInfo_0200', 0, async function (done) { - var result = featureAbility.getHapModuleInfo( + let tempInfo + featureAbility.getContext().getHapModuleInfo( (err, data) => { - checkHapModuleInfo(data); - done() + if(err.code != 0){ + expect().assertFail() + done() + }else{ + console.info('====> ACTS_GetHapModuleInfo_0200 =====>' + JSON.stringify(tempInfo)) + tempInfo = data + checkHapModuleInfo(tempInfo); + done() + } } ); - setTimeout(function () { - console.info('====> ACTS_GetHapModuleInfo_0200 =====>') - }, TIMEOUT) + await sleep(1000) }) // checkProcessName function checkProcessName(info) { - console.log("checkProcessName processName : " + info); + console.info("checkProcessName processName : " + info); expect(typeof (info)).assertEqual("string"); expect(info).assertEqual("processTestAbility"); } @@ -1706,15 +1294,16 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by promise) */ it('ACTS_GetProcessName_0100', 0, async function (done) { - var context = featureAbility.getContext(); - var promise = context.getProcessName(); - expect(typeof (promise)).assertEqual("object"); - var info = await context.getProcessName(); - checkProcessName(info); - done(); - setTimeout(function () { - console.info('====> ACTS_GetProcessName_0100 =====>') - }, TIMEOUT) + let context = featureAbility.getContext(); + await context.getProcessName().then((data)=>{ + console.info('====> ACTS_GetProcessName_0100 data=====>' + JSON.stringify(data)) + checkProcessName(data); + done() + }).catch((err)=>{ + console.info('====> ACTS_GetProcessName_0100 err=====>' + JSON.stringify(err)) + expect().assertFail() + done(); + }); }) /** @@ -1723,16 +1312,22 @@ describe('ActsFeatureAbilityTest', function () { * @tc.desc: Check the return value of the interface (by AsyncCallback) */ it('ACTS_GetProcessName_0200', 0, async function (done) { - var context = featureAbility.getContext(); - var result = context.getProcessName( + let tempInfo + let context = featureAbility.getContext(); + context.getProcessName( (err, data) => { - checkProcessName(data); - done() + if(err.code!= 0){ + expect().assertFail() + done() + }else{ + tempInfo = data + checkProcessName(tempInfo); + console.info('====> ACTS_GetProcessName_0200 =====>' + JSON.stringify(tempInfo)) + done() + } } ); - setTimeout(function () { - console.info('====> ACTS_GetProcessName_0200 =====>') - }, TIMEOUT) + await sleep(1000) }) /** @@ -1740,8 +1335,8 @@ describe('ActsFeatureAbilityTest', function () { * @tc.name: GetCallingBundle : Obtains the bundle name of the ability that called the current ability. * @tc.desc: Check the return type of the interface (by AsyncCallback) */ - it('ACTS_GetCallingBundle_0100', 0, async function (done) { - var Subscriber; + it('ACTS_GetCallingBundle_0100', 0, async function (done) { + let Subscriber; let id; let events = new Map(); @@ -1765,7 +1360,7 @@ describe('ActsFeatureAbilityTest', function () { } } - commonEvent.createSubscriber(subscriberInfoActsGetCallingBundle0100).then(async (data) => { + commonEvent.createSubscriber(subscriberInfo_ACTS_GetCallingBundle_0100).then(async (data) => { console.debug("====>Create Subscriber====>"); Subscriber = data; await commonEvent.subscribe(Subscriber, SubscribeCallBack); @@ -1783,7 +1378,7 @@ describe('ActsFeatureAbilityTest', function () { done(); } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - var result = await featureAbility.startAbility( + await featureAbility.startAbility( { want: { @@ -1794,35 +1389,46 @@ describe('ActsFeatureAbilityTest', function () { ); }) + // checkGetOrCreateLocalDir + function checkGetOrCreateLocalDir(info) { + console.info("checkGetOrCreateLocalDir root dir : " + info); + expect(info).assertEqual("/data/storage/el2/base/haps/entry"); + } + // @tc.number: ACTS_GetOrCreateLocalDir_0100 // @tc.name: GetProcessName : Obtains the name of the current process. // @tc.desc: Check the return value of the interface (by promise) it('ACTS_GetOrCreateLocalDir_0100', 0, async function (done) { - var context = featureAbility.getContext(); - var promise = context.getOrCreateLocalDir(); - expect(typeof (promise)).assertEqual("object"); - var info = await context.getOrCreateLocalDir(); - expect(info).assertEqual(CREATELOCALDIR); - done(); - setTimeout(function () { - console.info('====> ACTS_GetOrCreateLocalDir_0100 =====>') - }, TIMEOUT) + let context = featureAbility.getContext(); + await context.getOrCreateLocalDir().then((data)=>{ + checkGetOrCreateLocalDir(data); + console.info('====> ACTS_GetOrCreateLocalDir_0100 data=====>' + JSON.stringify(data)) + done(); + }).catch((err)=>{ + console.info('====> ACTS_GetOrCreateLocalDir_0100 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }) }) // @tc.number: ACTS_GetOrCreateLocalDir_0200 // @tc.name: GetProcessName : Obtains the name of the current process. // @tc.desc: Check the return value of the interface (by AsyncCallback) it('ACTS_GetOrCreateLocalDir_0200', 0, async function (done) { - var context = featureAbility.getContext(); - var result = context.getOrCreateLocalDir( + let context = featureAbility.getContext(); + context.getOrCreateLocalDir( (err, data) => { - expect(data).assertEqual(CREATELOCALDIR); - done() - } - ); - setTimeout(function () { - console.info('====> ACTS_GetOrCreateLocalDir_0200 =====>') - }, TIMEOUT) + if(err.code != 0){ + console.info('====> ACTS_GetOrCreateLocalDir_0200 err=====>' + JSON.stringify(err)) + expect().assertFail() + done() + }else{ + console.info('====> ACTS_GetOrCreateLocalDir_0200 data=====>' + JSON.stringify(data)) + checkGetOrCreateLocalDir(data); + done() + } + }); + await sleep(1000) }) /* @@ -1839,18 +1445,23 @@ describe('ActsFeatureAbilityTest', function () { bundleName: "com.example.startability", abilityName: "com.example.startability.MainAbilityXXXXX", } - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ - console.log('ACTS_StartAbility_0700 asyncCallback errCode : ' + JSON.stringify(err) + console.info('ACTS_StartAbility_0700 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data)); - expect(errCode).assertEqual(error.code); - done(); + if(err.code != 0){ + expect(err.code).assertEqual(1); + done(); + }else{ + expect().assertFail() + done() + } }); }catch(error){ - console.log("ACTS_StartAbility_0700 : error = " + error); + console.info("ACTS_StartAbility_0700 : error = " + error); } }); @@ -1868,18 +1479,23 @@ describe('ActsFeatureAbilityTest', function () { bundleName: "com.example.startabilityxxxxx", abilityName: "com.example.startability.MainAbility", } - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ - console.log('ACTS_StartAbility_0800 asyncCallback errCode : ' + JSON.stringify(err) + console.info('ACTS_StartAbility_0800 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data)); - expect(err.code != 0).assertTrue(); - done(); + if(err.code != 0){ + expect(err.code).assertEqual(1); + done(); + }else{ + expect().assertFail() + done() + } }); }catch(error){ - console.log("ACTS_StartAbility_0800 : error = " + error); + console.info("ACTS_StartAbility_0800 : error = " + error); } }); @@ -1897,18 +1513,23 @@ describe('ActsFeatureAbilityTest', function () { bundleName: "com.example.startability", abilityName: "com.example.startability.MainAbility", } - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ - console.log('ACTS_StartAbility_0900 asyncCallback errCode : ' + JSON.stringify(err) + console.info('ACTS_StartAbility_0900 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data) + "err.code: " + err.code); - expect(err.code != 0).assertTrue(); - done(); + if(err.code != 0){ + expect(err.code != 0).assertTrue(); + done(); + }else{ + expect().assertFail() + done() + } }); }catch(error){ - console.log("ACTS_StartAbility_0900 : error = " + error); + console.info("ACTS_StartAbility_0900 : error = " + error); } }); @@ -1924,18 +1545,23 @@ describe('ActsFeatureAbilityTest', function () { let Want = { action: "action.sysxxxtem.homexxxx" } - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ - console.log('ACTS_StartAbility_1100 asyncCallback errCode : ' + JSON.stringify(err) + console.info('ACTS_StartAbility_1100 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data)); - expect(err.code != 0).assertTrue(); - done(); + if(err.code != 0){ + expect(err.code).assertEqual(1); + done(); + }else{ + expect().assertFail() + done() + } }); }catch(error){ - console.log("ACTS_StartAbility_1100 : error = " + error); + console.info("ACTS_StartAbility_1100 : error = " + error); } }); @@ -1952,18 +1578,23 @@ describe('ActsFeatureAbilityTest', function () { action: "action.system.home", entities: ["entity.system.homexxxxxxxxx"] } - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ - console.log('ACTS_StartAbility_1200 asyncCallback errCode : ' + JSON.stringify(err) + console.info('ACTS_StartAbility_1200 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data)); - expect(err.code != 0).assertTrue(); - done(); + if(err.code != 0){ + expect(err.code).assertEqual(1); + done(); + }else{ + expect().assertFail() + done() + } }); }catch(error){ - console.log("ACTS_StartAbility_1200 : error = " + error); + console.info("ACTS_StartAbility_1200 : error = " + error); } }); @@ -1976,7 +1607,7 @@ describe('ActsFeatureAbilityTest', function () { it("ACTS_StartAbility_1300",0, async function(done){ console.info("------------------logMessage ACTS_StartAbility_1300-------------------"); try{ - var Subscriber; + let Subscriber; let id; function SubscribeCallBack(err, data) { @@ -2010,17 +1641,20 @@ describe('ActsFeatureAbilityTest', function () { action: "action.system.homeability", entities: [] } - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ - console.log('ACTS_StartAbility_1300 asyncCallback errCode : ' + JSON.stringify(err) + console.info('ACTS_StartAbility_1300 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data)); - expect(err.code == 0).assertTrue(); + if(err.code != 0){ + expect().assertFail() + done() + } }); }catch(error){ - console.log("ACTS_StartAbility_1300 : error = " + error); + console.info("ACTS_StartAbility_1300 : error = " + error); } }); @@ -2037,17 +1671,25 @@ describe('ActsFeatureAbilityTest', function () { action: "action.system.home", entities: 'asdfghj' } - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } featureAbility.startAbility(StartAbilityParameter,(err,data)=>{ - console.log('ACTS_StartAbility_1400 asyncCallback errCode : ' + JSON.stringify(err) + console.info('ACTS_StartAbility_1400 asyncCallback errCode : ' + JSON.stringify(err) + " data: " + JSON.stringify(data)); - done(); + if(err.code != 0){ + expect().assertFail() + done() + }else{ + expect(err.code).assertEqual(0) + done() + } }); }catch(error){ - console.log("ACTS_StartAbility_1400 : error = " + error); + console.info("ACTS_StartAbility_1400 : error = " + error); + expect().assertFail() + done() } }); @@ -2060,22 +1702,22 @@ describe('ActsFeatureAbilityTest', function () { it("ACTS_StartAbility_1600",0, async function(done){ console.info("------------------logMessage ACTS_StartAbility_1600-------------------"); let Want = {} - var StartAbilityParameter = { + let StartAbilityParameter = { want:Want } - var promise = featureAbility.startAbility(StartAbilityParameter); + let promise = featureAbility.startAbility(StartAbilityParameter); if (promise) { promise.then((data) => { - console.log('ACTS_StartAbility_1600 errCode : ' + " data: " + JSON.stringify(data)); + console.info('ACTS_StartAbility_1600 errCode : ' + " data: " + JSON.stringify(data)); expect().assertFail(); done(); }).catch((err)=>{ - expect(err.code != 0).assertTrue(); + expect(err.code).assertEqual(1); done(); }); } else { - expect(promise == undefined).assertTrue(); + expect().assertFail() done(); } }); @@ -2088,19 +1730,19 @@ describe('ActsFeatureAbilityTest', function () { */ it("ACTS_StartAbility_1700",0, async function(done){ console.info("------------------logMessage ACTS_StartAbility_1700-------------------"); - var StartAbilityParameter = {} - var promise = featureAbility.startAbility(StartAbilityParameter) + let StartAbilityParameter = {} + let promise = featureAbility.startAbility(StartAbilityParameter) if (promise) { promise.then((data) => { - console.log('ACTS_StartAbility_1700 data: ' + JSON.stringify(data)); + console.info('ACTS_StartAbility_1700 data: ' + JSON.stringify(data)); expect().assertFail(); done(); }).catch((err)=>{ - expect(err.code != 0).assertTrue(); + expect(err.code).assertEqual(202); done(); }); } else { - expect(promise == undefined).assertTrue(); + expect().assertFail() done(); } }); @@ -2113,18 +1755,18 @@ describe('ActsFeatureAbilityTest', function () { */ it("ACTS_StartAbility_1800",0, async function(done){ console.info("------------------logMessage ACTS_StartAbility_1800-------------------"); - var promise = featureAbility.startAbility(undefined); + let promise = featureAbility.startAbility(undefined); if (promise) { promise.then((data) => { - console.log('ACTS_StartAbility_1800 asyncCallback data: ' + JSON.stringify(data)); + console.info('ACTS_StartAbility_1800 asyncCallback data: ' + JSON.stringify(data)); expect().assertFail(); done(); }).catch((err)=>{ - expect(err.code != 0).assertTrue(); + expect(err.code).assertEqual(202); done(); }); } else { - expect(promise == undefined).assertTrue(); + expect().assertFail() done(); } }); diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets index 5110b70acf00e50af48b324741c917cd905e3efe..11b10395cf7c038d8fbf6f8592df22e4d21fb1b2 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets @@ -62,16 +62,17 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { tempDataC = dataC[0]; expect(error.code).assertEqual(ERR_OK_CODE); expect(error.message).assertEqual(ERR_OK); - done(); console.log(`==========${callbackName} ${describeName} end==========`); }); await sleep(2000) checkDataB(tempDataB) checkDataC(tempDataC) + done(); } catch (error) { console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`); console.log(`${callbackName} should not reach here`); expect().assertFail(); + done(); } }); @@ -110,6 +111,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { console.log(`${promiseName} exception caught: ${JSON.stringify(error)})`); console.log(`${promiseName} should not reach here`); expect().assertFail(); + done(); } }); function checkDataB(formInfo){ @@ -121,9 +123,9 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(FormInfo.FormType.JS).assertEqual(formInfo.type) expect('card_b').assertEqual(formInfo.jsComponentName) expect(FormInfo.ColorMode.MODE_AUTO).assertEqual(formInfo.colorMode) - expect(1).assertEqual(formInfo.isDefault) - expect(1).assertEqual(formInfo.updateEnabled) - expect(1).assertEqual(formInfo.formVisibleNotify) + expect(formInfo.isDefault).assertTrue() + expect(formInfo.updateEnabled).assertTrue() + expect(formInfo.formVisibleNotify).assertTrue() expect(undefined).assertEqual(formInfo.relatedBundleName) expect("abilityb").assertEqual(formInfo.formConfigAbility) expect(3).assertEqual(formInfo.updateDuration) @@ -131,8 +133,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect('10:30').assertEqual(formInfo.scheduledUpdateTime) expect(1).assertEqual(formInfo.supportDimensions[0]) expect(2).assertEqual(formInfo.supportDimensions[1]) - expect('originWidgetNameB').assertEqual(formInfo.metaData.customizeData[0].name) - expect('valueB').assertEqual(formInfo.metaData.customizeData[0].value) + expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name) + expect('valueB').assertEqual(formInfo.customizeData[0].value) } function checkDataC(formInfo){ expect("com.ohos.st.formsystemproviderc").assertEqual(formInfo.bundleName) @@ -143,9 +145,9 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(FormInfo.FormType.JS).assertEqual(formInfo.type) expect('card_c').assertEqual(formInfo.jsComponentName) expect(FormInfo.ColorMode.MODE_LIGHT).assertEqual(formInfo.colorMode) - expect(1).assertEqual(formInfo.isDefault) - expect(1).assertEqual(formInfo.updateEnabled) - expect(1).assertEqual(formInfo.formVisibleNotify) + expect(formInfo.isDefault).assertTrue() + expect(formInfo.updateEnabled).assertTrue() + expect(formInfo.formVisibleNotify).assertTrue() expect(undefined).assertEqual(formInfo.relatedBundleName) expect("abilityc").assertEqual(formInfo.formConfigAbility) expect(4).assertEqual(formInfo.updateDuration) @@ -153,8 +155,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(3).assertEqual(formInfo.defaultDimension) expect(3).assertEqual(formInfo.supportDimensions[0]) expect(4).assertEqual(formInfo.supportDimensions[1]) - expect('originWidgetNameC').assertEqual(formInfo.metaData.customizeData[0].name) - expect('valueC').assertEqual(formInfo.metaData.customizeData[0].value) + expect('originWidgetNameC').assertEqual(formInfo.customizeData[0].name) + expect('valueC').assertEqual(formInfo.customizeData[0].value) } }); }; diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets index b73c8e8e9eea320a683867d97bc706a728cc8a87..8058bc266157816b71c0119f5014986bb28193ee 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets @@ -74,6 +74,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`); console.log(`${callbackName} should not reach here`); expect().assertFail(); + done(); } }); @@ -115,6 +116,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { console.log(`${promiseName} exception caught: ${JSON.stringify(error)})`); console.log(`${promiseName} should not reach here`); expect().assertFail(); + done(); } }); @@ -127,9 +129,9 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(FormInfo.FormType.JS).assertEqual(formInfo.type) expect('card_b').assertEqual(formInfo.jsComponentName) expect(FormInfo.ColorMode.MODE_AUTO).assertEqual(formInfo.colorMode) - expect(1).assertEqual(formInfo.isDefault) - expect(1).assertEqual(formInfo.updateEnabled) - expect(1).assertEqual(formInfo.formVisibleNotify) + expect(formInfo.isDefault).assertTrue() + expect(formInfo.updateEnabled).assertTrue() + expect(formInfo.formVisibleNotify).assertTrue() expect(undefined).assertEqual(formInfo.relatedBundleName) expect("abilityb").assertEqual(formInfo.formConfigAbility) expect(3).assertEqual(formInfo.updateDuration) @@ -137,8 +139,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect('10:30').assertEqual(formInfo.scheduledUpdateTime) expect(1).assertEqual(formInfo.supportDimensions[0]) expect(2).assertEqual(formInfo.supportDimensions[1]) - expect('originWidgetNameB').assertEqual(formInfo.metaData.customizeData[0].name) - expect('valueB').assertEqual(formInfo.metaData.customizeData[0].value) + expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name) + expect('valueB').assertEqual(formInfo.customizeData[0].value) } function checkDataA1(formInfo){ @@ -150,9 +152,9 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(FormInfo.FormType.JS).assertEqual(formInfo.type) expect('card_a01').assertEqual(formInfo.jsComponentName) expect(FormInfo.ColorMode.MODE_DARK).assertEqual(formInfo.colorMode) - expect(1).assertEqual(formInfo.isDefault) - expect(1).assertEqual(formInfo.updateEnabled) - expect(1).assertEqual(formInfo.formVisibleNotify) + expect(formInfo.isDefault).assertTrue() + expect(formInfo.updateEnabled).assertTrue() + expect(formInfo.formVisibleNotify).assertTrue() expect(undefined).assertEqual(formInfo.relatedBundleName) expect("abilitya01").assertEqual(formInfo.formConfigAbility) expect(1).assertEqual(formInfo.updateDuration) @@ -160,8 +162,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect('5:30').assertEqual(formInfo.scheduledUpdateTime) expect(1).assertEqual(formInfo.supportDimensions[0]) expect(3).assertEqual(formInfo.supportDimensions[1]) - expect('originWidgetNameA01').assertEqual(formInfo.metaData.customizeData[0].name) - expect('valueA01').assertEqual(formInfo.metaData.customizeData[0].value) + expect('originWidgetNameA01').assertEqual(formInfo.customizeData[0].name) + expect('valueA01').assertEqual(formInfo.customizeData[0].value) } function checkDataA2(formInfo){ @@ -173,9 +175,9 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(FormInfo.FormType.JS).assertEqual(formInfo.type) expect('card_a02').assertEqual(formInfo.jsComponentName) expect(FormInfo.ColorMode.MODE_LIGHT).assertEqual(formInfo.colorMode) - expect(0).assertEqual(formInfo.isDefault) - expect(0).assertEqual(formInfo.updateEnabled) - expect(0).assertEqual(formInfo.formVisibleNotify) + expect(formInfo.isDefault).assertFalse() + expect(formInfo.updateEnabled).assertFalse() + expect(formInfo.formVisibleNotify).assertFalse() expect(undefined).assertEqual(formInfo.relatedBundleName) expect("abilitya02").assertEqual(formInfo.formConfigAbility) expect(2).assertEqual(formInfo.updateDuration) @@ -185,8 +187,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(2).assertEqual(formInfo.supportDimensions[1]) expect(3).assertEqual(formInfo.supportDimensions[2]) expect(4).assertEqual(formInfo.supportDimensions[3]) - expect('originWidgetNameA02').assertEqual(formInfo.metaData.customizeData[0].name) - expect('valueA02').assertEqual(formInfo.metaData.customizeData[0].value) + expect('originWidgetNameA02').assertEqual(formInfo.customizeData[0].name) + expect('valueA02').assertEqual(formInfo.customizeData[0].value) } }); }; diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets index a4d7ee31fee727a6267a729a3b1d3ea9cb130a51..b049106819b7c52879e3fa09f629b378248cfb05 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets @@ -68,6 +68,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`); console.log(`${callbackName} should not reach here`); expect().assertFail(); + done(); } }); @@ -118,9 +119,9 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(FormInfo.FormType.JS).assertEqual(formInfo.type) expect('card_b').assertEqual(formInfo.jsComponentName) expect(FormInfo.ColorMode.MODE_AUTO).assertEqual(formInfo.colorMode) - expect(1).assertEqual(formInfo.isDefault) - expect(1).assertEqual(formInfo.updateEnabled) - expect(1).assertEqual(formInfo.formVisibleNotify) + expect(formInfo.isDefault).assertTrue() + expect(formInfo.updateEnabled).assertTrue() + expect(formInfo.formVisibleNotify).assertTrue() expect(undefined).assertEqual(formInfo.relatedBundleName) expect("abilityb").assertEqual(formInfo.formConfigAbility) expect(3).assertEqual(formInfo.updateDuration) @@ -128,8 +129,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect('10:30').assertEqual(formInfo.scheduledUpdateTime) expect(1).assertEqual(formInfo.supportDimensions[0]) expect(2).assertEqual(formInfo.supportDimensions[1]) - expect('originWidgetNameB').assertEqual(formInfo.metaData.customizeData[0].name) - expect('valueB').assertEqual(formInfo.metaData.customizeData[0].value) + expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name) + expect('valueB').assertEqual(formInfo.customizeData[0].value) } }); };