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 5016d59ee154cd16758448ebd24942c508a25d57..7b71f8b0bfe1bc5c791928d98c9888fff27651d6 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 @@ -47,7 +47,7 @@ var bundleNameList = [ describe('ActsAmsCallBackFifthScene', function () { console.info('----ActsAmsCallBackFifthScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -62,18 +62,15 @@ describe('ActsAmsCallBackFifthScene', function () { }, ); var maxnum = 10, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfifthscene' && - data[i].topAbility.bundleName != 'com.example.actsamscallbackfifthscene') { - abilitymanager.removeMission(data[i].id, - (info) => { - console.info(' removeMission data [' + info + ']'); - }); - } + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfifthscene' && + data[i].topAbility.bundleName != 'com.example.actsamscallbackfifthscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -113,29 +110,7 @@ describe('ActsAmsCallBackFifthScene', function () { }, }, ); - - }); - - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); + done(); }); /* 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 d46896a6e978e3c39e83f159d89e52d8a4a74514..f28f4cd6b93e6d44537a63259e3466417ea5dc65 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 @@ -44,7 +44,7 @@ var bundleNameList = [ describe('ActsAmsCallBackFirstScene', function () { console.info('----ActsAmsCallBackFirstScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -59,18 +59,15 @@ describe('ActsAmsCallBackFirstScene', function () { }, ); var maxnum = 10, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfirstscene' && - data[i].topAbility.bundleName != 'com.example.actsamscallbackfirstscene') { - abilitymanager.removeMission(data[i].id, - (info) => { - console.info(' removeMission data [' + info + ']'); - }); - } + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfirstscene' && + data[i].topAbility.bundleName != 'com.example.actsamscallbackfirstscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -84,27 +81,7 @@ describe('ActsAmsCallBackFirstScene', function () { }, }, ); - }); - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); + done(); }); /* @@ -159,7 +136,7 @@ describe('ActsAmsCallBackFirstScene', function () { abilitymanager.queryRunningAbilityMissionInfos(maxnum, (error, info) => { console.info('queryRecentAbilityMissionInfos error.code : \ - ' + error.code + ',data length [' + data.length + ']'); + ' + error.code + ',data length [' + info.length + ']'); console.info('Acts_Ams_test_0400 queryRunningAbilityMissionInfos info ' + JSON.stringify(info)); expect(Array.isArray(info)).assertEqual(true); expect(info.length).assertEqual(2); @@ -205,7 +182,7 @@ describe('ActsAmsCallBackFirstScene', function () { abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, (error, info) => { console.info('queryRunningAbilityMissionInfos error.code : \ - ' + error.code + ',data length [' + data.length + ']'); + ' + error.code + ',data length [' + info.length + ']'); console.info('Acts_Ams_test_0600 queryRecentAbilityMissionInfos info ' + JSON.stringify(info)); expect(Array.isArray(info)).assertEqual(true); expect(info.length).assertEqual(2); diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index 27a82694fde2bca8ef50802a03847ef879353e17..ee1695a4742d4905f8414dc46448e5395956593f 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -50,7 +50,7 @@ var bundleNameList = [ describe('ActsAmsCallBackFourthScene', function () { console.info('----ActsAmsCallBackFourthScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -64,19 +64,16 @@ describe('ActsAmsCallBackFourthScene', function () { }, }, ); - var maxnum = 20, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfourthscene' && - data[i].topAbility.bundleName != 'com.example.actsamscallbackfourthscene') { - abilitymanager.removeMission(data[i].id, - (info) => { - console.info(' removeMission data [' + info + ']'); - }); - } + var maxnum = 10, flag = 1; + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackfourthscene' && + data[i].topAbility.bundleName != 'com.example.actsamscallbackfourthscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -129,28 +126,7 @@ describe('ActsAmsCallBackFourthScene', function () { }, } ); - }); - - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); + done(); }); /* 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 aadc744d91eb357f3288d1d486ea8f2af86ce06e..f056b9ac8064b068850a8f3706fe2e198328a819 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 @@ -46,7 +46,7 @@ var bundleNameList = [ describe('ActsAmsCallBackSecondScene', function () { console.info('----ActsAmsCallBackSecondScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -60,19 +60,16 @@ describe('ActsAmsCallBackSecondScene', function () { }, }, ); - var maxnum = 20, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamscallbacksecondscene' && - data[i].topAbility.bundleName != 'com.example.actsamscallbacksecondscene') { - abilitymanager.removeMission(data[i].id, - (info) => { - console.info(' removeMission data [' + info + ']'); - }); - } + var maxnum = 10, flag = 1; + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamscallbacksecondscene' && + data[i].topAbility.bundleName != 'com.example.actsamscallbacksecondscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -99,28 +96,7 @@ describe('ActsAmsCallBackSecondScene', function () { }, } ); - }); - - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); + done(); }); /* @@ -175,7 +151,7 @@ describe('ActsAmsCallBackSecondScene', function () { abilitymanager.queryRunningAbilityMissionInfos(maxnum, (error, info) => { console.info('queryRecentAbilityMissionInfos error.code : \ - ' + error.code + ',data length [' + data.length + ']'); + ' + error.code + ',data length [' + info.length + ']'); console.info('Acts_Ams_test_2000 queryRunningAbilityMissionInfos info ' + JSON.stringify(info)); expect(Array.isArray(info)).assertEqual(true); expect(info.length).assertEqual(3); @@ -221,7 +197,7 @@ describe('ActsAmsCallBackSecondScene', function () { abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, (error, info) => { console.info('queryRunningAbilityMissionInfos error.code : \ - ' + error.code + ',data length [' + data.length + ']'); + ' + error.code + ',data length [' + info.length + ']'); console.info('Acts_Ams_test_2200 queryRecentAbilityMissionInfos info ' + JSON.stringify(info)); expect(Array.isArray(info)).assertEqual(true); expect(info.length).assertEqual(3); 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 d16312f463108943ce225d502131ce3728be0692..804c044ceaf170537126716aa4b4dddbee60b716 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 @@ -44,7 +44,7 @@ var bundleNameList = [ ] describe('ActsAmsCallBackThirdScene', function () { console.info('----ActsAmsCallBackThirdScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -58,19 +58,16 @@ describe('ActsAmsCallBackThirdScene', function () { }, } ); - var maxnum = 20, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackthirdscene' && - data[i].topAbility.bundleName != 'com.example.actsamscallbackthirdscene') { - abilitymanager.removeMission(data[i].id, - (info) => { - console.info(' removeMission data [' + info + ']'); - }); - } + var maxnum = 10, flag = 1; + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamscallbackthirdscene' && + data[i].topAbility.bundleName != 'com.example.actsamscallbackthirdscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -110,28 +107,7 @@ describe('ActsAmsCallBackThirdScene', function () { }, }, ); - }); - - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); + done(); }); /* @@ -186,7 +162,7 @@ describe('ActsAmsCallBackThirdScene', function () { abilitymanager.queryRunningAbilityMissionInfos(maxnum, (error, info) => { console.info('queryRecentAbilityMissionInfos error.code : \ - ' + error.code + ',data length [' + data.length + ']'); + ' + error.code + ',data length [' + info.length + ']'); console.info('Acts_Ams_test_3600 queryRunningAbilityMissionInfos info ' + JSON.stringify(info)); expect(Array.isArray(info)).assertEqual(true); expect(info.length).assertEqual(3); @@ -232,7 +208,7 @@ describe('ActsAmsCallBackThirdScene', function () { abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, (error, info) => { console.info('queryRunningAbilityMissionInfos error.code : \ - ' + error.code + ',data length [' + data.length + ']'); + ' + error.code + ',data length [' + info.length + ']'); console.info('Acts_Ams_test_3800 queryRecentAbilityMissionInfos info ' + JSON.stringify(info)); expect(Array.isArray(info)).assertEqual(true); expect(info.length).assertEqual(3); 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 78d12dad875fc8c5613396317af9622dbf76bbe4..993b453acba049c7e6bb08980c4a4ecbf42aa3b5 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 @@ -47,7 +47,7 @@ var bundleNameList = [ describe('ActsAmsTestFifthScene', function () { console.info('----ActsAmsTestFifthScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -67,16 +67,15 @@ describe('ActsAmsTestFifthScene', function () { }, ); var maxnum = 10, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamstestfifthscene' && - data[i].topAbility.bundleName != 'com.example.actsamstestfifthscene') { - var info = abilitymanager.removeMission(data[i].id); - console.info(' removeMission data [' + info + ']'); - } + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamstestfifthscene' && + data[i].topAbility.bundleName != 'com.example.actsamstestfifthscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -131,31 +130,9 @@ describe('ActsAmsTestFifthScene', function () { }, }, ); + done(); }); - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); - }); - - /* * @tc.number : Acts_Ams_test_6500 * @tc.name : getAllRunningProcesses : Get All Running Processes Info 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 8990aa112d7a7cabd1b0fb217e2824ede1847b75..dd6ac9c8f2a125dbde433f50aa6ad0a9a85a47a9 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 @@ -44,7 +44,7 @@ var bundleNameList = [ describe('ActsAmsTestFirstScene', function () { console.info('----ActsAmsTestFirstScene----'); - beforeAll(async function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -64,16 +64,15 @@ describe('ActsAmsTestFirstScene', function () { }, ); var maxnum = 10, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamstestfirstscene' && - data[i].topAbility.bundleName != 'com.example.actsamstestfirstscene.MainAbility') { - var info = abilitymanager.removeMission(data[i].id); - console.info(' removeMission data [' + info + ']'); - } + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamstestfirstscene' && + data[i].topAbility.bundleName != 'com.example.actsamstestfirstscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -92,10 +91,7 @@ describe('ActsAmsTestFirstScene', function () { }, }, ); - }); - - afterAll(function () { - abilitymanager.clearMissions(); + done(); }); /* diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js index 5d6f6e93be002465fb40d9fe6bd18b93e1fbbeba..4eb02a189dd1f34e0245a9fbb0b18aa1d7e98676 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js @@ -49,7 +49,7 @@ var bundleNameList = [ ] describe('ActsAmsTestFourthScene', function () { console.info('----ActsAmsTestFourthScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -68,17 +68,16 @@ describe('ActsAmsTestFourthScene', function () { }, }, ); - var maxnum = 20, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamstestfourthscene' && - data[i].topAbility.bundleName != 'com.example.actsamstestfourthscene') { - var info = abilitymanager.removeMission(data[i].id); - console.info('removeMission data [' + info + ']'); - } + var maxnum = 10, flag = 1; + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamstestfourthscene' && + data[i].topAbility.bundleName != 'com.example.actsamstestfourthscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -151,28 +150,7 @@ describe('ActsAmsTestFourthScene', function () { }, }, ); - }); - - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); + done(); }); /* 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 96dfa603180b0932e1c8a6f891576ad3d458b082..140644ed72938900afc8e53f0a688446ffee2221 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 @@ -46,7 +46,7 @@ var bundleNameList = [ describe('ActsAmsTestSecondScene', function () { console.info('----ActsAmsTestSecondScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -66,16 +66,15 @@ describe('ActsAmsTestSecondScene', function () { }, ); var maxnum = 10, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamstestsecondscene' && - data[i].topAbility.bundleName != 'com.example.actsamstestsecondscene') { - var info = abilitymanager.removeMission(data[i].id); - console.info(' removeMission data [' + info + ']'); - } + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamstestsecondscene' && + data[i].topAbility.bundleName != 'com.example.actsamstestsecondscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -112,29 +111,7 @@ describe('ActsAmsTestSecondScene', function () { }, }, ); - - }); - - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); + done(); }); /* 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 ffeccab4f395fc72c4d70ceaaf1fd19e369ad56a..5da80ad40ef0b24ef401046f044ed3c506bcecd8 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 @@ -46,7 +46,7 @@ var bundleNameList = [ describe('ActsAmsTestThirdScene', function () { console.info('----ActsAmsTestThirdScene----'); - beforeAll(function () { + beforeAll(async function (done) { featureAbility.startAbility( { want: @@ -65,17 +65,16 @@ describe('ActsAmsTestThirdScene', function () { }, }, ); - var maxnum = 20, flag = 1; - abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag, data => { - console.info(' queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); - for (var i = 0; i < data.length; i++) { - if (data[i].baseAbility.bundleName != 'com.example.actsamstestthirdscene' && - data[i].topAbility.bundleName != 'com.example.actsamstestthirdscene') { - var info = abilitymanager.removeMission(data[i].id); - console.info(' removeMission data [' + info + ']'); - } + var maxnum = 10, flag = 1; + var data = await abilitymanager.queryRecentAbilityMissionInfos(maxnum, flag); + console.log('queryRecentAbilityMissionInfos data ' + JSON.stringify(data)); + for (var i = 0; i < data.length; i++) { + if (data[i].baseAbility.bundleName != 'com.example.actsamstestthirdscene' && + data[i].topAbility.bundleName != 'com.example.actsamstestthirdscene') { + var info = abilitymanager.removeMission(data[i].id); + console.log(' removeMission data [' + info + ']'); } - }); + }; featureAbility.startAbility( { want: @@ -130,28 +129,7 @@ describe('ActsAmsTestThirdScene', function () { }, }, ); - }); - - afterAll(function () { - featureAbility.startAbility( - { - want: - { - deviceId: "", - bundleName: "com.ohos.launcher", - abilityName: "com.ohos.launcher.MainAbility", - action: "action1", - entities: ["entity1"], - type: "MIMETYPE", - uri: "key={true,true,false}", - options: - {}, - parameters: - {}, - }, - }, - ); - abilitymanager.clearMissions(); + done(); }); /* diff --git a/notification/ans_standard/BUILD.gn b/notification/ans_standard/BUILD.gn index 2e4ce0046ba111c9539477dab1b286b24cf0ee1e..550f8b32eb9c45150c0d1a9ccaef11d27f60c029 100644 --- a/notification/ans_standard/BUILD.gn +++ b/notification/ans_standard/BUILD.gn @@ -15,9 +15,6 @@ import("//build/ohos_var.gni") group("ans_standard") { testonly = true if (is_standard_system) { - deps = [ - "cancel_test:cancel_test", - "publish_test:publish_test", - ] + deps = [ "publishicontest:ActsAnsIconTest" ] } } diff --git a/notification/ans_standard/publishicontest/BUILD.gn b/notification/ans_standard/publishicontest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..f184f4e05abd7c08a46713fb1349ba3db60ea7c0 --- /dev/null +++ b/notification/ans_standard/publishicontest/BUILD.gn @@ -0,0 +1,31 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("ActsAnsIconTest") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAnsIconTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" +} diff --git a/notification/ans_standard/publishicontest/Test.json b/notification/ans_standard/publishicontest/Test.json new file mode 100755 index 0000000000000000000000000000000000000000..74e88a81b20faa6eb4bb7d554e9eecb82c27e2f4 --- /dev/null +++ b/notification/ans_standard/publishicontest/Test.json @@ -0,0 +1,19 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "21600000", + "package": "com.example.actsansicontest", + "shell-timeout": "21600000" + }, + "kits": [ + { + "test-file-name": [ + "ActsAnsIconTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} + diff --git a/notification/ans_standard/publishicontest/entry/package.json b/notification/ans_standard/publishicontest/entry/package.json new file mode 100755 index 0000000000000000000000000000000000000000..69a88e3b65423624fe7ea8b0f8beefcc62cc3d5f --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/package.json @@ -0,0 +1 @@ +{} diff --git a/notification/ans_standard/publishicontest/entry/src/main/config.json b/notification/ans_standard/publishicontest/entry/src/main/config.json new file mode 100755 index 0000000000000000000000000000000000000000..730f1958ad069e7eb57b45e126249a8fa0fa518e --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/config.json @@ -0,0 +1,61 @@ +{ + "app": { + "bundleName": "com.example.actsansicontest", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 5, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.actsansicontest", + "name": ".actsansicontest", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.actsansicontest.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "isVisible": "true", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} \ No newline at end of file diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/default/app.js b/notification/ans_standard/publishicontest/entry/src/main/js/default/app.js new file mode 100755 index 0000000000000000000000000000000000000000..2a68c1992145a976957d7dcdd69a7e9c2e8e9877 --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/default/app.js @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/default/i18n/en-US.json b/notification/ans_standard/publishicontest/entry/src/main/js/default/i18n/en-US.json new file mode 100755 index 0000000000000000000000000000000000000000..e63c70d978a3a53be988388c87182f81785e170c --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/default/i18n/en-US.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + } +} \ No newline at end of file diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/default/i18n/zh-CN.json b/notification/ans_standard/publishicontest/entry/src/main/js/default/i18n/zh-CN.json new file mode 100755 index 0000000000000000000000000000000000000000..de6ee5748322f44942c1b003319d8e66c837675f --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/default/i18n/zh-CN.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + } +} \ No newline at end of file diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.css b/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..6fda792753f2e15f22b529c7b90a82185b2770bf --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,9 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.hml b/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..60c117fb35d180619185b62bee24293514f4e896 --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + icon_pixcelMap + +
diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.js b/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.js new file mode 100755 index 0000000000000000000000000000000000000000..c3b6a96287aa8ad4c9bf0e44ccba5d69b68ae02c --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/default/pages/index/index.js @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import file from '@system.file' +import {Core, ExpectExtend} from 'deccjsunit/index' + +const injectRef = Object.getPrototypeOf(global) || global +injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') + +export default { + data: { + title: "" + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('onShow finish') + const core = Core.getInstance() + const expectExtend = new ExpectExtend({ + 'id': 'extend' + }) + core.addService('expect', expectExtend) + core.init() + + const configService = core.getDefaultService('config') + configService.setConfig(this) + + require('../../../test/List.test') + core.execute() + }, + onReady() { + console.info('onReady'); + }, +} diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/resources/base/element/string.json b/notification/ans_standard/publishicontest/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..30895093f1f793272b0638cbde300dd08dfcf1c0 --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "Subscriber" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] +} \ No newline at end of file diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/resources/base/media/icon.png b/notification/ans_standard/publishicontest/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/notification/ans_standard/publishicontest/entry/src/main/js/resources/base/media/icon.png differ diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/test/Icon.js b/notification/ans_standard/publishicontest/entry/src/main/js/test/Icon.js new file mode 100755 index 0000000000000000000000000000000000000000..25a952fe44431f8dd99b7c8d47bf8e7d2b1a21ad --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/test/Icon.js @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import notify from '@ohos.notification' +import image from '@ohos.multimedia.image' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' + +var largeBuffer +var smallBuffer +var opts +var subInfo +var largeIcon +var smallIcon + +describe('ActsAnsIconTest', function () { + console.info("===========ActsAnsIconTest start====================>"); + + //consume + function consumeCallback(err,data) { + console.debug("==========================consumeCallback data : =======================>" +err+ JSON.stringify(data)); + data.largeIcon.getPixelBytesNumber().then((dataLarge)=>{ + console.info("==================getPixelBytesNumber_largeIcon dataLarge==================>"+ dataLarge); + console.info("==================getPixelBytesNumber_largeIcon largeBuffer==================>"+ largeBuffer); + expect(dataLarge).assertequal(largeBuffer); + }) + + data.smallIcon.getPixelBytesNumber().then((dataSmall)=>{ + console.info("==================getPixelBytesNumber_smallIcon dataSmall==================>"+ dataSmall); + console.info("==================getPixelBytesNumber_smallIcon smallBuffer==================>"+ smallBuffer); + expect(dataSmall).assertequal(smallBuffer); + }) + } + + function subscribeCallback(err) { + console.info("==========================subscribeCallback start=======================>"); + console.info("================subscribeCallback err : =======================>" + JSON.stringify(err)); + console.info("==========================subscribeCallback end=======================>"); + } + + function publishCallback(err){ + console.info("==========================publishCallback start=======================>"); + console.info("================publishCallback err : =======================>" + JSON.stringify(err)); + console.info("==========================publishCallback end=======================>"); + } + /* + * @tc.number: ActsAnsIconTest_0100 + * @tc.name: createPixelMap() + * @tc.desc: verify the function of subscribe + */ + it('ActsAnsIconTest_0100', 0, async function (done) { + console.debug("===============ActsAnsIconTest_0100 start====================>"); + subInfo ={ + onConsume:consumeCallback, + } + await notify.subscribe(subInfo,subscribeCallback); + + largeBuffer = new ArrayBuffer(64); + smallBuffer = new ArrayBuffer(32); + opts = {alphaType: 0, editable: true, pixelFormat: 4, scaleMode: 1, size: {height: 2, width: 3}} + const promise_Large = image.createPixelMap(largeBuffer, opts); + promise_Large.then((data) => { + console.debug("==========================createPixelMap_promise_Large=======================>"); + largeIcon = data; + console.debug("==========================createPixelMap_promise_Large largeIcon=======================>"+largeIcon); + + const promise_Small = image.createPixelMap(smallBuffer, opts); + promise_Small.then((data) => { + console.debug("==========================createPixelMap_promise_Small=======================>"); + smallIcon = data; + console.debug("==========================createPixelMap_promise_Small smallIcon=======================>"+smallIcon); + + notify.publish({ + id: 1, + content: { + contentType: notify.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT, + normal: { + title: "test1_title", + text: "test1_text", + additionalText: "test1_additionalText" + }, + }, + slotType:notify.SlotType.SOCIAL_COMMUNICATION, + classification:"classification1", + sortingKey:"sortingKey1", + smallIcon:smallIcon, + largeIcon:largeIcon, + },publishCallback); + done(); + }); + + }); + + }) +}) + diff --git a/notification/ans_standard/publishicontest/entry/src/main/js/test/List.test.js b/notification/ans_standard/publishicontest/entry/src/main/js/test/List.test.js new file mode 100755 index 0000000000000000000000000000000000000000..f6a0c80457aa4bd78d0066b7ca6c3dcbcd08b773 --- /dev/null +++ b/notification/ans_standard/publishicontest/entry/src/main/js/test/List.test.js @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +require('./Icon.js') \ No newline at end of file diff --git a/notification/ans_standard/publishicontest/hap/ActsAnsIconTest.hap b/notification/ans_standard/publishicontest/hap/ActsAnsIconTest.hap new file mode 100755 index 0000000000000000000000000000000000000000..acd006561e5f6fc747caa6283b18d43fea191bcd Binary files /dev/null and b/notification/ans_standard/publishicontest/hap/ActsAnsIconTest.hap differ diff --git a/notification/ans_standard/publishicontest/signature/openharmony_sx.p7b b/notification/ans_standard/publishicontest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/notification/ans_standard/publishicontest/signature/openharmony_sx.p7b differ