diff --git a/multimedia/userfilemgr/common.js b/multimedia/userfilemgr/common.js index 28844a552e2af85567ca48287af68a2fa991f564..0bb8bbe1a44620d926591c97bf76c0a7b2649be1 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 91c6a5c60740529175ca2dba9008eeafde0b6ed4..fa801a080c030fd28760ca7e275d1e590e5d8a91 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 bbf9015e8a34ea3ee66db366da9eb71de47d1e1b..402b363e4f065cf6cc528c05c9a93e4a73b8b0f7 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 fb16ea9bf5d3b8625377fee3937d16c42aa0ad15..1bc62eb5df94099511cc1afff05a7050605445cc 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 5abce72aa971d6b754f59ee211364908d650d445..145348be5fbf7ef394c39260b9b6d26b59031613 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 e23fc635bca70566122ff8f54b124a9cdedaba89..febe59e5c54250d912f4f29dfdc3ae1d45bb4ceb 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 a413e7b0b00acef54528f6811f2fbb5a3e3edb69..d9d5ce2001049bf2a8927a38932d3e156554ccd9 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 2eeabf41f0a8c3fd4e018a97ab9b8e8607b6bf66..d0dee964f546163674e80e87c985304485a5a879 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 4124ab7b196c35697538956b8348912ca82dc9d5..e2873129cb8c61eca21b7023e4d9c786fc39d130 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 c4d38cf2a69f275a75be2a3ebd7f136572785ec9..8ba9ab76196adc4a14fdb225eb6557832f03f4bd 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 075d58d6a964478ea1ef38d7bee28cc99280d173..a145e129735b4cbdd6a28783bd2a8e0f01ce5732 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 f9b874f9328eac4b799d4fc842d9e2b2eef34f87..356f097c7bdffa8b2a572a5282f45ba9869ff764 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 19075130be8675f170e644440b2d80cdd062e6a9..70536a80e6f5cc48403ffe74ca88eb1c17b28c4b 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');