From 1dffe30666b7fc267fa99366a4a1e2f0c993c3ca Mon Sep 17 00:00:00 2001 From: yangbo Date: Thu, 27 Oct 2022 17:18:42 +0800 Subject: [PATCH] fixbug no column 666 Signed-off-by: yangbo --- .../main/js/test/albumTestCallBack.test.js | 12 +++---- .../src/main/js/test/albumTestPromise.test.js | 32 ++++++++++++++----- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestCallBack.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestCallBack.test.js index 41c408707..8c5ed2bae 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestCallBack.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestCallBack.test.js @@ -512,12 +512,12 @@ describe('albumTestCallBack.test.js', async function () { }; try { media.getAlbums(fileHasArgsfetchOp4, (err, albumList) => { - if (albumList == undefined) { - expect(false).assertTrue(); + if (err != undefined) { + expect(true).assertTrue(); done(); } else { console.info('GETALBUMASSETS_CALLBACK_002_07 length:' + albumList.length); - expect(albumList.length == 0).assertTrue(); + expect(false).assertTrue(); done(); } }); @@ -544,12 +544,12 @@ describe('albumTestCallBack.test.js', async function () { try { media.getAlbums(fileHasArgsfetchOp5, (err, albumList) => { - if (albumList == undefined) { - expect(false).assertTrue(); + if (err != undefined) { + expect(true).assertTrue(); done(); } else { console.info('GETALBUMASSETS_CALLBACK_002_08 length:' + albumList.length); - expect(albumList.length == 0).assertTrue(); + expect(false).assertTrue(); done(); } }); diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestPromise.test.js index 5a2d53e3d..0431a3833 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/albumTestPromise.test.js @@ -423,10 +423,18 @@ describe('albumTestPromise.test.js', async function () { selectionArgs: [videoType.toString()], }; try { - const albumList = await media.getAlbums(fileHasArgsfetchOp4); - console.info('GETALBUMASSETS_PROMISE_002_07 length:' + albumList.length); - expect(albumList.length == 0).assertTrue(); - done(); + media.getAlbums(fileHasArgsfetchOp4).then((albumList) => { + expect(false).assertTrue(); + done(); + }).catch((err) => { + if (err != undefined) { + expect(true).assertTrue(); + done(); + return; + } + expect(false).assertTrue(); + done(); + }) } catch (error) { console.info('ALBUM_PROMISE getFileAssets 002_07 passed'); expect(false).assertTrue(); @@ -449,10 +457,18 @@ describe('albumTestPromise.test.js', async function () { }; try { - const albumList = await media.getAlbums(fileHasArgsfetchOp5); - console.info('GETALBUMASSETS_PROMISE_002_08 length:' + albumList.length); - expect(albumList.length == 0).assertTrue(); - done(); + media.getAlbums(fileHasArgsfetchOp5).then((albumList) => { + expect(false).assertTrue(); + done(); + }).catch((err) => { + if (err != undefined) { + expect(true).assertTrue(); + done(); + return; + } + expect(false).assertTrue(); + done(); + }) } catch (error) { console.info('ALBUM_PROMISE getFileAssets 002_08 passed'); expect(false).assertTrue(); -- GitLab