Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Backup.

Browse Source
This commit is contained in:
Fancy code 2024-03-26 16:09:29 +08:00
parent 2956868344
commit cbb9e2a5d2
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
View File

@ -425,39 +425,19 @@ AppGetFileInfo inline SixFrameHandle::RequestGetFileListParse(const std::string
void SixFrameHandle::RequestGetFileList(const std::string &url, ResponseHandle responseHandle, void *context) void SixFrameHandle::RequestGetFileList(const std::string &url, ResponseHandle responseHandle, void *context)
{ {
LogInfo("RequestGetFileList.\n"); LogInfo("RequestGetFileList.\n");
std::vector<AppGetFileList> param; std::vector<AppGetFileList> files;
AppGetFileInfo info = RequestGetFileListParse(url); AppGetFileInfo info = RequestGetFileListParse(url);
mAppMonitor->GetStorageFileList(info, param); mAppMonitor->GetStorageFileList(info, files);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL); cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
if (nullptr == result) { if (nullptr == result) {
LogError("MakeResponseResult failed.\n"); LogError("MakeResponseResult failed.\n");
responseHandle("Device run out of memory.", context); responseHandle("Device run out of memory.", context);
return; return;
} }
ResponseGetFileList(result, param, info); ResponseGetFileList(result, files, info);
ResponseJsonString(result, responseHandle, context); ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result); 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, void inline SixFrameHandle::ResponseGetFileList(cJSON *result, const std::vector<AppGetFileList> &param,
const AppGetFileInfo &fileInfo) const AppGetFileInfo &fileInfo)
{ {

3
test/middleware/AppManager/tool/include/AppManagerTestTool.h
View File

@ -42,9 +42,11 @@ protected:
void MockSetParamValue(void); void MockSetParamValue(void);
void MockEnterRecorder(void); void MockEnterRecorder(void);
void MockAppPlayback(void); void MockAppPlayback(void);
void MockMonitorSetFileList(std::vector<AppGetFileList> &files);
private: private:
void AppManagerMockInit(std::shared_ptr<IAppManager> &vMock); void AppManagerMockInit(std::shared_ptr<IAppManager> &vMock);
void AppMonitorInit(std::shared_ptr<VAppMonitor> &vMock);
private: private:
std::shared_ptr<IAppManager> mAppManagerMock; std::shared_ptr<IAppManager> mAppManagerMock;
@ -52,6 +54,5 @@ private:
public: public:
static std::shared_ptr<VAppMonitor> MakeMonitorMock(void); static std::shared_ptr<VAppMonitor> MakeMonitorMock(void);
void AppMonitorInit(std::shared_ptr<VAppMonitor> &vMock);
}; };
#endif #endif

13
test/middleware/AppManager/tool/src/AppManagerTestTool.cpp
View File

@ -194,6 +194,17 @@ void AppManagerTestTool::MockAppPlayback(void)
} }
ServersMock::GetInstance()->MockAppPlayback(); 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) void AppManagerTestTool::AppManagerMockInit(std::shared_ptr<IAppManager> &vMock)
{ {
std::shared_ptr<AppManagerMock> mock = std::dynamic_pointer_cast<AppManagerMock>(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) { auto getAppMonitor = [=](std::shared_ptr<VAppMonitor> &monitor) {
LogInfo("mAppMonitorMock get.\n"); LogInfo("mAppMonitorMock get.\n");
// mAppMonitorMock = std::dynamic_pointer_cast<AppMonitorMock>(monitor);
mAppMonitorMock = monitor; mAppMonitorMock = monitor;
AppManagerTestTool::AppMonitorInit(mAppMonitorMock); AppManagerTestTool::AppMonitorInit(mAppMonitorMock);
}; };
@ -220,7 +230,6 @@ std::shared_ptr<VAppMonitor> AppManagerTestTool::MakeMonitorMock(void)
virtual ~Monitor() = default; virtual ~Monitor() = default;
}; };
std::shared_ptr<VAppMonitor> monitor = std::make_shared<Monitor>(); std::shared_ptr<VAppMonitor> monitor = std::make_shared<Monitor>();
// auto result = std::dynamic_pointer_cast<VAppMonitor>(monitor);
return monitor; return monitor;
} }
void AppManagerTestTool::AppMonitorInit(std::shared_ptr<VAppMonitor> &vMock) void AppManagerTestTool::AppMonitorInit(std::shared_ptr<VAppMonitor> &vMock)