From 49d3a9e7c77ccbde1723a70b113f62e33f17656c Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Tue, 16 Jul 2024 23:42:08 +0800 Subject: [PATCH] Fixed:format bug. --- .../MissionManager/src/TestMissionState.cpp | 3 ++- .../src_mock/DeviceManager_Mock_Test.cpp | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/application/MissionManager/src/TestMissionState.cpp b/application/MissionManager/src/TestMissionState.cpp index 04dd26b..45f3738 100644 --- a/application/MissionManager/src/TestMissionState.cpp +++ b/application/MissionManager/src/TestMissionState.cpp @@ -36,6 +36,7 @@ TestMissionState::TestMissionState() : MissionState("TestMissionState"), mFormat } void TestMissionState::GoInState() { + mFormattingSDCard = false; MissionState::GoInState(); LogInfo(" ========== TestMissionState::GoInState.\n"); AppParam mAppParam(APP_MANAGER_DEVICE_IP, APP_MANAGER_HTTP_SERVER_PORT, APP_MANAGER_TCP_SERVER_PORT); // TODO: @@ -93,7 +94,7 @@ bool TestMissionState::HoldDownFormatKey(const KeyEventData &data) } bool TestMissionState::HoldUpFormatKey(const KeyEventData &data) { - mFormattingSDCard = false; + // mFormattingSDCard = false; return EXECUTED; } SdCardStatus TestMissionState::SdCardStatusConvert(const StorageEvent &event) diff --git a/test/application/HuntingCamera/src_mock/DeviceManager_Mock_Test.cpp b/test/application/HuntingCamera/src_mock/DeviceManager_Mock_Test.cpp index c860389..9834020 100644 --- a/test/application/HuntingCamera/src_mock/DeviceManager_Mock_Test.cpp +++ b/test/application/HuntingCamera/src_mock/DeviceManager_Mock_Test.cpp @@ -81,6 +81,24 @@ TEST_F(HuntingCameraTest, HS_INTEGRATION_HunttingCamera_EXAMPLE_FormatSDCard) std::this_thread::sleep_for(std::chrono::milliseconds(100)); MainThread::GetInstance()->Runing(); } +/** + * @brief Construct a new test f object + * ../output_files/test/bin/HuntingCameraTest + * --gtest_filter=HuntingCameraTest.HS_INTEGRATION_HunttingCamera_EXAMPLE_FormatSDCard_Twice + */ +TEST_F(HuntingCameraTest, HS_INTEGRATION_HunttingCamera_EXAMPLE_FormatSDCard_Twice) +{ + SetAllCamerasResult(mAllCamerasMock); + MockOtherSideIpcMissionReply(IpcMission::TEST); + MockSdCardFormatReturn(mLinuxTest, FORMAT_SD_CARD_SUCESS); + MainThread::GetInstance()->Init(); + TestManager::ResetTimeOut(1000 * 40); + HalTestTool::MockKeyClick("format", 1000 * 16); // Simulate pressing a button. + std::this_thread::sleep_for(std::chrono::milliseconds(1000 * 17)); + HalTestTool::MockKeyClick("format", 1000 * 16); // Simulate pressing a button. + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + MainThread::GetInstance()->Runing(); +} /** * @brief Construct a new test f object * ../output_files/test/bin/HuntingCameraTest