From a7fab5d9af4f970b21abf8d942fcb7a7e42b2fc7 Mon Sep 17 00:00:00 2001 From: zhang-daiyue Date: Wed, 23 Feb 2022 15:11:57 +0800 Subject: [PATCH] Fix coding style check. Signed-off-by: zhang-daiyue Change-Id: Ib91581e2068d35a1c2c481473af1f530987bf6d6 --- .../FileAssetGetThumbnailCallBack.test.js | 4 ---- .../test/FileAssetGetThumbnailPromise.test.js | 4 ---- .../src/main/js/test/albumTestPromise.test.js | 2 +- .../src/main/js/test/favTestCallBack.test.js | 8 ++------ .../src/main/js/test/favTestPromise.test.js | 19 +++++++++++-------- .../src/main/js/test/fileTestCallBack.test.js | 6 +----- .../src/main/js/test/fileTestPromise.test.js | 18 +++++++++--------- 7 files changed, 24 insertions(+), 37 deletions(-) diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/FileAssetGetThumbnailCallBack.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/FileAssetGetThumbnailCallBack.test.js index 22b8f7e4d..dba320bb9 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/FileAssetGetThumbnailCallBack.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/FileAssetGetThumbnailCallBack.test.js @@ -56,17 +56,13 @@ describe('GetFileAssets_GetCount_GetAllObjects', function () { order: fileKeyObj.dateAdded, }; beforeAll(function () { - //onsole.info('beforeAll: Prerequisites at the test suite level, which are executed before the test suite is executed.'); }); beforeEach(function () { - //console.info('MediaLibraryTest: beforeEach: Prerequisites at the test case level, which are executed before each test case is executed.'); }); afterEach(function () { - //console.info('MediaLibraryTest: afterEach: Test case-level clearance conditions, which are executed after each test case is executed.'); }); afterAll(function () { - //console.info('MediaLibraryTest: afterAll: Test suite-level cleanup condition, which is executed after the test suite is executed'); }); /** diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/FileAssetGetThumbnailPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/FileAssetGetThumbnailPromise.test.js index 37e8db7cb..a3eb95957 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/FileAssetGetThumbnailPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/FileAssetGetThumbnailPromise.test.js @@ -56,17 +56,13 @@ describe('GetFileAssets_GetCount_GetAllObjects', function () { order: fileKeyObj.dateAdded, }; beforeAll(function () { - //onsole.info('beforeAll: Prerequisites at the test suite level, which are executed before the test suite is executed.'); }); beforeEach(function () { - //console.info('MediaLibraryTest: beforeEach: Prerequisites at the test case level, which are executed before each test case is executed.'); }); afterEach(function () { - //console.info('MediaLibraryTest: afterEach: Test case-level clearance conditions, which are executed after each test case is executed.'); }); afterAll(function () { - //console.info('MediaLibraryTest: afterAll: Test suite-level cleanup condition, which is executed after the test suite is executed'); }); /** 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 95eb6b15f..d355932ca 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 @@ -53,7 +53,7 @@ describe('album.promise.test.js', async function () { console.info('MediaLibraryTest : getMediaLibrary OUT'); beforeAll(function () { - onsole.info('Album Promise MediaLibraryTest: beforeAll: Prerequisites at the test suite level, which are executed before the test suite is executed.'); + console.info('Album Promise MediaLibraryTest: beforeAll: Prerequisites at the test suite level, which are executed before the test suite is executed.'); }); beforeEach(function () { console.info('Album Promise MediaLibraryTest: beforeEach: Prerequisites at the test case level, which are executed before each test case is executed.'); diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favTestCallBack.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favTestCallBack.test.js index e20d07f49..3883850d1 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favTestCallBack.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favTestCallBack.test.js @@ -29,21 +29,17 @@ describe('favSmartAlbum.promise.test.js', function () { var asset; var favSmartAlbum; beforeAll(function () { - onsole.info('Smart Album Callback MediaLibraryTest: beforeAll： Prerequisites at the test suite level, which are executed before the test suite is executed.'); - + console.info('Smart Album Callback MediaLibraryTest: beforeAll： Prerequisites at the test suite level, which are executed before the test suite is executed.'); }) beforeEach(function () { console.info('Smart Album Callback MediaLibraryTest: beforeEach：Prerequisites at the test case level, which are executed before each test case is executed.'); - }) afterEach(function () { console.info('Smart Album Callback MediaLibraryTest: afterEach： Test case-level clearance conditions, which are executed after each test case is executed.'); - }) afterAll(function () { console.info('Smart Album Callback MediaLibraryTest: afterAll： Test suite-level cleanup condition, which is executed after the test suite is executed'); - }) /** @@ -115,4 +111,4 @@ describe('favSmartAlbum.promise.test.js', function () { done(); } } -}) \ No newline at end of file +}) diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favTestPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favTestPromise.test.js index 3287b9d93..054273d8f 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favTestPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/favTestPromise.test.js @@ -62,7 +62,8 @@ describe('favSmartAlbum.promise.test.js', function () { const favSmartAlbums = await media.getPrivateAlbum(mediaLibrary.PrivateAlbumType.TYPE_FAVORITE); console.info('MediaLibraryTest : SMARTALBUM_PROMISE getPrivateAlbum favSmartAlbums 001_01'); console.info('MediaLibraryTest : SMARTALBUM_PROMISE favSmartAlbums 001_01 ' + favSmartAlbums[0].albumName); - console.info('MediaLibraryTest : SMARTALBUM_PROMISE favSmartAlbums 001_01 ' + favSmartAlbums[0].albumCapacity); + console.info('MediaLibraryTest : SMARTALBUM_PROMISE favSmartAlbums 001_01 ' + + favSmartAlbums[0].albumCapacity); favSmartAlbum = favSmartAlbums[0]; expect(true).assertTrue(); done(); @@ -78,8 +79,10 @@ describe('favSmartAlbum.promise.test.js', function () { try { const trashSmartAlbums = await media.getPrivateAlbum(mediaLibrary.PrivateAlbumType.TYPE_TRASH); console.info('MediaLibraryTest : SMARTALBUM_PROMISE getPrivateAlbum trashSmartAlbums 001_02'); - console.info('MediaLibraryTest : SMARTALBUM_PROMISE trashSmartAlbums 001_02 ' + trashSmartAlbums[0].albumName); - console.info('MediaLibraryTest : SMARTALBUM_PROMISE trashSmartAlbums 001_02 ' + trashSmartAlbums[0].albumCapacity); + console.info('MediaLibraryTest : SMARTALBUM_PROMISE trashSmartAlbums 001_02 ' + + trashSmartAlbums[0].albumName); + console.info('MediaLibraryTest : SMARTALBUM_PROMISE trashSmartAlbums 001_02 ' + + trashSmartAlbums[0].albumCapacity); trashSmartAlbum = trashSmartAlbums[0]; expect(true).assertTrue(); done(); @@ -228,8 +231,8 @@ describe('favSmartAlbum.promise.test.js', function () { try { await favSmartAlbum.removeAsset(asset.uri); let fSmartFetchFileResultNew = await favSmartAlbum.getFileAssets(); - console.info('MediaLibraryTest : SMARTALBUM_PROMISE getFileAssets Successfull removeAsset 003_01 fSmartFetchFileResultNew = ' - + fSmartFetchFileResultNew.getCount()); + console.info('MediaLibraryTest : SMARTALBUM_PROMISE getFileAssets Successfull removeAsset 003_01 fSmartFetchFileResultNew = ' + + fSmartFetchFileResultNew.getCount()); await media.deleteAsset(asset.uri); done(); } catch (error) { @@ -301,8 +304,8 @@ describe('favSmartAlbum.promise.test.js', function () { it('SUB_MEDIA_MEDIALIBRARY_GETASSET_PROMISE_004_01', 0, async function (done) { try { let fSmartFetchFileResultGet = await favSmartAlbum.getFileAssets(); - console.info('MediaLibraryTest : SMARTALBUM_PROMISE getFileAssets Successfull 004_01 fSmartFetchFileResultGet = ' - + fSmartFetchFileResultGet.getCount()); + console.info('MediaLibraryTest : SMARTALBUM_PROMISE getFileAssets Successfull 004_01 fSmartFetchFileResultGet = ' + + fSmartFetchFileResultGet.getCount()); expect(true).assertTrue(); done(); } catch (error) { @@ -311,4 +314,4 @@ describe('favSmartAlbum.promise.test.js', function () { done(); } }); -}) \ No newline at end of file +}) diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestCallBack.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestCallBack.test.js index 11d5fe3e3..4a2d6c475 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestCallBack.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestCallBack.test.js @@ -39,20 +39,16 @@ describe('file.callback.test.js', function () { console.info('MediaLibraryTest : getMediaLibrary OUT'); beforeAll(function () { console.info('File Callback MediaLibraryTest: beforeAll ： Prerequisites at the test suite level, which are executed before the test suite is executed.'); - }) beforeEach(function () { console.info('File Callback MediaLibraryTest: beforeEach：Prerequisites at the test case level, which are executed before each test case is executed.'); - }) afterEach(function () { console.info('File Callback MediaLibraryTest: afterEach： Test case-level clearance conditions, which are executed after each test case is executed.'); - }) afterAll(function () { console.info('File Callback MediaLibraryTest: afterAll： Test suite-level cleanup condition, which is executed after the test suite is executed'); - }) /** @@ -801,4 +797,4 @@ describe('file.callback.test.js', function () { } } -}) \ No newline at end of file +}) diff --git a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js index 4febdc629..137232f6a 100644 --- a/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js +++ b/multimedia/medialibrary/mediaLibrary_js_standard/src/main/js/test/fileTestPromise.test.js @@ -44,20 +44,16 @@ describe('file.promise.test.js', function () { console.info('MediaLibraryTest : getMediaLibrary OUT'); beforeAll(function () { console.info('File Promise MediaLibraryTest: beforeAll ： Prerequisites at the test suite level, which are executed before the test suite is executed.'); - }) beforeEach(function () { console.info('File Promise MediaLibraryTest: beforeEach：Prerequisites at the test case level, which are executed before each test case is executed.'); - }) afterEach(function () { console.info('File Promise MediaLibraryTest: afterEach： Test case-level clearance conditions, which are executed after each test case is executed.'); - }) afterAll(function () { console.info('File Promise MediaLibraryTest: afterAll： Test suite-level cleanup condition, which is executed after the test suite is executed'); - }) /** @@ -98,7 +94,8 @@ describe('file.promise.test.js', function () { let mediaType = mediaLibrary.MediaType.VIDEO; let path = "Movies/"; var asset02 = await media.createAsset(mediaType, "video01.avi", path); - console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_02 asset.displayName = ' + asset02.displayName); + console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_02 asset.displayName = ' + + asset02.displayName); } catch (error) { console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_02 fail, message = ' + error); } @@ -110,7 +107,8 @@ describe('file.promise.test.js', function () { let mediaType = mediaLibrary.MediaType.VIDEO; let path = ""; var asset03 = await media.createAsset(mediaType, "video03.avi", path); - console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_03 asset.displayName = ' + asset03.displayName); + console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_03 asset.displayName = ' + + asset03.displayName); expect(false).assertTrue(); } catch (error) { console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_03 fail, message = ' + error); @@ -124,7 +122,8 @@ describe('file.promise.test.js', function () { let mediaType; let path = "Movies/"; var asset04 = await media.createAsset(mediaType, "video04.avi", path); - console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_04 asset.displayName = ' + asset04.displayName); + console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_04 asset.displayName = ' + + asset04.displayName); expect(false).assertTrue(); } catch (error) { console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_04 fail, message = ' + error); @@ -138,7 +137,8 @@ describe('file.promise.test.js', function () { let mediaType; let path; var asset05 = await media.createAsset(mediaType, "video05.avi", path); - console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_05 asset.displayName = ' + asset05.displayName); + console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_05 asset.displayName = ' + + asset05.displayName); expect(false).assertTrue(); } catch (error) { console.info('MediaLibraryTest : ASSET_PROMISE create asset 001_05 fail, message = ' + error); @@ -1114,4 +1114,4 @@ describe('file.promise.test.js', function () { } }); } -}) \ No newline at end of file +}) -- GitLab