From 98970c75f6e3b7db07d0dbd30ee7b9fd343b9fa3 Mon Sep 17 00:00:00 2001 From: yangbo Date: Thu, 27 Jul 2023 12:02:24 +0800 Subject: [PATCH] fix uri cases Signed-off-by: yangbo --- .../test/PhotoAccessHelper/registerChange.ets | 8 +-- .../PhotoAccessHelper/unRegisterChange.ets | 20 +++--- .../main/ets/test/PhotoAsset/commitModify.ets | 4 +- .../src/main/ets/test/PhotoAsset/get.ets | 64 +++++++++--------- .../ets/test/publicApiTestWithSystemApi.ets | 65 ++++++++++--------- 5 files changed, 82 insertions(+), 79 deletions(-) diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/registerChange.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/registerChange.ets index d98341b1b..72688797e 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/registerChange.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/registerChange.ets @@ -34,7 +34,7 @@ export default function registerChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0100 * @tc.name : registerChange_callback_001 - * @tc.desc : listening motify file displayName, type NOTIFY_UPDATE + * @tc.desc : listening motify file title, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -143,12 +143,12 @@ export default function registerChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_1100 * @tc.name : registerChange_callback_011 - * @tc.desc : listening album removeAssets, type NOTIFY_ALBUM_ADD_ASSET + * @tc.desc : listening album addAssets, type NOTIFY_ALBUM_ADD_ASSET * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('registerChange_callback_011', 0, async function (done) { + it('registerChange_callback_011', 2, async function (done) { const testNum = 'registerChange_callback_011'; try { let albumName = 'testAlbum' + Date.now(); @@ -185,7 +185,7 @@ export default function registerChangeTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('registerChange_callback_012', 0, async function (done) { + it('registerChange_callback_012', 2, async function (done) { const testNum = 'registerChange_callback_012'; try { let albumName = 'testAlbum' + Date.now(); diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/unRegisterChange.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/unRegisterChange.ets index 147b34a31..238d1e847 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/unRegisterChange.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/unRegisterChange.ets @@ -32,7 +32,7 @@ export default function unRegisterChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0100 * @tc.name : unRegisterChange_001 - * @tc.desc : off listening motify file displayName, type NOTIFY_UPDATE + * @tc.desc : unRegister listening motify file displayName * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -67,7 +67,7 @@ export default function unRegisterChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0700 * @tc.name : unRegisterChange_007 - * @tc.desc : off listening create album, type NOTIFY_ADD + * @tc.desc : unRegister listening create album * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -98,7 +98,7 @@ export default function unRegisterChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0800 * @tc.name : unRegisterChange_008 - * @tc.desc : off listening create album, type NOTIFY_UPDATE + * @tc.desc : unRegister listening create album * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -134,7 +134,7 @@ export default function unRegisterChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1000 * @tc.name : unRegisterChange_010 - * @tc.desc : off listening change album overUri, type NOTIFY_UPDATE + * @tc.desc : unRegister listening change album overUri * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -173,7 +173,7 @@ export default function unRegisterChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1100 * @tc.name : unRegisterChange_011 - * @tc.desc : off listening album removeAssets, type NOTIFY_ALBUM_ADD_ASSET + * @tc.desc : unRegister listening album addAssets * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -208,7 +208,7 @@ export default function unRegisterChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1200 * @tc.name : unRegisterChange_012 - * @tc.desc : off listening album removeAssets, type NOTIFY_ALBUM_REMOVE_ASSET + * @tc.desc : unRegister listening album removeAssets * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -244,12 +244,12 @@ export default function unRegisterChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1500 * @tc.name : unRegisterChange_015 - * @tc.desc : off remove all listening + * @tc.desc : unRegister remove all listening * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('unRegisterChange_015', 0, async function (done) { + it('unRegisterChange_015', 3, async function (done) { const testNum = 'unRegisterChange_015'; try { let fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'off15.jpg'); @@ -283,12 +283,12 @@ export default function unRegisterChangeTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_CALLBACK_0000 * @tc.name : unRegisterChange_callback_000 - * @tc.desc : off remove specified callback + * @tc.desc : unRegister remove specified callback * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('unRegisterChange_callback_000', 0, async function (done) { + it('unRegisterChange_callback_000', 3, async function (done) { const testNum = 'unRegisterChange_callback_000'; try { let fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'offCb01.jpg'); diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/commitModify.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/commitModify.ets index c6f72ca2f..81834f7ab 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/commitModify.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/commitModify.ets @@ -136,7 +136,7 @@ export default function commitModifyTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_FILE_ASSET_COMMITMODIFY_0100 * @tc.name : photoAsset_commitModify_callback_001 - * @tc.desc : modify image displayName '一...' (84) + * @tc.desc : modify image displayName '一...' (83) * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 @@ -260,7 +260,7 @@ export default function commitModifyTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_FILE_ASSET_COMMITMODIFY_0800 * @tc.name : photoAsset_commitModify_callback_008 - * @tc.desc : modify video displayName '三三...' (84) + * @tc.desc : modify video displayName '三三...' (83) * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/get.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/get.ets index d00f80f22..936c33fce 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/get.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/get.ets @@ -58,7 +58,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_000', 0, async function (done) { + it('get_000', 2, async function (done) { const testNum = 'get_000'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.URI; @@ -74,7 +74,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_001', 0, async function (done) { + it('get_001', 2, async function (done) { const testNum = 'get_001'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.PHOTO_TYPE; @@ -90,7 +90,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_002', 0, async function (done) { + it('get_002', 2, async function (done) { const testNum = 'get_002'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.DISPLAY_NAME; @@ -106,7 +106,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_003', 0, async function (done) { + it('get_003', 2, async function (done) { const testNum = 'get_003'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.DATE_ADDED; @@ -122,7 +122,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_004', 0, async function (done) { + it('get_004', 2, async function (done) { const testNum = 'get_004'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.DATE_MODIFIED; @@ -138,7 +138,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_005', 0, async function (done) { + it('get_005', 2, async function (done) { const testNum = 'get_005'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.DURATION; @@ -154,7 +154,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_006', 0, async function (done) { + it('get_006', 2, async function (done) { const testNum = 'get_006'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.WIDTH; @@ -170,7 +170,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_007', 0, async function (done) { + it('get_007', 2, async function (done) { const testNum = 'get_007'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.HEIGHT; @@ -186,7 +186,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_008', 0, async function (done) { + it('get_008', 2, async function (done) { const testNum = 'get_008'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.DATE_TAKEN; @@ -202,7 +202,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_009', 0, async function (done) { + it('get_009', 2, async function (done) { const testNum = 'get_009'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.ORIENTATION; @@ -218,7 +218,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_010', 0, async function (done) { + it('get_010', 2, async function (done) { const testNum = 'get_010'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.FAVORITE; @@ -234,7 +234,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_011', 0, async function (done) { + it('get_011', 2, async function (done) { const testNum = 'get_011'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.SIZE; @@ -250,7 +250,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_012', 0, async function (done) { + it('get_012', 2, async function (done) { const testNum = 'get_012'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.TITLE; @@ -266,7 +266,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_013', 0, async function (done) { + it('get_013', 2, async function (done) { const testNum = 'get_013'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.POSITION; @@ -282,7 +282,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_014', 0, async function (done) { + it('get_014', 2, async function (done) { const testNum = 'get_014'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.DATE_TRASHED; @@ -298,7 +298,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_015', 0, async function (done) { + it('get_015', 2, async function (done) { const testNum = 'get_015'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.jpg'); const key = photoKeys.HIDDEN; @@ -315,7 +315,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_050', 0, async function (done) { + it('get_050', 2, async function (done) { const testNum = 'get_050'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.URI; @@ -331,7 +331,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_051', 0, async function (done) { + it('get_051', 2, async function (done) { const testNum = 'get_051'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.PHOTO_TYPE; @@ -347,7 +347,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_052', 0, async function (done) { + it('get_052', 2, async function (done) { const testNum = 'get_052'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.DISPLAY_NAME; @@ -363,7 +363,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_053', 0, async function (done) { + it('get_053', 2, async function (done) { const testNum = 'get_053'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.DATE_ADDED; @@ -379,7 +379,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_054', 0, async function (done) { + it('get_054', 2, async function (done) { const testNum = 'get_054'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.DATE_MODIFIED; @@ -395,7 +395,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_055', 0, async function (done) { + it('get_055', 2, async function (done) { const testNum = 'get_055'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.DURATION; @@ -411,7 +411,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_056', 0, async function (done) { + it('get_056', 2, async function (done) { const testNum = 'get_056'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.WIDTH; @@ -427,7 +427,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_057', 0, async function (done) { + it('get_057', 2, async function (done) { const testNum = 'get_057'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.HEIGHT; @@ -443,7 +443,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_058', 0, async function (done) { + it('get_058', 2, async function (done) { const testNum = 'get_058'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.DATE_TAKEN; @@ -459,7 +459,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_059', 0, async function (done) { + it('get_059', 2, async function (done) { const testNum = 'get_059'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.ORIENTATION; @@ -475,7 +475,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_060', 0, async function (done) { + it('get_060', 2, async function (done) { const testNum = 'get_060'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.FAVORITE; @@ -491,7 +491,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_061', 0, async function (done) { + it('get_061', 2, async function (done) { const testNum = 'get_061'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.SIZE; @@ -507,7 +507,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_062', 0, async function (done) { + it('get_062', 2, async function (done) { const testNum = 'get_062'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.TITLE; @@ -523,7 +523,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_063', 0, async function (done) { + it('get_063', 2, async function (done) { const testNum = 'get_063'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.POSITION; @@ -539,7 +539,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_064', 0, async function (done) { + it('get_064', 2, async function (done) { const testNum = 'get_064'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.DATE_TRASHED; @@ -555,7 +555,7 @@ export default function getTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('get_065', 0, async function (done) { + it('get_065', 2, async function (done) { const testNum = 'get_065'; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, '01.mp4'); const key = photoKeys.HIDDEN; diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/publicApiTestWithSystemApi.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/publicApiTestWithSystemApi.ets index 137801a7c..0434e1c7a 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/publicApiTestWithSystemApi.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/publicApiTestWithSystemApi.ets @@ -269,7 +269,7 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0000 * @tc.name : unRegisterChange_000 - * @tc.desc : off listening create file, type NOTIFY_ADD + * @tc.desc : unRegister listening create file * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -304,7 +304,7 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0200 * @tc.name : unRegisterChange_002 - * @tc.desc : off listening setFavorite(true) file, type NOTIFY_UPDATE + * @tc.desc : unRegister listening setFavorite(true) file * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -337,7 +337,7 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0300 * @tc.name : unRegisterChange_003 - * @tc.desc : off listening setFavorite(false) file, type NOTIFY_UPDATE + * @tc.desc : unRegister listening setFavorite(false) file * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -371,12 +371,12 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0400 * @tc.name : unRegisterChange_004 - * @tc.desc : off listening delete file, type NOTIFY_REMOVE + * @tc.desc : unRegister listening delete file * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('unRegisterChange_004', 0, async function (done) { + it('unRegisterChange_004', 2, async function (done) { const testNum = 'unRegisterChange_004'; try { const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'off04.jpg'); @@ -404,12 +404,12 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0500 * @tc.name : unRegisterChange_005 - * @tc.desc : off listening recover file, type NOTIFY_ADD + * @tc.desc : unRegister listening recover file * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('unRegisterChange_005', 0, async function (done) { + it('unRegisterChange_005', 2, async function (done) { const testNum = 'unRegisterChange_005'; try { let testFileName = 'testCreateFile' + Date.now() + '.jpg'; @@ -447,12 +447,12 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0600 * @tc.name : unRegisterChange_006 - * @tc.desc : off listening trash delete file, type NOTIFY_REMOVE + * @tc.desc : unRegister listening trash delete file * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('unRegisterChange_006', 0, async function (done) { + it('unRegisterChange_006', 2, async function (done) { const testNum = 'unRegisterChange_006'; try { let testFileName = 'testCreateFile' + Date.now() + '.jpg'; @@ -488,7 +488,7 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0900 * @tc.name : unRegisterChange_009 - * @tc.desc : off listening delete album, type NOTIFY_REMOVE + * @tc.desc : unRegister listening delete album * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -521,12 +521,12 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1300 * @tc.name : unRegisterChange_013 - * @tc.desc : off listening DEFAULT_ALBUM_URI + * @tc.desc : unRegister listening DEFAULT_ALBUM_URI * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('unRegisterChange_013', 0, async function (done) { + it('unRegisterChange_013', 3, async function (done) { const testNum = 'unRegisterChange_013'; try { const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'off13.jpg'); @@ -581,12 +581,12 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1400 * @tc.name : unRegisterChange_014 - * @tc.desc : off listening DEFAULT_PHOTO_URI + * @tc.desc : unRegister listening DEFAULT_PHOTO_URI * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('unRegisterChange_014', 0, async function (done) { + it('unRegisterChange_014', 3, async function (done) { const testNum = 'unRegisterChange_014'; try { let listenCount = 0; @@ -638,7 +638,7 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0000 * @tc.name : registerChange_callback_000 - * @tc.desc : off listening create file, type NOTIFY_ADD + * @tc.desc : listening create file, type NOTIFY_ADD * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -758,7 +758,7 @@ export default function publicApiTestWithSystemApiTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('registerChange_callback_005', 0, async function (done) { + it('registerChange_callback_005', 2, async function (done) { const testNum = 'registerChange_callback_005'; let uri; try { @@ -800,12 +800,12 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0600 * @tc.name : registerChange_callback_006 - * @tc.desc : listening trash delete file, type NOTIFY_REMOVE + * @tc.desc : listening trash delete file, type NOTIFY_ALBUM_REMOVE_ASSET * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('registerChange_callback_006', 0, async function (done) { + it('registerChange_callback_006', 2, async function (done) { const testNum = 'registerChange_callback_006'; let uri; try { @@ -894,7 +894,7 @@ export default function publicApiTestWithSystemApiTest () { * @tc.type : Function * @tc.level : Level 3 */ - it('registerChange_callback_013', 0, async function (done) { + it('registerChange_callback_013', 3, async function (done) { const testNum = 'registerChange_callback_013'; let uri; try { @@ -1023,7 +1023,7 @@ export default function publicApiTestWithSystemApiTest () { * @tc.type : Function * @tc.level : Level 3 */ - it('registerChange_callback_014', 0, async function (done) { + it('registerChange_callback_014', 3, async function (done) { const testNum = 'registerChange_callback_014'; let uri; try { @@ -1033,23 +1033,27 @@ export default function publicApiTestWithSystemApiTest () { let photoAssetUri = asset.uri; await sleep(550); uri = DEFAULT_PHOTO_URI; + let expectUri = photoAssetUri; helper.registerChange(uri, true, async (changeData) => { listenCount++; switch (listenCount) { case 1: console.info(`${testNum} 1 changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_UPDATE); - expect(changeData.uris[0]).assertEqual(photoAssetUri); + expect(changeData.uris[0]).assertEqual(expectUri); break; case 2: console.info(`${testNum} 2 changeData: ${JSON.stringify(changeData)}`); + const option = fetchOption(testNum, photoKeys.URI, photoAssetUri); + const newAsset = await getFileAsset(testNum, option); + expectUri = newAsset.uri; expect(changeData.type).assertEqual(NOTIFY_UPDATE); - expect(changeData.uris[0]).assertEqual(photoAssetUri); + expect(changeData.uris[0]).assertEqual(expectUri); break; case 3: console.info(`${testNum} 3 changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_UPDATE); - expect(changeData.uris[0]).assertEqual(photoAssetUri); + expect(changeData.uris[0]).assertEqual(expectUri); break; default: break; @@ -1082,12 +1086,12 @@ export default function publicApiTestWithSystemApiTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_1500 * @tc.name : registerChange_callback_015 - * @tc.desc : listening 32 + * @tc.desc : listening in 500ms, notify times lessthan update times * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('registerChange_callback_015', 0, async function (done) { + it('registerChange_callback_015', 3, async function (done) { const testNum = 'registerChange_callback_015'; let uri; try { @@ -1101,19 +1105,18 @@ export default function publicApiTestWithSystemApiTest () { helper.registerChange(DEFAULT_PHOTO_URI, true, async (changeData) => { listenCount++; console.info(`${testNum} i: ${i}, listenCount: ${listenCount}`); - expect(i > 1).assertTrue() + expect(listenCount < i).assertTrue() console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_UPDATE); expect(changeData.uris[0]).assertEqual(asset.uri); }); await sleep(550); + const isFav = (asset.get(photoKeys.FAVORITE) === 1) ? true : false; const endTime = Date.now() + 500; for (let now = Date.now(); now < endTime; now = Date.now()) { i++; - const newTitle = asset.get(photoKeys.TITLE).toString() + i; - asset.set(photoKeys.TITLE, newTitle); - await asset.commitModify(); + await asset.setFavorite(!isFav); } await sleep(1000); done(); @@ -1134,7 +1137,7 @@ export default function publicApiTestWithSystemApiTest () { * @tc.type : Function * @tc.level : Level 3 */ - it('registerChange_callback_016', 0, async function (done) { + it('registerChange_callback_016', 3, async function (done) { const testNum = 'registerChange_callback_016'; let uri; try { @@ -1158,7 +1161,7 @@ export default function publicApiTestWithSystemApiTest () { } else { await asset.setFavorite(false); } - await sleep(550); + await sleep(500); } await sleep(1000); -- GitLab