From cbb9e2a5d21770e73cd5e0fe53faa7ce2c5f21e9 Mon Sep 17 00:00:00 2001
From: Fancy code <258828110.@qq.com>
Date: Tue, 26 Mar 2024 16:09:29 +0800
Subject: [PATCH] Backup.

---
 .../src/Protocol/SixFrame/SixFrameHandle.cpp  | 26 +++----------------
 .../tool/include/AppManagerTestTool.h         |  3 ++-
 .../tool/src/AppManagerTestTool.cpp           | 13 ++++++++--
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
index 232ab0ad..91f1d3e2 100644
--- a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
+++ b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
@@ -425,39 +425,19 @@ AppGetFileInfo inline SixFrameHandle::RequestGetFileListParse(const std::string
 void SixFrameHandle::RequestGetFileList(const std::string &url, ResponseHandle responseHandle, void *context)
 {
     LogInfo("RequestGetFileList.\n");
-    std::vector<AppGetFileList> param;
+    std::vector<AppGetFileList> files;
     AppGetFileInfo info = RequestGetFileListParse(url);
-    mAppMonitor->GetStorageFileList(info, param);
+    mAppMonitor->GetStorageFileList(info, files);
     cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
     if (nullptr == result) {
         LogError("MakeResponseResult failed.\n");
         responseHandle("Device run out of memory.", context);
         return;
     }
-    ResponseGetFileList(result, param, info);
+    ResponseGetFileList(result, files, info);
     ResponseJsonString(result, responseHandle, context);
     cJSON_Delete(result);
 }
-/**
- * @brief
-{
-        "result":       0,
-        "info": [{
-                        "folder":       "loop",
-                        "count":        1,
-                        "files":        [{
-                                        "name": "/DCIM/2024/01/15/20240115135444-20240115135504.mp4",
-                                        "duration":     15,
-                                        "size": 1024,
-                                        "createtime":   123456789,
-                                        "type": 0
-                                }]
-                }]
-}
- * @param result
- * @param param
- * @param fileInfo
- */
 void inline SixFrameHandle::ResponseGetFileList(cJSON *result, const std::vector<AppGetFileList> &param,
                                                 const AppGetFileInfo &fileInfo)
 {
diff --git a/test/middleware/AppManager/tool/include/AppManagerTestTool.h b/test/middleware/AppManager/tool/include/AppManagerTestTool.h
index 2e6020b4..f110eabd 100644
--- a/test/middleware/AppManager/tool/include/AppManagerTestTool.h
+++ b/test/middleware/AppManager/tool/include/AppManagerTestTool.h
@@ -42,9 +42,11 @@ protected:
     void MockSetParamValue(void);
     void MockEnterRecorder(void);
     void MockAppPlayback(void);
+    void MockMonitorSetFileList(std::vector<AppGetFileList> &files);
 
 private:
     void AppManagerMockInit(std::shared_ptr<IAppManager> &vMock);
+    void AppMonitorInit(std::shared_ptr<VAppMonitor> &vMock);
 
 private:
     std::shared_ptr<IAppManager> mAppManagerMock;
@@ -52,6 +54,5 @@ private:
 
 public:
     static std::shared_ptr<VAppMonitor> MakeMonitorMock(void);
-    void AppMonitorInit(std::shared_ptr<VAppMonitor> &vMock);
 };
 #endif
\ No newline at end of file
diff --git a/test/middleware/AppManager/tool/src/AppManagerTestTool.cpp b/test/middleware/AppManager/tool/src/AppManagerTestTool.cpp
index 1bf97e31..a2ba6db0 100644
--- a/test/middleware/AppManager/tool/src/AppManagerTestTool.cpp
+++ b/test/middleware/AppManager/tool/src/AppManagerTestTool.cpp
@@ -194,6 +194,17 @@ void AppManagerTestTool::MockAppPlayback(void)
     }
     ServersMock::GetInstance()->MockAppPlayback();
 }
+void AppManagerTestTool::MockMonitorSetFileList(std::vector<AppGetFileList> &files)
+{
+    std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
+    if (mock) {
+        EXPECT_CALL(*mock.get(), GetStorageFileListTrace(_, _))
+            .WillRepeatedly(DoAll(SetArgReferee<1>(files), Return(CreateStatusCode(STATUS_CODE_OK))));
+    }
+    else {
+        LogError("MockMonitorSetFileList failed, mAppMonitorMock isn't mock object.\n");
+    }
+}
 void AppManagerTestTool::AppManagerMockInit(std::shared_ptr<IAppManager> &vMock)
 {
     std::shared_ptr<AppManagerMock> mock = std::dynamic_pointer_cast<AppManagerMock>(vMock);
@@ -203,7 +214,6 @@ void AppManagerTestTool::AppManagerMockInit(std::shared_ptr<IAppManager> &vMock)
     }
     auto getAppMonitor = [=](std::shared_ptr<VAppMonitor> &monitor) {
         LogInfo("mAppMonitorMock get.\n");
-        // mAppMonitorMock = std::dynamic_pointer_cast<AppMonitorMock>(monitor);
         mAppMonitorMock = monitor;
         AppManagerTestTool::AppMonitorInit(mAppMonitorMock);
     };
@@ -220,7 +230,6 @@ std::shared_ptr<VAppMonitor> AppManagerTestTool::MakeMonitorMock(void)
         virtual ~Monitor() = default;
     };
     std::shared_ptr<VAppMonitor> monitor = std::make_shared<Monitor>();
-    // auto result = std::dynamic_pointer_cast<VAppMonitor>(monitor);
     return monitor;
 }
 void AppManagerTestTool::AppMonitorInit(std::shared_ptr<VAppMonitor> &vMock)