diff --git a/multimedia/medialibrary/mediaLibrary_album/Test.json b/multimedia/medialibrary/mediaLibrary_album/Test.json index 7d75024789c213c7de2faabe6ddf316f1ca77cf4..007c9a0b1d8ad4dd63db250e9cf527874e67cb30 100644 --- a/multimedia/medialibrary/mediaLibrary_album/Test.json +++ b/multimedia/medialibrary/mediaLibrary_album/Test.json @@ -44,7 +44,6 @@ "cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/01.mp4", "cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/Screenshots/01.jpg", "cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/ScreenRecordings/01.mp4", - "chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "hilog -Q pidoff", diff --git a/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestCallback.test.ets b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestCallback.test.ets index 1ececc7e36d009ab067ceccd9177048cc9dbb857..64a3bafa35c42d04ff37734bd83015450869e7ed 100644 --- a/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestCallback.test.ets +++ b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestCallback.test.ets @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestPromise.test.ets b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestPromise.test.ets index 598ca5f69495dfd96494614b30356c32f36ac511..2101b7a743baa8954a192618e34052f4ee956e35 100644 --- a/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestPromise.test.ets +++ b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestPromise.test.ets @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/test/getThumbnailPromise.test.ets b/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/test/getThumbnailPromise.test.ets index d02bd2d3361cbfde63f0849a17c4f335f77a85b3..215a3cee803cf583ce1e8607ca8f97e6d2c64280 100644 --- a/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/test/getThumbnailPromise.test.ets +++ b/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/test/getThumbnailPromise.test.ets @@ -334,7 +334,7 @@ export default function getThumbnailPromise(abilityContext) { let size = false; await testGetThumbnailError(done, testNum, dOp, size); }); - + /** * @tc.number : SUB_MEDIA_MEDIALIBRARY_GETTHUMBNAIL_PROMISE_ERROR_001_08 * @tc.name : getThumbnail diff --git a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json index 6d2d16b94fd7a9fa94134ff9adfb780d6bd5a16b..2bfb872d6b26c8e09a3e0840994292dfbcd4e65d 100644 --- a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json +++ b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json @@ -42,7 +42,6 @@ "cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/01.mp3", "cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/01.mp4", "cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/01.dat", - "chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "hilog -Q pidoff", diff --git a/multimedia/medialibrary/mediaLibrary_trash/Test.json b/multimedia/medialibrary/mediaLibrary_trash/Test.json index 1c8eeb1688add80a06d192665c5f576c4756ca0b..6dda711e251eecbf56532768cf8b1c1ef113c10a 100644 --- a/multimedia/medialibrary/mediaLibrary_trash/Test.json +++ b/multimedia/medialibrary/mediaLibrary_trash/Test.json @@ -38,14 +38,13 @@ { "type": "ShellKit", "run-command": [ + "mkdir -pv /storage/media/100/local/files/Videos/ScreenRecordings", "mkdir -pv /storage/media/100/local/files/Audios/{trash,trashCb}", "mkdir -pv /storage/media/100/local/files/Documents/{trash,trashCb}", "for i in $$(seq 3); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Camera/0$$i.jpg; done;", - "for i in $$(seq 3); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/0$$i.mp4; done;", - + "for i in $$(seq 3); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Videos/ScreenRecordings/0$$i.mp4; done;", "for d in trash trashCb; do for i in $$(seq 3); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;", "for d in trash trashCb; do for i in $$(seq 3); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;", - "chmod -R 777 /storage/media/100/local/files/*", "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*", "hilog -Q pidoff", diff --git a/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashCallback.test.ets b/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashCallback.test.ets index 61b0c770ee06eadb3d1c62f919ed548d112bd0b8..705903bd597eba484a09759979e01aec4ad1e439 100644 --- a/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashCallback.test.ets +++ b/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashCallback.test.ets @@ -24,7 +24,6 @@ import { fetchOps, getPermission, albumFetchOps, - fileIdFetchOps, checkPresetsAssets, } from "../../../../../../common"; @@ -215,8 +214,8 @@ export default function trashCallback(abilityContext) { */ it("SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_002", 0, async function (done) { let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_002"; - let assetOps = fetchOps(testNum, "Videos/", VIDEO_TYPE); - let albumOps = albumFetchOps(testNum, "Videos"); + let assetOps = fetchOps(testNum, "Videos/ScreenRecordings/", VIDEO_TYPE); + let albumOps = albumFetchOps(testNum, "ScreenRecordings"); let noAlbum = false; await setTrash(done, testNum, assetOps, albumOps, noAlbum); }); @@ -354,8 +353,8 @@ export default function trashCallback(abilityContext) { */ it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_002", 0, async function (done) { let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_002"; - let assetOps = fetchOps(testNum, "Videos/", VIDEO_TYPE); - let albumOps = albumFetchOps(testNum, "Videos"); + let assetOps = fetchOps(testNum, "Videos/ScreenRecordings/", VIDEO_TYPE); + let albumOps = albumFetchOps(testNum, "ScreenRecordings"); let noAlbum = false; await recovery(done, testNum, assetOps, albumOps, noAlbum); }); diff --git a/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashPromise.test.ets b/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashPromise.test.ets index 87bc7faf4990848f48c3bc7c2e3065fbf03d0281..3d1233c1ce734098cf9eb6853eae1b3499c8f51f 100644 --- a/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashPromise.test.ets +++ b/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashPromise.test.ets @@ -21,7 +21,6 @@ import { VIDEO_TYPE, FILE_TYPE, fetchOps, - fileIdFetchOps, albumFetchOps, } from "../../../../../../common"; @@ -189,8 +188,8 @@ export default function trashPromise(abilityContext) { */ it("SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_002", 0, async function (done) { let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_002"; - let assetOps = fetchOps(testNum, "Videos/", VIDEO_TYPE); - let albumOps = albumFetchOps(testNum, "Videos"); + let assetOps = fetchOps(testNum, "Videos/ScreenRecordings/", VIDEO_TYPE); + let albumOps = albumFetchOps(testNum, "ScreenRecordings"); let noAlbum = false; await setTrash(done, testNum, assetOps, albumOps, noAlbum); }); @@ -328,8 +327,8 @@ export default function trashPromise(abilityContext) { */ it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_002", 0, async function (done) { let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_002"; - let assetOps = fetchOps(testNum, "Videos/", VIDEO_TYPE); - let albumOps = albumFetchOps(testNum, "Videos"); + let assetOps = fetchOps(testNum, "Videos/ScreenRecordings/", VIDEO_TYPE); + let albumOps = albumFetchOps(testNum, "ScreenRecordings"); let noAlbum = false; await recovery(done, testNum, assetOps, albumOps, noAlbum); });