From 3f93c7ca57586819e45c3d3bf036dfe8a7064294 Mon Sep 17 00:00:00 2001
From: zhangxingxia <zhangxingxia1@huawei.com>
Date: Thu, 10 Mar 2022 09:23:53 +0800
Subject: [PATCH] update filemanager xts

Signed-off-by: zhangxingxia <zhangxingxia1@huawei.com>
---
 storage/storagefilemanagerjstest/Test.json    | 20 +++++++++----------
 .../main/js/default/test/filemanager.test.js  | 16 +++++++++++----
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/storage/storagefilemanagerjstest/Test.json b/storage/storagefilemanagerjstest/Test.json
index 134ec259b..523810445 100644
--- a/storage/storagefilemanagerjstest/Test.json
+++ b/storage/storagefilemanagerjstest/Test.json
@@ -10,26 +10,26 @@
 		{
             "type": "ShellKit",
             "run-command": [
-                "mkdir /storage/media/100/local/files/photo",
-                "mkdir /storage/media/100/local/files/document",
-                "mkdir /storage/media/100/local/files/video",
-                "mkdir /storage/media/100/local/files/audio",
-                "mkdir /storage/media/100/local/files/photo/weixin",
+                "mkdir -p /storage/media/100/local/files/photo",
+                "mkdir -p /storage/media/100/local/files/document",
+                "mkdir -p /storage/media/100/local/files/video",
+                "mkdir -p /storage/media/100/local/files/audio",
+                "mkdir -p /storage/media/100/local/files/photo/weixin",
                 "touch /storage/media/100/local/files/photo/weixin/1.jpg",
                 "touch /storage/media/100/local/files/photo/weixin/2.jpg",
                 "touch /storage/media/100/local/files/photo/weixin/3.jpg",
                 "touch /storage/media/100/local/files/photo/weixin/1.mp3",
                 "touch /storage/media/100/local/files/photo/weixin/1.mp4",
-                "mkdir /storage/media/100/local/files/photo/taobao",
+                "mkdir -p /storage/media/100/local/files/photo/taobao",
                 "touch /storage/media/100/local/files/photo/taobao/1.mp4",
-                "mkdir /storage/media/100/local/files/taobao",
+                "mkdir -p /storage/media/100/local/files/taobao",
                 "touch /storage/media/100/local/files/taobao/1.jpg",
-                "mkdir /storage/media/100/local/files/image",
+                "mkdir -p /storage/media/100/local/files/image",
                 "touch /storage/media/100/local/files/image/1.jpg",
                 "touch /storage/media/100/local/files/image/2.jpg",
-                "mkdir /storage/media/100/local/files/alarms",
+                "mkdir -p /storage/media/100/local/files/alarms",
                 "touch /storage/media/100/local/files/alarms/tree.mp3",
-                "mkdir /storage/media/100/local/files/wps",
+                "mkdir -p /storage/media/100/local/files/wps",
                 "touch /storage/media/100/local/files/wps/news.pdf",
                 "touch /storage/media/100/local/files/wps/introduce.doc",
                 "killall com.ohos.medialibrary.MediaScannerAbilityA",
diff --git a/storage/storagefilemanagerjstest/src/main/js/default/test/filemanager.test.js b/storage/storagefilemanagerjstest/src/main/js/default/test/filemanager.test.js
index 7ebf4e140..e2ad87d59 100644
--- a/storage/storagefilemanagerjstest/src/main/js/default/test/filemanager.test.js
+++ b/storage/storagefilemanagerjstest/src/main/js/default/test/filemanager.test.js
@@ -35,6 +35,7 @@ let FILE_ROOT = "";
 let AUDIO_ROOT = "";
 let IMAGE_ALBUM = "";
 let LOG_ = "FMS_XTS_TEXT: ";
+let LENGTH = 0;
 describe("filemanager_test", function () {
 
   /**
@@ -242,10 +243,16 @@ describe("filemanager_test", function () {
   it("filemanager_test_list_file_async_002", 0, async function (done) {
     try {
       let path = FILE_ROOT;
-      filemanager.listFile(path, "file", function(error,fileInfos){
-        expect(Array.isArray(fileInfos)).assertTrue();
-        done();
-      });
+      let options = {
+        dev:{
+          "name":"local"
+        },
+        offset:0
+      };
+      let fileInfos = await filemanager.listFile(path, "file",options);
+      LENGTH = fileInfos.length;
+      expect(Array.isArray(fileInfos)).assertTrue();
+      done();
     } catch (error) {
       console.log("filemanager_test_list_file_async_002 has failed for " + error);
       expect(null).assertFail();
@@ -302,6 +309,7 @@ describe("filemanager_test", function () {
     };
       filemanager.listFile(path, "file", options, function(error,fileInfos){
         expect(Array.isArray(fileInfos)).assertTrue();
+        expect(fileInfos.length == LENGTH-2).assertTrue();
         done();
       });
     } catch (error) {
-- 
GitLab