媒体库用例修改关冻结和使能命令

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

multimedia/medialibrary/common.js

@@ -236,13 +236,18 @@ const getPermission = async function (name, context) {
     context.requestPermissionsFromUser(permissions, (data) => {
         console.info(`getPermission requestPermissionsFromUser ${JSON.stringify(data)}`);
     });
-    await sleep(200);
 
     let driver = uitest.Driver.create();
-    await sleep(200);
+    await sleep(500);
 
-    let button = await driver.findComponent(uitest.ON.text("允许"));
-    await button.click();
+    for (let i = 0; i < 10; i++) {
+        await sleep(500);
+        let button = await driver.findComponent(uitest.ON.text("允许"));
+        if (button != undefined) {
+            await button.click();
+            break;
+        }
+    }
 
     let appInfo = await bundle.getApplicationInfo(name, 0, 100);
     let tokenID = appInfo.accessTokenId;

multimedia/medialibrary/mediaLibrary_album/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -54,6 +56,8 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "param set persist.sys.suspend_manager_enabled 1",
+                "reboot",
                 "hilog -b X -D 0xD002B70",
                 "power-shell setmode 600"
             ]

multimedia/medialibrary/mediaLibrary_base/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -36,8 +38,6 @@
         {
             "type": "ShellKit",
             "run-command": [
-                "param set persist.ace.testmode.enabled 1",
-                "param set persist.sys.suspend_manager_enabled 0",
                 "mkdir -pv /storage/media/100/local/files/Pictures/{Static,On,Off,OnAlbum,OffAlbum}",
                 "mkdir -pv /storage/media/100/local/files/Videos//{Static,On,Off}",
                 "mkdir -pv /storage/media/100/local/files/Audios/{Static,On,Off}",

multimedia/medialibrary/mediaLibrary_favorite/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -54,6 +56,8 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "param set persist.sys.suspend_manager_enabled 1",
+                "reboot",
                 "hilog -b X -D 0xD002B70",
                 "power-shell setmode 600"
             ]

multimedia/medialibrary/mediaLibrary_file/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -58,6 +60,8 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "param set persist.sys.suspend_manager_enabled 1",
+                "reboot",
                 "hilog -b X -D 0xD002B70",
                 "power-shell setmode 600"
             ]

multimedia/medialibrary/mediaLibrary_fileAsset/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -36,9 +38,6 @@
         {
             "type": "ShellKit",
             "run-command": [
-                "param set persist.ace.testmode.enabled 1",
-                "param set persist.sys.suspend_manager_enabled 0",
-                "reboot",
                 "mkdir -pv /storage/media/100/local/files/Pictures/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}",
                 "mkdir -pv /storage/media/100/local/files/Videos/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}",
                 "mkdir -pv /storage/media/100/local/files/Audios/{ModifyCb,ModifyPro,RW,R,W,RW_cb,R_cb,W_cb,openClose}",

multimedia/medialibrary/mediaLibrary_fileKey/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -50,6 +52,8 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "param set persist.sys.suspend_manager_enabled 1",
+                "reboot",
                 "hilog -b X -D 0xD002B70",
                 "power-shell setmode 600"
             ]

multimedia/medialibrary/mediaLibrary_fileResult/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -54,6 +56,8 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "param set persist.sys.suspend_manager_enabled 1",
+                "reboot",
                 "hilog -b X -D 0xD002B70",
                 "power-shell setmode 600"
             ]

multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.MediaLibraryDataA/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -35,9 +37,6 @@
         {
             "type": "ShellKit",
             "run-command": [
-                "param set persist.ace.testmode.enabled 1",
-                "param set persist.sys.suspend_manager_enabled 0",
-                "reboot",
                 "mkdir -pv /storage/media/100/local/files/Pictures/Thumbnail",
                 "mkdir -pv /storage/media/100/local/files/Videos/Thumbnail",
                 "mkdir -pv /storage/media/100/local/files/Audios/Thumbnail",

multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -54,6 +56,8 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "param set persist.sys.suspend_manager_enabled 1",
+                "reboot",
                 "hilog -b X -D 0xD002B70",
                 "power-shell setmode 600"
             ]

multimedia/medialibrary/mediaLibrary_trash/Test.json

@@ -17,6 +17,8 @@
                 "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.MediaLibraryDataA/*",
                 "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
                 "mkdir -p /storage/media/100/local/temp",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "param set persist.ace.testmode.enabled 1",
                 "power-shell wakeup",
                 "uinput  -T -d 300 600 -m 300 600 300 100 -u 300 100",
@@ -54,6 +56,8 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "param set persist.sys.suspend_manager_enabled 1",
+                "reboot",
                 "hilog -b X -D 0xD002B70",
                 "power-shell setmode 600"
             ]