From 7465ed7f69bd60641f2b4bac6c548d163ef9e476 Mon Sep 17 00:00:00 2001 From: yangbo Date: Wed, 19 Jul 2023 16:56:43 +0800 Subject: [PATCH] photoAccessHelper xts update Signed-off-by: yangbo --- multimedia/medialibrary/common.js | 44 +- .../medialibrary/mediaLibrary_album/Test.json | 2 +- .../medialibrary/mediaLibrary_base/Test.json | 2 +- .../mediaLibrary_favorite/Test.json | 2 +- .../medialibrary/mediaLibrary_file/Test.json | 2 +- .../mediaLibrary_fileAsset/Test.json | 2 +- .../mediaLibrary_fileKey/Test.json | 2 +- .../mediaLibrary_fileResult/Test.json | 2 +- .../mediaLibrary_getExifNoLocation/Test.json | 2 +- .../mediaLibrary_getExiflocation/Test.json | 2 +- .../mediaLibrary_getThumbnail/Test.json | 2 +- .../mediaLibrary_mediafetchoptions/Test.json | 2 +- .../medialibrary/mediaLibrary_trash/Test.json | 2 +- multimedia/photoAccess/common.ts | 27 - multimedia/photoAccess/photoAccess/Test.json | 16 +- .../src/main/ets/test/AbsAlbum/checkAttr.ets | 1 - .../src/main/ets/test/AbsAlbum/getAssets.ets | 2 - .../src/main/ets/test/Album/addAssets.ets | 75 ++- .../src/main/ets/test/Album/commitModify.ets | 1 - .../src/main/ets/test/Album/removeAssets.ets | 31 +- .../main/ets/test/AlbumFetchResult/close.ets | 1 - .../test/AlbumFetchResult/getAllObjects.ets | 1 - .../ets/test/AlbumFetchResult/getCount.ets | 11 +- .../test/AlbumFetchResult/getFirstObject.ets | 1 - .../test/AlbumFetchResult/getLastObject.ets | 1 - .../test/AlbumFetchResult/getNextObject.ets | 1 - .../AlbumFetchResult/getObjectByPosition.ets | 1 - .../ets/test/AlbumFetchResult/isAfterLast.ets | 1 - .../entry/src/main/ets/test/List.test.ets | 2 + .../test/PhotoAccessHelper/createAsset.ets | 3 +- .../PhotoAccessHelper/createDeleteRequest.ets | 100 ++++ .../ets/test/PhotoAccessHelper/getAlbums.ets | 86 +++- .../ets/test/PhotoAccessHelper/getAssets.ets | 1 - .../test/PhotoAccessHelper/registerChange.ets | 42 +- .../ets/test/PhotoAccessHelper/release.ets | 1 - .../PhotoAccessHelper/unRegisterChange.ets | 68 ++- .../main/ets/test/PhotoAsset/checkAttr.ets | 6 +- .../src/main/ets/test/PhotoAsset/close.ets | 1 - .../main/ets/test/PhotoAsset/commitModify.ets | 4 +- .../src/main/ets/test/PhotoAsset/get.ets | 6 +- .../ets/test/PhotoAsset/getReadOnlyFd.ets | 2 - .../main/ets/test/PhotoAsset/getThumbnail.ets | 1 - .../ets/test/PhotoAssetFetchResult/close.ets | 1 - .../PhotoAssetFetchResult/getAllObjects.ets | 1 - .../test/PhotoAssetFetchResult/getCount.ets | 1 - .../PhotoAssetFetchResult/getFirstObject.ets | 41 +- .../PhotoAssetFetchResult/getLastObject.ets | 1 - .../PhotoAssetFetchResult/getNextObject.ets | 35 +- .../getObjectByPosition.ets | 1 - .../PhotoAssetFetchResult/isAfterLast.ets | 32 +- .../main/ets/test/getPhotoAccessHelper.ets | 7 +- .../photoAccess/entry/src/main/module.json | 3 +- .../photoAccess/photoAccessSystem/Test.json | 16 +- .../src/main/ets/test/Album/deleteAssets.ets | 1 - .../src/main/ets/test/Album/recoverAssets.ets | 1 - .../src/main/ets/test/Album/setCoverUri.ets | 1 - .../entry/src/main/ets/test/createAlbum.ets | 1 - .../entry/src/main/ets/test/deleteAlbums.ets | 5 +- .../entry/src/main/ets/test/deleteAssets.ets | 1 - .../entry/src/main/ets/test/open.ets | 63 ++- .../ets/test/publicApiTestWithSystemApi.ets | 465 +++++++++++++----- .../entry/src/main/ets/test/setFavorite.ets | 1 - .../entry/src/main/ets/test/setHidden.ets | 1 - .../entry/src/main/module.json | 3 +- 64 files changed, 871 insertions(+), 373 deletions(-) create mode 100644 multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/createDeleteRequest.ets diff --git a/multimedia/medialibrary/common.js b/multimedia/medialibrary/common.js index 0bb01d665..6f1876d9c 100644 --- a/multimedia/medialibrary/common.js +++ b/multimedia/medialibrary/common.js @@ -238,28 +238,36 @@ const getPermission = async function (name, context) { name = "ohos.acts.multimedia.mediaLibrary"; } - console.info('getPermission start: ' + name); - let permissions = ["ohos.permission.MEDIA_LOCATION", "ohos.permission.READ_MEDIA", "ohos.permission.WRITE_MEDIA"]; - let atManager = abilityAccessCtrl.createAtManager(); - atManager.requestPermissionsFromUser(context, permissions, (err, result) => { - if (err) { - console.info('getPermission failed: ' + JSON.stringify(err)); - } else { - console.info('getPermission suc: ' + JSON.stringify(result)); - } - }); - - let driver = uitest.Driver.create(); - await sleep(500); + try { + console.info('getPermission start: ' + name); + let isGetPermission = false; + let permissions = ["ohos.permission.MEDIA_LOCATION", "ohos.permission.READ_MEDIA", "ohos.permission.WRITE_MEDIA"]; + let atManager = abilityAccessCtrl.createAtManager(); + atManager.requestPermissionsFromUser(context, permissions, (err, result) => { + if (err) { + console.info('getPermission failed: ' + JSON.stringify(err)); + } else { + console.info('getPermission suc: ' + JSON.stringify(result)); + isGetPermission = true; + } + }); - for (let i = 0; i < 10; i++) { + let driver = uitest.Driver.create(); await sleep(500); - let button = await driver.findComponent(uitest.ON.text('允许')); - if (button != undefined) { - await button.click(); + for (let i = 0; i < 10; i++) { + if (isGetPermission) { + break; + } + await sleep(500); + let button = await driver.findComponent(uitest.ON.text('允许')); + if (button != undefined) { + await button.click(); + } } + console.info("getPermission end"); + } catch (error) { + console.info('getPermission error: ' + error); } - console.info("getPermission end"); }; const MODIFY_ERROR_CODE_01 = "-1000"; diff --git a/multimedia/medialibrary/mediaLibrary_album/Test.json b/multimedia/medialibrary/mediaLibrary_album/Test.json index a6c88e4eb..6847d38b6 100644 --- a/multimedia/medialibrary/mediaLibrary_album/Test.json +++ b/multimedia/medialibrary/mediaLibrary_album/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_base/Test.json b/multimedia/medialibrary/mediaLibrary_base/Test.json index 3d57ffee8..0bcd492aa 100644 --- a/multimedia/medialibrary/mediaLibrary_base/Test.json +++ b/multimedia/medialibrary/mediaLibrary_base/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_favorite/Test.json b/multimedia/medialibrary/mediaLibrary_favorite/Test.json index 3e0dfdbf4..842ad7d42 100644 --- a/multimedia/medialibrary/mediaLibrary_favorite/Test.json +++ b/multimedia/medialibrary/mediaLibrary_favorite/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_file/Test.json b/multimedia/medialibrary/mediaLibrary_file/Test.json index 1ff7f34c3..604e45a75 100644 --- a/multimedia/medialibrary/mediaLibrary_file/Test.json +++ b/multimedia/medialibrary/mediaLibrary_file/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json b/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json index 85f980e4e..7a0d21c02 100644 --- a/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json +++ b/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_fileKey/Test.json b/multimedia/medialibrary/mediaLibrary_fileKey/Test.json index 7bdeb786b..7c5e3c30e 100644 --- a/multimedia/medialibrary/mediaLibrary_fileKey/Test.json +++ b/multimedia/medialibrary/mediaLibrary_fileKey/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_fileResult/Test.json b/multimedia/medialibrary/mediaLibrary_fileResult/Test.json index 1ff42252c..368490f02 100644 --- a/multimedia/medialibrary/mediaLibrary_fileResult/Test.json +++ b/multimedia/medialibrary/mediaLibrary_fileResult/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_getExifNoLocation/Test.json b/multimedia/medialibrary/mediaLibrary_getExifNoLocation/Test.json index dd3a633ff..676a449de 100644 --- a/multimedia/medialibrary/mediaLibrary_getExifNoLocation/Test.json +++ b/multimedia/medialibrary/mediaLibrary_getExifNoLocation/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_getExiflocation/Test.json b/multimedia/medialibrary/mediaLibrary_getExiflocation/Test.json index b6e8d8c00..62c0acb80 100644 --- a/multimedia/medialibrary/mediaLibrary_getExiflocation/Test.json +++ b/multimedia/medialibrary/mediaLibrary_getExiflocation/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json b/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json index e3755f0be..1029d3158 100644 --- a/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json +++ b/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json index a8dc841b6..ab6a30158 100644 --- a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json +++ b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/medialibrary/mediaLibrary_trash/Test.json b/multimedia/medialibrary/mediaLibrary_trash/Test.json index 566d32b21..615d57f05 100644 --- a/multimedia/medialibrary/mediaLibrary_trash/Test.json +++ b/multimedia/medialibrary/mediaLibrary_trash/Test.json @@ -6,7 +6,7 @@ "bundle-name": "ohos.acts.multimedia.mediaLibrary", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { diff --git a/multimedia/photoAccess/common.ts b/multimedia/photoAccess/common.ts index 40d8c44c6..2af43d51e 100644 --- a/multimedia/photoAccess/common.ts +++ b/multimedia/photoAccess/common.ts @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper'; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import bundleManager from '@ohos.bundle.bundleManager'; @@ -159,32 +158,6 @@ export async function createUserAlbum(testNum, albumName) : Promise { - try { - const helper = photoAccessHelper.getPhotoAccessHelper(globalThis.abilityContext); - let fetchResult = await helper.getAlbums(albumType.USER, albumSubtype.USER_GENERIC); - let count = fetchResult.getCount(); - console.info(`${testNum} deleteAllUserAlbum count: ${count}`); - if (count <= 0) { - return; - } - const albumList = await fetchResult.getAllObjects(); - console.info(`${testNum} deleteAllUserAlbum getAllObjects: ${albumList.length}`); - await helper.deleteAlbums(albumList); - fetchResult = await helper.getAlbums(albumType.USER, albumSubtype.USER_GENERIC); - if (fetchResult.getCount() === 0) { - console.info(`${testNum} deleteAllUserAlbum suc`); - } else { - console.info(`${testNum} deleteAllUserAlbum failed! fetchResult.getCount(): ${fetchResult.getCount()}`); - } - fetchResult.close(); - } catch (error) { - console.info(`${testNum} deleteAllUserAlbum failed! error: ${error}`); - throw error; - } -}; - export async function getFileAsset(testNum, fetchOps) : Promise { let asset: photoAccessHelper.PhotoAsset; try { diff --git a/multimedia/photoAccess/photoAccess/Test.json b/multimedia/photoAccess/photoAccess/Test.json index 488ac605b..459f7e74f 100644 --- a/multimedia/photoAccess/photoAccess/Test.json +++ b/multimedia/photoAccess/photoAccess/Test.json @@ -6,14 +6,26 @@ "bundle-name": "ohos.acts.multimedia.photoaccess", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Audios/.*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Camera/.*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Documents/.*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Download/.*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Pictures/.*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/files/Videos/.*", + "sleep 5", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "kill -9 `pidof com.ohos.medialibrary.medialibrarydata`", "scanner", diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AbsAlbum/checkAttr.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AbsAlbum/checkAttr.ets index 2e5505f5b..e0311dc7a 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AbsAlbum/checkAttr.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AbsAlbum/checkAttr.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AbsAlbum/getAssets.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AbsAlbum/getAssets.ets index 22aa7e140..4445aeb13 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AbsAlbum/getAssets.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AbsAlbum/getAssets.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { @@ -21,7 +20,6 @@ import { albumSubtype, photoKeys, fetchOption, - getFileAsset, } from '../../../../../../../common' export default function albumGetAssetsTest () { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/addAssets.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/addAssets.ets index ed230042d..66a11841e 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/addAssets.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/addAssets.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -// @ts-nocheck +import dataSharePredicates from '@ohos.data.dataSharePredicates'; import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { @@ -78,14 +78,16 @@ export default function addAssetsTest () { const testNum = 'addAssets_callback_003'; try { const album = await helper.createAlbum(testNum); - const fetchOps1 = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'addCb03.jpg'); - const fetchOps2 = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'addCb01.mp4'); - const assetList: Array = new Array(); - const asset1 = await getFileAsset(testNum, fetchOps1); - assetList.push(asset1); - const asset2 = await getFileAsset(testNum, fetchOps2); - assetList.push(asset2); - + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.in(photoKeys.DISPLAY_NAME, ['addCb03.jpg', 'addCb01.mp4']); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; + const fetchResult = await helper.getAssets(fetchOps); + console.info(`${testNum} fetchResult: ${fetchResult.getCount()}`); + const assetList = await fetchResult.getAllObjects(); + fetchResult.close(); album.addAssets(assetList, async (err) => { try { if (err) { @@ -109,6 +111,37 @@ export default function addAssetsTest () { } }); + /** + * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_ADD_ASSETS_0400 + * @tc.name : addAssets_callback_004 + * @tc.desc : add empty array to user album + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 2 + */ + it('addAssets_callback_004', 2, async function (done) { + const testNum = 'addAssets_callback_004'; + try { + const album = await helper.createAlbum(testNum); + album.addAssets([], async (err) => { + try { + if (err) { + console.info(`${testNum} err: ${err}`); + expect(false).assertTrue(); + } + } catch (error) { + console.info(`${testNum} error: ${error}`); + } + done(); + }) + + } catch (error) { + console.info(`${testNum} failed; error: ${error}`); + expect(false).assertTrue(); + done(); + } + }); + /** * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_ADD_ASSETS_0500 * @tc.name : addAssets_callback_005 @@ -176,18 +209,20 @@ export default function addAssetsTest () { const testNum = 'addAssets_promise_003'; try { const album = await helper.createAlbum(testNum); - const fetchOps1 = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'addPro03.jpg'); - const fetchOps2 = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'addPro01.mp4'); - const assetList: Array = new Array(); - const asset1 = await getFileAsset(testNum, fetchOps1); - assetList.push(asset1); - const asset2 = await getFileAsset(testNum, fetchOps2); - assetList.push(asset2); - - await album.addAssets(assetList); - const fetchResult = await album.getAssets(fetchAllOption()); - expect(fetchResult.getCount()).assertEqual(2); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.in(photoKeys.DISPLAY_NAME, ['addCb03.jpg', 'addCb01.mp4']); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; + const fetchResult = await helper.getAssets(fetchOps); + console.info(`${testNum} fetchResult: ${fetchResult.getCount()}`); + const assetList = await fetchResult.getAllObjects(); fetchResult.close(); + await album.addAssets(assetList); + const albumFetchResult = await album.getAssets(fetchAllOption()); + expect(albumFetchResult.getCount()).assertEqual(2); + albumFetchResult.close(); done(); } catch (error) { console.info(`${testNum} failed; error: ${error}`); diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/commitModify.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/commitModify.ets index b4ec51420..fab41bd6a 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/commitModify.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/commitModify.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/removeAssets.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/removeAssets.ets index 2c4dbc264..ad9ead1f3 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/removeAssets.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/Album/removeAssets.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { @@ -115,6 +114,36 @@ export default function removeAssetsTest () { } }); + /** + * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_REMOVE_ASSETS_0300 + * @tc.name : removeAssets_callback_003 + * @tc.desc : user album remove empty array + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 2 + */ + it('removeAssets_callback_003', 2, async function (done) { + const testNum = 'removeAssets_callback_003'; + try { + const album = await helper.createAlbum(testNum); + album.removeAssets([], async (err) => { + try { + if (err) { + console.info(`${testNum} err: ${err}`); + expect(false).assertTrue(); + } + } catch (error) { + console.info(`${testNum} error: ${error}`); + } + done(); + }) + } catch (error) { + console.info(`${testNum} failed; error: ${error}`); + expect(false).assertTrue(); + done(); + } + }); + /** * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_REMOVE_ASSETS_0400 * @tc.name : removeAssets_callback_004 diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/close.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/close.ets index f7ae2be8c..2d321e0e1 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/close.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/close.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getAllObjects.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getAllObjects.ets index 7a547e0b2..7f69fb177 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getAllObjects.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getAllObjects.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getCount.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getCount.ets index 793369caa..c0bec86ac 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getCount.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getCount.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { @@ -38,7 +37,7 @@ export default function albumGetCountTest () { * @tc.level : Level 0 */ it('album_getCount_callback_000', 0, async function (done) { - const testNum = 'album_getCount_callback_000'; + const testNum = 'album_getCount_callback_000'; try { const subTypes : Array = [ albumSubtype.VIDEO, @@ -61,8 +60,8 @@ export default function albumGetCountTest () { } } } catch (error) { - console.info(`${testNum} failed; error: ${error}`); - expect(false).assertTrue(); + console.info(`${testNum} failed; error: ${error}`); + expect(false).assertTrue(); done(); } }); @@ -76,7 +75,7 @@ export default function albumGetCountTest () { * @tc.level : Level 0 */ it('album_getCount_callback_001', 0, async function (done) { - const testNum = 'album_getCount_callback_001'; + const testNum = 'album_getCount_callback_001'; try { const albumName = genRadomStr(10); await createUserAlbum(testNum, albumName); @@ -92,7 +91,7 @@ export default function albumGetCountTest () { done(); } catch (error) { console.info(`${testNum} failed; error: ${error}`); - expect(false).assertTrue(); + expect(false).assertTrue(); done(); } }); diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getFirstObject.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getFirstObject.ets index 6836ea4ae..b48dcecc5 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getFirstObject.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getFirstObject.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getLastObject.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getLastObject.ets index eaa4bfc5b..26b000ccb 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getLastObject.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getLastObject.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getNextObject.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getNextObject.ets index 300327be2..5106c8fce 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getNextObject.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getNextObject.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getObjectByPosition.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getObjectByPosition.ets index 9afc2e60d..d92d67b2e 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getObjectByPosition.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/getObjectByPosition.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/isAfterLast.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/isAfterLast.ets index 4700a2d83..e5f6eadab 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/isAfterLast.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/AlbumFetchResult/isAfterLast.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/List.test.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/List.test.ets index 09fe90f6c..540a68611 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/List.test.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/List.test.ets @@ -36,6 +36,7 @@ import assetGetNextObjectTest from './PhotoAssetFetchResult/getNextObject' import assetGetPositionObjectTest from './PhotoAssetFetchResult/getObjectByPosition' import assetIsAfterLastTest from './PhotoAssetFetchResult/isAfterLast' import createAssetTest from './PhotoAccessHelper/createAsset' +import createDeleteRequestTest from './PhotoAccessHelper/createDeleteRequest' import getAlbumsTest from './PhotoAccessHelper/getAlbums' import getAssetsTest from './PhotoAccessHelper/getAssets' import unRegisterChangeTest from './PhotoAccessHelper/unRegisterChange' @@ -72,6 +73,7 @@ export default function testsuite () { assetGetPositionObjectTest() assetIsAfterLastTest() createAssetTest() + createDeleteRequestTest() getAlbumsTest() getAssetsTest() unRegisterChangeTest() diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/createAsset.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/createAsset.ets index 8142cb365..17af2693b 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/createAsset.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/createAsset.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { photoType } from '../../../../../../../common' @@ -242,7 +241,7 @@ export default function createAssetTest () { const options: photoAccessHelper.CreateOptions = undefined; await createAssetAbnormalCallback1(done, testNum, type, extension, options); }); - + /** * @tc.number : SUB_PHOTOACCESS_HELPER_PROMISE_CREATE_IMAGE_0000 * @tc.name : createImage_promise_000 diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/createDeleteRequest.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/createDeleteRequest.ets new file mode 100644 index 000000000..911d59cb2 --- /dev/null +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/createDeleteRequest.ets @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2023 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 photoAccessHelper from '@ohos.file.photoAccessHelper' +import { describe, it, expect } from 'deccjsunit/index' +import { genRadomStr, photoType } from '../../../../../../../common'; + +export default function createDeleteRequestTest() { + describe('createDeleteRequestTest', function () { + const helper = photoAccessHelper.getPhotoAccessHelper(globalThis.abilityContext) + const ERR_CODE_PARAMERTER_INVALID = 13900020; + + const createFiles = async (count) => { + try { + const uriList: Array = new Array(); + for (let i = 0; i < count; i++) { + let title = genRadomStr(10); + let asset = await helper.createAsset(title + '.jpg'); + let fd = await asset.open('rw'); + await asset.close(fd); + uriList.push(asset.uri); + } + return uriList; + } catch (error) { + console.info(`delete_popup createFiles error ${error}`); + } + }; + + /** + * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_CREATE_DELETE_REQUEST_0000 + * @tc.name : createDeleteRequest_callback_000 + * @tc.desc : delete 1 file + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 0 + */ + it('createDeleteRequest_callback_000', 0, async function (done) { + const testNum = 'createDeleteRequest_callback_000'; + try { + let uriList = await createFiles(1); + console.info(`${testNum} uriList: ${JSON.stringify(uriList)}`) + helper.createDeleteRequest(uriList, (err) => { + try { + if (err) { + console.info(`${testNum} error ${JSON.stringify(err)}`); + } else { + console.log(`${testNum} delete suc`); + } + } catch (error) { + console.info(`${testNum} error ${JSON.stringify(error)}`); + } + done(); + }) + done(); + } catch (error) { + expect(false).assertTrue(); + done(); + } + }); + + /** + * @tc.number : SUB_PHOTOACCESS_HELPER_PROMISE_CREATE_DELETE_REQUEST_0000 + * @tc.name : createDeleteRequest_promise_000 + * @tc.desc : delete 1 file + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 0 + */ + it('createDeleteRequest_promise_000', 0, async function (done) { + const testNum = 'createDeleteRequest_promise_000'; + try { + let uriList = await createFiles(1); + helper.createDeleteRequest(uriList) + .then(() => { + console.log(`${testNum} delete suc`); + }) + .catch((error) => { + console.info(`${testNum} error ${JSON.stringify(error)}`); + expect(true).assertTrue(); + }); + done(); + } catch (error) { + expect(false).assertTrue(); + done(); + } + }); + }); +} diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/getAlbums.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/getAlbums.ets index 5f403e5a9..2dfdf5b69 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/getAlbums.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/getAlbums.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -// @ts-nocheck +import dataSharePredicates from '@ohos.data.dataSharePredicates'; import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { @@ -94,7 +94,7 @@ export default function getAlbumsTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('getAlbums_callback_001', 0, async function (done) { + it('getAlbums_callback_001', 2, async function (done) { const testNum = 'getAlbums_callback_001'; try { // Firstly, create an album @@ -134,7 +134,7 @@ export default function getAlbumsTest () { * @tc.type : Function * @tc.level : Level 0 */ - it('SUB_PHOTOACCESS_HELPER_CALLBACK_GET_ALBUM_003', 0, async function (done) { + it('getAlbums_callback_002', 0, async function (done) { const testNum = 'getAlbums_callback_002'; try { let subTypes : Array = [ @@ -225,7 +225,7 @@ export default function getAlbumsTest () { * @tc.type : Function * @tc.level : Level 2 */ - it('getAlbums_promise_001', 0, async function (done) { + it('getAlbums_promise_001', 2, async function (done) { const testNum = 'getAlbums_promise_001'; try { // Firstly, create an album @@ -254,7 +254,7 @@ export default function getAlbumsTest () { * @tc.type : Function * @tc.level : Level 0 */ - it('SUB_PHOTOACCESS_HELPER_PROMISE_GET_ALBUM_003', 0, async function (done) { + it('getAlbums_promise_002', 0, async function (done) { const testNum = 'getAlbums_promise_002'; try { let subTypes : Array = [ @@ -278,5 +278,81 @@ export default function getAlbumsTest () { done(); } }); + + /** + * @tc.number : SUB_PHOTOACCESS_HELPER_PROMISE_GET_ALBUMS_0300 + * @tc.name : getAlbums_promise_003 + * @tc.desc : get user albums by orderByAsc + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 2 + */ + it('getAlbums_promise_003', 2, async function (done) { + const testNum = 'getAlbums_promise_003'; + try { + const albumNames = ['b', 'a', 'c']; + for (let i = 0; i < albumNames.length; i++) { + await helper.createAlbum(albumNames[i]); + } + + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.in(albumKeys.ALBUM_NAME, albumNames).orderByAsc(albumKeys.ALBUM_NAME); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; + const fetchResult = await helper.getAlbums(albumType.USER, albumSubtype.USER_GENERIC, fetchOps); + expect(fetchResult.getCount()).assertEqual(3); + const resultList = await fetchResult.getAllObjects(); + const expectNames = ['a', 'b', 'c']; + for (let i = 0; i < albumNames.length; i++) { + console.info(`${testNum} albumName: ${resultList[i].albumName}`); + expect(resultList[i].albumName).assertEqual(expectNames[i]); + } + done(); + } catch (error) { + console.info(`${testNum} failed, error: ${error}`); + expect(false).assertTrue(); + done(); + } + }); + + /** + * @tc.number : SUB_PHOTOACCESS_HELPER_PROMISE_GET_ALBUMS_0400 + * @tc.name : getAlbums_promise_004 + * @tc.desc : get user albums by orderByDesc + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 2 + */ + it('getAlbums_promise_004', 2, async function (done) { + const testNum = 'getAlbums_promise_004'; + try { + const albumNames = ['x', 'y', 'z']; + for (let i = 0; i < albumNames.length; i++) { + await helper.createAlbum(albumNames[i]); + } + + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.in(albumKeys.ALBUM_NAME, albumNames).orderByDesc(albumKeys.ALBUM_NAME); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; + const fetchResult = await helper.getAlbums(albumType.USER, albumSubtype.USER_GENERIC, fetchOps); + expect(fetchResult.getCount()).assertEqual(3); + const resultList = await fetchResult.getAllObjects(); + const expectNames = ['z', 'y', 'x']; + for (let i = 0; i < albumNames.length; i++) { + console.info(`${testNum} albumName: ${resultList[i].albumName}`); + expect(resultList[i].albumName).assertEqual(expectNames[i]); + } + done(); + } catch (error) { + console.info(`${testNum} failed, error: ${error}`); + expect(false).assertTrue(); + done(); + } + }); }) } diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/getAssets.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/getAssets.ets index 9c0d9437a..59bd88f42 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/getAssets.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/getAssets.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { 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 9487ca830..472f918f7 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 @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { @@ -22,7 +21,6 @@ import { photoKeys, getFileAsset, photoFetchOption, - photoType, } from '../../../../../../../common' export default function registerChangeTest () { @@ -34,15 +32,15 @@ export default function registerChangeTest () { const DEFAULT_ALBUM_URI = photoAccessHelper.DefaultChangeUri.DEFAULT_ALBUM_URI; /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0100 - * @tc.name : on_callback_001 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0100 + * @tc.name : registerChange_callback_001 * @tc.desc : listening motify file displayName, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('on_callback_001', 0, async function (done) { - const testNum = 'on_callback_001'; + it('registerChange_callback_001', 0, async function (done) { + const testNum = 'registerChange_callback_001'; try { let fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'on01.jpg'); const asset = await getFileAsset(testNum, fetchOps); @@ -69,15 +67,15 @@ export default function registerChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0700 - * @tc.name : on_callback_007 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0700 + * @tc.name : registerChange_callback_007 * @tc.desc : listening create album, type NOTIFY_ADD * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('on_callback_007', 0, async function (done) { - const testNum = 'on_callback_007'; + it('registerChange_callback_007', 0, async function (done) { + const testNum = 'registerChange_callback_007'; try { let changeDataUri = ''; let listenCount = 0; @@ -104,15 +102,15 @@ export default function registerChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0800 - * @tc.name : on_callback_008 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0800 + * @tc.name : registerChange_callback_008 * @tc.desc : listening change albumName, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('on_callback_008', 0, async function (done) { - const testNum = 'on_callback_008'; + it('registerChange_callback_008', 0, async function (done) { + const testNum = 'registerChange_callback_008'; try { let albumUri = ''; let count = 0; @@ -140,15 +138,15 @@ export default function registerChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_1100 - * @tc.name : on_callback_011 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_1100 + * @tc.name : registerChange_callback_011 * @tc.desc : listening album removeAssets, type NOTIFY_ALBUM_ADD_ASSET * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('on_callback_011', 0, async function (done) { - const testNum = 'on_callback_011'; + it('registerChange_callback_011', 0, async function (done) { + const testNum = 'registerChange_callback_011'; try { let albumName = 'testAlbum' + Date.now(); let album = await helper.createAlbum(albumName); @@ -176,15 +174,15 @@ export default function registerChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_1200 - * @tc.name : on_callback_012 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_1200 + * @tc.name : registerChange_callback_012 * @tc.desc : listening album removeAssets, type NOTIFY_ALBUM_REMOVE_ASSET * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('on_callback_012', 0, async function (done) { - const testNum = 'on_callback_012'; + it('registerChange_callback_012', 0, async function (done) { + const testNum = 'registerChange_callback_012'; try { let albumName = 'testAlbum' + Date.now(); let album = await helper.createAlbum(albumName); diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/release.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/release.ets index 8426b8332..947559d85 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/release.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAccessHelper/release.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' 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 ec904abb8..8bf39896f 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 @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { @@ -22,9 +21,6 @@ import { photoKeys, getFileAsset, photoFetchOption, - photoType, - albumType, - albumSubtype } from '../../../../../../../common' export default function unRegisterChangeTest () { @@ -34,15 +30,15 @@ export default function unRegisterChangeTest () { const DEFAULT_ALBUM_URI = photoAccessHelper.DefaultChangeUri.DEFAULT_ALBUM_URI; /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0100 - * @tc.name : off_001 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0100 + * @tc.name : unRegisterChange_001 * @tc.desc : off listening motify file displayName, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_001', 0, async function (done) { - const testNum = 'off_001'; + it('unRegisterChange_001', 0, async function (done) { + const testNum = 'unRegisterChange_001'; try { const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'off01.jpg'); const asset = await getFileAsset(testNum, fetchOps); @@ -69,15 +65,15 @@ export default function unRegisterChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0700 - * @tc.name : off_007 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0700 + * @tc.name : unRegisterChange_007 * @tc.desc : off listening create album, type NOTIFY_ADD * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_007', 0, async function (done) { - const testNum = 'off_007'; + it('unRegisterChange_007', 0, async function (done) { + const testNum = 'unRegisterChange_007'; try { let count = 0; helper.registerChange(DEFAULT_ALBUM_URI, true, async (changeData) => { @@ -100,15 +96,15 @@ export default function unRegisterChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0800 - * @tc.name : off_008 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0800 + * @tc.name : unRegisterChange_008 * @tc.desc : off listening create album, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_008', 0, async function (done) { - const testNum = 'off_008'; + it('unRegisterChange_008', 0, async function (done) { + const testNum = 'unRegisterChange_008'; try { let albumUri = ''; let count = 0; @@ -136,15 +132,15 @@ export default function unRegisterChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_1000 - * @tc.name : off_010 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1000 + * @tc.name : unRegisterChange_010 * @tc.desc : off listening change album overUri, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_010', 0, async function example(done) { - const testNum = 'off_010'; + it('unRegisterChange_010', 0, async function example(done) { + const testNum = 'unRegisterChange_010'; try { let albumUri = ''; let count = 0; @@ -175,15 +171,15 @@ export default function unRegisterChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_1100 - * @tc.name : off_011 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1100 + * @tc.name : unRegisterChange_011 * @tc.desc : off listening album removeAssets, type NOTIFY_ALBUM_ADD_ASSET * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_011', 0, async function (done) { - const testNum = 'off_011'; + it('unRegisterChange_011', 0, async function (done) { + const testNum = 'unRegisterChange_011'; try { let albumName = 'testAlbum' + Date.now(); let album = await helper.createAlbum(albumName); @@ -210,15 +206,15 @@ export default function unRegisterChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_1200 - * @tc.name : off_012 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1200 + * @tc.name : unRegisterChange_012 * @tc.desc : off listening album removeAssets, type NOTIFY_ALBUM_REMOVE_ASSET * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_012', 0, async function (done) { - const testNum = 'off_012'; + it('unRegisterChange_012', 0, async function (done) { + const testNum = 'unRegisterChange_012'; try { let albumName = 'testAlbum' + Date.now(); let album = await helper.createAlbum(albumName); @@ -246,15 +242,15 @@ export default function unRegisterChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_1500 - * @tc.name : off_015 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1500 + * @tc.name : unRegisterChange_015 * @tc.desc : off remove all listening * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('off_015', 0, async function (done) { - const testNum = 'off_015'; + it('unRegisterChange_015', 0, async function (done) { + const testNum = 'unRegisterChange_015'; try { let fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'off15.jpg'); const asset = await getFileAsset(testNum, fetchOps); @@ -285,15 +281,15 @@ export default function unRegisterChangeTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_CALLBACK_0000 - * @tc.name : off_callback_000 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_CALLBACK_0000 + * @tc.name : unRegisterChange_callback_000 * @tc.desc : off remove specified callback * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('off_callback_000', 0, async function (done) { - const testNum = 'off_callback_000'; + it('unRegisterChange_callback_000', 0, async function (done) { + const testNum = 'unRegisterChange_callback_000'; try { let fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'offCb01.jpg'); const asset = await getFileAsset(testNum, fetchOps); diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/checkAttr.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/checkAttr.ets index 5d62983fe..58e1453b4 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/checkAttr.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/checkAttr.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import { describe, it, expect } from 'deccjsunit/index' import { photoKeys, @@ -28,12 +27,13 @@ export default function checkAttrTest () { async function checkAssetAttr (done, testNum, displayName, mediaType) { try { let key = photoKeys.DISPLAY_NAME; - let uri = 'file://media/Photo/'; const fetchOps = fetchOption(testNum, key, displayName); const asset = await getFileAsset(testNum, fetchOps); console.info(`${testNum} uri: ${asset.uri} filetype: ${asset.photoType} displayName: ${asset.displayName}`) const id = getId(asset.uri); - expect(asset.uri).assertEqual(uri + id); + const expectUri = 'file://media/Photo/' + id; + const isIncludes = asset.uri.includes(expectUri); + expect(isIncludes).assertTrue(); expect(asset.photoType).assertEqual(mediaType); expect(asset.displayName).assertEqual(displayName); done(); diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/close.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/close.ets index 8508b45fd..ffe0f14ed 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/close.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/close.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import fileio from "@ohos.fileio"; import { describe, it, expect } from 'deccjsunit/index' import { 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 37218b163..04445ca06 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 @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { @@ -30,8 +29,9 @@ export default function commitModifyTest () { try { const asset = await getFileAsset(testNum, fetchOps); const oldTitle: photoAccessHelper.MemberType = asset.get(photoKeys.TITLE).toString(); - console.info(`${testNum} oldTitle: ${typeof oldTitle}`); + console.info(`${testNum} oldTitle: ${oldTitle}`); asset.set(photoKeys.TITLE, newTitle); + console.info(`${testNum} newTitle: ${newTitle}`); asset.commitModify(async (err) => { try { if (err) { 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 1a5e33018..0f6319e4b 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 @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import { describe, it, expect } from 'deccjsunit/index' import { photoKeys, @@ -32,7 +31,10 @@ export default function getTest () { console.info(`${testNum} key: ${key}, value: ${value}, asset.key: ${asset.get(key)}`); if (key === 'uri') { const id = getId(asset.get(key)); - expect(asset.get(key)).assertEqual(value + id); + const expectUri = value + id; + const uri = asset.get(key).toString(); + const isIncludes = uri.includes(expectUri); + expect(isIncludes).assertTrue(); } else if (key === 'date_added' || key === 'date_modified' || key === 'date_taken') { expect(isNum(asset.get(key))).assertTrue(); } else { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/getReadOnlyFd.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/getReadOnlyFd.ets index 0b6fe23ca..1a474b193 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/getReadOnlyFd.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/getReadOnlyFd.ets @@ -13,14 +13,12 @@ * limitations under the License. */ -// @ts-nocheck import fileio from "@ohos.fileio"; import { describe, it, expect } from 'deccjsunit/index' import { photoKeys, fetchOption, getFileAsset, - isNum, } from '../../../../../../../common' export default function getReadOnlyFdTest () { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/getThumbnail.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/getThumbnail.ets index 423172895..f45205e0b 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/getThumbnail.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAsset/getThumbnail.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import image from '@ohos.multimedia.image'; import { describe, it, expect } from 'deccjsunit/index' diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/close.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/close.ets index e40b4e520..dc01505f8 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/close.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/close.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getAllObjects.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getAllObjects.ets index 8494415af..761f2bd55 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getAllObjects.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getAllObjects.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getCount.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getCount.ets index 678a7ffca..3f9dd6c70 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getCount.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getCount.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getFirstObject.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getFirstObject.ets index 213af16fc..53e908846 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getFirstObject.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getFirstObject.ets @@ -13,11 +13,10 @@ * limitations under the License. */ -// @ts-nocheck +import dataSharePredicates from '@ohos.data.dataSharePredicates'; import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { - fetchOption, photoType, photoKeys } from '../../../../../../../common' @@ -30,17 +29,18 @@ export default function assetGetFirstObjectTest () { try { let fetchResult = await helper.getAssets(fetchOps); console.info(`${testNum} fetchResult: ${fetchResult.getCount()}`); - expect(fetchResult.getCount() > 0).assertTrue(); + expect(fetchResult.getCount()).assertEqual(1); fetchResult.getFirstObject((err, asset) => { try { if (err !== undefined) { - console.info(`${testNum} getFirstObject failed; err: ${err}`); + console.info(`${testNum} err: ${err}`); expect(false).assertTrue(); } else { + console.info(`${testNum} asset: ${asset.displayName}`); expect(asset !== undefined).assertTrue(); } } catch (error) { - console.info(`${testNum} getFirstObject failed; error: ${error}`); + console.info(`${testNum} error: ${error}`); } fetchResult.close(); done(); @@ -55,9 +55,10 @@ export default function assetGetFirstObjectTest () { async function getFirstObjectPromiseTest (done, testNum, fetchOps) { try { let fetchResult = await helper.getAssets(fetchOps); - expect(fetchResult.getCount() > 0).assertTrue(); + expect(fetchResult.getCount()).assertEqual(1); const asset = await fetchResult.getFirstObject(); fetchResult.close(); + console.info(`${testNum} asset: ${asset.displayName}`); expect(asset !== undefined).assertTrue(); done(); } catch (error) { @@ -79,7 +80,12 @@ export default function assetGetFirstObjectTest () { */ it('getFirstObject_callback_000', 0, async function (done) { const testNum = 'getFirstObject_callback_000'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.IMAGE); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.IMAGE).and().equalTo(photoKeys.DISPLAY_NAME, '01.jpg'); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await getFirstObjectCallbackTest(done, testNum, fetchOps); }); @@ -94,7 +100,12 @@ export default function assetGetFirstObjectTest () { */ it('getFirstObject_promise_000', 0, async function (done) { const testNum = 'getFirstObject_promise_000'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.IMAGE); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.IMAGE).and().equalTo(photoKeys.DISPLAY_NAME, '01.jpg'); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await getFirstObjectPromiseTest(done, testNum, fetchOps); }); @@ -110,7 +121,12 @@ export default function assetGetFirstObjectTest () { */ it('getFirstObject_callback_001', 0, async function (done) { const testNum = 'getFirstObject_callback_001'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.VIDEO); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.VIDEO).and().equalTo(photoKeys.DISPLAY_NAME, '01.mp4'); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await getFirstObjectCallbackTest(done, testNum, fetchOps); }); @@ -125,7 +141,12 @@ export default function assetGetFirstObjectTest () { */ it('getFirstObject_promise_001', 0, async function (done) { const testNum = 'getFirstObject_promise_001'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.VIDEO); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.VIDEO).and().equalTo(photoKeys.DISPLAY_NAME, '01.mp4'); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await getFirstObjectPromiseTest(done, testNum, fetchOps); }); }) diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getLastObject.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getLastObject.ets index 96a05ab69..577dbdb6d 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getLastObject.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getLastObject.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getNextObject.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getNextObject.ets index dd6b669ab..7a8216a7b 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getNextObject.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getNextObject.ets @@ -13,11 +13,10 @@ * limitations under the License. */ -// @ts-nocheck +import dataSharePredicates from '@ohos.data.dataSharePredicates'; import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { - fetchOption, photoType, photoKeys } from '../../../../../../../common' @@ -29,7 +28,7 @@ export default function assetGetNextObjectTest () { async function getNextObjectCallbackTest (done, testNum, fetchOps) { try { let fetchResult = await helper.getAssets(fetchOps); - expect(fetchResult.getCount() > 1).assertTrue(); + expect(fetchResult.getCount()).assertEqual(2); await fetchResult.getFirstObject(); fetchResult.getNextObject((err, asset) => { try { @@ -55,7 +54,7 @@ export default function assetGetNextObjectTest () { async function getNextObjectPromiseTest (done, testNum, fetchOps) { try { let fetchResult = await helper.getAssets(fetchOps); - expect(fetchResult.getCount() > 1).assertTrue(); + expect(fetchResult.getCount()).assertEqual(2); let asset = await fetchResult.getFirstObject(); asset = await fetchResult.getNextObject(); fetchResult.close(); @@ -80,7 +79,12 @@ export default function assetGetNextObjectTest () { */ it('getNextObject_callback_000', 0, async function (done) { const testNum = 'getNextObject_callback_000'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.IMAGE); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.IMAGE).limit(2, 0); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await getNextObjectCallbackTest(done, testNum, fetchOps); }); @@ -95,7 +99,12 @@ export default function assetGetNextObjectTest () { */ it('getNextObject_promise_000', 0, async function (done) { const testNum = 'getNextObject_promise_000'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.IMAGE); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.IMAGE).limit(2, 0); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await getNextObjectPromiseTest(done, testNum, fetchOps); }); @@ -111,7 +120,12 @@ export default function assetGetNextObjectTest () { */ it('getNextObject_callback_001', 0, async function (done) { const testNum = 'getNextObject_callback_001'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.VIDEO); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.VIDEO).limit(2, 0); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await getNextObjectCallbackTest(done, testNum, fetchOps); }); @@ -126,7 +140,12 @@ export default function assetGetNextObjectTest () { */ it('getNextObject_promise_001', 0, async function (done) { const testNum = 'getNextObject_promise_001'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.VIDEO); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.VIDEO).limit(2, 0); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await getNextObjectPromiseTest(done, testNum, fetchOps); }); }) diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getObjectByPosition.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getObjectByPosition.ets index 00151defc..677a6af19 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getObjectByPosition.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/getObjectByPosition.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/isAfterLast.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/isAfterLast.ets index 6792f2d6d..1e6d56ab3 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/isAfterLast.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/PhotoAssetFetchResult/isAfterLast.ets @@ -13,11 +13,10 @@ * limitations under the License. */ -// @ts-nocheck +import dataSharePredicates from '@ohos.data.dataSharePredicates'; import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { - fetchOption, photoType, photoKeys } from '../../../../../../../common' @@ -30,17 +29,12 @@ export default function assetIsAfterLastTest () { try { let fetchResult = await helper.getAssets(fetchOps); let count = fetchResult.getCount(); - expect(count > 1).assertTrue(); + expect(count).assertEqual(2); let asset = await fetchResult.getFirstObject(); - for (let i = 1; i < count; i++) { - asset = await fetchResult.getNextObject(); - if (i + 1 === count) { - const result = fetchResult.isAfterLast(); - expect(result).assertTrue(); - fetchResult.close(); - done(); - } - } + asset = await fetchResult.getNextObject(); + const result = fetchResult.isAfterLast(); + expect(result).assertTrue(); + done(); } catch (error) { console.info(`${testNum} failed; error: ${error}`); expect(false).assertTrue(); @@ -59,7 +53,12 @@ export default function assetIsAfterLastTest () { */ it('isAfterLast_callback_000', 0, async function (done) { const testNum = 'isAfterLast_callback_000'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.IMAGE); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.IMAGE).limit(2, 0); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await isAfterLastCallbackTest(done, testNum, fetchOps); }); @@ -74,7 +73,12 @@ export default function assetIsAfterLastTest () { */ it('isAfterLast_callback_001', 0, async function (done) { const testNum = 'isAfterLast_callback_001'; - const fetchOps = fetchOption(testNum, photoKeys.PHOTO_TYPE, photoType.VIDEO); + const predicates = new dataSharePredicates.DataSharePredicates(); + predicates.equalTo(photoKeys.PHOTO_TYPE, photoType.IMAGE).limit(2, 0); + const fetchOps : photoAccessHelper.FetchOptions = { + fetchColumns: [], + predicates: predicates + }; await isAfterLastCallbackTest(done, testNum, fetchOps); }); }) diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/getPhotoAccessHelper.ets b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/getPhotoAccessHelper.ets index 92496952b..2011ee9a0 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/getPhotoAccessHelper.ets +++ b/multimedia/photoAccess/photoAccess/entry/src/main/ets/test/getPhotoAccessHelper.ets @@ -13,16 +13,15 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, beforeAll, it, expect } from 'deccjsunit/index' import { getPermission } from '../../../../../../common' -export default function getUserFileMgrTest () { - describe('getUserFileMgrTest', function () { +export default function getPhotoAccessHelper () { + describe('getPhotoAccessHelper', function () { beforeAll(async function () { console.info('beforeAll case') - await getPermission('ohos.acts.multimedia.photoaccess'); + await getPermission(); }) /** diff --git a/multimedia/photoAccess/photoAccess/entry/src/main/module.json b/multimedia/photoAccess/photoAccess/entry/src/main/module.json index c3740a931..2dd3f8ab6 100644 --- a/multimedia/photoAccess/photoAccess/entry/src/main/module.json +++ b/multimedia/photoAccess/photoAccess/entry/src/main/module.json @@ -8,8 +8,7 @@ "deviceTypes": [ "tablet", "default", - "phone", - "2in1" + "phone" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/multimedia/photoAccess/photoAccessSystem/Test.json b/multimedia/photoAccess/photoAccessSystem/Test.json index c6849a6cb..a950807b0 100644 --- a/multimedia/photoAccess/photoAccessSystem/Test.json +++ b/multimedia/photoAccess/photoAccessSystem/Test.json @@ -6,14 +6,26 @@ "bundle-name": "ohos.acts.multimedia.photoaccess", "module-name": "phone", "shell-timeout": "600000", - "testcase-timeout": 70000 + "testcase-timeout": 10000 }, "kits": [ { "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Audios/.*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Camera/.*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Documents/.*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Download/.*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Pictures/.*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/files/Videos/.*", + "sleep 5", "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", "kill -9 `pidof com.ohos.medialibrary.medialibrarydata`", "scanner", diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/deleteAssets.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/deleteAssets.ets index 73129aba5..f0fb17c8c 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/deleteAssets.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/deleteAssets.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, beforeAll, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/recoverAssets.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/recoverAssets.ets index ad051c5ba..459d1d588 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/recoverAssets.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/recoverAssets.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, beforeAll, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/setCoverUri.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/setCoverUri.ets index 113210cfd..109d263d0 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/setCoverUri.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/Album/setCoverUri.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, beforeAll, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/createAlbum.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/createAlbum.ets index 541fb2580..6fbd2aa0b 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/createAlbum.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/createAlbum.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, beforeAll, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/deleteAlbums.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/deleteAlbums.ets index 0c227bac3..47b14c657 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/deleteAlbums.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/deleteAlbums.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, beforeAll, it, expect } from 'deccjsunit/index' import { @@ -36,7 +35,7 @@ export default function deleteAlbumsTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_DELETE_ALBUMS_0000 * @tc.name : deleteAlbums_callback_000 - * @tc.desc : delete user test + * @tc.desc : delete user albums * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 @@ -120,7 +119,7 @@ export default function deleteAlbumsTest () { /** * @tc.number : SUB_PHOTOACCESS_HELPER_PROMISE_DELETE_ALBUMS_0000 * @tc.name : deleteAlbums_promise_000 - * @tc.desc : delete albums test + * @tc.desc : delete user albums * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/deleteAssets.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/deleteAssets.ets index 93643ebe6..d06570227 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/deleteAssets.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/deleteAssets.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/open.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/open.ets index 0e8299e54..090547b6b 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/open.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/open.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import fileio from "@ohos.fileio"; import { describe, beforeAll, it, expect } from 'deccjsunit/index' import { @@ -46,8 +45,6 @@ export default function openTest() { let write = await fileio.write(fd, testNum); expect(write).assertEqual(testNum.length); - let newAsset = await getFileAsset(testNum, fetchOp); - // expect(newAsset.get(photoKeys.DATE_MODIFIED) != asset.get(photoKeys.DATE_MODIFIED)).assertTrue(); } } catch (error) { console.info(`${testNum} error: ${error}`); @@ -75,6 +72,9 @@ export default function openTest() { let buf = new ArrayBuffer(4096); let res = await fileio.read(fd, buf); expect(res.bytesRead).assertEqual(assetBytes); + console.info(`${testNum} read suc`); + await fileio.write(fd, testNum); + expect(false).assertTrue(); } } catch (error) { console.info(`${testNum} error: ${error}`); @@ -100,14 +100,15 @@ export default function openTest() { } else { let write = await fileio.write(fd, testNum); expect(write).assertEqual(testNum.length); - await asset.close(fd); - let newAsset = await getFileAsset(testNum, fetchOp); - // expect(newAsset.get(photoKeys.DATE_MODIFIED) != asset.get(photoKeys.DATE_MODIFIED)).assertTrue(); + + let buf = new ArrayBuffer(4096); + await fileio.read(fd, buf); + expect(false).assertTrue(); } } catch (error) { console.info(`${testNum} error: ${error}`); - await asset.close(fd); } + await asset.close(fd); done(); }); } catch (error) { @@ -118,9 +119,10 @@ export default function openTest() { }; async function rwOpenPromise(done, testNum, fetchOp, assetBytes) { - const asset = await getFileAsset(testNum, fetchOp); + let asset; let fd; try { + asset = await getFileAsset(testNum, fetchOp); fd = await asset.open('rw'); console.info(`${testNum} fd: ${fd}`); let buf = new ArrayBuffer(4096); @@ -129,50 +131,71 @@ export default function openTest() { let write = await fileio.write(fd, testNum); expect(write).assertEqual(testNum.length); - let newAsset = await getFileAsset(testNum, fetchOp); - // expect(newAsset.get(photoKeys.DATE_MODIFIED) != asset.get(photoKeys.DATE_MODIFIED)).assertTrue(); - await asset.close(fd); done(); } catch (error) { console.info(`${testNum} failed, error: ${error}`); - await asset.close(fd); expect(false).assertTrue(); done(); + } finally { + if (asset) { + await asset.close(fd); + } } }; async function rOpenPromise(done, testNum, fetchOp, assetBytes) { + let asset; + let fd; try { - const asset = await getFileAsset(testNum, fetchOp); - const fd = await asset.open('r'); + asset = await getFileAsset(testNum, fetchOp); + fd = await asset.open('r'); console.info(`${testNum} fd: ${fd}`); let buf = new ArrayBuffer(4096); let res = await fileio.read(fd, buf); expect(res.bytesRead).assertEqual(assetBytes); - await asset.close(fd); + try { + await fileio.write(fd, testNum); + expect(false).assertTrue(); + } catch (error) { + console.info(`${testNum} error: ${error}`); + } done(); } catch (error) { console.info(`${testNum} failed, error: ${error}`); expect(false).assertTrue(); done(); + } finally { + if (asset) { + await asset.close(fd); + } } }; async function wOpenPromise(done, testNum, fetchOp) { + let asset; + let fd; try { - const asset = await getFileAsset(testNum, fetchOp); - const fd = await asset.open('w'); + asset = await getFileAsset(testNum, fetchOp); + fd = await asset.open('w'); let write = await fileio.write(fd, testNum); expect(write).assertEqual(testNum.length); - let newAsset = await getFileAsset(testNum, fetchOp); - // expect(newAsset.get(photoKeys.DATE_MODIFIED) != asset.get(photoKeys.DATE_MODIFIED)).assertTrue(); - await asset.close(fd); + try { + let buf = new ArrayBuffer(4096); + await fileio.read(fd, buf); + expect(false).assertTrue(); + } catch (error) { + console.info(`${testNum} error: ${error}`); + } done(); } catch (error) { console.info(`${testNum} failed, error: ${error}`); expect(false).assertTrue(); done(); + } finally { + if (asset) { + await asset.close(fd); + } } }; 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 7aca480c2..1a6998b70 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/publicApiTestWithSystemApi.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/publicApiTestWithSystemApi.ets @@ -13,10 +13,9 @@ * limitations under the License. */ -// @ts-nocheck import fileio from "@ohos.fileio"; import photoAccessHelper from '@ohos.file.photoAccessHelper' -import { describe, it, expect } from 'deccjsunit/index' +import { describe, beforeAll, it, expect } from 'deccjsunit/index' import { albumType, albumSubtype, @@ -25,6 +24,7 @@ import { getFileAsset, photoFetchOption, sleep, + getPermission, } from '../../../../../../common' export default function publicApiTestWithSystemApiTest () { @@ -35,6 +35,11 @@ export default function publicApiTestWithSystemApiTest () { const DEFAULT_PHOTO_URI = photoAccessHelper.DefaultChangeUri.DEFAULT_PHOTO_URI; const DEFAULT_ALBUM_URI = photoAccessHelper.DefaultChangeUri.DEFAULT_ALBUM_URI; + beforeAll(async function () { + console.info('beforeAll case') + await getPermission() + }) + //callback /** * @tc.number : SUB_PHOTOACCESS_HELPER_CALLBACK_GET_ASSETS_0100 @@ -258,15 +263,15 @@ export default function publicApiTestWithSystemApiTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0000 - * @tc.name : off_000 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0000 + * @tc.name : unRegisterChange_000 * @tc.desc : off listening create file, type NOTIFY_ADD * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_000', 0, async function (done) { - const testNum = 'off_000'; + it('unRegisterChange_000', 0, async function (done) { + const testNum = 'unRegisterChange_000'; try { const createAsset = await helper.createAsset(testNum + '.jpg'); let fd = await createAsset.open('rw'); @@ -292,15 +297,15 @@ export default function publicApiTestWithSystemApiTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0200 - * @tc.name : off_002 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0200 + * @tc.name : unRegisterChange_002 * @tc.desc : off listening setFavorite(true) file, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_002', 0, async function (done) { - const testNum = 'off_002'; + it('unRegisterChange_000', 0, async function (done) { + const testNum = 'unRegisterChange_000'; try { const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'off02.jpg'); const asset = await getFileAsset(testNum, fetchOps); @@ -325,15 +330,15 @@ export default function publicApiTestWithSystemApiTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0300 - * @tc.name : off_003 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0300 + * @tc.name : unRegisterChange_003 * @tc.desc : off listening setFavorite(false) file, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_003', 0, async function (done) { - const testNum = 'off_003'; + it('unRegisterChange_003', 0, async function (done) { + const testNum = 'unRegisterChange_003'; try { const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'off03.jpg'); const asset = await getFileAsset(testNum, fetchOps); @@ -359,15 +364,15 @@ export default function publicApiTestWithSystemApiTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0400 - * @tc.name : off_004 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0400 + * @tc.name : unRegisterChange_004 * @tc.desc : off listening delete file, type NOTIFY_REMOVE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('off_004', 0, async function (done) { - const testNum = 'off_004'; + it('unRegisterChange_004', 0, async function (done) { + const testNum = 'unRegisterChange_004'; try { const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'off04.jpg'); const asset = await getFileAsset(testNum, fetchOps); @@ -392,15 +397,15 @@ export default function publicApiTestWithSystemApiTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0500 - * @tc.name : off_005 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0500 + * @tc.name : unRegisterChange_005 * @tc.desc : off listening recover file, type NOTIFY_ADD * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('off_005', 0, async function (done) { - const testNum = 'off_005'; + it('unRegisterChange_005', 0, async function (done) { + const testNum = 'unRegisterChange_005'; try { let testFileName = 'testCreateFile' + Date.now() + '.jpg'; let fileAsset = await helper.createAsset(testFileName); @@ -416,7 +421,7 @@ export default function publicApiTestWithSystemApiTest () { await sleep(500); helper.registerChange(trashFileAsset.uri, false, async (changeData) => { count++; - console.info(`off_005 changeData: ${JSON.stringify(changeData)}`); + console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(false).assertTrue(); done(); }); @@ -428,22 +433,22 @@ export default function publicApiTestWithSystemApiTest () { expect(count).assertEqual(0); done(); } catch (error) { - console.log(`off_005: tryError: $${error}`); + console.log(`${testNum}: tryError: $${error}`); expect(false).assertTrue(); done(); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0600 - * @tc.name : off_006 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0600 + * @tc.name : unRegisterChange_006 * @tc.desc : off listening trash delete file, type NOTIFY_REMOVE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('off_006', 0, async function (done) { - const testNum = 'off_006'; + it('unRegisterChange_006', 0, async function (done) { + const testNum = 'unRegisterChange_006'; try { let testFileName = 'testCreateFile' + Date.now() + '.jpg'; let fileAsset = await helper.createAsset(testFileName); @@ -459,7 +464,7 @@ export default function publicApiTestWithSystemApiTest () { await sleep(500); helper.registerChange(trashAlbum.albumUri, false, async (changeData) => { count++; - console.info(`off_006 changeData: ${JSON.stringify(changeData)}`); + console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); }); await sleep(100); helper.unRegisterChange(trashAlbum.albumUri); @@ -469,21 +474,22 @@ export default function publicApiTestWithSystemApiTest () { expect(count).assertEqual(0); done(); } catch (error) { - console.log(`off_006: tryError: $${error}`); + console.log(`${testNum}: tryError: $${error}`); expect(false).assertTrue(); done(); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_0900 - * @tc.name : off_009 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_0900 + * @tc.name : unRegisterChange_009 * @tc.desc : off listening delete album, type NOTIFY_REMOVE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('off_009', 0, async function (done) { + it('unRegisterChange_009', 0, async function (done) { + const testNum = 'unRegisterChange_009'; try { let count= 0; let albumName = 'testAlbum' + Date.now(); @@ -491,7 +497,7 @@ export default function publicApiTestWithSystemApiTest () { await sleep(500); helper.registerChange(DEFAULT_ALBUM_URI, true, async (changeData) => { count++; - console.info(`off_009 changeData: ${JSON.stringify(changeData)}`); + console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); }); await sleep(100); helper.unRegisterChange(DEFAULT_ALBUM_URI); @@ -501,22 +507,22 @@ export default function publicApiTestWithSystemApiTest () { expect(count).assertEqual(0); done(); } catch (error) { - console.log(`off_009: tryError: $${error}`); + console.log(`${testNum}: tryError: $${error}`); expect(false).assertTrue(); done(); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_1300 - * @tc.name : off_013 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1300 + * @tc.name : unRegisterChange_013 * @tc.desc : off listening DEFAULT_ALBUM_URI * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('off_013', 0, async function (done) { - const testNum = 'off_013'; + it('unRegisterChange_013', 0, async function (done) { + const testNum = 'unRegisterChange_013'; try { const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'off13.jpg'); const asset = await getFileAsset(testNum, fetchOps); @@ -568,15 +574,15 @@ export default function publicApiTestWithSystemApiTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_OFF_1400 - * @tc.name : off_014 + * @tc.number : SUB_PHOTOACCESS_UNREGISTERCHANGE_1400 + * @tc.name : unRegisterChange_014 * @tc.desc : off listening DEFAULT_PHOTO_URI * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('off_014', 0, async function (done) { - const testNum = 'off_014'; + it('unRegisterChange_014', 0, async function (done) { + const testNum = 'unRegisterChange_014'; try { let listenCount = 0; let fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'off14.jpg'); @@ -624,118 +630,128 @@ export default function publicApiTestWithSystemApiTest () { }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0000 - * @tc.name : on_callback_000 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0000 + * @tc.name : registerChange_callback_000 * @tc.desc : off listening create file, type NOTIFY_ADD * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('on_callback_000', 0, async function (done) { - const testNum = 'on_callback_000'; + it('registerChange_callback_000', 0, async function (done) { + const testNum = 'registerChange_callback_000'; + let uri; try { const createAsset = await helper.createAsset(testNum + '.jpg'); - let fd = await createAsset.open('rw'); - await createAsset.close(fd); + uri = createAsset.uri; let count = 0; - await sleep(500); - helper.registerChange(createAsset.uri, false, async (changeData) => { + console.log(`${testNum}: uri: ${uri}`); + helper.registerChange(uri, false, async (changeData) => { count++; console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_ADD); - expect(changeData.uris[0]).assertEqual(createAsset.uri); + expect(changeData.uris[0]).assertEqual(uri); }); await sleep(100); - fd = await createAsset.getReadOnlyFd(); + let fd = await createAsset.open('rw'); + await fileio.write(fd, testNum); await createAsset.close(fd); await sleep(1000); - helper.unRegisterChange(createAsset.uri); - expect(count).assertEqual(0); + expect(count).assertEqual(1); done(); } catch (error) { console.log(`${testNum}: tryError: ${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0200 - * @tc.name : on_callback_002 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0200 + * @tc.name : registerChange_callback_002 * @tc.desc : listening setFavorite(true) file, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('on_callback_002', 0, async function (done) { - const testNum = 'on_callback_002'; + it('registerChange_callback_002', 0, async function (done) { + const testNum = 'registerChange_callback_002'; + let uri; try { let fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'on02.jpg'); const asset = await getFileAsset(testNum, fetchOps); + uri = asset.uri; let count= 0; - await sleep(500); - helper.registerChange(asset.uri, false, async (changeData) => { + helper.registerChange(uri, false, async (changeData) => { count++; console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_UPDATE); - expect(changeData.uris[0]).assertEqual(asset.uri); + expect(changeData.uris[0]).assertEqual(uri); }); await asset.setFavorite(true); await sleep(1000); - helper.unRegisterChange(asset.uri); + expect(count).assertEqual(1); done(); } catch (error) { console.log(`${testNum}: tryError: ${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0300 - * @tc.name : on_callback_003 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0300 + * @tc.name : registerChange_callback_003 * @tc.desc : listening setFavorite(false) file, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('on_callback_003', 0, async function (done) { - const testNum = 'on_callback_003'; + it('registerChange_callback_003', 0, async function (done) { + const testNum = 'registerChange_callback_003'; + let uri; try { let fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'on03.jpg'); const asset = await getFileAsset(testNum, fetchOps); + uri = asset.uri; await asset.setFavorite(true); let count= 0; await sleep(500); - helper.registerChange(asset.uri, false, async (changeData) => { + helper.registerChange(uri, false, async (changeData) => { count++; console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_UPDATE); - expect(changeData.uris[0]).assertEqual(asset.uri); + expect(changeData.uris[0]).assertEqual(uri); }); await asset.setFavorite(false); await sleep(1000); - helper.unRegisterChange(asset.uri); + expect(count).assertEqual(1); done(); } catch (error) { console.log(`${testNum}: tryError: ${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0500 - * @tc.name : on_callback_005 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0500 + * @tc.name : registerChange_callback_005 * @tc.desc : listening recover file, type NOTIFY_ADD * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('on_callback_005', 0, async function (done) { - const testNum = 'on_callback_005'; + it('registerChange_callback_005', 0, async function (done) { + const testNum = 'registerChange_callback_005'; + let uri; try { let testFileName = 'testCreateFile' + Date.now() + '.jpg'; let fileAsset = await helper.createAsset(testFileName); @@ -747,76 +763,88 @@ export default function publicApiTestWithSystemApiTest () { const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, testFileName); let trashFetchResult = await trashAlbum.getAssets(fetchOps); const trashFileAsset = await trashFetchResult.getFirstObject(); + uri = trashFileAsset.uri; let count= 0; await sleep(500); - helper.registerChange(trashFileAsset.uri, false, async (changeData) => { + console.log(`${testNum}: uri: ${uri}`); + helper.registerChange(uri, false, async (changeData) => { count++; - console.info(`on_callback_005 changeData: ${JSON.stringify(changeData)}`); + console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_ADD); - expect(changeData.uris[0]).assertEqual(trashFileAsset.uri); + expect(changeData.uris[0]).assertEqual(uri); }); await trashAlbum.recoverAssets([trashFileAsset]); await sleep(2000); - helper.unRegisterChange(trashFileAsset.uri); + expect(count).assertEqual(1); done(); } catch (error) { - console.log(`on_callback_005: tryError: $${error}`); + console.log(`${testNum}: tryError: $${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0600 - * @tc.name : on_callback_006 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0600 + * @tc.name : registerChange_callback_006 * @tc.desc : listening trash delete file, type NOTIFY_REMOVE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 2 */ - it('on_callback_006', 0, async function (done) { - const testNum = 'on_callback_006'; + it('registerChange_callback_006', 0, async function (done) { + const testNum = 'registerChange_callback_006'; + let uri; try { let testFileName = 'testCreateFile' + Date.now() + '.jpg'; let fileAsset = await helper.createAsset(testFileName); let fd = await fileAsset.open('rw'); await fileAsset.close(fd); + console.info(`${testNum} fileAsset.uri: ${fileAsset.uri}`); await helper.deleteAssets([fileAsset.uri]); let trashAlbumList = await helper.getAlbums(albumType.SYSTEM, albumSubtype.TRASH); let trashAlbum = await trashAlbumList.getFirstObject(); + uri = trashAlbum.albumUri; const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, testFileName); let trashFetchResult = await trashAlbum.getAssets(fetchOps); const trashFileAsset = await trashFetchResult.getFirstObject(); + console.info(`${testNum} trashFileAsset.uri: ${trashFileAsset.uri}`); let count= 0; - await sleep(500); - helper.registerChange(trashAlbum.albumUri, false, async (changeData) => { + helper.registerChange(uri, false, async (changeData) => { count++; - console.info(`on_callback_006 changeData: ${JSON.stringify(changeData)}`); + console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_ALBUM_REMOVE_ASSET); + expect(changeData.uris[0]).assertEqual(uri); expect(changeData.extraUris[0]).assertEqual(trashFileAsset.uri); }); await trashAlbum.deleteAssets([trashFileAsset]); await sleep(1000); - helper.unRegisterChange(trashAlbum.albumUri); + expect(count).assertEqual(1); done(); } catch (error) { - console.log(`on_callback_006: tryError: $${error}`); + console.log(`${testNum}: tryError: $${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_0900 - * @tc.name : on_callback_009 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_0900 + * @tc.name : registerChange_callback_009 * @tc.desc : listening delete album, type NOTIFY_REMOVE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('on_callback_009', 0, async function (done) { + it('registerChange_callback_009', 0, async function (done) { + const testNum = 'registerChange_callback_009'; + let uri; try { let albumUri = ''; let listenCount = 0; @@ -824,43 +852,174 @@ export default function publicApiTestWithSystemApiTest () { let album = await helper.createAlbum(albumName); albumUri = album.albumUri; await sleep(500); - helper.registerChange(DEFAULT_ALBUM_URI, true, async (changeData) => { + uri = DEFAULT_ALBUM_URI; + helper.registerChange(uri, true, async (changeData) => { listenCount++; - if (listenCount < 2) { - console.info(`on_callback_009 changeData: ${JSON.stringify(changeData)}`); - expect(changeData.type).assertEqual(NOTIFY_REMOVE); - expect(changeData.uris[0]).assertEqual(albumUri); - done(); - } + console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); + expect(changeData.type).assertEqual(NOTIFY_REMOVE); + expect(changeData.uris[0]).assertEqual(albumUri); + done(); }); await helper.deleteAlbums([album]); await sleep(1000); expect(listenCount).assertEqual(1); - helper.unRegisterChange(DEFAULT_ALBUM_URI); + + done(); + } catch (error) { + console.log(`${testNum}: tryError: $${error}`); + expect(false).assertTrue(); + done(); + } finally { + helper.unRegisterChange(uri); + } + }); + + /** + * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_1300 + * @tc.name : registerChange_callback_013 + * @tc.desc : listening DEFAULT_ALBUM_URI + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 3 + */ + it('registerChange_callback_013', 0, async function (done) { + const testNum = 'registerChange_callback_013'; + let uri; + try { + let albumUri = ''; + let trashAlbumUri = ''; + let trashFileAssetUri = ''; + let listenCount = 0; + const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'on13.jpg'); + const asset = await getFileAsset(testNum, fetchOps); + let testFileName = 'testCreateFile' + Date.now() + '.jpg'; + let fileAsset = await helper.createAsset(testFileName); + let fd = await fileAsset.open('rw'); + await fileAsset.close(fd); + await helper.deleteAssets([fileAsset.uri]); + await sleep(500); + uri = DEFAULT_ALBUM_URI; + helper.registerChange(uri, true, async (changeData) => { + listenCount++; + switch (listenCount) { + case 1: + console.info(`${testNum} 1 changeData: ${JSON.stringify(changeData)}`); + expect(changeData.type).assertEqual(NOTIFY_ADD); + expect(changeData.uris[0]).assertEqual(albumUri); + break; + case 2: + console.info(`${testNum} 2 changeData: ${JSON.stringify(changeData)}`); + expect(changeData.type).assertEqual(NOTIFY_UPDATE); + expect(changeData.uris[0]).assertEqual(albumUri); + break; + case 3: + console.info(`${testNum} 3 changeData: ${JSON.stringify(changeData)}`); + expect(changeData.type).assertEqual(NOTIFY_ALBUM_ADD_ASSET); + expect(changeData.uris[0]).assertEqual(albumUri); + break; + case 4: + console.info(`${testNum} 4 changeData: ${JSON.stringify(changeData)}`); + expect(changeData.type).assertEqual(NOTIFY_UPDATE); + expect(changeData.uris[0]).assertEqual(albumUri); + break; + case 5: + console.info(`${testNum} 5 changeData: ${JSON.stringify(changeData)}`); + expect(changeData.type).assertEqual(NOTIFY_ALBUM_REMOVE_ASSET); + expect(changeData.uris[0]).assertEqual(albumUri); + break; + case 6: + console.info(`${testNum} 6 changeData: ${JSON.stringify(changeData)}`); + expect(changeData.type).assertEqual(NOTIFY_REMOVE); + expect(changeData.uris[0]).assertEqual(albumUri); + break; + case 7: + console.info(`${testNum} 7 changeData: ${JSON.stringify(changeData)}`); + expect(changeData.uris[0]).assertEqual(trashAlbumUri); + expect(changeData.type).assertEqual(NOTIFY_ALBUM_REMOVE_ASSET); + expect(changeData.extraUris[0]).assertEqual(trashFileAssetUri); + break; + default: + break; + } + }); + let testCount = 0; + // 1 + testCount++; + console.info(`${testNum} testCount: ${testCount}`); + let albumName = testNum + Date.now(); + let album = await helper.createAlbum(albumName); + albumUri = album.albumUri; + // 2 + await sleep(500); + testCount++; + console.info(`${testNum} testCount: ${testCount}`); + album.albumName = Date.now() + album.albumName; + await album.commitModify(); + // 3 + await sleep(500); + testCount++; + console.info(`${testNum} testCount: ${testCount}`); + await album.addAssets([asset]); + // 4 + await sleep(500); + testCount++; + console.info(`${testNum} testCount: ${testCount}`); + album.albumName = testNum + album.albumName; + await album.commitModify(); + // 5 + await sleep(500); + testCount++; + console.info(`${testNum} testCount: ${testCount}`); + await album.removeAssets([asset]); + // 6 + await sleep(500); + testCount++; + console.info(`${testNum} testCount: ${testCount}`); + await helper.deleteAlbums([album]); + // 7 + await sleep(500); + testCount++; + console.info(`${testNum} testCount: ${testCount}`); + let trashAlbumList = await helper.getAlbums(albumType.SYSTEM, albumSubtype.TRASH); + let trashAlbum = await trashAlbumList.getFirstObject(); + trashAlbumUri = trashAlbum.albumUri; + const fetchOps1 = fetchOption(testNum, photoKeys.DISPLAY_NAME, testFileName); + let trashFetchResult = await trashAlbum.getAssets(fetchOps1); + let trashFileAsset = await trashFetchResult.getFirstObject(); + trashFileAssetUri = trashFileAsset.uri; + console.log(`${testNum}: trashFileAssetUri: ${trashFileAssetUri}`); + await trashAlbum.deleteAssets([trashFileAsset]); + await sleep(1000); + + expect(listenCount).assertEqual(testCount); done(); } catch (error) { - console.log(`on_callback_009: tryError: $${error}`); + console.log(`${testNum}: tryError: ${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_1400 - * @tc.name : on_callback_014 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_1400 + * @tc.name : registerChange_callback_014 * @tc.desc : listening DEFAULT_PHOTO_URI * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('on_callback_014', 0, async function (done) { - const testNum = 'on_callback_014'; + it('registerChange_callback_014', 0, async function (done) { + const testNum = 'registerChange_callback_014'; + let uri; try { let listenCount = 0; const fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'on14.jpg'); const asset = await getFileAsset(testNum, fetchOps); let photoAssetUri = asset.uri; - helper.registerChange(DEFAULT_PHOTO_URI, true, async (changeData) => { + uri = DEFAULT_PHOTO_URI; + helper.registerChange(uri, true, async (changeData) => { listenCount++; switch (listenCount) { case 1: @@ -894,38 +1053,95 @@ export default function publicApiTestWithSystemApiTest () { await sleep(500); await asset.setFavorite(false); await sleep(1000); - helper.unRegisterChange(DEFAULT_PHOTO_URI); + expect(listenCount).assertEqual(3); done(); } catch (error) { console.log(`${testNum}: tryError: ${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_1600 - * @tc.name : on_callback_016 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_1500 + * @tc.name : registerChange_callback_015 + * @tc.desc : listening 32 + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 3 + */ + it('registerChange_callback_015', 0, async function (done) { + const testNum = 'registerChange_callback_015'; + let uri; + try { + let listenCount = 0; + let fetchOps = photoFetchOption(testNum, photoKeys.DISPLAY_NAME, 'on15.jpg'); + let asset = await getFileAsset(testNum, fetchOps); + + //notify times lessthan 32 in 500ms + let i = 0; + uri = DEFAULT_PHOTO_URI; + helper.registerChange(DEFAULT_PHOTO_URI, true, async (changeData) => { + listenCount++; + console.info(`${testNum} i: ${i}, listenCount: ${listenCount}`); + if (listenCount > 1) { + if (i <= 32) { + expect(listenCount - 1).assertEqual(1); + } else { + expect(listenCount - 1).assertEqual(Math.ceil(i/32)) + } + console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); + expect(changeData.type).assertEqual(NOTIFY_UPDATE); + expect(changeData.uris[0]).assertEqual(asset.uri); + listenCount--; + } + }); + + 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 sleep(2000); + done(); + } catch (error) { + console.log(`${testNum}: tryError: ${error}`); + expect(false).assertTrue(); + done(); + } finally { + helper.unRegisterChange(uri); + } + }); + + /** + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_1600 + * @tc.name : registerChange_callback_016 * @tc.desc : listening 500ms * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 3 */ - it('on_callback_016', 0, async function (done) { - const testNum = 'on_callback_016'; + it('registerChange_callback_016', 0, async function (done) { + const testNum = 'registerChange_callback_016'; + let uri; try { const fetchOps = fetchOption(testNum, photoKeys.DISPLAY_NAME, 'on16.jpg'); const asset = await getFileAsset(testNum, fetchOps); + uri = asset.uri; let fd = await asset.open('rw'); await asset.close(fd); let listenCount = 0; await sleep(500); - helper.registerChange(asset.uri, false, async (changeData) => { + helper.registerChange(uri, false, async (changeData) => { listenCount++; console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_UPDATE); - expect(changeData.uris[0]).assertEqual(asset.uri); + expect(changeData.uris[0]).assertEqual(uri); }); for (let i = 0; i < 10; i++) { if (i % 2 == 0) { @@ -936,25 +1152,29 @@ export default function publicApiTestWithSystemApiTest () { await sleep(500); } await sleep(2000); - helper.unRegisterChange(asset.uri); + expect(listenCount).assertEqual(10); done(); } catch (error) { console.log(`${testNum}: tryError: ${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); /** - * @tc.number : SUB_PHOTOACCESS_HELPER_ON_CALLBACK_1700 - * @tc.name : on_callback_017 + * @tc.number : SUB_PHOTOACCESS_HELPER_REGISTERCHANGE_CALLBACK_1700 + * @tc.name : registerChange_callback_017 * @tc.desc : listening update file, type NOTIFY_UPDATE * @tc.size : MEDIUM * @tc.type : Function * @tc.level : Level 0 */ - it('on_callback_017', 0, async function example(done) { + it('registerChange_callback_017', 0, async function example(done) { + const testNum = 'registerChange_callback_017'; + let uri; try { let testFileName = 'testCreateFile' + Date.now() + '.jpg'; let fileAsset = await helper.createAsset(testFileName); @@ -965,11 +1185,12 @@ export default function publicApiTestWithSystemApiTest () { await fileAsset.close(fd); let count= 0; await sleep(1000); - helper.registerChange(fileAsset.uri, false, async (changeData) => { + uri = fileAsset.uri; + helper.registerChange(uri, false, async (changeData) => { count++; - console.info(`on_callback_017 changeData: ${JSON.stringify(changeData)}`); + console.info(`${testNum} changeData: ${JSON.stringify(changeData)}`); expect(changeData.type).assertEqual(NOTIFY_UPDATE); - expect(changeData.uris[0]).assertEqual(fileAsset.uri); + expect(changeData.uris[0]).assertEqual(uri); done(); }); fd = await fileAsset.open('rw'); @@ -979,12 +1200,14 @@ export default function publicApiTestWithSystemApiTest () { await fileAsset.close(fd); await sleep(1000); expect(count).assertEqual(1); - helper.unRegisterChange(fileAsset.uri); + done(); } catch (error) { - console.log(`on_callback_017: tryError: $${error}`); + console.log(`${testNum}: tryError: $${error}`); expect(false).assertTrue(); done(); + } finally { + helper.unRegisterChange(uri); } }); diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/setFavorite.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/setFavorite.ets index a260a42ab..9b10d77c3 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/setFavorite.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/setFavorite.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/setHidden.ets b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/setHidden.ets index dc63196b8..1dc43659a 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/setHidden.ets +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/ets/test/setHidden.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import photoAccessHelper from '@ohos.file.photoAccessHelper' import { describe, it, expect } from 'deccjsunit/index' import { diff --git a/multimedia/photoAccess/photoAccessSystem/entry/src/main/module.json b/multimedia/photoAccess/photoAccessSystem/entry/src/main/module.json index c3740a931..2dd3f8ab6 100644 --- a/multimedia/photoAccess/photoAccessSystem/entry/src/main/module.json +++ b/multimedia/photoAccess/photoAccessSystem/entry/src/main/module.json @@ -8,8 +8,7 @@ "deviceTypes": [ "tablet", "default", - "phone", - "2in1" + "phone" ], "deliveryWithInstall": true, "installationFree": false, -- GitLab