!8461 【3.2-Release】修改媒体库xts预置资源及完成后清理资源

Merge pull request !8461 from yangbo/medialibrary_xts_3.2release

multimedia/medialibrary/mediaLibrary_album/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_base/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_favorite/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_file/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -60,6 +63,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_fileAsset/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -60,6 +63,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_fileKey/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -52,6 +55,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_fileResult/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.MediaLibraryDataA/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -53,6 +56,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",

multimedia/medialibrary/mediaLibrary_trash/Test.json

@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.MediaLibraryDataA/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",