From a91edc71f1b5654297b484858ba03e87a71cf093 Mon Sep 17 00:00:00 2001 From: lwx1121892 Date: Fri, 23 Sep 2022 15:36:02 +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 --- multimedia/userfilemgr/common.js | 4 ++-- .../src/main/ets/test/albumCommitModifyCallback.test.ets | 2 +- .../entry/src/main/ets/test/albumCommitModifyPromise.test.ets | 2 +- .../src/main/ets/test/albumGetFileAssetsCallback.test.ets | 2 +- .../src/main/ets/test/albumGetFileAssetsPromise.test.ets | 2 +- .../entry/src/main/ets/test/getAlbumsCallback.test.ets | 2 +- .../entry/src/main/ets/test/getAlbumsPromise.test.ets | 2 +- .../entry/src/main/ets/test/getFileAssetsCallback.test.ets | 2 +- .../entry/src/main/ets/test/getFileAssetsPromise.test.ets | 2 +- .../src/main/ets/test/fileAssetCommitModifyCallback.test.ets | 2 +- .../src/main/ets/test/fileAssetCommitModifyPromise.test.ets | 2 +- .../entry/src/main/ets/test/fileAssetOpenCallback.test.ets | 2 +- .../entry/src/main/ets/test/fileAssetOpenPromise.test.ets | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/multimedia/userfilemgr/common.js b/multimedia/userfilemgr/common.js index 28844a552..0bb8bbe1a 100755 --- a/multimedia/userfilemgr/common.js +++ b/multimedia/userfilemgr/common.js @@ -18,8 +18,8 @@ import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import bundle from '@ohos.bundle'; const presetsCount = { - ActsUserFileMgrAlbumJsTest: { albumsCount: 9, assetsCount: 9 }, - ActsUserFileMgrBaseJsTest: { albumsCount: 42, assetsCount: 84 }, + ActsUserFileMgrAlbum: { albumsCount: 9, assetsCount: 9 }, + ActsUserFileMgrBase: { albumsCount: 42, assetsCount: 84 }, } const IMAGE_TYPE = userfile_manager.MediaType.IMAGE; diff --git a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumCommitModifyCallback.test.ets b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumCommitModifyCallback.test.ets index 91c6a5c60..fa801a080 100755 --- a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumCommitModifyCallback.test.ets +++ b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumCommitModifyCallback.test.ets @@ -34,7 +34,7 @@ export default function albumCommitModifyCallback(abilityContext) { beforeAll(async function () { console.info('beforeAll case'); await getPermission(); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbum'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumCommitModifyPromise.test.ets b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumCommitModifyPromise.test.ets index bbf9015e8..402b363e4 100755 --- a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumCommitModifyPromise.test.ets +++ b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumCommitModifyPromise.test.ets @@ -34,7 +34,7 @@ export default function albumCommitModifyPromise(abilityContext) { beforeAll(async function () { console.info('beforeAll case'); await getPermission(); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbum'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumGetFileAssetsCallback.test.ets b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumGetFileAssetsCallback.test.ets index fb16ea9bf..1bc62eb5d 100755 --- a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumGetFileAssetsCallback.test.ets +++ b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumGetFileAssetsCallback.test.ets @@ -32,7 +32,7 @@ export default function albumGetFileAssetsCallback(abilityContext) { const userfile_mgr = userfile_manager.getUserFileMgr(abilityContext); beforeAll(async function () { console.info('beforeAll case'); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbum'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumGetFileAssetsPromise.test.ets b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumGetFileAssetsPromise.test.ets index 5abce72aa..145348be5 100755 --- a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumGetFileAssetsPromise.test.ets +++ b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/test/albumGetFileAssetsPromise.test.ets @@ -34,7 +34,7 @@ export default function albumGetFileAssetsPromise(abilityContext) { const userfile_mgr = userfile_manager.getUserFileMgr(abilityContext); beforeAll(async function () { console.info('beforeAll case'); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbum'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getAlbumsCallback.test.ets b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getAlbumsCallback.test.ets index e23fc635b..febe59e5c 100644 --- a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getAlbumsCallback.test.ets +++ b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getAlbumsCallback.test.ets @@ -35,7 +35,7 @@ export default function getAlbumsCallback(abilityContext) { beforeAll(async function () { console.info('beforeAll case'); await getPermission(); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbum'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getAlbumsPromise.test.ets b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getAlbumsPromise.test.ets index a413e7b0b..d9d5ce200 100644 --- a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getAlbumsPromise.test.ets +++ b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getAlbumsPromise.test.ets @@ -32,7 +32,7 @@ export default function getAlbumsPromise(abilityContext) { const userfile_mgr = userfile_manager.getUserFileMgr(abilityContext); beforeAll(async function () { console.info('beforeAll case'); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbum'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getFileAssetsCallback.test.ets b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getFileAssetsCallback.test.ets index 2eeabf41f..d0dee964f 100644 --- a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getFileAssetsCallback.test.ets +++ b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getFileAssetsCallback.test.ets @@ -32,7 +32,7 @@ export default function getFileAssetsCallback(abilityContext) { const userfile_mgr = userfile_manager.getUserFileMgr(abilityContext); beforeAll(async function () { console.info('beforeAll case'); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrBaseJsTest'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrBase'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getFileAssetsPromise.test.ets b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getFileAssetsPromise.test.ets index 4124ab7b1..e2873129c 100644 --- a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getFileAssetsPromise.test.ets +++ b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/test/getFileAssetsPromise.test.ets @@ -30,7 +30,7 @@ export default function getFileAssetsPromise(abilityContext) { const userfile_mgr = userfile_manager.getUserFileMgr(abilityContext); beforeAll(async function () { console.info('beforeAll case'); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrBaseJsTest'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrBase'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetCommitModifyCallback.test.ets b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetCommitModifyCallback.test.ets index c4d38cf2a..8ba9ab761 100755 --- a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetCommitModifyCallback.test.ets +++ b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetCommitModifyCallback.test.ets @@ -33,7 +33,7 @@ export default function fileAssetCommitModifyCallback(abilityContext) { beforeAll(async function () { console.info('beforeAll case'); await getPermission(); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAssetJsTest') + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAsset') }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetCommitModifyPromise.test.ets b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetCommitModifyPromise.test.ets index 075d58d6a..a145e1297 100755 --- a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetCommitModifyPromise.test.ets +++ b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetCommitModifyPromise.test.ets @@ -31,7 +31,7 @@ export default function fileAssetCommitModifyPromise(abilityContext) { const userfile_mgr = userfile_manager.getUserFileMgr(abilityContext); beforeAll(async function () { console.info('beforeAll case'); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAssetJsTest') + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAsset') }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetOpenCallback.test.ets b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetOpenCallback.test.ets index f9b874f93..356f097c7 100755 --- a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetOpenCallback.test.ets +++ b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetOpenCallback.test.ets @@ -31,7 +31,7 @@ export default function fileAssetOpenCallback(abilityContext) { const userfile_mgr = userfile_manager.getUserFileMgr(abilityContext); beforeAll(async function () { console.info('beforeAll case'); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAssetJsTest') + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAsset') }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetOpenPromise.test.ets b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetOpenPromise.test.ets index 19075130b..70536a80e 100755 --- a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetOpenPromise.test.ets +++ b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/test/fileAssetOpenPromise.test.ets @@ -32,7 +32,7 @@ export default function fileAssetOpenPromise(abilityContext) { const userfile_mgr = userfile_manager.getUserFileMgr(abilityContext); beforeAll(async function () { console.info('beforeAll case'); - await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAssetJsTest') + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAsset') }); beforeEach(function () { console.info('beforeEach case'); -- GitLab