From 9d65ccd0a52608b8be0f5591cbf896b4285b651e Mon Sep 17 00:00:00 2001 From: qinliwen Date: Thu, 4 Aug 2022 19:42:35 +0800 Subject: [PATCH] =?UTF-8?q?<=E5=A2=9E=E5=8A=A0medialibrary=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E9=85=8DHOS>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinliwen --- .../main/js/test/favoriteTestCallBack.test.js | 8 ++--- .../main/js/test/favoriteTestPromise.test.js | 8 ++--- .../js/test/fileAssetTestCallback.test.js | 32 ++++++++--------- .../main/js/test/fileAssetTestPromise.test.js | 36 +++++++++---------- .../src/main/js/test/fileTestCallBack.test.js | 8 ++--- .../src/main/js/test/fileTestPromise.test.js | 8 ++--- .../js/test/mediaLibraryTestCallBack.test.js | 8 ++--- .../js/test/mediaLibraryTestPromise.test.js | 8 ++--- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestCallBack.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestCallBack.test.js index c2c2b380e..f8cf7005d 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestCallBack.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestCallBack.test.js @@ -23,8 +23,8 @@ const imageType = mediaLibrary.MediaType.IMAGE; const videoType = mediaLibrary.MediaType.VIDEO; const audioType = mediaLibrary.MediaType.AUDIO; const fileFetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [fileType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [fileType.toString(), 'Documents/'], }; const imageFetchOp = { selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', @@ -35,8 +35,8 @@ const videoFetchOp = { selectionArgs: [videoType.toString()], }; const audioFetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [audioType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs: [audioType.toString(), 'Camera'], }; describe('favoriteTestCallBack.test.js', function () { diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestPromise.test.js index d4b03a03a..ed12b142c 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favoriteTestPromise.test.js @@ -23,8 +23,8 @@ const imageType = mediaLibrary.MediaType.IMAGE; const videoType = mediaLibrary.MediaType.VIDEO; const audioType = mediaLibrary.MediaType.AUDIO; const fileFetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [fileType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [fileType.toString(), 'Documents/'], }; const imageFetchOp = { selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', @@ -35,8 +35,8 @@ const videoFetchOp = { selectionArgs: [videoType.toString()], }; const audioFetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [audioType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs: [audioType.toString(), 'Camera'], }; describe('favoriteTestPromise.test.js', function () { 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 0c9086739..ca42b102b 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 @@ -42,8 +42,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let fileType = mediaLibrary.MediaType.FILE; let fileFetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ fileType.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ fileType.toString(), 'Documents/'], }; let fetchFileResult = await media.getFileAssets(fileFetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -109,8 +109,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let type = mediaLibrary.MediaType.FILE; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ type.toString(), 'Documents/'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -173,8 +173,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let type = mediaLibrary.MediaType.FILE; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ type.toString(), 'Documents/'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -438,8 +438,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let fileType = mediaLibrary.MediaType.AUDIO; let fileFetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ fileType.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs : [ fileType.toString(), 'Camera'], }; let fetchFileResult = await media.getFileAssets(fileFetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -499,8 +499,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let type = mediaLibrary.MediaType.AUDIO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs : [ type.toString(), 'Camera'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -566,8 +566,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let type = mediaLibrary.MediaType.AUDIO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs : [ type.toString(), 'Camera'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -845,8 +845,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let type = mediaLibrary.MediaType.FILE; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ type.toString(), 'Documents/'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -941,8 +941,8 @@ describe('fileAssetTestCallback.test.js', async function() { try { let type = mediaLibrary.MediaType.AUDIO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + 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 1279da85a..090c81ebe 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 @@ -42,8 +42,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let fileType = mediaLibrary.MediaType.FILE; let fileFetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ fileType.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ fileType.toString(), 'Documents/'], }; let fetchFileResult = await media.getFileAssets(fileFetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -95,8 +95,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let type = mediaLibrary.MediaType.FILE; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ type.toString(), 'Documents/'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -136,8 +136,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let type = mediaLibrary.MediaType.FILE; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ type.toString(), 'Documents/'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -183,7 +183,7 @@ describe('fileAssetTestPromise.test.js', async function() { let fileType = mediaLibrary.MediaType.IMAGE; let fileFetchOp = { selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ fileType.toString() ], + selectionArgs : [ fileType.toString()], }; let fetchFileResult = await media.getFileAssets(fileFetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -320,8 +320,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let fileType = mediaLibrary.MediaType.AUDIO; let fileFetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ fileType.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs : [ fileType.toString(), 'Camera'], }; let fetchFileResult = await media.getFileAssets(fileFetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -371,8 +371,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let type = mediaLibrary.MediaType.AUDIO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs : [ type.toString(), 'Camera'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -412,8 +412,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let type = mediaLibrary.MediaType.AUDIO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs : [ type.toString(), 'Camera'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -459,7 +459,7 @@ describe('fileAssetTestPromise.test.js', async function() { let fileType = mediaLibrary.MediaType.VIDEO; let fileFetchOp = { selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ fileType.toString() ], + selectionArgs : [ fileType.toString()], }; let fetchFileResult = await media.getFileAssets(fileFetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -610,8 +610,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let type = mediaLibrary.MediaType.FILE; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs : [ type.toString(), 'Documents/'], }; let fetchFileResult = await media.getFileAssets(fetchOp); const dataList = await fetchFileResult.getAllObject(); @@ -698,8 +698,8 @@ describe('fileAssetTestPromise.test.js', async function() { try { let type = mediaLibrary.MediaType.AUDIO; let fetchOp = { - selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs : [ type.toString() ], + selections : mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + 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/fileTestCallBack.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestCallBack.test.js index ccccc309d..b5d0fdfe2 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestCallBack.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestCallBack.test.js @@ -33,12 +33,12 @@ let videosfetchOp = { selectionArgs: [videoType.toString()], }; let audiosfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [audioType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs: [audioType.toString(), 'Camera'], }; let filesfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [fileType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [fileType.toString(), 'Documents/'], }; function checkAssetAttr(done, attr, testNum, asset, checkType) { 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 ff9541a6d..0fbc2d693 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 @@ -33,12 +33,12 @@ let videosfetchOp = { selectionArgs: [videoType.toString()], }; let audiosfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [audioType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs: [audioType.toString(), 'Camera'], }; let filesfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [fileType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [fileType.toString(), 'Documents/'], }; function checkAssetAttr(done, attr, testNum, asset, checkType) { 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 baab218c3..158f90513 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 @@ -44,12 +44,12 @@ let videosfetchOp = { selectionArgs: [videoType.toString()], }; let audiosfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [audioType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs: [audioType.toString(), 'Camera'], }; let filesfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [fileType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [fileType.toString(), 'Documents/'], }; let imageAndVideofetchOp = { 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 3745ccc66..65bae0d5d 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 @@ -44,12 +44,12 @@ let videosfetchOp = { selectionArgs: [videoType.toString()], }; let audiosfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [audioType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND bucket_display_name = ?', + selectionArgs: [audioType.toString(), 'Camera'], }; let filesfetchOp = { - selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ?', - selectionArgs: [fileType.toString()], + selections: mediaLibrary.FileKey.MEDIA_TYPE + '= ? AND relative_path = ?', + selectionArgs: [fileType.toString(), 'Documents/'], }; let imageAndVideofetchOp = { -- GitLab