Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
接近 2 年 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
提交 0f638cde 编写于 作者: J JH C
浏览文件
操作

<chenjiahuan@huawei.com> 

Signed-off-by: NJH C <chenjiahuan@huawei.com>
上级 dd56ec90
隐藏空白更改
内联 并排
Showing with 517 addition and 649 deletion
multimedia/medialibrary/mediaLibrary_js_standard/Test.json
浏览文件 @ 0f638cde
...@@ -7,77 +7,47 @@ ...@@ -7,77 +7,47 @@
"shell-timeout": "600000" "shell-timeout": "600000"
}, },
"kits": [ "kits": [
{
"type": "ShellKit",
"pre-push": [
],
"run-command": [
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/*",
"mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
"mkdir -p /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA"
]
},
{ {
"type": "PushKit", "type": "PushKit",
"pre-push": [ "pre-push": [
], ],
"push": [ "push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/files", "./resource/medialibrary/01.jpg ->/data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/files", "./resource/medialibrary/01.mp3 ->/data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA",
"./resource/medialibrary/01.mp4 ->/storage/media/100/local/files", "./resource/medialibrary/01.mp4 ->/data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA",
"./resource/medialibrary/test.dat ->/storage/media/100/local/files", "./resource/medialibrary/01.dat ->/data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA"
"./resource/medialibrary/test2.dat ->/storage/media/100/local/files"
] ]
}, },
{ {
"type": "ShellKit", "type": "ShellKit",
"run-command": [ "run-command": [
"mkdir /storage/media/100/local/files/Pictures", "mkdir -pv /storage/media/100/local/files/{Pictures/{Static,Static01,Album/Static,SR001PRO,SR001CB,Dynamic,Dynamic01,Dynamic02,Dynamic022,DeleteCb01,AblumInfo,DeletePro01,Delete01,Temp},Videos/{Static,Static01,Album/Static,SR001PRO,SR001CB,Dynamic,Dynamic01,Dynamic02,DeleteCb01,AblumInfo,DeletePro01,Delete01},Audios/{Static,Static01,Album/Static,SR001PRO,SR001CB,Dynamic,Dynamic01,Dynamic02,DeleteCb01,AblumInfo,DeletePro01,Delete01},Documents/{Static,Static01,Album/Static,SR001PRO,SR001CB,Dynamic,Dynamic01,Dynamic02,DeleteCb01,AblumInfo,DeletePro01,Delete01}}",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/", "for d in Static Album/Static Dynamic Dynamic01 Dynamic022 AblumInfo; do for i in $$(seq 3); do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/02.jpg", "for d in Static Album/Static Dynamic Dynamic01 Dynamic02 AblumInfo; do for i in $$(seq 3); do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/03.jpg", "for d in Static Album/Static Dynamic Dynamic01 Dynamic02 AblumInfo; do for i in $$(seq 3); do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/", "for d in Static Album/Static Dynamic Dynamic01 Dynamic02 AblumInfo; do for i in $$(seq 3); do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/02.mp3",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/03.mp3", "for d in SR001PRO SR001CB DeleteCb01 DeletePro01 Static01; do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/01.jpg /storage/media/100/local/files/Pictures/$$d ;done;",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/", "for d in SR001PRO SR001CB DeleteCb01 DeletePro01 Static01; do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/01.mp3 /storage/media/100/local/files/Audios/$$d ;done;",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/02.mp4", "for d in SR001PRO SR001CB DeleteCb01 DeletePro01 Static01; do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/01.mp4 /storage/media/100/local/files/Videos/$$d ;done;",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/03.mp4", "for d in SR001PRO SR001CB DeleteCb01 DeletePro01 Static01; do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/01.dat /storage/media/100/local/files/Documents/$$d ;done;",
"mkdir /storage/media/100/local/files/Pictures/weixin",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/weixin",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/weixin",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/weixin",
"mkdir /storage/media/100/local/files/Camera",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Camera/01.jpg",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Camera/02.jpg",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Camera/01.mp3",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Camera/02.mp3",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Camera/01.mp4",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Camera/02.mp4",
"mkdir /storage/media/100/local/files/Documents",
"cp /storage/media/100/local/files/test.dat /storage/media/100/local/files/Documents/test.dat",
"cp /storage/media/100/local/files/test2.dat /storage/media/100/local/files/Documents/test2.dat",
"mkdir /storage/media/100/local/files/Pictures/DeleteAlbumPro",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/DeleteAlbumPro",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/DeleteAlbumPro",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/DeleteAlbumPro",
"mkdir /storage/media/100/local/files/Pictures/DeleteAlbumCallback",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/DeleteAlbumCallback",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/DeleteAlbumCallback",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/DeleteAlbumCallback",
"mkdir /storage/media/100/local/files/Pictures/AblumInfo",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/AblumInfo",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/AblumInfo",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/AblumInfo",
"mkdir /storage/media/100/local/files/Pictures/FileAssetTest",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/FileAssetTest",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/FileAssetTest/02.jpg",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/FileAssetTest",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/FileAssetTest/02.mp3",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/FileAssetTest",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/FileAssetTest/02.mp4",
"mkdir /storage/media/100/local/files/Pictures/MediaLibraryTest",
"cp /storage/media/100/local/files/01.jpg /storage/media/100/local/files/Pictures/MediaLibraryTest",
"cp /storage/media/100/local/files/01.mp3 /storage/media/100/local/files/Pictures/MediaLibraryTest",
"cp /storage/media/100/local/files/01.mp4 /storage/media/100/local/files/Pictures/MediaLibraryTest",
"cp /storage/media/100/local/files/test.dat /storage/media/100/local/files/Pictures/MediaLibraryTest",
"chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"killall com.ohos.medialibrary.MediaScannerAbilityA", "killall com.ohos.medialibrary.MediaScannerAbilityA",
"aa start -a MediaScannerAbility -b com.ohos.medialibrary.MediaScannerAbilityA" "aa start -a MediaScannerAbility -b com.ohos.medialibrary.MediaScannerAbilityA",
], "sleep 20"
"teardown-command":[
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/accounts/account_0/appdata/com.ohos.medialibrary.MediaLibraryDataA/*"
] ]
}, },
{ {
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumGetFileAssetsCallback.test.js
浏览文件 @ 0f638cde
...@@ -33,7 +33,10 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -33,7 +33,10 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
let audioType = mediaLibrary.MediaType.AUDIO; let audioType = mediaLibrary.MediaType.AUDIO;
const count = 3; const count = 3;
const countOne = 1; const countOne = 1;
let allTypefetchOp = {
selections: '',
selectionArgs: [],
};
/** /**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_01 * @tc.number : SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_01
* @tc.name : getFileAssets * @tc.name : getFileAssets
...@@ -45,8 +48,8 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -45,8 +48,8 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_01', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_01', 0, async function (done) {
try { try {
let allTypefetchOp = { let allTypefetchOp = {
selections: '', selections: fileKeyObj.ALBUM_NAME + '= ? ',
selectionArgs: [], selectionArgs: ['AblumInfo'],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(allTypefetchOp); const albumList = await media.getAlbums(allTypefetchOp);
...@@ -78,13 +81,13 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -78,13 +81,13 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_02', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_02', 0, async function (done) {
try { try {
let imageAlbumfetchOp = { let imageAlbumfetchOp = {
selections: fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures', imageType.toString()], selectionArgs: ['Pictures/', 'Static', imageType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(imageAlbumfetchOp); const albumList = await media.getAlbums(imageAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
album.getFileAssets(imageAlbumfetchOp, (error, fetchFileResult) => { album.getFileAssets((error, fetchFileResult) => {
if (fetchFileResult == undefined) { if (fetchFileResult == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
...@@ -111,13 +114,13 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -111,13 +114,13 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_03', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_03', 0, async function (done) {
try { try {
let audioAlbumfetchOp = { let audioAlbumfetchOp = {
selections: fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures', audioType.toString()], selectionArgs: ['Audios/', 'Static', audioType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(audioAlbumfetchOp); const albumList = await media.getAlbums(audioAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
album.getFileAssets(audioAlbumfetchOp, (error, fetchFileResult) => { album.getFileAssets((error, fetchFileResult) => {
if (fetchFileResult == undefined) { if (fetchFileResult == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
...@@ -143,13 +146,13 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -143,13 +146,13 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_04', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_04', 0, async function (done) {
try { try {
let videoAlbumfetchOp = { let videoAlbumfetchOp = {
selections: fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures', videoType.toString()], selectionArgs: ['Videos/', 'Static', videoType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(videoAlbumfetchOp); const albumList = await media.getAlbums(videoAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
album.getFileAssets(videoAlbumfetchOp, (error, fetchFileResult) => { album.getFileAssets((error, fetchFileResult) => {
if (fetchFileResult == undefined) { if (fetchFileResult == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
...@@ -175,13 +178,16 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -175,13 +178,16 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_05', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_05', 0, async function (done) {
try { try {
let imageAndVideoAlbumfetchOp = { let imageAndVideoAlbumfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
selectionArgs: [imageType.toString(), videoType.toString()], fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'Videos/', 'AblumInfo', imageType.toString(), videoType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(imageAndVideoAlbumfetchOp); const albumList = await media.getAlbums(imageAndVideoAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
album.getFileAssets(imageAndVideoAlbumfetchOp, (error, fetchFileResult) => { album.getFileAssets(allTypefetchOp, (error, fetchFileResult) => {
if (fetchFileResult == undefined) { if (fetchFileResult == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
...@@ -207,13 +213,16 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -207,13 +213,16 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_06', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_06', 0, async function (done) {
try { try {
let imageAndAudioAlbumfetchOp = { let imageAndAudioAlbumfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
selectionArgs: [imageType.toString(), audioType.toString()], fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'Audios/', 'AblumInfo', imageType.toString(), audioType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(imageAndAudioAlbumfetchOp); const albumList = await media.getAlbums(imageAndAudioAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
album.getFileAssets(imageAndAudioAlbumfetchOp, (error, fetchFileResult) => { album.getFileAssets(allTypefetchOp, (error, fetchFileResult) => {
if (fetchFileResult == undefined) { if (fetchFileResult == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
...@@ -239,13 +248,16 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -239,13 +248,16 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_07', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_07', 0, async function (done) {
try { try {
let videoAndAudioAlbumfetchOp = { let videoAndAudioAlbumfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
selectionArgs: [videoType.toString(), audioType.toString()], fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Videos/', 'Audios/', 'AblumInfo', audioType.toString(), videoType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(videoAndAudioAlbumfetchOp); const albumList = await media.getAlbums(videoAndAudioAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
album.getFileAssets(videoAndAudioAlbumfetchOp, (error, fetchFileResult) => { album.getFileAssets(allTypefetchOp, (error, fetchFileResult) => {
if (fetchFileResult == undefined) { if (fetchFileResult == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
...@@ -271,14 +283,17 @@ describe('albumGetFileAssetsCallback.test.js', async function () { ...@@ -271,14 +283,17 @@ describe('albumGetFileAssetsCallback.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_08', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_CALLBACK_001_08', 0, async function (done) {
try { try {
let imgAndVideoAndAudioAlbumfetchOp = { let imgAndVideoAndAudioAlbumfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
+ fileKeyObj.MEDIA_TYPE + '= ?', fileKeyObj.ALBUM_NAME + '= ? AND (' +
selectionArgs: [imageType.toString(), videoType.toString(), audioType.toString()], fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'Videos/', 'Audios/', 'AblumInfo', imageType.toString(), videoType.toString(), audioType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(imgAndVideoAndAudioAlbumfetchOp); const albumList = await media.getAlbums(imgAndVideoAndAudioAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
album.getFileAssets(imgAndVideoAndAudioAlbumfetchOp, (error, fetchFileResult) => { album.getFileAssets(allTypefetchOp, (error, fetchFileResult) => {
if (fetchFileResult == undefined) { if (fetchFileResult == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumGetFileAssetsPromise.test.js
浏览文件 @ 0f638cde
...@@ -33,7 +33,10 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -33,7 +33,10 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
let audioType = mediaLibrary.MediaType.AUDIO; let audioType = mediaLibrary.MediaType.AUDIO;
const count = 3; const count = 3;
const countOne = 1; const countOne = 1;
let allTypefetchOp = {
selections: '',
selectionArgs: [],
};
/** /**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_01 * @tc.number : SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_01
* @tc.name : getFileAssets * @tc.name : getFileAssets
...@@ -45,8 +48,8 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -45,8 +48,8 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_01', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_01', 0, async function (done) {
try { try {
let allTypefetchOp = { let allTypefetchOp = {
selections: '', selections: fileKeyObj.ALBUM_NAME + '= ? ',
selectionArgs: [], selectionArgs: ['AblumInfo'],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(allTypefetchOp); const albumList = await media.getAlbums(allTypefetchOp);
...@@ -72,14 +75,14 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -72,14 +75,14 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_02', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_02', 0, async function (done) {
try { try {
let imageAlbumfetchOp = { let imageAlbumfetchOp = {
selections: fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures', imageType.toString()], selectionArgs: ['Pictures/', 'Static', imageType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(imageAlbumfetchOp); const albumList = await media.getAlbums(imageAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
const fetchFileResult = await album.getFileAssets(imageAlbumfetchOp); const fetchFileResult = await album.getFileAssets();
expect(fetchFileResult.getCount() == count).assertTrue(); expect(fetchFileResult.getCount() == count).assertTrue();
done(); done();
} catch (error) { } catch (error) {
...@@ -99,14 +102,14 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -99,14 +102,14 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_03', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_03', 0, async function (done) {
try { try {
let audioAlbumfetchOp = { let audioAlbumfetchOp = {
selections: fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures', audioType.toString()], selectionArgs: ['Audios/', 'Static', audioType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(audioAlbumfetchOp); const albumList = await media.getAlbums(audioAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
const fetchFileResult = await album.getFileAssets(audioAlbumfetchOp); const fetchFileResult = await album.getFileAssets();
expect(fetchFileResult.getCount() == count).assertTrue(); expect(fetchFileResult.getCount() == count).assertTrue();
done(); done();
...@@ -127,13 +130,13 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -127,13 +130,13 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_04', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_04', 0, async function (done) {
try { try {
let videoAlbumfetchOp = { let videoAlbumfetchOp = {
selections: fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures', videoType.toString()], selectionArgs: ['Videos/', 'Static', videoType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(videoAlbumfetchOp); const albumList = await media.getAlbums(videoAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
const fetchFileResult = await album.getFileAssets(videoAlbumfetchOp); const fetchFileResult = await album.getFileAssets();
expect(fetchFileResult.getCount() == count).assertTrue(); expect(fetchFileResult.getCount() == count).assertTrue();
done(); done();
...@@ -154,13 +157,16 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -154,13 +157,16 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_05', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_05', 0, async function (done) {
try { try {
let imageAndVideoAlbumfetchOp = { let imageAndVideoAlbumfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
selectionArgs: [imageType.toString(), videoType.toString()], fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'Videos/', 'AblumInfo', imageType.toString(), videoType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(imageAndVideoAlbumfetchOp); const albumList = await media.getAlbums(imageAndVideoAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
const fetchFileResult = await album.getFileAssets(imageAndVideoAlbumfetchOp); const fetchFileResult = await album.getFileAssets(allTypefetchOp);
expect(fetchFileResult.getCount() == count).assertTrue(); expect(fetchFileResult.getCount() == count).assertTrue();
done(); done();
} catch (error) { } catch (error) {
...@@ -180,13 +186,16 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -180,13 +186,16 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_06', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_06', 0, async function (done) {
try { try {
let imageAndAudioAlbumfetchOp = { let imageAndAudioAlbumfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
selectionArgs: [imageType.toString(), audioType.toString()], fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'Audios/', 'AblumInfo', imageType.toString(), audioType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(imageAndAudioAlbumfetchOp); const albumList = await media.getAlbums(imageAndAudioAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
const fetchFileResult = await album.getFileAssets(imageAndAudioAlbumfetchOp); const fetchFileResult = await album.getFileAssets(allTypefetchOp);
expect(fetchFileResult.getCount() == count).assertTrue(); expect(fetchFileResult.getCount() == count).assertTrue();
done(); done();
} catch (error) { } catch (error) {
...@@ -206,13 +215,16 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -206,13 +215,16 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_07', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_07', 0, async function (done) {
try { try {
let videoAndAudioAlbumfetchOp = { let videoAndAudioAlbumfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
selectionArgs: [videoType.toString(), audioType.toString()], fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Videos/', 'Audios/', 'AblumInfo', audioType.toString(), videoType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(videoAndAudioAlbumfetchOp); const albumList = await media.getAlbums(videoAndAudioAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
const fetchFileResult = await album.getFileAssets(videoAndAudioAlbumfetchOp); const fetchFileResult = await album.getFileAssets(allTypefetchOp);
expect(fetchFileResult.getCount() == count).assertTrue(); expect(fetchFileResult.getCount() == count).assertTrue();
done(); done();
} catch (error) { } catch (error) {
...@@ -232,14 +244,17 @@ describe('albumGetFileAssetsPromise.test.js', async function () { ...@@ -232,14 +244,17 @@ describe('albumGetFileAssetsPromise.test.js', async function () {
it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_08', 0, async function (done) { it('SUB_MEDIA_MEDIALIBRARY_ALBUM_GET_ASSETS_PROMISE_001_08', 0, async function (done) {
try { try {
let imgAndVideoAndAudioAlbumfetchOp = { let imgAndVideoAndAudioAlbumfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
+ fileKeyObj.MEDIA_TYPE + '= ?', fileKeyObj.ALBUM_NAME + '= ? AND (' +
selectionArgs: [imageType.toString(), videoType.toString(), audioType.toString()], fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'Videos/', 'Audios/', 'AblumInfo', imageType.toString(), videoType.toString(), audioType.toString()],
order: 'date_added DESC LIMIT 0,3', order: 'date_added DESC LIMIT 0,3',
}; };
const albumList = await media.getAlbums(imgAndVideoAndAudioAlbumfetchOp); const albumList = await media.getAlbums(imgAndVideoAndAudioAlbumfetchOp);
const album = albumList[0]; const album = albumList[0];
const fetchFileResult = await album.getFileAssets(imgAndVideoAndAudioAlbumfetchOp); const fetchFileResult = await album.getFileAssets(allTypefetchOp);
expect(fetchFileResult.getCount() == count).assertTrue(); expect(fetchFileResult.getCount() == count).assertTrue();
done(); done();
} catch (error) { } catch (error) {
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestCallBack.test.js
浏览文件 @ 0f638cde
...@@ -32,7 +32,7 @@ let albumDeletefetchOp = { ...@@ -32,7 +32,7 @@ let albumDeletefetchOp = {
}; };
let albumCoverUrifetchOp = { let albumCoverUrifetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ?',
selectionArgs: ['Pictures/', 'weixin'], selectionArgs: ['Pictures/', 'AblumInfo'],
}; };
let allTypeInfofetchOp = { let allTypeInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ?',
...@@ -40,43 +40,46 @@ let allTypeInfofetchOp = { ...@@ -40,43 +40,46 @@ let allTypeInfofetchOp = {
}; };
let imageAlbumInfofetchOp = { let imageAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/', 'AblumInfo', imageType.toString()], selectionArgs: ['Pictures/', 'AblumInfo', imageType.toString()],
}; };
let videoAlbumInfofetchOp = { let videoAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/', 'AblumInfo', videoType.toString()], selectionArgs: ['Videos/', 'AblumInfo', videoType.toString()],
}; };
let audioAlbumInfofetchOp = { let audioAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/', 'AblumInfo', audioType.toString()], selectionArgs: ['Audios/', 'AblumInfo', audioType.toString()],
}; };
let imageAndVideoAlbumInfofetchOp = { let imageAndVideoAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND (' + fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE +'= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)', fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'AblumInfo', imageType.toString(), videoType.toString()], selectionArgs: ['Pictures/', 'Videos/', 'AblumInfo', imageType.toString(), videoType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let imageAndAudioAlbumInfofetchOp = { let imageAndAudioAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND (' + fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)', fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'AblumInfo', imageType.toString(), audioType.toString()], selectionArgs: ['Pictures/', 'Audios/', 'AblumInfo', imageType.toString(), videoType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let videoAndAudioAlbumInfofetchOp = { let videoAndAudioAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND (' + fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)', fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'AblumInfo', videoType.toString(), audioType.toString()], selectionArgs: ['Videos/', 'Audios/', 'AblumInfo', imageType.toString(), videoType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
function printAlbumMessage(testNum, album) { function printAlbumMessage(testNum, album) {
console.info(`ALBUM_CALLBACK getAlbum ${testNum} album.albumId: ${album.albumId}`); console.info(`ALBUM_CALLBACK getAlbum ${testNum} album.albumId: ${album.albumId}`);
...@@ -91,16 +94,15 @@ function printAlbumMessage(testNum, album) { ...@@ -91,16 +94,15 @@ function printAlbumMessage(testNum, album) {
const props = { const props = {
albumName: 'AblumInfo', albumName: 'AblumInfo',
albumUri: 'dataability:///media/album/', albumUri: 'dataability:///media/album/',
relativePath: 'Pictures/', count: 3
count: 1
} }
function checkAlbumAttr(done, album) { function checkAlbumAttr(done, album, relativePaths) {
if ( if (
album.albumId == undefined || album.albumId == undefined ||
album.albumName != props.albumName || album.albumName != props.albumName ||
album.albumUri != props.albumUri + album.albumId || album.albumUri != props.albumUri + album.albumId ||
album.count != props.count || album.count != props.count ||
album.relativePath != props.relativePath || !relativePaths.includes(album.relativePath) ||
album.coverUri == undefined album.coverUri == undefined
) { ) {
expect(false).assertTrue(); expect(false).assertTrue();
...@@ -135,7 +137,7 @@ describe('albumTestCallBack.test.js', async function () { ...@@ -135,7 +137,7 @@ describe('albumTestCallBack.test.js', async function () {
} else { } else {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_01', album); printAlbumMessage('001_01', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Pictures/']);
console.info('ALBUM_CALLBACK getAlbum 001_01 success'); console.info('ALBUM_CALLBACK getAlbum 001_01 success');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -168,7 +170,7 @@ describe('albumTestCallBack.test.js', async function () { ...@@ -168,7 +170,7 @@ describe('albumTestCallBack.test.js', async function () {
} else { } else {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_02', album); printAlbumMessage('001_02', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Pictures/']);
console.info('ALBUM_CALLBACK getAlbum 001_02 success'); console.info('ALBUM_CALLBACK getAlbum 001_02 success');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -201,7 +203,7 @@ describe('albumTestCallBack.test.js', async function () { ...@@ -201,7 +203,7 @@ describe('albumTestCallBack.test.js', async function () {
} else { } else {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_03', album); printAlbumMessage('001_03', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Videos/']);
console.info('ALBUM_CALLBACK getAlbum 001_03 passed'); console.info('ALBUM_CALLBACK getAlbum 001_03 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -234,7 +236,7 @@ describe('albumTestCallBack.test.js', async function () { ...@@ -234,7 +236,7 @@ describe('albumTestCallBack.test.js', async function () {
} else { } else {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_04', album); printAlbumMessage('001_04', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Audios/']);
console.info('ALBUM_CALLBACK getAlbum 001_04 passed'); console.info('ALBUM_CALLBACK getAlbum 001_04 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -268,7 +270,7 @@ describe('albumTestCallBack.test.js', async function () { ...@@ -268,7 +270,7 @@ describe('albumTestCallBack.test.js', async function () {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_05', album); printAlbumMessage('001_05', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Videos/', 'Pictures/']);
console.info('ALBUM_CALLBACK getAlbum 001_05 passed'); console.info('ALBUM_CALLBACK getAlbum 001_05 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -302,7 +304,7 @@ describe('albumTestCallBack.test.js', async function () { ...@@ -302,7 +304,7 @@ describe('albumTestCallBack.test.js', async function () {
} else { } else {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_06', album); printAlbumMessage('001_06', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Audios/', 'Pictures/']);
console.info('ALBUM_CALLBACK getAlbum 001_06 passed'); console.info('ALBUM_CALLBACK getAlbum 001_06 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -336,7 +338,7 @@ describe('albumTestCallBack.test.js', async function () { ...@@ -336,7 +338,7 @@ describe('albumTestCallBack.test.js', async function () {
} else { } else {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_07', album); printAlbumMessage('001_07', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Videos/', 'Audios/']);
console.info('ALBUM_CALLBACK getAlbum 001_07 passed'); console.info('ALBUM_CALLBACK getAlbum 001_07 passed');
expect(true).assertTrue(); expect(true).assertTrue();
done(); done();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestPromise.test.js
浏览文件 @ 0f638cde
...@@ -32,52 +32,54 @@ let albumDeletefetchOp = { ...@@ -32,52 +32,54 @@ let albumDeletefetchOp = {
}; };
let albumCoverUrifetchOp = { let albumCoverUrifetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ?',
selectionArgs: ['Pictures/', 'weixin'], selectionArgs: ['Pictures/', 'AblumInfo'],
}; };
let allTypeInfofetchOp = { let allTypeInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.ALBUM_NAME + '= ?',
selectionArgs: ['Pictures/', 'AblumInfo'], selectionArgs: ['Pictures/', 'AblumInfo'],
}; };
let imageAlbumInfofetchOp = { let imageAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/', 'AblumInfo', imageType.toString()], selectionArgs: ['Pictures/', 'AblumInfo', imageType.toString()],
}; };
let videoAlbumInfofetchOp = { let videoAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/', 'AblumInfo', videoType.toString()], selectionArgs: ['Videos/', 'AblumInfo', videoType.toString()],
}; };
let audioAlbumInfofetchOp = { let audioAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', fileKeyObj.ALBUM_NAME + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/', 'AblumInfo', audioType.toString()], selectionArgs: ['Audios/', 'AblumInfo', audioType.toString()],
}; };
let imageAndVideoAlbumInfofetchOp = { let imageAndVideoAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND (' + fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)', fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'AblumInfo', imageType.toString(), videoType.toString()], selectionArgs: ['Pictures/', 'Videos/', 'AblumInfo', imageType.toString(), videoType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let imageAndAudioAlbumInfofetchOp = { let imageAndAudioAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND (' + fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)', fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'AblumInfo', imageType.toString(), audioType.toString()], selectionArgs: ['Pictures/', 'Audios/', 'AblumInfo', imageType.toString(), videoType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let videoAndAudioAlbumInfofetchOp = { let videoAndAudioAlbumInfofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? ) AND ' +
fileKeyObj.ALBUM_NAME + '= ? AND (' + fileKeyObj.ALBUM_NAME + '= ? AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' +
fileKeyObj.MEDIA_TYPE + '= ?)', fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/', 'AblumInfo', videoType.toString(), audioType.toString()], selectionArgs: ['Videos/', 'Audios/', 'AblumInfo', imageType.toString(), videoType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
function printAlbumMessage(testNum, album) { function printAlbumMessage(testNum, album) {
...@@ -93,16 +95,15 @@ function printAlbumMessage(testNum, album) { ...@@ -93,16 +95,15 @@ function printAlbumMessage(testNum, album) {
const props = { const props = {
albumName: 'AblumInfo', albumName: 'AblumInfo',
albumUri: 'dataability:///media/album/', albumUri: 'dataability:///media/album/',
relativePath: 'Pictures/', count: 3
count: 1
} }
function checkAlbumAttr(done, album) { function checkAlbumAttr(done, album, relativePaths) {
if ( if (
album.albumId == undefined || album.albumId == undefined ||
album.albumName != props.albumName || album.albumName != props.albumName ||
album.albumUri != props.albumUri + album.albumId || album.albumUri != props.albumUri + album.albumId ||
album.count != props.count || album.count != props.count ||
album.relativePath != props.relativePath || !relativePaths.includes(album.relativePath) ||
album.coverUri == undefined album.coverUri == undefined
) { ) {
expect(false).assertTrue(); expect(false).assertTrue();
...@@ -133,7 +134,7 @@ describe('albumTestPromise.test.js', async function () { ...@@ -133,7 +134,7 @@ describe('albumTestPromise.test.js', async function () {
const albumList = await media.getAlbums(allTypeInfofetchOp); const albumList = await media.getAlbums(allTypeInfofetchOp);
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_01', album); printAlbumMessage('001_01', album);
checkAlbumAttr(done, album, 3); checkAlbumAttr(done, album, ['Pictures/']);
console.info('ALBUM_PROMISE getAlbum 001_01 success'); console.info('ALBUM_PROMISE getAlbum 001_01 success');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -159,8 +160,7 @@ describe('albumTestPromise.test.js', async function () { ...@@ -159,8 +160,7 @@ describe('albumTestPromise.test.js', async function () {
const albumList = await media.getAlbums(imageAlbumInfofetchOp); const albumList = await media.getAlbums(imageAlbumInfofetchOp);
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_02', album); printAlbumMessage('001_02', album);
checkAlbumAttr(done, album, ['Pictures/']);
checkAlbumAttr(done, album);
console.info('ALBUM_PROMISE getAlbum 001_02 success'); console.info('ALBUM_PROMISE getAlbum 001_02 success');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -187,7 +187,7 @@ describe('albumTestPromise.test.js', async function () { ...@@ -187,7 +187,7 @@ describe('albumTestPromise.test.js', async function () {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_03', album); printAlbumMessage('001_03', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Videos/']);
console.info('ALBUM_PROMISE getAlbum 001_03 passed'); console.info('ALBUM_PROMISE getAlbum 001_03 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -214,7 +214,7 @@ describe('albumTestPromise.test.js', async function () { ...@@ -214,7 +214,7 @@ describe('albumTestPromise.test.js', async function () {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_04', album); printAlbumMessage('001_04', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Audios/']);
console.info('ALBUM_PROMISE getAlbum 001_04 passed'); console.info('ALBUM_PROMISE getAlbum 001_04 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -242,7 +242,7 @@ describe('albumTestPromise.test.js', async function () { ...@@ -242,7 +242,7 @@ describe('albumTestPromise.test.js', async function () {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_05', album); printAlbumMessage('001_05', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Videos/', 'Pictures/']);
console.info('ALBUM_PROMISE getAlbum 001_05 passed'); console.info('ALBUM_PROMISE getAlbum 001_05 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -270,7 +270,7 @@ describe('albumTestPromise.test.js', async function () { ...@@ -270,7 +270,7 @@ describe('albumTestPromise.test.js', async function () {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_06', album); printAlbumMessage('001_06', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Audios/', 'Pictures/']);
console.info('ALBUM_PROMISE getAlbum 001_06 passed'); console.info('ALBUM_PROMISE getAlbum 001_06 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -298,7 +298,7 @@ describe('albumTestPromise.test.js', async function () { ...@@ -298,7 +298,7 @@ describe('albumTestPromise.test.js', async function () {
const album = albumList[0]; const album = albumList[0];
printAlbumMessage('001_07', album); printAlbumMessage('001_07', album);
checkAlbumAttr(done, album); checkAlbumAttr(done, album, ['Videos/', 'Audios/']);
console.info('ALBUM_PROMISE getAlbum 001_07 passed'); console.info('ALBUM_PROMISE getAlbum 001_07 passed');
expect(true).assertTrue(); expect(true).assertTrue();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fetchFileResultCallBack.test.js
浏览文件 @ 0f638cde
...@@ -16,88 +16,55 @@ ...@@ -16,88 +16,55 @@
import mediaLibrary from '@ohos.multimedia.mediaLibrary'; import mediaLibrary from '@ohos.multimedia.mediaLibrary';
import featureAbility from '@ohos.ability.featureAbility'; import featureAbility from '@ohos.ability.featureAbility';
import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index';
let fileKeyObj = mediaLibrary.FileKey; let fileKeyObj = mediaLibrary.FileKey;
let fileType = mediaLibrary.MediaType.FILE; let fileType = mediaLibrary.MediaType.FILE;
let imageType = mediaLibrary.MediaType.IMAGE; let imageType = mediaLibrary.MediaType.IMAGE;
let videoType = mediaLibrary.MediaType.VIDEO; let videoType = mediaLibrary.MediaType.VIDEO;
let audioType = mediaLibrary.MediaType.AUDIO; let audioType = mediaLibrary.MediaType.AUDIO;
let getFileCountOneOp = {
selections : fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
order : fileKeyObj.DATE_ADDED + " DESC LIMIT 0,1",
extendArgs : "",
};
let getFileCountTwoOp = {
selections : fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
order : fileKeyObj.DATE_ADDED + " DESC LIMIT 0,2",
extendArgs : "",
};
let getFileCountTenOp = {
selections : fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
order : fileKeyObj.DATE_ADDED + " DESC LIMIT 0,10",
extendArgs : "",
};
let getFileCountOneHundredOp = {
selections : fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ],
order : fileKeyObj.DATE_ADDED + " DESC LIMIT 0,100",
extendArgs : "",
};
let getFirstObjectOp = { let getFirstObjectOp = {
selections : fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ 'Camera/' ], selectionArgs: ['Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,5", order: fileKeyObj.ID + " DESC LIMIT 0,5",
extendArgs : "", extendArgs: "",
} }
let getAllObjectLimitOneOp = { let getAllObjectLimitOneOp = {
selections : fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ 'Camera/' ], selectionArgs: ['Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,1", order: fileKeyObj.ID + " DESC LIMIT 0,1",
extendArgs : "", extendArgs: "",
} }
let getAllObjectLimitTwoOp = { let getAllObjectLimitTwoOp = {
selections : fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ 'Camera/' ], selectionArgs: ['Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,1", order: fileKeyObj.ID + " DESC LIMIT 0,1",
extendArgs : "", extendArgs: "",
} }
let getAllObjectLimitOneHundredOp = { let getAllObjectLimitOneHundredOp = {
selections : fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ 'Camera/' ], selectionArgs: ['Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,100", order: fileKeyObj.ID + " DESC LIMIT 0,100",
extendArgs : "", extendArgs: "",
} }
let getFileCountZeroOp = {
selections : fileKeyObj.DISPLAY_NAME + '=?',
selectionArgs : [ 'The world has kissed my soul with its pain, asking for its return in songs.' ],
};
let getFileOp = { let getFileOp = {
selections : fileKeyObj.DISPLAY_NAME + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.DISPLAY_NAME + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ '01.jpg', 'Camera/' ], selectionArgs: ['01.jpg', 'Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,100", order: fileKeyObj.ID + " DESC LIMIT 0,100",
extendArgs : "", extendArgs: "",
} }
describe('fetchFileResultCallback.test.js', async function() { describe('fetchFileResultCallback.test.js', async function () {
var context = featureAbility.getContext(); var context = featureAbility.getContext();
var media = mediaLibrary.getMediaLibrary(context); var media = mediaLibrary.getMediaLibrary(context);
beforeAll(function() {}); beforeAll(function () { });
beforeEach(function() {}); beforeEach(function () { });
afterEach(function() {}); afterEach(function () { });
afterAll(function() {}); afterAll(function () { });
// ------------------------------ 004 test start ------------------------- // ------------------------------ 004 test start -------------------------
/** /**
...@@ -108,7 +75,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -108,7 +75,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETFIRSTOBJECT_CALLBACK_004', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETFIRSTOBJECT_CALLBACK_004', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getFirstObject begin'); console.info('MediaLibraryTest : FETCHRESULT getFirstObject begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
...@@ -118,7 +85,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -118,7 +85,7 @@ describe('fetchFileResultCallback.test.js', async function() {
console.info('MediaLibraryTest : FETCHRESULT getNextObject 004 fail'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 004 fail');
done(); done();
} else { } else {
expect(firstObject.relativePath == 'Camera/').assertTrue(); expect(firstObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
console.info('MediaLibraryTest : FETCHRESULT getFirstObject 004 end'); console.info('MediaLibraryTest : FETCHRESULT getFirstObject 004 end');
done(); done();
...@@ -142,12 +109,12 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -142,12 +109,12 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETNEXTOBJECT_CALLBACK_005', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETNEXTOBJECT_CALLBACK_005', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 begin'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
let firstObject = await fetchFileResult.getFirstObject(); let firstObject = await fetchFileResult.getFirstObject();
expect(firstObject.relativePath == 'Camera/').assertTrue(); expect(firstObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.getNextObject(async (error, nextObject) => { fetchFileResult.getNextObject(async (error, nextObject) => {
if (nextObject == undefined) { if (nextObject == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
...@@ -155,7 +122,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -155,7 +122,7 @@ describe('fetchFileResultCallback.test.js', async function() {
done(); done();
console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 fail'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 fail');
} else { } else {
expect(nextObject.relativePath == 'Camera/').assertTrue(); expect(nextObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 end'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 end');
done(); done();
...@@ -178,7 +145,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -178,7 +145,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETLASTOBJECT_CALLBACK_006', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETLASTOBJECT_CALLBACK_006', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getLastObject begin'); console.info('MediaLibraryTest : FETCHRESULT getLastObject begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
...@@ -189,7 +156,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -189,7 +156,7 @@ describe('fetchFileResultCallback.test.js', async function() {
console.info('MediaLibraryTest : FETCHRESULT getNextObject 006 fail'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 006 fail');
done(); done();
} else { } else {
expect(lastObject.relativePath == 'Camera/').assertTrue(); expect(lastObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
console.info('MediaLibraryTest : FETCHRESULT getNextObject 006 end'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 006 end');
done(); done();
...@@ -212,7 +179,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -212,7 +179,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_CALLBACK_007_01', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_CALLBACK_007_01', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_01 begin'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_01 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
...@@ -223,7 +190,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -223,7 +190,7 @@ describe('fetchFileResultCallback.test.js', async function() {
console.info('MediaLibraryTest : FETCHRESULT getNextObject 007_01 fail'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 007_01 fail');
done(); done();
} else { } else {
expect(targetObject.relativePath == 'Camera/').assertTrue(); expect(targetObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_01 end'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_01 end');
done(); done();
...@@ -244,7 +211,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -244,7 +211,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_CALLBACK_007_02', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_CALLBACK_007_02', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_02 begin'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_02 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
...@@ -255,7 +222,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -255,7 +222,7 @@ describe('fetchFileResultCallback.test.js', async function() {
console.info('MediaLibraryTest : FETCHRESULT getNextObject 007_02 fail'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 007_02 fail');
done(); done();
} else { } else {
expect(targetObject.relativePath == 'Camera/').assertTrue(); expect(targetObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_02 end'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_02 end');
done(); done();
...@@ -276,7 +243,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -276,7 +243,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_CALLBACK_007_03', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_CALLBACK_007_03', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_03 begin'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_03 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
...@@ -288,7 +255,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -288,7 +255,7 @@ describe('fetchFileResultCallback.test.js', async function() {
console.info('MediaLibraryTest : FETCHRESULT getNextObject 007_03 fail'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 007_03 fail');
done(); done();
} else { } else {
expect(targetObject.relativePath == 'Camera/').assertTrue(); expect(targetObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_03 end'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_03 end');
done(); done();
...@@ -309,7 +276,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -309,7 +276,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_CALLBACK_007_04', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_CALLBACK_007_04', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_04 begin'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_04 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
...@@ -351,7 +318,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -351,7 +318,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_CALLBACK_008_01', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_CALLBACK_008_01', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_01 begin'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_01 begin');
let fetchFileResult = await media.getFileAssets(getAllObjectLimitOneOp); let fetchFileResult = await media.getFileAssets(getAllObjectLimitOneOp);
...@@ -382,7 +349,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -382,7 +349,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_CALLBACK_008_02', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_CALLBACK_008_02', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 begin'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 begin');
let fetchFileResult = await media.getFileAssets(getAllObjectLimitTwoOp); let fetchFileResult = await media.getFileAssets(getAllObjectLimitTwoOp);
...@@ -395,7 +362,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -395,7 +362,7 @@ describe('fetchFileResultCallback.test.js', async function() {
} else { } else {
expect(0 < targetObjects.length <= 2).assertTrue(); expect(0 < targetObjects.length <= 2).assertTrue();
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 targetObjects.length:' console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 targetObjects.length:'
+ targetObjects.length); + targetObjects.length);
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 end'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 end');
done(); done();
} }
...@@ -415,7 +382,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -415,7 +382,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_CALLBACK_008_03', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_CALLBACK_008_03', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_03 begin'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_03 begin');
let fetchFileResult = await media.getFileAssets(getAllObjectLimitOneHundredOp); let fetchFileResult = await media.getFileAssets(getAllObjectLimitOneHundredOp);
...@@ -447,7 +414,7 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -447,7 +414,7 @@ describe('fetchFileResultCallback.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_getFirstObject_CALLBACK_009_01', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_getFirstObject_CALLBACK_009_01', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getAllObject 009_01 begin'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 009_01 begin');
let fetchFileResult = await media.getFileAssets(getFileOp); let fetchFileResult = await media.getFileAssets(getFileOp);
...@@ -487,8 +454,8 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -487,8 +454,8 @@ describe('fetchFileResultCallback.test.js', async function() {
console.info('MediaLibraryTest :firstObject.title:' + firstObject.title); console.info('MediaLibraryTest :firstObject.title:' + firstObject.title);
} }
expect(firstObject.relativePath == 'Camera/').assertTrue(); expect(firstObject.relativePath == 'Pictures/Static/').assertTrue();
if (firstObject.relativePath != 'Camera/') { if (firstObject.relativePath != 'Pictures/Static/') {
console.info('MediaLibraryTest :firstObject.relativePath:' + firstObject.relativePath); console.info('MediaLibraryTest :firstObject.relativePath:' + firstObject.relativePath);
} }
...@@ -547,8 +514,8 @@ describe('fetchFileResultCallback.test.js', async function() { ...@@ -547,8 +514,8 @@ describe('fetchFileResultCallback.test.js', async function() {
console.info('MediaLibraryTest :firstObject.albumUri:' + firstObject.albumUri); console.info('MediaLibraryTest :firstObject.albumUri:' + firstObject.albumUri);
} }
expect(firstObject.albumName == 'Camera').assertTrue(); expect(firstObject.albumName == 'Static').assertTrue();
if (firstObject.albumName != 'Camera') { if (firstObject.albumName != 'Static') {
console.info('MediaLibraryTest :firstObject.albumName:' + firstObject.albumName); console.info('MediaLibraryTest :firstObject.albumName:' + firstObject.albumName);
} }
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fetchFileResultPromise.test.js
浏览文件 @ 0f638cde
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
import mediaLibrary from '@ohos.multimedia.mediaLibrary'; import mediaLibrary from '@ohos.multimedia.mediaLibrary';
import featureAbility from '@ohos.ability.featureAbility'; import featureAbility from '@ohos.ability.featureAbility';
import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index';
let fileKeyObj = mediaLibrary.FileKey; let fileKeyObj = mediaLibrary.FileKey;
let fileType = mediaLibrary.MediaType.FILE; let fileType = mediaLibrary.MediaType.FILE;
let imageType = mediaLibrary.MediaType.IMAGE; let imageType = mediaLibrary.MediaType.IMAGE;
...@@ -24,80 +24,80 @@ let videoType = mediaLibrary.MediaType.VIDEO; ...@@ -24,80 +24,80 @@ let videoType = mediaLibrary.MediaType.VIDEO;
let audioType = mediaLibrary.MediaType.AUDIO; let audioType = mediaLibrary.MediaType.AUDIO;
let getFileCountOneOp = { let getFileCountOneOp = {
selections : fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ], selectionArgs: [fileType.toString()],
order : fileKeyObj.DATE_ADDED + " DESC LIMIT 0,1", order: fileKeyObj.DATE_ADDED + " DESC LIMIT 0,1",
extendArgs : "", extendArgs: "",
}; };
let getFileCountTwoOp = { let getFileCountTwoOp = {
selections : fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ], selectionArgs: [fileType.toString()],
order : fileKeyObj.DATE_ADDED + " DESC LIMIT 0,2", order: fileKeyObj.DATE_ADDED + " DESC LIMIT 0,2",
extendArgs : "", extendArgs: "",
}; };
let getFileCountTenOp = { let getFileCountTenOp = {
selections : fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ], selectionArgs: [fileType.toString()],
order : fileKeyObj.DATE_ADDED + " DESC LIMIT 0,10", order: fileKeyObj.DATE_ADDED + " DESC LIMIT 0,10",
extendArgs : "", extendArgs: "",
}; };
let getFileCountOneHundredOp = { let getFileCountOneHundredOp = {
selections : fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs : [ fileType.toString() ], selectionArgs: [fileType.toString()],
order : fileKeyObj.DATE_ADDED + " DESC LIMIT 0,100", order: fileKeyObj.DATE_ADDED + " DESC LIMIT 0,100",
extendArgs : "", extendArgs: "",
}; };
let getFirstObjectOp = { let getFirstObjectOp = {
selections : fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ 'Camera/' ], selectionArgs: ['Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,5", order: fileKeyObj.ID + " DESC LIMIT 0,5",
extendArgs : "", extendArgs: "",
} }
let getAllObjectLimitOneOp = { let getAllObjectLimitOneOp = {
selections : fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ 'Camera/' ], selectionArgs: ['Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,1", order: fileKeyObj.ID + " DESC LIMIT 0,1",
extendArgs : "", extendArgs: "",
} }
let getAllObjectLimitTwoOp = { let getAllObjectLimitTwoOp = {
selections : fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ 'Camera/' ], selectionArgs: ['Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,1", order: fileKeyObj.ID + " DESC LIMIT 0,1",
extendArgs : "", extendArgs: "",
} }
let getAllObjectLimitOneHundredOp = { let getAllObjectLimitOneHundredOp = {
selections : fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ 'Camera/' ], selectionArgs: ['Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,100", order: fileKeyObj.ID + " DESC LIMIT 0,100",
extendArgs : "", extendArgs: "",
} }
let getFileCountZeroOp = { let getFileCountZeroOp = {
selections : fileKeyObj.DISPLAY_NAME + '=?', selections: fileKeyObj.DISPLAY_NAME + '=?',
selectionArgs : [ 'The world has kissed my soul with its pain, asking for its return in songs.' ], selectionArgs: ['The world has kissed my soul with its pain, asking for its return in songs.'],
}; };
let getFileOp = { let getFileOp = {
selections : fileKeyObj.DISPLAY_NAME + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ?', selections: fileKeyObj.DISPLAY_NAME + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ?',
selectionArgs : [ '01.jpg', 'Camera/' ], selectionArgs: ['01.jpg', 'Pictures/Static/'],
order : fileKeyObj.ID + " DESC LIMIT 0,100", order: fileKeyObj.ID + " DESC LIMIT 0,100",
extendArgs : "", extendArgs: "",
} }
describe('fetchFileResultPromise.test.js', async function() { describe('fetchFileResultPromise.test.js', async function () {
var context = featureAbility.getContext(); var context = featureAbility.getContext();
var media = mediaLibrary.getMediaLibrary(context); var media = mediaLibrary.getMediaLibrary(context);
beforeAll(function() {}); beforeAll(function () { });
beforeEach(function() {}); beforeEach(function () { });
afterEach(function() {}); afterEach(function () { });
afterAll(function() {}); afterAll(function () { });
// ------------------------------ 001 test start ------------------------- // ------------------------------ 001 test start -------------------------
/** /**
...@@ -108,7 +108,7 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -108,7 +108,7 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETCOUNT_PROMISE_001_01', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETCOUNT_PROMISE_001_01', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getCount 001_01 begin'); console.info('MediaLibraryTest : FETCHRESULT getCount 001_01 begin');
let fetchFileResult = await media.getFileAssets(getFileCountOneOp); let fetchFileResult = await media.getFileAssets(getFileCountOneOp);
...@@ -133,7 +133,7 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -133,7 +133,7 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETCOUNT_PROMISE_001_02', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETCOUNT_PROMISE_001_02', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getCount 001_02 begin'); console.info('MediaLibraryTest : FETCHRESULT getCount 001_02 begin');
let fetchFileResult = await media.getFileAssets(getFileCountTwoOp); let fetchFileResult = await media.getFileAssets(getFileCountTwoOp);
...@@ -158,7 +158,7 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -158,7 +158,7 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETCOUNT_PROMISE_001_03', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETCOUNT_PROMISE_001_03', 0, async function (done) {
try { try {
console.info('MediaLibraryTest :FETCHRESULT getCount 001_03 begin'); console.info('MediaLibraryTest :FETCHRESULT getCount 001_03 begin');
let fetchFileResult = await media.getFileAssets(getFileCountOneHundredOp); let fetchFileResult = await media.getFileAssets(getFileCountOneHundredOp);
...@@ -184,7 +184,7 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -184,7 +184,7 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETCOUNT_PROMISE_001_04', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETCOUNT_PROMISE_001_04', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getCount 001_04 begin'); console.info('MediaLibraryTest : FETCHRESULT getCount 001_04 begin');
let fetchFileResult = await media.getFileAssets(getFileCountZeroOp); let fetchFileResult = await media.getFileAssets(getFileCountZeroOp);
...@@ -212,7 +212,7 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -212,7 +212,7 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_ISAFTERLAST_PROMISE_002', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_ISAFTERLAST_PROMISE_002', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : isAfterLast begin'); console.info('MediaLibraryTest : isAfterLast begin');
let fetchFileResult = await media.getFileAssets(getFileCountTenOp); let fetchFileResult = await media.getFileAssets(getFileCountTenOp);
...@@ -248,7 +248,7 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -248,7 +248,7 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_CLOSE_PROMISE_003', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_CLOSE_PROMISE_003', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT close 003 begin'); console.info('MediaLibraryTest : FETCHRESULT close 003 begin');
let fetchFileResult = await media.getFileAssets(getFileCountTenOp); let fetchFileResult = await media.getFileAssets(getFileCountTenOp);
...@@ -295,12 +295,12 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -295,12 +295,12 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETFIRSTOBJECT_PROMISE_004', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETFIRSTOBJECT_PROMISE_004', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getFirstObject begin'); console.info('MediaLibraryTest : FETCHRESULT getFirstObject begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
let firstObject = await fetchFileResult.getFirstObject(); let firstObject = await fetchFileResult.getFirstObject();
expect(firstObject.relativePath == 'Camera/').assertTrue(); expect(firstObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
console.info('MediaLibraryTest : FETCHRESULT getFirstObject 004 end'); console.info('MediaLibraryTest : FETCHRESULT getFirstObject 004 end');
done(); done();
...@@ -322,14 +322,14 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -322,14 +322,14 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETNEXTOBJECT_PROMISE_005', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETNEXTOBJECT_PROMISE_005', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 begin'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
let firstObject = await fetchFileResult.getFirstObject(); let firstObject = await fetchFileResult.getFirstObject();
expect(firstObject.relativePath == 'Camera/').assertTrue(); expect(firstObject.relativePath == 'Pictures/Static/').assertTrue();
let nextObject = await fetchFileResult.getNextObject(); let nextObject = await fetchFileResult.getNextObject();
expect(nextObject.relativePath == 'Camera/').assertTrue(); expect(nextObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
done(); done();
console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 end'); console.info('MediaLibraryTest : FETCHRESULT getNextObject 005 end');
...@@ -350,12 +350,12 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -350,12 +350,12 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETLASTOBJECT_PROMISE_006', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETLASTOBJECT_PROMISE_006', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getLastObject begin'); console.info('MediaLibraryTest : FETCHRESULT getLastObject begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
let lastObject = await fetchFileResult.getLastObject(); let lastObject = await fetchFileResult.getLastObject();
expect(lastObject.relativePath == 'Camera/').assertTrue(); expect(lastObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
console.info('MediaLibraryTest : FETCHRESULT getLastObject 006 end'); console.info('MediaLibraryTest : FETCHRESULT getLastObject 006 end');
done(); done();
...@@ -376,12 +376,12 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -376,12 +376,12 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_PROMISE_007_01', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_PROMISE_007_01', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_01 begin'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_01 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
let targetObject = await fetchFileResult.getPositionObject(0); let targetObject = await fetchFileResult.getPositionObject(0);
expect(targetObject.relativePath == 'Camera/').assertTrue(); expect(targetObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
done(); done();
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_01 end'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_01 end');
...@@ -400,12 +400,12 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -400,12 +400,12 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_PROMISE_007_02', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_PROMISE_007_02', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_02 begin'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_02 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
let targetObject = await fetchFileResult.getPositionObject(1); let targetObject = await fetchFileResult.getPositionObject(1);
expect(targetObject.relativePath == 'Camera/').assertTrue(); expect(targetObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
done(); done();
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_02 end'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_02 end');
...@@ -424,13 +424,13 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -424,13 +424,13 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_PROMISE_007_03', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_PROMISE_007_03', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_03 begin'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_03 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
const count = await fetchFileResult.getCount(); const count = await fetchFileResult.getCount();
let targetObject = await fetchFileResult.getPositionObject(count - 1); let targetObject = await fetchFileResult.getPositionObject(count - 1);
expect(targetObject.relativePath == 'Camera/').assertTrue(); expect(targetObject.relativePath == 'Pictures/Static/').assertTrue();
fetchFileResult.close(); fetchFileResult.close();
done(); done();
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_03 end'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_03 end');
...@@ -449,7 +449,7 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -449,7 +449,7 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_PROMISE_007_04', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETPOSITIONOBJECT_PROMISE_007_04', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_04 begin'); console.info('MediaLibraryTest : FETCHRESULT getPositionObject 007_04 begin');
let fetchFileResult = await media.getFileAssets(getFirstObjectOp); let fetchFileResult = await media.getFileAssets(getFirstObjectOp);
...@@ -487,13 +487,13 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -487,13 +487,13 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_PROMISE_008_01', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_PROMISE_008_01', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_01 begin'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_01 begin');
let fetchFileResult = await media.getFileAssets(getAllObjectLimitOneOp); let fetchFileResult = await media.getFileAssets(getAllObjectLimitOneOp);
var targetObjects = await fetchFileResult.getAllObject(); var targetObjects = await fetchFileResult.getAllObject();
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_01 targetObjects.length:' console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_01 targetObjects.length:'
+ targetObjects.length); + targetObjects.length);
expect(targetObjects.length <= 1).assertTrue(); expect(targetObjects.length <= 1).assertTrue();
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_01 end'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_01 end');
done(); done();
...@@ -512,14 +512,14 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -512,14 +512,14 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_PROMISE_008_02', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_PROMISE_008_02', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 begin'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 begin');
let fetchFileResult = await media.getFileAssets(getAllObjectLimitTwoOp); let fetchFileResult = await media.getFileAssets(getAllObjectLimitTwoOp);
var targetObjects = await fetchFileResult.getAllObject(); var targetObjects = await fetchFileResult.getAllObject();
expect(targetObjects.length <= 2).assertTrue(); expect(targetObjects.length <= 2).assertTrue();
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 targetObjects.length:' console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 targetObjects.length:'
+ targetObjects.length); + targetObjects.length);
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 end'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_02 end');
done(); done();
} catch (error) { } catch (error) {
...@@ -537,13 +537,13 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -537,13 +537,13 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_PROMISE_008_03', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_GETALLOBJECT_PROMISE_008_03', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_03 begin'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_03 begin');
let fetchFileResult = await media.getFileAssets(getAllObjectLimitOneHundredOp); let fetchFileResult = await media.getFileAssets(getAllObjectLimitOneHundredOp);
var targetObjects = await fetchFileResult.getAllObject(); var targetObjects = await fetchFileResult.getAllObject();
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_03 targetObjects.length:' console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_03 targetObjects.length:'
+ targetObjects.length); + targetObjects.length);
expect(targetObjects.length <= 100).assertTrue(); expect(targetObjects.length <= 100).assertTrue();
console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_03 end'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 008_03 end');
done(); done();
...@@ -563,7 +563,7 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -563,7 +563,7 @@ describe('fetchFileResultPromise.test.js', async function() {
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_getFirstObject_PROMISE_009_01', 0, async function(done) { it('SUB_MEDIA_MEDIALIBRARY_FETCHRESULT_getFirstObject_PROMISE_009_01', 0, async function (done) {
try { try {
console.info('MediaLibraryTest : FETCHRESULT getAllObject 009_01 begin'); console.info('MediaLibraryTest : FETCHRESULT getAllObject 009_01 begin');
let fetchFileResult = await media.getFileAssets(getFileOp); let fetchFileResult = await media.getFileAssets(getFileOp);
...@@ -598,8 +598,8 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -598,8 +598,8 @@ describe('fetchFileResultPromise.test.js', async function() {
console.info('MediaLibraryTest :firstObject.title:' + firstObject.title); console.info('MediaLibraryTest :firstObject.title:' + firstObject.title);
} }
expect(firstObject.relativePath == 'Camera/').assertTrue(); expect(firstObject.relativePath == 'Pictures/Static/').assertTrue();
if (firstObject.relativePath != 'Camera/') { if (firstObject.relativePath != 'Pictures/Static/') {
console.info('MediaLibraryTest :firstObject.relativePath:' + firstObject.relativePath); console.info('MediaLibraryTest :firstObject.relativePath:' + firstObject.relativePath);
} }
...@@ -658,8 +658,8 @@ describe('fetchFileResultPromise.test.js', async function() { ...@@ -658,8 +658,8 @@ describe('fetchFileResultPromise.test.js', async function() {
console.info('MediaLibraryTest :firstObject.albumUri:' + firstObject.albumUri); console.info('MediaLibraryTest :firstObject.albumUri:' + firstObject.albumUri);
} }
expect(firstObject.albumName == 'Camera').assertTrue(); expect(firstObject.albumName == 'Static').assertTrue();
if (firstObject.albumName != 'Camera') { if (firstObject.albumName != 'Static') {
console.info('MediaLibraryTest :firstObject.albumName:' + firstObject.albumName); console.info('MediaLibraryTest :firstObject.albumName:' + firstObject.albumName);
} }
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetCallBack2.test.js
浏览文件 @ 0f638cde
...@@ -47,8 +47,8 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -47,8 +47,8 @@ describe('fileAssetCallBack2.test.js', async function () {
let videoType = mediaLibrary.MediaType.VIDEO; let videoType = mediaLibrary.MediaType.VIDEO;
let audioType = mediaLibrary.MediaType.AUDIO; let audioType = mediaLibrary.MediaType.AUDIO;
let imagesfetchOp = { let imagesfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [imageType.toString()], selectionArgs: ['Pictures/Dynamic/', imageType.toString()],
}; };
let videosfetchOp = { let videosfetchOp = {
...@@ -66,10 +66,10 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -66,10 +66,10 @@ describe('fileAssetCallBack2.test.js', async function () {
}; };
const context = featureAbility.getContext(); const context = featureAbility.getContext();
const media = mediaLibrary.getMediaLibrary(context); const media = mediaLibrary.getMediaLibrary(context);
beforeAll(function () {}); beforeAll(function () { });
beforeEach(function () {}); beforeEach(function () { });
afterEach(function () {}); afterEach(function () { });
afterAll(function () {}); afterAll(function () { });
/** /**
* @tc.number : SUB_MEDIA_FILEASSET_commitModify_callback_001 * @tc.number : SUB_MEDIA_FILEASSET_commitModify_callback_001
...@@ -83,25 +83,19 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -83,25 +83,19 @@ describe('fileAssetCallBack2.test.js', async function () {
try { try {
const fetchFileResult = await media.getFileAssets(imagesfetchOp); const fetchFileResult = await media.getFileAssets(imagesfetchOp);
const asset = await fetchFileResult.getFirstObject(); const asset = await fetchFileResult.getFirstObject();
const newName = 'newName'; const newName = 'newName' + new Date().getTime();
asset.displayName = newName; asset.displayName = newName;
const id = asset.id; const id = asset.id;
asset.commitModify(async ()=>{ asset.commitModify(async () => {
const fetchFileResult2 = await media.getFileAssets(imagesfetchOp); let currentfetchOp = {
const dataList = await fetchFileResult2.getAllObject(); selections: fileKeyObj.ID + '= ?',
let passed = false; selectionArgs: [id + ''],
for (let i = 0; i < dataList.length; i++) { };
const asset = dataList[i]; const fetchFileResult2 = await media.getFileAssets(currentfetchOp);
if (asset.id == id && asset.displayName == newName) { const currentAsset = await fetchFileResult2.getFirstObject();
passed = true; expect(currentAsset.displayName == newName).assertTrue();
break;
}
}
expect(passed).assertTrue();
done(); done();
}); });
} catch (error) { } catch (error) {
console.info('FileAsset commitModify 001 failed, message = ' + error); console.info('FileAsset commitModify 001 failed, message = ' + error);
expect(false).assertTrue(); expect(false).assertTrue();
...@@ -121,21 +115,17 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -121,21 +115,17 @@ describe('fileAssetCallBack2.test.js', async function () {
try { try {
const fetchFileResult = await media.getFileAssets(imagesfetchOp); const fetchFileResult = await media.getFileAssets(imagesfetchOp);
const asset = await fetchFileResult.getFirstObject(); const asset = await fetchFileResult.getFirstObject();
const newTitle = 'newTitle'; const newTitle = 'newTitle' + new Date().getTime();
asset.title = newTitle; asset.title = newTitle;
const id = asset.id; const id = asset.id;
asset.commitModify(async () => { asset.commitModify(async () => {
const fetchFileResult2 = await media.getFileAssets(imagesfetchOp); let currentfetchOp = {
const dataList = await fetchFileResult2.getAllObject(); selections: fileKeyObj.ID + '= ?',
let passed = false; selectionArgs: [id + ''],
for (let i = 0; i < dataList.length; i++) { };
const asset = dataList[i]; const fetchFileResult2 = await media.getFileAssets(currentfetchOp);
if (asset.id == id && asset.title == newTitle) { const currentAsset = await fetchFileResult2.getFirstObject();
passed = true; expect(currentAsset.title == newTitle).assertTrue();
break;
}
}
expect(passed).assertTrue();
done(); done();
}); });
} catch (error) { } catch (error) {
...@@ -155,32 +145,20 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -155,32 +145,20 @@ describe('fileAssetCallBack2.test.js', async function () {
*/ */
it('SUB_MEDIA_FILEASSET_commitModify_callback_003', 0, async function (done) { it('SUB_MEDIA_FILEASSET_commitModify_callback_003', 0, async function (done) {
try { try {
const path1 = await media.getPublicDirectory(mediaLibrary.DirectoryType.DIR_IMAGE);
const path2 = await media.getPublicDirectory(mediaLibrary.DirectoryType.DIR_VIDEO);
const fetchFileResult = await media.getFileAssets(imagesfetchOp); const fetchFileResult = await media.getFileAssets(imagesfetchOp);
const asset = await fetchFileResult.getFirstObject(); const asset = await fetchFileResult.getFirstObject();
let relativePath = asset.relativePath; let newrelativePath = 'Pictures/Temp/';
let newrelativePath = path1;
if (relativePath == path1) {
newrelativePath = path2;
}
asset.relativePath = newrelativePath; asset.relativePath = newrelativePath;
const id = asset.id; const id = asset.id;
asset.commitModify(async () => { asset.commitModify(async () => {
const fetchFileResult2 = await media.getFileAssets(imagesfetchOp); let currentfetchOp = {
const dataList = await fetchFileResult2.getAllObject(); selections: fileKeyObj.ID + '= ?',
let passed = false; selectionArgs: [id + ''],
for (let i = 0; i < dataList.length; i++) { };
const asset = dataList[i]; const fetchFileResult2 = await media.getFileAssets(currentfetchOp);
if (asset.id == id && asset.relativePath == newrelativePath) { const currentAsset = await fetchFileResult2.getFirstObject();
passed = true; expect(currentAsset.relativePath == newrelativePath).assertTrue();
break;
}
}
expect(passed).assertTrue();
done(); done();
}); });
} catch (error) { } catch (error) {
...@@ -209,17 +187,13 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -209,17 +187,13 @@ describe('fileAssetCallBack2.test.js', async function () {
asset.orientation = neworientation; asset.orientation = neworientation;
const id = asset.id; const id = asset.id;
asset.commitModify(async () => { asset.commitModify(async () => {
const fetchFileResult2 = await media.getFileAssets(imagesfetchOp); let currentfetchOp = {
const dataList = await fetchFileResult2.getAllObject(); selections: fileKeyObj.ID + '= ?',
let passed = false; selectionArgs: [id + ''],
for (let i = 0; i < dataList.length; i++) { };
const asset = dataList[i]; const fetchFileResult2 = await media.getFileAssets(currentfetchOp);
if (asset.id == id && asset.orientation == neworientation) { const currentAsset = await fetchFileResult2.getFirstObject();
passed = true; expect(currentAsset.orientation == neworientation).assertTrue();
break;
}
}
expect(passed).assertTrue();
done(); done();
}); });
} catch (error) { } catch (error) {
...@@ -247,9 +221,9 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -247,9 +221,9 @@ describe('fileAssetCallBack2.test.js', async function () {
asset.uri = newUri; asset.uri = newUri;
asset.commitModify(async (err) => { asset.commitModify(async (err) => {
if(err) { if (err) {
expect(true).assertTrue(); expect(true).assertTrue();
done(); done();
} else { } else {
console.info('FileAsset commitModify 005 failed'); console.info('FileAsset commitModify 005 failed');
expect(false).assertTrue(); expect(false).assertTrue();
...@@ -257,7 +231,7 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -257,7 +231,7 @@ describe('fileAssetCallBack2.test.js', async function () {
} }
}); });
} catch (error) { } catch (error) {
console.info('FileAsset commitModify 005 passed'); console.info('FileAsset commitModify 005 passed');
expect(true).assertTrue(); expect(true).assertTrue();
...@@ -283,7 +257,7 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -283,7 +257,7 @@ describe('fileAssetCallBack2.test.js', async function () {
asset.mediaType = newMediaType; asset.mediaType = newMediaType;
asset.commitModify(async (err) => { asset.commitModify(async (err) => {
if(err) { if (err) {
expect(true).assertTrue(); expect(true).assertTrue();
done(); done();
} else { } else {
...@@ -312,7 +286,7 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -312,7 +286,7 @@ describe('fileAssetCallBack2.test.js', async function () {
const fetchFileResult = await media.getFileAssets(imagesfetchOp); const fetchFileResult = await media.getFileAssets(imagesfetchOp);
const asset = await fetchFileResult.getFirstObject(); const asset = await fetchFileResult.getFirstObject();
asset.isDirectory((err, isDir) => { asset.isDirectory((err, isDir) => {
if(isDir == undefined) { if (isDir == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
} else { } else {
...@@ -339,7 +313,7 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -339,7 +313,7 @@ describe('fileAssetCallBack2.test.js', async function () {
try { try {
const fetchFileResult = await media.getFileAssets(imagesfetchOp); const fetchFileResult = await media.getFileAssets(imagesfetchOp);
fetchFileResult.getFirstObject((err, asset) => { fetchFileResult.getFirstObject((err, asset) => {
if(asset == undefined) { if (asset == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
} else { } else {
...@@ -366,7 +340,7 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -366,7 +340,7 @@ describe('fileAssetCallBack2.test.js', async function () {
try { try {
const fetchFileResult = await media.getFileAssets(videosfetchOp); const fetchFileResult = await media.getFileAssets(videosfetchOp);
fetchFileResult.getFirstObject((err, asset) => { fetchFileResult.getFirstObject((err, asset) => {
if(asset == undefined) { if (asset == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
} else { } else {
...@@ -392,8 +366,8 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -392,8 +366,8 @@ describe('fileAssetCallBack2.test.js', async function () {
it('SUB_MEDIA_FILEASSET_checkAttr_callback_003', 0, async function (done) { it('SUB_MEDIA_FILEASSET_checkAttr_callback_003', 0, async function (done) {
try { try {
const fetchFileResult = await media.getFileAssets(audiosfetchOp); const fetchFileResult = await media.getFileAssets(audiosfetchOp);
fetchFileResult.getFirstObject((err, asset)=>{ fetchFileResult.getFirstObject((err, asset) => {
if(asset == undefined) { if (asset == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
} else { } else {
...@@ -421,8 +395,8 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -421,8 +395,8 @@ describe('fileAssetCallBack2.test.js', async function () {
const albumList = await media.getAlbums(allTypefetchOp); const albumList = await media.getAlbums(allTypefetchOp);
const album = albumList[0]; const album = albumList[0];
const fetchFileResult = await album.getFileAssets(allTypefetchOp); const fetchFileResult = await album.getFileAssets(allTypefetchOp);
fetchFileResult.getFirstObject((err, asset) => { fetchFileResult.getFirstObject((err, asset) => {
if(asset == undefined) { if (asset == undefined) {
expect(false).assertTrue(); expect(false).assertTrue();
done(); done();
} else { } else {
...@@ -430,7 +404,7 @@ describe('fileAssetCallBack2.test.js', async function () { ...@@ -430,7 +404,7 @@ describe('fileAssetCallBack2.test.js', async function () {
checkAttrs(done, asset, '004'); checkAttrs(done, asset, '004');
} }
}); });
} catch (error) { } catch (error) {
console.info('FileAsset checkAttr 003 failed, message = ' + error); console.info('FileAsset checkAttr 003 failed, message = ' + error);
expect(false).assertTrue(); expect(false).assertTrue();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetPromise2.test.js
浏览文件 @ 0f638cde
...@@ -47,8 +47,8 @@ describe('fileAssetPromise2.test.js', async function () { ...@@ -47,8 +47,8 @@ describe('fileAssetPromise2.test.js', async function () {
let videoType = mediaLibrary.MediaType.VIDEO; let videoType = mediaLibrary.MediaType.VIDEO;
let audioType = mediaLibrary.MediaType.AUDIO; let audioType = mediaLibrary.MediaType.AUDIO;
let imagesfetchOp = { let imagesfetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [imageType.toString()], selectionArgs: ['Pictures/Dynamic/', imageType.toString()],
}; };
let videosfetchOp = { let videosfetchOp = {
...@@ -66,10 +66,10 @@ describe('fileAssetPromise2.test.js', async function () { ...@@ -66,10 +66,10 @@ describe('fileAssetPromise2.test.js', async function () {
}; };
const context = featureAbility.getContext(); const context = featureAbility.getContext();
const media = mediaLibrary.getMediaLibrary(context); const media = mediaLibrary.getMediaLibrary(context);
beforeAll(function () {}); beforeAll(function () { });
beforeEach(function () {}); beforeEach(function () { });
afterEach(function () {}); afterEach(function () { });
afterAll(function () {}); afterAll(function () { });
/** /**
* @tc.number : SUB_MEDIA_FILEASSET_commitModify_promise_001 * @tc.number : SUB_MEDIA_FILEASSET_commitModify_promise_001
...@@ -83,22 +83,18 @@ describe('fileAssetPromise2.test.js', async function () { ...@@ -83,22 +83,18 @@ describe('fileAssetPromise2.test.js', async function () {
try { try {
const fetchFileResult = await media.getFileAssets(imagesfetchOp); const fetchFileResult = await media.getFileAssets(imagesfetchOp);
const asset = await fetchFileResult.getFirstObject(); const asset = await fetchFileResult.getFirstObject();
const newName = 'newName'; const newName = 'newName' + new Date().getTime();
asset.displayName = newName; asset.displayName = newName;
const id = asset.id; const id = asset.id;
await asset.commitModify(); await asset.commitModify();
const fetchFileResult2 = await media.getFileAssets(imagesfetchOp); let currentfetchOp = {
const dataList = await fetchFileResult2.getAllObject(); selections: fileKeyObj.ID + '= ?',
let passed = false; selectionArgs: [id + ''],
for (let i = 0; i < dataList.length; i++) { };
const asset = dataList[i]; const fetchFileResult2 = await media.getFileAssets(currentfetchOp);
if (asset.id == id && asset.displayName == newName) { const currentAsset = await fetchFileResult2.getFirstObject();
passed = true; expect(currentAsset.displayName == newName).assertTrue();
break;
}
}
expect(passed).assertTrue();
done(); done();
} catch (error) { } catch (error) {
console.info('FileAsset commitModify 001 failed, message = ' + error); console.info('FileAsset commitModify 001 failed, message = ' + error);
...@@ -119,22 +115,18 @@ describe('fileAssetPromise2.test.js', async function () { ...@@ -119,22 +115,18 @@ describe('fileAssetPromise2.test.js', async function () {
try { try {
const fetchFileResult = await media.getFileAssets(imagesfetchOp); const fetchFileResult = await media.getFileAssets(imagesfetchOp);
const asset = await fetchFileResult.getFirstObject(); const asset = await fetchFileResult.getFirstObject();
const newTitle = 'newTitle'; const newTitle = 'newTitle' + new Date().getTime();
asset.title = newTitle; asset.title = newTitle;
const id = asset.id; const id = asset.id;
await asset.commitModify(); await asset.commitModify();
const fetchFileResult2 = await media.getFileAssets(imagesfetchOp); let currentfetchOp = {
const dataList = await fetchFileResult2.getAllObject(); selections: fileKeyObj.ID + '= ?',
let passed = false; selectionArgs: [id + ''],
for (let i = 0; i < dataList.length; i++) { };
const asset = dataList[i]; const fetchFileResult2 = await media.getFileAssets(currentfetchOp);
if (asset.id == id && asset.title == newTitle) { const currentAsset = await fetchFileResult2.getFirstObject();
passed = true; expect(currentAsset.title == newTitle).assertTrue();
break;
}
}
expect(passed).assertTrue();
done(); done();
} catch (error) { } catch (error) {
console.info('FileAsset commitModify 002 failed, message = ' + error); console.info('FileAsset commitModify 002 failed, message = ' + error);
...@@ -153,33 +145,22 @@ describe('fileAssetPromise2.test.js', async function () { ...@@ -153,33 +145,22 @@ describe('fileAssetPromise2.test.js', async function () {
*/ */
it('SUB_MEDIA_FILEASSET_commitModify_promise_003', 0, async function (done) { it('SUB_MEDIA_FILEASSET_commitModify_promise_003', 0, async function (done) {
try { try {
const path1 = await media.getPublicDirectory(mediaLibrary.DirectoryType.DIR_IMAGE);
const path2 = await media.getPublicDirectory(mediaLibrary.DirectoryType.DIR_VIDEO);
const fetchFileResult = await media.getFileAssets(imagesfetchOp); const fetchFileResult = await media.getFileAssets(imagesfetchOp);
const asset = await fetchFileResult.getFirstObject(); const asset = await fetchFileResult.getFirstObject();
let relativePath = asset.relativePath; let newrelativePath = 'Pictures/Temp/';
let newrelativePath = path1;
if (relativePath == path1) {
newrelativePath = path2;
}
asset.relativePath = newrelativePath; asset.relativePath = newrelativePath;
const id = asset.id; const id = asset.id;
await asset.commitModify(); await asset.commitModify();
const fetchFileResult2 = await media.getFileAssets(imagesfetchOp); let currentfetchOp = {
const dataList = await fetchFileResult2.getAllObject(); selections: fileKeyObj.ID + '= ?',
let passed = false; selectionArgs: [id + ''],
for (let i = 0; i < dataList.length; i++) { };
const asset = dataList[i]; const fetchFileResult2 = await media.getFileAssets(currentfetchOp);
if (asset.id == id && asset.relativePath == newrelativePath) { const currentAsset = await fetchFileResult2.getFirstObject();
passed = true; expect(currentAsset.relativePath == newrelativePath).assertTrue();
break;
}
}
expect(passed).assertTrue();
done(); done();
} catch (error) { } catch (error) {
console.info('FileAsset commitModify 003 failed, message = ' + error); console.info('FileAsset commitModify 003 failed, message = ' + error);
...@@ -208,17 +189,13 @@ describe('fileAssetPromise2.test.js', async function () { ...@@ -208,17 +189,13 @@ describe('fileAssetPromise2.test.js', async function () {
const id = asset.id; const id = asset.id;
await asset.commitModify(); await asset.commitModify();
const fetchFileResult2 = await media.getFileAssets(imagesfetchOp); let currentfetchOp = {
const dataList = await fetchFileResult2.getAllObject(); selections: fileKeyObj.ID + '= ?',
let passed = false; selectionArgs: [id + ''],
for (let i = 0; i < dataList.length; i++) { };
const asset = dataList[i]; const fetchFileResult2 = await media.getFileAssets(currentfetchOp);
if (asset.id == id && asset.orientation == neworientation) { const currentAsset = await fetchFileResult2.getFirstObject();
passed = true; expect(currentAsset.orientation == neworientation).assertTrue();
break;
}
}
expect(passed).assertTrue();
done(); done();
} catch (error) { } catch (error) {
console.info('FileAsset commitModify 004 failed, message = ' + error); console.info('FileAsset commitModify 004 failed, message = ' + error);
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestCallback.test.js
浏览文件 @ 0f638cde
...@@ -48,8 +48,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -48,8 +48,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let fileType = mediaLibrary.MediaType.FILE; let fileType = mediaLibrary.MediaType.FILE;
let fileFetchOp = { let fileFetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()], selectionArgs: ['Documents/Dynamic01/', fileType.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fileFetchOp); let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -118,8 +118,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -118,8 +118,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.FILE; let type = mediaLibrary.MediaType.FILE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Documents/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -182,8 +182,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -182,8 +182,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.FILE; let type = mediaLibrary.MediaType.FILE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Documents/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -363,12 +363,12 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -363,12 +363,12 @@ describe('fileAssetTestCallback.test.js', async function () {
write: 4096, write: 4096,
} }
try { try {
let fileType = mediaLibrary.MediaType.IMAGE; let type = mediaLibrary.MediaType.IMAGE;
let fileFetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()], selectionArgs: ['Pictures/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fileFetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
asset = dataList[0]; asset = dataList[0];
...@@ -429,8 +429,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -429,8 +429,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.IMAGE; let type = mediaLibrary.MediaType.IMAGE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Pictures/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -493,8 +493,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -493,8 +493,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.IMAGE; let type = mediaLibrary.MediaType.IMAGE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Pictures/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -568,10 +568,10 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -568,10 +568,10 @@ describe('fileAssetTestCallback.test.js', async function () {
write: 4096, write: 4096,
} }
try { try {
let fileType = mediaLibrary.MediaType.AUDIO; let type = mediaLibrary.MediaType.AUDIO;
let fileFetchOp = { let fileFetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()], selectionArgs: ['Audios/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fileFetchOp); let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -635,8 +635,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -635,8 +635,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.AUDIO; let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Audios/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -702,8 +702,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -702,8 +702,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.AUDIO; let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Audios/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -777,12 +777,12 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -777,12 +777,12 @@ describe('fileAssetTestCallback.test.js', async function () {
write: 4096, write: 4096,
} }
try { try {
let fileType = mediaLibrary.MediaType.VIDEO; let type = mediaLibrary.MediaType.VIDEO;
let fileFetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString()], selectionArgs: ['Videos/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fileFetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
asset = dataList[0]; asset = dataList[0];
asset.open('rw', async (error, fd) => { asset.open('rw', async (error, fd) => {
...@@ -852,8 +852,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -852,8 +852,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.VIDEO; let type = mediaLibrary.MediaType.VIDEO;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Videos/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -917,8 +917,8 @@ describe('fileAssetTestCallback.test.js', async function () { ...@@ -917,8 +917,8 @@ describe('fileAssetTestCallback.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.VIDEO; let type = mediaLibrary.MediaType.VIDEO;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Videos/Dynamic01/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileAssetTestPromise.test.js
浏览文件 @ 0f638cde
...@@ -42,15 +42,14 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -42,15 +42,14 @@ describe('FileAssetTestPromise.test.js', async function () {
let fd; let fd;
let fd1; let fd1;
let assetProps = { let assetProps = {
bytesRead: 4096, bytesRead: 10,
write: 4096, write: 4096,
} }
try { try {
let type = mediaLibrary.MediaType.FILE; let fileType = mediaLibrary.MediaType.FILE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? ', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString(),], selectionArgs: ['Documents/Dynamic02/', fileType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -111,10 +110,9 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -111,10 +110,9 @@ describe('FileAssetTestPromise.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.FILE; let type = mediaLibrary.MediaType.FILE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? ', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString(),], selectionArgs: ['Documents/Dynamic02/', type.toString()],
order: fileKeyObj.DATE_ADDED + " DESC", }
};
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
asset = dataList[0]; asset = dataList[0];
...@@ -158,9 +156,8 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -158,9 +156,8 @@ describe('FileAssetTestPromise.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.FILE; let type = mediaLibrary.MediaType.FILE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? ', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString(),], selectionArgs: ['Documents/Dynamic02/', type.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -266,10 +263,10 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -266,10 +263,10 @@ describe('FileAssetTestPromise.test.js', async function () {
let asset; let asset;
let fd; let fd;
try { try {
let type = mediaLibrary.MediaType.ALBUM; let type = mediaLibrary.MediaType.IMAGE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Pictures/Dynamic02/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -307,19 +304,16 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -307,19 +304,16 @@ describe('FileAssetTestPromise.test.js', async function () {
write: 4096, write: 4096,
} }
try { try {
let fileType = mediaLibrary.MediaType.IMAGE; let type = mediaLibrary.MediaType.IMAGE;
let fetchOp = {
let fileFetchOp = { selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ? ', selectionArgs: ['Pictures/Dynamic022/', type.toString()],
selectionArgs: ['Pictures/FileAssetTest/', fileType.toString()],
}; };
// let fileFetchOp = { let fetchFileResult = await media.getFileAssets(fetchOp);
// selections: fileKeyObj.MEDIA_TYPE + '= ?',
// selectionArgs: [fileType.toString()],
// };
let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
console.log('1111111111111111:' + dataList.length)
asset = dataList[0]; asset = dataList[0];
console.log('2222222222222222:' + asset.id)
fd = await asset.open('rw'); fd = await asset.open('rw');
expect(isNum(fd)).assertTrue(); expect(isNum(fd)).assertTrue();
let buf = new ArrayBuffer(4096); let buf = new ArrayBuffer(4096);
...@@ -371,8 +365,8 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -371,8 +365,8 @@ describe('FileAssetTestPromise.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.IMAGE; let type = mediaLibrary.MediaType.IMAGE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Pictures/Dynamic022/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -414,8 +408,8 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -414,8 +408,8 @@ describe('FileAssetTestPromise.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.IMAGE; let type = mediaLibrary.MediaType.IMAGE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Pictures/Dynamic022/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -464,13 +458,11 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -464,13 +458,11 @@ describe('FileAssetTestPromise.test.js', async function () {
write: 4096, write: 4096,
} }
try { try {
let fileType = mediaLibrary.MediaType.AUDIO; let type = mediaLibrary.MediaType.AUDIO;
let fileFetchOp = { let fileFetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ? ', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [fileType.toString(), 'Pictures/FileAssetTest/'], selectionArgs: ['Audios/Dynamic02/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fileFetchOp); let fetchFileResult = await media.getFileAssets(fileFetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
asset = dataList[0]; asset = dataList[0];
...@@ -525,8 +517,8 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -525,8 +517,8 @@ describe('FileAssetTestPromise.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.AUDIO; let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Audios/Dynamic02/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -568,8 +560,8 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -568,8 +560,8 @@ describe('FileAssetTestPromise.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.AUDIO; let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString()], selectionArgs: ['Audios/Dynamic02/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -618,13 +610,12 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -618,13 +610,12 @@ describe('FileAssetTestPromise.test.js', async function () {
write: 4096, write: 4096,
} }
try { try {
let fileType = mediaLibrary.MediaType.VIDEO; let type = mediaLibrary.MediaType.VIDEO;
let fetchOp = {
let fileFetchOp = { selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selections: fileKeyObj.MEDIA_TYPE + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ? ', selectionArgs: ['Videos/Dynamic02/', type.toString()],
selectionArgs: [fileType.toString(), 'Pictures/FileAssetTest/'],
}; };
let fetchFileResult = await media.getFileAssets(fileFetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
asset = dataList[0]; asset = dataList[0];
...@@ -678,12 +669,11 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -678,12 +669,11 @@ describe('FileAssetTestPromise.test.js', async function () {
} }
try { try {
let type = mediaLibrary.MediaType.VIDEO; let type = mediaLibrary.MediaType.VIDEO;
let fetchOp = {
let fileFetchOp = { selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selections: fileKeyObj.MEDIA_TYPE + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ? ', selectionArgs: ['Videos/Dynamic02/', type.toString()],
selectionArgs: [type.toString(), 'Pictures/FileAssetTest/'],
}; };
let fetchFileResult = await media.getFileAssets(fileFetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
console.info('MediaLibraryTest : SUB_MEDIA_MEDIALIBRARY_OPENANDCLOSE_ASSET_PROMISE_005_14 dataList.length:' console.info('MediaLibraryTest : SUB_MEDIA_MEDIALIBRARY_OPENANDCLOSE_ASSET_PROMISE_005_14 dataList.length:'
+ dataList.length); + dataList.length);
...@@ -724,11 +714,11 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -724,11 +714,11 @@ describe('FileAssetTestPromise.test.js', async function () {
let fd1; let fd1;
try { try {
let type = mediaLibrary.MediaType.VIDEO; let type = mediaLibrary.MediaType.VIDEO;
let fileFetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ? ', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString(), 'Pictures/FileAssetTest/'], selectionArgs: ['Videos/Dynamic02/', type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fileFetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
console.info('MediaLibraryTest : SUB_MEDIA_MEDIALIBRARY_OPENANDCLOSE_ASSET_PROMISE_005_15 dataList.length:' console.info('MediaLibraryTest : SUB_MEDIA_MEDIALIBRARY_OPENANDCLOSE_ASSET_PROMISE_005_15 dataList.length:'
+ dataList.length); + dataList.length);
...@@ -821,8 +811,8 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -821,8 +811,8 @@ describe('FileAssetTestPromise.test.js', async function () {
let type = mediaLibrary.MediaType.IMAGE; let type = mediaLibrary.MediaType.IMAGE;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ? ', selections: fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString(), 'Pictures/FileAssetTest/'], selectionArgs: [type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -865,8 +855,8 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -865,8 +855,8 @@ describe('FileAssetTestPromise.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.AUDIO; let type = mediaLibrary.MediaType.AUDIO;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ? ', selections: fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString(), 'Pictures/FileAssetTest/'], selectionArgs: [type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
...@@ -913,8 +903,8 @@ describe('FileAssetTestPromise.test.js', async function () { ...@@ -913,8 +903,8 @@ describe('FileAssetTestPromise.test.js', async function () {
try { try {
let type = mediaLibrary.MediaType.VIDEO; let type = mediaLibrary.MediaType.VIDEO;
let fetchOp = { let fetchOp = {
selections: fileKeyObj.MEDIA_TYPE + '= ? AND ' + fileKeyObj.RELATIVE_PATH + '= ? ', selections: fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: [type.toString(), 'Pictures/FileAssetTest/'], selectionArgs: [type.toString()],
}; };
let fetchFileResult = await media.getFileAssets(fetchOp); let fetchFileResult = await media.getFileAssets(fetchOp);
const dataList = await fetchFileResult.getAllObject(); const dataList = await fetchFileResult.getAllObject();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js
浏览文件 @ 0f638cde
...@@ -54,57 +54,37 @@ let filesfetchOp = { ...@@ -54,57 +54,37 @@ let filesfetchOp = {
let imageRelativefetchOp = { let imageRelativefetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/MediaLibraryTest/', imageType.toString()], selectionArgs: ['Pictures/Static01/', imageType.toString()],
}; };
let videoRelativefetchOp = { let videoRelativefetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/MediaLibraryTest/', videoType.toString()], selectionArgs: ['Videos/Static01/', videoType.toString()],
}; };
let audioRelativefetchOp = { let audioRelativefetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/MediaLibraryTest/', audioType.toString()], selectionArgs: ['Audios/Static01/', audioType.toString()],
}; };
let fileRelativefetchOp = { let fileRelativefetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/MediaLibraryTest/', fileType.toString()], selectionArgs: ['Documents/Static01/', fileType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC", order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let imageAndVideofetchOp = { let imageAndVideofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND (' + selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ?' + ') AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?)', fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/MediaLibraryTest/', imageType.toString(), videoType.toString()], selectionArgs: ['Videos/Static01/', 'Pictures/Static01/', imageType.toString(), videoType.toString()],
}; };
let imageAndVideoAndfilefetchOp = { let imageAndVideoAndfilefetchOp = {
selections: selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ?' + ') AND (' +
fileKeyObj.RELATIVE_PATH + '= ? AND (' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?)',
fileKeyObj.MEDIA_TYPE + selectionArgs: ['Documents/Static01/', 'Videos/Static01/', 'Pictures/Static01/', imageType.toString(), videoType.toString(), fileType.toString()],
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ?)',
selectionArgs: ['Pictures/MediaLibraryTest/', imageType.toString(), videoType.toString(), fileType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC", order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let imageAndVideoAndfileAndAudiofetchOp = { let imageAndVideoAndfileAndAudiofetchOp = {
selections: selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ?' + ') AND (' +
fileKeyObj.RELATIVE_PATH + '= ? AND (' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?)',
fileKeyObj.MEDIA_TYPE + selectionArgs: ['Documents/Static01/', 'Videos/Static01/', 'Pictures/Static01/', 'Audios/Static01/', imageType.toString(), videoType.toString(), fileType.toString(), audioType.toString(),],
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ?)',
selectionArgs: [
'Pictures/MediaLibraryTest/',
imageType.toString(),
videoType.toString(),
fileType.toString(),
audioType.toString(),
],
order: fileKeyObj.DATE_ADDED + " DESC", order: fileKeyObj.DATE_ADDED + " DESC",
}; };
...@@ -125,7 +105,7 @@ const props = { ...@@ -125,7 +105,7 @@ const props = {
image: { image: {
mimeType: 'image/*', mimeType: 'image/*',
displayName: '01.jpg', displayName: '01.jpg',
relativePath: 'Pictures/MediaLibraryTest/', relativePath: 'Pictures/Static01/',
size: '348113', size: '348113',
mediaType: '3', mediaType: '3',
title: '01', title: '01',
...@@ -135,12 +115,12 @@ const props = { ...@@ -135,12 +115,12 @@ const props = {
orientation: '0', orientation: '0',
duration: '0', duration: '0',
albumId: '1118', albumId: '1118',
albumName: 'MediaLibraryTest' albumName: 'Static01'
}, },
video: { video: {
mimeType: 'video/mp4', mimeType: 'video/mp4',
displayName: '01.mp4', displayName: '01.mp4',
relativePath: 'Pictures/MediaLibraryTest/', relativePath: 'Videos/Static01/',
size: '4853005', size: '4853005',
mediaType: '4', mediaType: '4',
title: '01', title: '01',
...@@ -149,12 +129,12 @@ const props = { ...@@ -149,12 +129,12 @@ const props = {
height: '720', height: '720',
orientation: '0', orientation: '0',
duration: '10100', duration: '10100',
albumName: 'MediaLibraryTest' albumName: 'Static01'
}, },
audio: { audio: {
mimeType: 'audio/mpeg', mimeType: 'audio/mpeg',
displayName: '01.mp3', displayName: '01.mp3',
relativePath: 'Pictures/MediaLibraryTest/', relativePath: 'Audios/Static01/',
size: '4113874', size: '4113874',
mediaType: '5', mediaType: '5',
title: '01', title: '01',
...@@ -164,22 +144,21 @@ const props = { ...@@ -164,22 +144,21 @@ const props = {
height: '0', height: '0',
orientation: '0', orientation: '0',
duration: '169697', duration: '169697',
albumName: 'MediaLibraryTest' albumName: 'Static01'
}, },
file: { file: {
mimeType: 'file/*', mimeType: 'file/*',
displayName: 'test.dat', displayName: '01.dat',
relativePath: 'Pictures/MediaLibraryTest/', relativePath: 'Documents/Static01/',
size: '10', size: '10',
displayName: 'test.dat',
mediaType: '1', mediaType: '1',
title: 'test', title: '01',
dateTaken: '0', dateTaken: '0',
width: '0', width: '0',
height: '0', height: '0',
orientation: '0', orientation: '0',
duration: '0', duration: '0',
albumName: 'MediaLibraryTest' albumName: 'Static01'
} }
} }
...@@ -189,7 +168,7 @@ async function checkFileAssetAttr(done, fetchFileResult, type, count, typesArr) ...@@ -189,7 +168,7 @@ async function checkFileAssetAttr(done, fetchFileResult, type, count, typesArr)
expect(fetchFileResult.getCount() == count).assertTrue(); expect(fetchFileResult.getCount() == count).assertTrue();
let asset = await fetchFileResult.getFirstObject(); let asset = await fetchFileResult.getFirstObject();
if (count > 1) { if (count > 1) {
type = asset.mimeType.match(/[a-z]+/g)[0] type = asset.mimeType.match(/[a-z]+/g)[0];
} }
if (type == 'audio' && asset.artist != props[type].artist) { if (type == 'audio' && asset.artist != props[type].artist) {
expect(false).assertTrue(); expect(false).assertTrue();
......
multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js
浏览文件 @ 0f638cde
...@@ -54,61 +54,41 @@ let filesfetchOp = { ...@@ -54,61 +54,41 @@ let filesfetchOp = {
let imageRelativefetchOp = { let imageRelativefetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/MediaLibraryTest/', imageType.toString()], selectionArgs: ['Pictures/Static01/', imageType.toString()],
}; };
let videoRelativefetchOp = { let videoRelativefetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/MediaLibraryTest/', videoType.toString()], selectionArgs: ['Videos/Static01/', videoType.toString()],
}; };
let audioRelativefetchOp = { let audioRelativefetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/MediaLibraryTest/', audioType.toString()], selectionArgs: ['Audios/Static01/', audioType.toString()],
}; };
let fileRelativefetchOp = { let fileRelativefetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?', selections: fileKeyObj.RELATIVE_PATH + '= ? AND ' + fileKeyObj.MEDIA_TYPE + '= ?',
selectionArgs: ['Pictures/MediaLibraryTest/', fileType.toString()], selectionArgs: ['Documents/Static01/', fileType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC", order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let imageAndVideofetchOp = { let imageAndVideofetchOp = {
selections: fileKeyObj.RELATIVE_PATH + '= ? AND (' + selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ?' + ') AND (' +
fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?)', fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?)',
selectionArgs: ['Pictures/MediaLibraryTest/', imageType.toString(), videoType.toString()], selectionArgs: ['Videos/Static01/', 'Pictures/Static01/', imageType.toString(), videoType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let imageAndVideoAndfilefetchOp = { let imageAndVideoAndfilefetchOp = {
selections: selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ?' + ') AND (' +
fileKeyObj.RELATIVE_PATH + '= ? AND (' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?)',
fileKeyObj.MEDIA_TYPE + selectionArgs: ['Documents/Static01/', 'Videos/Static01/', 'Pictures/Static01/', imageType.toString(), videoType.toString(), fileType.toString()],
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ?)',
selectionArgs: ['Pictures/MediaLibraryTest/', imageType.toString(), videoType.toString(), fileType.toString()],
order: fileKeyObj.DATE_ADDED + " DESC", order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let imageAndVideoAndfileAndAudiofetchOp = { let imageAndVideoAndfileAndAudiofetchOp = {
selections: selections: '(' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ? or ' + fileKeyObj.RELATIVE_PATH + '= ?' + ') AND (' +
fileKeyObj.RELATIVE_PATH + '= ? AND (' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ? or ' + fileKeyObj.MEDIA_TYPE + '= ?)',
fileKeyObj.MEDIA_TYPE + selectionArgs: ['Documents/Static01/', 'Videos/Static01/', 'Pictures/Static01/', 'Audios/Static01/', imageType.toString(), videoType.toString(), fileType.toString(), audioType.toString(),],
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ? or ' +
fileKeyObj.MEDIA_TYPE +
'= ?)',
selectionArgs: [
'Pictures/MediaLibraryTest/',
imageType.toString(),
videoType.toString(),
fileType.toString(),
audioType.toString(),
],
order: fileKeyObj.DATE_ADDED + " DESC", order: fileKeyObj.DATE_ADDED + " DESC",
}; };
let allTypefetchOp = { let allTypefetchOp = {
selections: '', selections: '',
selectionArgs: [], selectionArgs: [],
...@@ -125,7 +105,7 @@ const props = { ...@@ -125,7 +105,7 @@ const props = {
image: { image: {
mimeType: 'image/*', mimeType: 'image/*',
displayName: '01.jpg', displayName: '01.jpg',
relativePath: 'Pictures/MediaLibraryTest/', relativePath: 'Pictures/Static01/',
size: '348113', size: '348113',
mediaType: '3', mediaType: '3',
title: '01', title: '01',
...@@ -135,12 +115,12 @@ const props = { ...@@ -135,12 +115,12 @@ const props = {
orientation: '0', orientation: '0',
duration: '0', duration: '0',
albumId: '1118', albumId: '1118',
albumName: 'MediaLibraryTest' albumName: 'Static01'
}, },
video: { video: {
mimeType: 'video/mp4', mimeType: 'video/mp4',
displayName: '01.mp4', displayName: '01.mp4',
relativePath: 'Pictures/MediaLibraryTest/', relativePath: 'Videos/Static01/',
size: '4853005', size: '4853005',
mediaType: '4', mediaType: '4',
title: '01', title: '01',
...@@ -149,12 +129,12 @@ const props = { ...@@ -149,12 +129,12 @@ const props = {
height: '720', height: '720',
orientation: '0', orientation: '0',
duration: '10100', duration: '10100',
albumName: 'MediaLibraryTest' albumName: 'Static01'
}, },
audio: { audio: {
mimeType: 'audio/mpeg', mimeType: 'audio/mpeg',
displayName: '01.mp3', displayName: '01.mp3',
relativePath: 'Pictures/MediaLibraryTest/', relativePath: 'Audios/Static01/',
size: '4113874', size: '4113874',
mediaType: '5', mediaType: '5',
title: '01', title: '01',
...@@ -164,22 +144,21 @@ const props = { ...@@ -164,22 +144,21 @@ const props = {
height: '0', height: '0',
orientation: '0', orientation: '0',
duration: '169697', duration: '169697',
albumName: 'MediaLibraryTest' albumName: 'Static01'
}, },
file: { file: {
mimeType: 'file/*', mimeType: 'file/*',
displayName: 'test.dat', displayName: '01.dat',
relativePath: 'Pictures/MediaLibraryTest/', relativePath: 'Documents/Static01/',
size: '10', size: '10',
displayName: 'test.dat',
mediaType: '1', mediaType: '1',
title: 'test', title: '01',
dateTaken: '0', dateTaken: '0',
width: '0', width: '0',
height: '0', height: '0',
orientation: '0', orientation: '0',
duration: '0', duration: '0',
albumName: 'MediaLibraryTest' albumName: 'Static01'
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或