From ff046980062bfcd8c8951cc1793e354666f970a0 Mon Sep 17 00:00:00 2001 From: GuoxYu Date: Sun, 29 Jan 2023 19:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90medialibrary=E3=80=91=E3=80=903.1=5FRe?= =?UTF-8?q?lease=E3=80=91=E7=94=A8=E4=BE=8B=E9=80=82=E9=85=8D=E5=8F=8C?= =?UTF-8?q?=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GuoxYu Change-Id: I032911a17ec8c1255509e320272700bb1936fee8 --- .../src/main/js/test/fileAssetTestCallback.test.js | 12 ++++++------ .../src/main/js/test/fileAssetTestPromise.test.js | 12 ++++++------ .../src/main/js/test/fileTestPromise.test.js | 4 ++-- .../main/js/test/mediaLibraryTestCallBack.test.js | 4 ++-- .../src/main/js/test/mediaLibraryTestPromise.test.js | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestCallback.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestCallback.test.js index c6ce2e8fd..3edfc9ed8 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestCallback.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestCallback.test.js @@ -639,8 +639,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let fileType = mediaLibrary.MediaType.VIDEO; let fileFetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs : [ fileType.toString(), '01.mp4' ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ fileType.toString(), 'Camera/' ], }; let fetchFileResult = await media.getFileAssets(fileFetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -708,8 +708,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let type = mediaLibrary.MediaType.VIDEO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs : [ type.toString(), '01.mp4' ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ type.toString(), 'Camera/' ], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -773,8 +773,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let type = mediaLibrary.MediaType.VIDEO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs : [ type.toString(), '01.mp4' ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ type.toString(), 'Camera/' ], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestPromise.test.js index ecaf75eb3..edb924525 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestPromise.test.js @@ -458,8 +458,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let fileType = mediaLibrary.MediaType.VIDEO; let fileFetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs : [ fileType.toString(), '01.mp4' ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ fileType.toString(), 'Camera/' ], }; let fetchFileResult = await media.getFileAssets(fileFetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -517,8 +517,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let type = mediaLibrary.MediaType.VIDEO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs : [ type.toString(), '01.mp4' ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ fileType.toString(), 'Camera/' ], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -561,8 +561,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let type = mediaLibrary.MediaType.VIDEO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs : [ type.toString(), '01.mp4' ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ fileType.toString(), 'Camera/' ], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js index 72cfe8344..706bdd031 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js @@ -29,8 +29,8 @@ let imagesfetchOp = { selectionArgs: [imageType.toString()], }; let videosfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs: [videoType.toString(), '01.mp4'], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [videoType.toString(), 'Camera/'], }; let audiosfetchOp = { selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js index af33f957c..cf55fca8d 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js @@ -40,8 +40,8 @@ let imagesfetchOp = { selectionArgs: [imageType.toString()], }; let videosfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs: [videoType.toString(), '01.mp4'], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [videoType.toString(), 'Camera/'], }; let audiosfetchOp = { selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js index 25be293f3..cf44933e2 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js @@ -40,8 +40,8 @@ let imagesfetchOp = { selectionArgs: [imageType.toString()], }; let videosfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND display_name = ?', - selectionArgs: [videoType.toString(), '01.mp4'], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [videoType.toString(), 'Camera/'], }; let audiosfetchOp = { selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', -- GitLab