0616.update

Signed-off-by: N yangbo <yangbo258@huawei.com>

0616.update
Signed-off-by: N yangbo <yangbo258@huawei.com>
58f2df3e · yangbo · 59c50192 · 58f2df3e · 58f2df3e · 58f2df3e
8 changed file
--- 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",

--- 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
 /*
- * 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

--- 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
 /*
- * 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

--- 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

--- 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",

--- 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",

--- 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);
        });

--- 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);
        });