From c08c38552c7f9ec837deeb9f1a4ce251d85c8f28 Mon Sep 17 00:00:00 2001 From: lwx1121892 Date: Tue, 5 Jul 2022 10:11:10 +0800 Subject: [PATCH] =?UTF-8?q??= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lwx1121892 --- .../js/test/mediaLibraryTestCallBack.test.js | 10 ++--- .../js/test/mediaLibraryTestPromise.test.js | 38 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js index 488bc722c..6e8a0de8f 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestCallBack.test.js @@ -265,14 +265,14 @@ describe('mediaLibraryTestCallBack.test.js', function () { * @tc.type : Function * @tc.level : Level 0 */ - it('SUB__MEDIA_MIDIALIBRARY_CALLBACK_GETFILEASSETS_008', 0, async function (done) { + it('SUB__MEDIA_MIDIALIBRARY_CALLBACK_GETFILEASSETS_008', 0, async function (done) { let fetchOp = { selections: mediaLibrary.FileKey.MEDIA_TYPE + 'abc= ?', selectionArgs: ['abc'], }; try { media.getFileAssets(fetchOp, (err, fetchFileResult) => { - expect(fetchFileResult == undefined).assertTrue(); + expect(err != undefined).assertTrue(); done(); }); } catch (error) { @@ -297,7 +297,7 @@ describe('mediaLibraryTestCallBack.test.js', function () { }; try { media.getFileAssets(fetchOp, (err, fetchFileResult) => { - expect(fetchFileResult == undefined).assertTrue(); + expect(err != undefined).assertTrue(); done(); }); } catch (error) { @@ -328,7 +328,7 @@ describe('mediaLibraryTestCallBack.test.js', function () { }; try { media.getFileAssets(fetchOp, (err, fetchFileResult) => { - expect(fetchFileResult == undefined).assertTrue(); + expect(err != undefined).assertTrue(); done(); }); } catch (error) { @@ -361,7 +361,7 @@ describe('mediaLibraryTestCallBack.test.js', function () { }; try { media.getFileAssets(fetchOp, (err, fetchFileResult) => { - expect(fetchFileResult == undefined).assertTrue(); + expect(err != undefined).assertTrue(); done(); }); } catch (error) { diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js index 3daa0f74f..43d6b94ea 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/mediaLibraryTestPromise.test.js @@ -278,16 +278,16 @@ describe('mediaLibraryTestPromise.test.js', function () { * @tc.type : Function * @tc.level : Level 0 */ - it('SUB__MEDIA_MIDIALIBRARY_PROMISE_GETFILEASSETS_008', 0, async function (done) { + it('SUB__MEDIA_MIDIALIBRARY_PROMISE_GETFILEASSETS_008', 0, async function (done) { let fetchOp = { selections: mediaLibrary.FileKey.MEDIA_TYPE + 'abc= ?', selectionArgs: ['abc'], }; try { - await media.getFileAssets(fetchOp); - console.info('MediaLibraryTest : getFileAssets 008 failed'); - expect(false).assertTrue(); - done(); + await media.getFileAssets(fetchOp).then((err, fetchFileResult) => { + expect(err != undefined).assertTrue(); + done(); + }) } catch (error) { console.info(`MediaLibraryTest : getFileAssets 008 passed`); expect(true).assertTrue(); @@ -309,10 +309,10 @@ describe('mediaLibraryTestPromise.test.js', function () { selectionArgs: ['abc', audioType.toString()], }; try { - await media.getFileAssets(fetchOp); - console.info('MediaLibraryTest : getFileAssets 009 failed'); - expect(false).assertTrue(); - done(); + await media.getFileAssets(fetchOp).then((err, fetchFileResult) => { + expect(err != undefined).assertTrue(); + done(); + }) } catch (error) { console.info('MediaLibraryTest : getFileAssets 009 passed'); expect(true).assertTrue(); @@ -340,10 +340,10 @@ describe('mediaLibraryTestPromise.test.js', function () { selectionArgs: ['abc', videoType.toString(), fileType.toString()], }; try { - await media.getFileAssets(fetchOp); - console.info('MediaLibraryTest : getFileAssets 010 failed'); - expect(false).assertTrue(); - done(); + await media.getFileAssets(fetchOp).then((err, fetchFileResult) => { + expect(err != undefined).assertTrue(); + done(); + }) } catch (error) { console.info('MediaLibraryTest : getFileAssets 010 passed'); expect(true).assertTrue(); @@ -373,10 +373,14 @@ describe('mediaLibraryTestPromise.test.js', function () { selectionArgs: ['abc', videoType.toString(), fileType.toString(), audioType.toString()], }; try { - await media.getFileAssets(fetchOp); - console.info('MediaLibraryTest : getFileAssets 011 failed'); - expect(false).assertTrue(); - done(); + // await media.getFileAssets(fetchOp); + // console.info('MediaLibraryTest : getFileAssets 011 failed'); + // expect(false).assertTrue(); + // done(); + await media.getFileAssets(fetchOp).then((err, fetchFileResult) => { + expect(err != undefined).assertTrue(); + done(); + }) } catch (error) { console.info('MediaLibraryTest : getFileAssets 011 passed'); expect(true).assertTrue(); -- GitLab