diff --git a/multimedia/userfilemgr/common.js b/multimedia/userfilemgr/common.js index 0bb8bbe1a44620d926591c97bf76c0a7b2649be1..28844a552e2af85567ca48287af68a2fa991f564 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 = { - ActsUserFileMgrAlbum: { albumsCount: 9, assetsCount: 9 }, - ActsUserFileMgrBase: { albumsCount: 42, assetsCount: 84 }, + ActsUserFileMgrAlbumJsTest: { albumsCount: 9, assetsCount: 9 }, + ActsUserFileMgrBaseJsTest: { albumsCount: 42, assetsCount: 84 }, } const IMAGE_TYPE = userfile_manager.MediaType.IMAGE; diff --git a/multimedia/userfilemgr/userfilemgr_album/BUILD.gn b/multimedia/userfilemgr/userfilemgr_album/BUILD.gn index 5a3ec53b4fd3bf74893236475cea777e1237f996..c2d6356fa83ce43f2612672796b5b1c50fb86b88 100755 --- a/multimedia/userfilemgr/userfilemgr_album/BUILD.gn +++ b/multimedia/userfilemgr/userfilemgr_album/BUILD.gn @@ -21,7 +21,7 @@ ohos_js_hap_suite("userfilemgr_album_js_hap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsUserFileMgrAlbum" + hap_name = "ActsUserFileMgrAlbumJsTest" } ohos_app_scope("medialibrary_app_profile") { diff --git a/multimedia/userfilemgr/userfilemgr_album/Test.json b/multimedia/userfilemgr/userfilemgr_album/Test.json index 1304522e8816791b36a1fd4ac987fb023ce66d80..bf42c195c50b28ab5e33fba47b3fdaf5a2a4f8f8 100755 --- a/multimedia/userfilemgr/userfilemgr_album/Test.json +++ b/multimedia/userfilemgr/userfilemgr_album/Test.json @@ -51,7 +51,7 @@ }, { "test-file-name": [ - "ActsUserFileMgrAlbum.hap" + "ActsUserFileMgrAlbumJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true 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 fa801a080c030fd28760ca7e275d1e590e5d8a91..91c6a5c60740529175ca2dba9008eeafde0b6ed4 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, 'ActsUserFileMgrAlbum'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); }); 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 402b363e4f065cf6cc528c05c9a93e4a73b8b0f7..bbf9015e8a34ea3ee66db366da9eb71de47d1e1b 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, 'ActsUserFileMgrAlbum'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); }); 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 1bc62eb5df94099511cc1afff05a7050605445cc..fb16ea9bf5d3b8625377fee3937d16c42aa0ad15 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, 'ActsUserFileMgrAlbum'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); }); 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 145348be5fbf7ef394c39260b9b6d26b59031613..5abce72aa971d6b754f59ee211364908d650d445 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, 'ActsUserFileMgrAlbum'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_base/BUILD.gn b/multimedia/userfilemgr/userfilemgr_base/BUILD.gn index 7a40f4adae56a18a7708946f290bd6cb402927d6..0bdbd5796205af9f91f30776113530ec1d393a2d 100755 --- a/multimedia/userfilemgr/userfilemgr_base/BUILD.gn +++ b/multimedia/userfilemgr/userfilemgr_base/BUILD.gn @@ -21,7 +21,7 @@ ohos_js_hap_suite("userfilemgr_base_js_hap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsUserFileMgrBase" + hap_name = "ActsUserFileMgrBaseJsTest" } ohos_app_scope("medialibrary_app_profile") { diff --git a/multimedia/userfilemgr/userfilemgr_base/Test.json b/multimedia/userfilemgr/userfilemgr_base/Test.json index 16338711826c78dd04fe847fb103b8263081e56f..52ead4cd7d2261f7cef3d498a807337a3e1a1ae1 100755 --- a/multimedia/userfilemgr/userfilemgr_base/Test.json +++ b/multimedia/userfilemgr/userfilemgr_base/Test.json @@ -51,7 +51,7 @@ }, { "test-file-name": [ - "ActsUserFileMgrBase.hap" + "ActsUserFileMgrBaseJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true 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 febe59e5c54250d912f4f29dfdc3ae1d45bb4ceb..e23fc635bca70566122ff8f54b124a9cdedaba89 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, 'ActsUserFileMgrAlbum'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); }); 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 d9d5ce2001049bf2a8927a38932d3e156554ccd9..a413e7b0b00acef54528f6811f2fbb5a3e3edb69 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, 'ActsUserFileMgrAlbum'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrAlbumJsTest'); }); 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 d0dee964f546163674e80e87c985304485a5a879..2eeabf41f0a8c3fd4e018a97ab9b8e8607b6bf66 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, 'ActsUserFileMgrBase'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrBaseJsTest'); }); 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 e2873129cb8c61eca21b7023e4d9c786fc39d130..4124ab7b196c35697538956b8348912ca82dc9d5 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, 'ActsUserFileMgrBase'); + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrBaseJsTest'); }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_fileAsset/BUILD.gn b/multimedia/userfilemgr/userfilemgr_fileAsset/BUILD.gn index 56621e4c637cedeae5904b50daff381b12d72a68..d2ed44f87ab2b29287d7a70f99dbbd5a369a80c9 100755 --- a/multimedia/userfilemgr/userfilemgr_fileAsset/BUILD.gn +++ b/multimedia/userfilemgr/userfilemgr_fileAsset/BUILD.gn @@ -21,7 +21,7 @@ ohos_js_hap_suite("userfilemgr_fileAsset_js_hap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsUserFileMgrFileAsset" + hap_name = "ActsUserFileMgrFileAssetJsTest" } ohos_app_scope("medialibrary_app_profile") { diff --git a/multimedia/userfilemgr/userfilemgr_fileAsset/Test.json b/multimedia/userfilemgr/userfilemgr_fileAsset/Test.json index 381aa4ed78e0d989267d626e4d2d845f57d3b6b8..72a1199e197860e0b96b92bdc1ac01b1f4e9ffe7 100755 --- a/multimedia/userfilemgr/userfilemgr_fileAsset/Test.json +++ b/multimedia/userfilemgr/userfilemgr_fileAsset/Test.json @@ -59,7 +59,7 @@ }, { "test-file-name": [ - "ActsUserFileMgrFileAsset.hap" + "ActsUserFileMgrFileAssetJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true 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 8ba9ab76196adc4a14fdb225eb6557832f03f4bd..c4d38cf2a69f275a75be2a3ebd7f136572785ec9 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, 'ActsUserFileMgrFileAsset') + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAssetJsTest') }); 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 a145e129735b4cbdd6a28783bd2a8e0f01ce5732..075d58d6a964478ea1ef38d7bee28cc99280d173 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, 'ActsUserFileMgrFileAsset') + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAssetJsTest') }); 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 356f097c7bdffa8b2a572a5282f45ba9869ff764..f9b874f9328eac4b799d4fc842d9e2b2eef34f87 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, 'ActsUserFileMgrFileAsset') + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAssetJsTest') }); 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 70536a80e6f5cc48403ffe74ca88eb1c17b28c4b..19075130be8675f170e644440b2d80cdd062e6a9 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, 'ActsUserFileMgrFileAsset') + await checkPresetsAssets(userfile_mgr, 'ActsUserFileMgrFileAssetJsTest') }); beforeEach(function () { console.info('beforeEach case'); diff --git a/multimedia/userfilemgr/userfilemgr_noPermission/BUILD.gn b/multimedia/userfilemgr/userfilemgr_noPermission/BUILD.gn index 635e201ddbfee370429e10ea34a8bd7cc075bea6..064eb330ef0284b78f356acb6e0f410ccaa19353 100755 --- a/multimedia/userfilemgr/userfilemgr_noPermission/BUILD.gn +++ b/multimedia/userfilemgr/userfilemgr_noPermission/BUILD.gn @@ -21,7 +21,7 @@ ohos_js_hap_suite("userfilemgr_noPermission_js_hap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsUserFileMgrNoPermission" + hap_name = "ActsUserFileMgrNoPermissionJsTest" } ohos_app_scope("medialibrary_app_profile") { diff --git a/multimedia/userfilemgr/userfilemgr_noPermission/Test.json b/multimedia/userfilemgr/userfilemgr_noPermission/Test.json index 11f9996f03f8c419e5cb9fc419a8a36d491b925b..75731fa22ace7d1ed294dfa249bcb843e534422d 100755 --- a/multimedia/userfilemgr/userfilemgr_noPermission/Test.json +++ b/multimedia/userfilemgr/userfilemgr_noPermission/Test.json @@ -36,7 +36,7 @@ }, { "test-file-name": [ - "ActsUserFileMgrNoPermission.hap" + "ActsUserFileMgrNoPermissionJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true