Merge branch 'master-develop' of gitee.com:shenzhen-jiuyilian/ipc into master-develop

application/HunttingCamera/src/MainThread.cpp

@@ -79,4 +79,10 @@ void MainThread::Runing(void)
     while (mMainThreadRuning) {
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     }
+}
+extern bool CreateProtocolHandleImpl(void);
+void MainThread::CustomizationInit(void)
+{
+    //
+    CreateProtocolHandleImpl();
 }

application/HunttingCamera/src/MainThread.h

@@ -26,7 +26,7 @@ public:
     virtual StatusCode UnInit(void);
     void Runing(void);
     void Exit(void) { mMainThreadRuning = false; }
-    virtual void CustomizationInit(void) {}
+    virtual void CustomizationInit(void);
 
 private:
     StatusCode CreateAllModules(void);

application/MissionManager/src/AppMonitor.cpp

@@ -1,6 +1,22 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "AppMonitor.h"
+#include "ILog.h"
 StatusCode AppMonitor::GetProductInfo(AppGetProductInfo &param)
 {
+    LogInfo("AppMonitor::GetProductInfo.\n");
     param.mModel = "test";
     param.mCompany = "test";
     param.mSoc = "test";
@@ -9,6 +25,7 @@ StatusCode AppMonitor::GetProductInfo(AppGetProductInfo &param)
 }
 StatusCode AppMonitor::GetDeviceAttr(AppGetDeviceAttr &param)
 {
+    LogInfo("AppMonitor::GetDeviceAttr.\n");
     param.mUUID = "test";
     param.mSoftVersion = "test";
     param.mOtaVersion = "test";
@@ -22,6 +39,7 @@ StatusCode AppMonitor::GetDeviceAttr(AppGetDeviceAttr &param)
 }
 StatusCode AppMonitor::GetMediaInfo(AppGetMeidaInfo &param)
 {
+    LogInfo("AppMonitor::GetMediaInfo.\n");
     param.mRtspUrl = "test";
     param.mTransport = "test";
     param.mPort = 123;
@@ -29,6 +47,7 @@ StatusCode AppMonitor::GetMediaInfo(AppGetMeidaInfo &param)
 }
 StatusCode AppMonitor::GetSdCardInfo(AppGetSdCardInfo &param)
 {
+    LogInfo("AppMonitor::GetSdCardInfo.\n");
     param.mStatus = SdCardStatus::CARD_DAMAGED;
     param.mFree = 0;
     param.mTotal = 0;
@@ -36,6 +55,7 @@ StatusCode AppMonitor::GetSdCardInfo(AppGetSdCardInfo &param)
 }
 StatusCode AppMonitor::GetBatteryInfo(AppGetBatteryInfo &param)
 {
+    LogInfo("AppMonitor::GetBatteryInfo.\n");
     param.mCapacity = 0;
     param.mChargeStatus = ChargeStatus::CHARGING;
     return CreateStatusCode(STATUS_CODE_OK);

application/MissionManager/src/DataProcessing.h

@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef DATAPROCESSING_H
-#define DATAPROCESSING_H
+#ifndef DATA_PROCESSING_H
+#define DATA_PROCESSING_H
 #include "IMissionManager.h"
 #include "IStateMachine.h"
 #include <functional>

application/MissionManager/src/MissionManager.h

@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef MISSIONMANAGER_H
-#define MISSIONMANAGER_H
+#ifndef MISSION_MANAGER_H
+#define MISSION_MANAGER_H
 #include "IMissionManager.h"
 class MissionManager : public IMissionManager
 {

application/MissionManager/src/MissionManagerMakePtr.h

@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef MISSIONMANAGERMAKEIMPL_H
-#define MISSIONMANAGERMAKEIMPL_H
+#ifndef MISSION_MANAGER_MAKE_PTR_H
+#define MISSION_MANAGER_MAKE_PTR_H
 #include "IMcuManager.h"
 #include "IMissionManager.h"
 #include "IStateMachine.h"

application/MissionManager/src/MissionState.cpp

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "MissionState.h"
+#include "IAppManager.h"
+#include "ILog.h"
+MissionState::MissionState(const std::string &name) : State(name) {}
+void MissionState::GoInState()
+{
+    //
+    LogInfo(" ========== MissionState::GoInState.\n");
+}
+void MissionState::GoOutState()
+{
+    //
+    LogInfo(" ========== MissionState::GoOutState.\n");
+}
+bool MissionState::ExecuteStateMsg(VStateMachineData *msg) { return DataProcessing::EventHandle(msg); }

application/MissionManager/src/MissionState.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MISSION_STATE_H
+#define MISSION_STATE_H
+#include "DataProcessing.h"
+#include "IStateMachine.h"
+class MissionState : public State, public DataProcessing, public std::enable_shared_from_this<MissionState>
+{
+public:
+    MissionState(const std::string &name);
+    virtual ~MissionState() = default;
+    void GoInState() override;
+    void GoOutState() override;
+    bool ExecuteStateMsg(VStateMachineData *msg) override;
+};
+#endif

application/MissionManager/src/MissionStateMachine.h

@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef MISSIONSTATEMACHINE_H
-#define MISSIONSTATEMACHINE_H
+#ifndef MISSION_STATE_MACHINE_H
+#define MISSION_STATE_MACHINE_H
 // #include "IDeviceManager.h"
 #include "IMcuManager.h"
 #include "IMissionManager.h"

application/MissionManager/src/TestMissionState.cpp

@@ -15,17 +15,20 @@
 #include "TestMissionState.h"
 #include "IAppManager.h"
 #include "ILog.h"
-TestMissionState::TestMissionState() : State("TestMissionState") {}
+TestMissionState::TestMissionState() : MissionState("TestMissionState") {}
 void TestMissionState::GoInState()
 {
-    //
+    MissionState::GoInState();
     LogInfo(" ========== TestMissionState::GoInState.\n");
-    AppParam mAppParam("192.168.1.29", APP_MANAGER_HTTP_SERVER_PORT); // TODO:
+    AppParam mAppParam(APP_MANAGER_HTTP_SERVER_IP, APP_MANAGER_HTTP_SERVER_PORT); // TODO:
     IAppManager::GetInstance()->Init(mAppParam);
+    std::shared_ptr<VAppMonitor> monitor =
+        std::dynamic_pointer_cast<TestMissionState>(MissionState::shared_from_this());
+    IAppManager::GetInstance()->SetAppMonitor(monitor);
 }
 void TestMissionState::GoOutState()
 {
-    //
+    MissionState::GoOutState();
     LogInfo(" ========== TestMissionState::GoOutState.\n");
 }
-bool TestMissionState::ExecuteStateMsg(VStateMachineData *msg) { return DataProcessing::EventHandle(msg); }
+bool TestMissionState::ExecuteStateMsg(VStateMachineData *msg) { return MissionState::EventHandle(msg); }

application/MissionManager/src/TestMissionState.h

@@ -15,9 +15,9 @@
 #ifndef TEST_MISSION_STATE_H
 #define TEST_MISSION_STATE_H
 #include "AppMonitor.h"
-#include "DataProcessing.h"
 #include "IStateMachine.h"
-class TestMissionState : public State, public DataProcessing, public AppMonitor
+#include "MissionState.h"
+class TestMissionState : public MissionState, public AppMonitor
 {
 public:
     TestMissionState();

build/cmake/toolchain/linux.toolchain.cmake

@@ -49,7 +49,7 @@ set(LOG_SUPPORT                            "true")
 set(GOAHEAD_DOCUMENTS_PATH                 "web")
 set(GOAHEAD_UPLOAD_TMP_PATH                "./goahead")
 set(GOAHEAD_UPLOAD_PATH                    "${GOAHEAD_UPLOAD_TMP_PATH}")
-set(GOAHEAD_LIMIT_POST                     "33554432") # If not defined means using default setting. See goahead-linux-static-fancy.mk
+set(GOAHEAD_LIMIT_POST                     "335544320") # If not defined means using default setting. See goahead-linux-static-fancy.mk
 # GOAHEAD_CONFIG_FILE_PATH should be set when cross compile
 # set(GOAHEAD_CONFIG_FILE_PATH               "./")
 # ------------ build GoAhead end ------------ #

hal/abstract/IHalCpp.cpp

@@ -36,6 +36,10 @@ StatusCode IHalCpp::GetAllLeds(std::map<std::string, std::shared_ptr<VLedHal>> &
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }
 StatusCode IHalCpp::GetAllKeys(std::map<std::string, std::shared_ptr<VKeyHal>> &allKeys)
+{
+    return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
+}
+StatusCode IHalCpp::GetWifiHal(std::shared_ptr<VWifiHal> &wifi)
 {
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }

hal/include/IHalCpp.h

@@ -50,6 +50,13 @@ public:
     VLedHal() = default;
     virtual ~VLedHal() = default;
 };
+class VWifiHal
+{
+public:
+    VWifiHal() = default;
+    virtual ~VWifiHal() = default;
+    virtual StatusCode OpenApMode(void) { return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); }
+};
 class IHalCpp
 {
 public:
@@ -60,5 +67,6 @@ public:
     virtual StatusCode UnInit(void);
     virtual StatusCode GetAllLeds(std::map<std::string, std::shared_ptr<VLedHal>> &allLeds);
     virtual StatusCode GetAllKeys(std::map<std::string, std::shared_ptr<VKeyHal>> &allKeys);
+    virtual StatusCode GetWifiHal(std::shared_ptr<VWifiHal> &wifi);
 };
 #endif

hal/src/WifiHal.cpp

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

hal/src/WifiHal.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef WIFI_HAL_H
+#define WIFI_HAL_H
+#include "IHalCpp.h"
+class WifiHal : public VWifiHal
+{
+public:
+    WifiHal() = default;
+    virtual ~WifiHal() = default;
+};
+#endif

middleware/AppManager/src/AppManager.cpp

@@ -15,20 +15,28 @@
 #include "AppManager.h"
 #include "AppManagerMakePtr.h"
 // #include "FxHttpServer.h"
+#include "IHalCpp.h"
 #include "ILog.h"
 #include "WebServer.h"
 AppManager::AppManager()
 {
-    //
     // mHttpServerRuning = false;
+    mProtocolHandle = std::make_shared<IAppProtocolHandle>();
 }
 const StatusCode AppManager::Init(const AppParam &param)
 {
+    std::shared_ptr<VWifiHal> wifi;
+    IHalCpp::GetInstance()->GetWifiHal(wifi);
+    if (!wifi) {
+        LogError("Get wifi hal failed.\n");
+        return CreateStatusCode(STATUS_CODE_NOT_OK);
+    }
+    wifi->OpenApMode();
     AppManagerMakePtr::GetInstance()->CreateProtocolHandle(mProtocolHandle);
     HttpServerStart(param);
     return CreateStatusCode(STATUS_CODE_OK);
 }
-const StatusCode AppManager::UnInit(void)
+const StatusCode AppManager::UnInit(void) 
 {
     HttpServerStop();
     mProtocolHandle.reset();

middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp

@@ -102,14 +102,24 @@ void SixFrameHandle::RequestGetProductInfo(const std::string &url, ResponseHandl
 {
     LogInfo("RequestGetProductInfo.\n");
     char *resultStr = nullptr;
-    cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
-    resultStr = cJSON_Print(result);
     AppGetProductInfo param;
     mAppMonitor->GetProductInfo(param);
+    cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
+    ResponseGetProductInfo(result, param);
+    resultStr = cJSON_Print(result);
     responseHandle(resultStr, context);
     free(resultStr);
     cJSON_Delete(result);
 }
+void inline SixFrameHandle::ResponseGetProductInfo(cJSON *result, const AppGetProductInfo &param)
+{
+    cJSON *info = nullptr;
+    cJSON_AddItemToObject(result, CJSON_INFO_STRING, info = cJSON_CreateObject());
+    cJSON_AddStringToObject(info, "model", param.mModel.c_str());
+    cJSON_AddStringToObject(info, "company", param.mCompany.c_str());
+    cJSON_AddStringToObject(info, "soc", param.mSoc.c_str());
+    cJSON_AddStringToObject(info, "sp", param.mSp.c_str());
+}
 void SixFrameHandle::RequestGetDeviceAttr(const std::string &url, ResponseHandle responseHandle, void *context)
 {
     LogInfo("RequestGetDeviceAttr.\n");

middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.h

@@ -59,6 +59,7 @@ private:
                         void *context);
     void DoNothing(const std::string &url, ResponseHandle responseHandle, void *context);
     void RequestGetProductInfo(const std::string &url, ResponseHandle responseHandle, void *context);
+    void ResponseGetProductInfo(cJSON *result, const AppGetProductInfo &param);
     void RequestGetDeviceAttr(const std::string &url, ResponseHandle responseHandle, void *context);
     void ResponseGetDeviceAttr(cJSON *result, const AppGetDeviceAttr &param);
     void RequestGetMediaInfo(const std::string &url, ResponseHandle responseHandle, void *context);

test/application/CMakeLists.txt

@@ -1,2 +1,3 @@
 
-add_subdirectory(HunttingCamera)
+add_subdirectory(HunttingCamera)
+add_subdirectory(MissionManager)

test/application/HunttingCamera/CMakeLists.txt

@@ -13,6 +13,7 @@ include_directories(
     ${UTILS_SOURCE_PATH}/UartDevice/include
     ${TEST_SOURCE_PATH}
     ${TEST_SOURCE_PATH}/middleware/McuManager/tool/include
+    ${TEST_SOURCE_PATH}/middleware/AppManager/tool/include
     ${TEST_SOURCE_PATH}/utils/LinuxApiMock/include
     ${TEST_SOURCE_PATH}/utils/TestManager/include
     ${TEST_SOURCE_PATH}/utils/McuProtocol/tool/include
@@ -34,7 +35,7 @@ endif()
 
 set(TARGET_NAME HunttingCameraTest)
 add_executable(${TARGET_NAME} ${SRC_FILES_MAIN} ${SRC_FILES})
-target_link_libraries(${TARGET_NAME} HunttingMainLib McuManagerTestTool McuAskBaseTestTool TestManager gtest gmock pthread)
+target_link_libraries(${TARGET_NAME} HunttingMainLib McuManagerTestTool McuAskBaseTestTool AppManagerTestTool TestManager gtest gmock pthread)
 if(${TEST_COVERAGE} MATCHES "true")
     target_link_libraries(${TARGET_NAME} gcov)
 endif()

test/application/HunttingCamera/src_mock/HunttingCamera_Mock_Test.cpp

@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "AppManagerTestTool.h"
 #include "GtestUsing.h"
 #include "ILog.h"
 #include "MainThread.h"
@@ -20,7 +21,10 @@
 #include <thread>
 namespace HunttingCameraTest
 {
-class HunttingCameraTest : public testing::Test, public TestManager, public McuManagerTestTool
+class HunttingCameraTest : public testing::Test,
+                           public TestManager,
+                           public McuManagerTestTool,
+                           public AppManagerTestTool
 {
 public:
     HunttingCameraTest() {}
@@ -68,6 +72,8 @@ TEST_F(HunttingCameraTest, INTEGRATION_DeviceManager_EXAMPLE_Demo)
 {
     MainThread::GetInstance()->Init();
     TestManager::ResetTimeOut(1000 * 3);
+    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    MockGetProductInfo();
     MainThread::GetInstance()->Runing();
 }
 } // namespace HunttingCameraTest

test/application/MissionManager/CMakeLists.txt

@@ -0,0 +1,2 @@
+
+add_subdirectory(tool)

test/application/MissionManager/tool/CMakeLists.txt

@@ -0,0 +1,58 @@
+include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
+set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+
+include_directories(
+    ./src
+    ./include
+    ${UTILS_SOURCE_PATH}/StatusCode/include
+    ${UTILS_SOURCE_PATH}/Log/include
+    ${APPLICATION_SOURCE_PATH}/MissionManager/include
+    ${APPLICATION_SOURCE_PATH}/MissionManager/src
+    ${MIDDLEWARE_SOURCE_PATH}/AppManager/include
+    ${MIDDLEWARE_SOURCE_PATH}/StateMachine/include
+    ${TEST_SOURCE_PATH}
+    ${TEST_SOURCE_PATH}/middleware/AppManager/tool/include
+    ${TEST_SOURCE_PATH}/middleware/AppManager/tool/src
+    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googletest/include
+    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/include
+)
+# link_directories(
+#     ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs
+# )
+
+aux_source_directory(./src TEST_TOOL_SRC_FILES)
+set(TEST_TOOL_TARGET MissionManagerTestTool)
+add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES})
+target_link_libraries(${TEST_TOOL_TARGET} MissionManager AppManagerTestTool Log)
+
+if ("${CLANG_TIDY_SUPPORT}" MATCHES "true")
+add_custom_target(
+    MissionManagerTestTool_code_check
+    COMMAND ${CLANG_TIDY_EXE}
+    -checks='${CLANG_TIDY_CHECKS}'
+    --header-filter=.*
+    --system-headers=false
+    ${TEST_TOOL_SRC_FILES}
+    ${CLANG_TIDY_CONFIG}
+    -p ${PLATFORM_PATH}/cmake-shell
+    WORKING_DIRECTORY ${TEST_SOURCE_PATH}/application/MissionManager/tool
+)
+file(GLOB_RECURSE HEADER_FILES *.h)
+add_custom_target(
+    MissionManagerTestTool_code_format
+    COMMAND ${CLANG_FORMAT_EXE}
+    -style=file
+    -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES}
+    WORKING_DIRECTORY ${TEST_SOURCE_PATH}/application/MissionManager/tool
+)
+add_custom_command(
+    TARGET ${TEST_TOOL_TARGET}
+    PRE_BUILD
+    COMMAND make MissionManagerTestTool_code_check
+    COMMAND make MissionManagerTestTool_code_format
+    WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/
+)
+endif()
+
+define_file_name(${TEST_TOOL_TARGET})

test/application/MissionManager/tool/include/MissionManagerTestTool.h

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MISSION_MANAGER_TEST_TOOL_H
+#define MISSION_MANAGER_TEST_TOOL_H
+#include "GtestUsing.h"
+#include "IMissionManager.h"
+#include <memory>
+class MissionManagerTestTool
+{
+public:
+    MissionManagerTestTool() = default;
+    virtual ~MissionManagerTestTool() = default;
+    void Init(void);
+    void UnInit(void);
+
+private:
+    // void MissionManagerMockInit(std::shared_ptr<IMissionManager> &vMock);
+
+    // private:
+    //     std::shared_ptr<IMissionManager> mMissionManagerMock;
+    //     std::shared_ptr<VAppMonitor> mAppMonitorMock;
+
+    // public:
+    //     static std::shared_ptr<VAppMonitor> MakeMonitorMock(void);
+    //     void AppMonitorInit(std::shared_ptr<VAppMonitor> &vMock);
+};
+#endif

test/application/MissionManager/tool/src/MissionManagerTestTool.cpp

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "MissionManagerTestTool.h"
+void MissionManagerTestTool::Init(void)
+{
+    // ServersMock::GetInstance()->Init();
+    // mMissionManagerMock = std::make_shared<MissionManagerMock>();
+    // MissionManagerMockInit(mMissionManagerMock);
+    // std::shared_ptr<MissionManagerMock> mock = std::dynamic_pointer_cast<MissionManagerMock>(mMissionManagerMock);
+    // OverrideMissionManagerMakePtrObject(mock);
+}
+void MissionManagerTestTool::UnInit(void)
+{
+    // ServersMock::GetInstance()->UnInit();
+    // mMissionManagerMock.reset();
+    // mAppMonitorMock.reset();
+    // CancelOverrideMissionManagerMakePtrObject();
+}

test/application/MissionManager/tool/src/TestMissionStateMock.cpp

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "TestMissionStateMock.h"
+#include "AppMonitorMock.h"
+#include "ILog.h"
+StatusCode TestMissionStateTest::GetProductInfo(AppGetProductInfo &param)
+{
+    LogInfo("TestMissionStateTest::GetProductInfo\n");
+    StatusCode code = GetProductInfoTrace(param);
+    if (StatusCodeEqual(code, "STATUS_CODE_VIRTUAL_FUNCTION")) {
+        return AppMonitor::GetProductInfo(param);
+    }
+    return code;
+}
+StatusCode TestMissionStateTest::GetDeviceAttr(AppGetDeviceAttr &param)
+{
+    LogInfo("TestMissionStateTest::GetDeviceAttr\n");
+    StatusCode code = GetDeviceAttrTrace(param);
+    if (StatusCodeEqual(code, "STATUS_CODE_VIRTUAL_FUNCTION")) {
+        return AppMonitor::GetDeviceAttr(param);
+    }
+    return code;
+}
+StatusCode TestMissionStateTest::GetMediaInfo(AppGetMeidaInfo &param)
+{
+    LogInfo("TestMissionStateTest::GetMediaInfo\n");
+    StatusCode code = GetMediaInfoTrace(param);
+    if (StatusCodeEqual(code, "STATUS_CODE_VIRTUAL_FUNCTION")) {
+        return AppMonitor::GetMediaInfo(param);
+    }
+    return code;
+}
+StatusCode TestMissionStateTest::GetSdCardInfo(AppGetSdCardInfo &param)
+{
+    LogInfo("TestMissionStateTest::GetSdCardInfo\n");
+    StatusCode code = GetSdCardInfoTrace(param);
+    if (StatusCodeEqual(code, "STATUS_CODE_VIRTUAL_FUNCTION")) {
+        return AppMonitor::GetSdCardInfo(param);
+    }
+    return code;
+}
+StatusCode TestMissionStateTest::GetBatteryInfo(AppGetBatteryInfo &param)
+{
+    LogInfo("TestMissionStateTest::GetBatteryInfo\n");
+    StatusCode code = GetBatteryInfoTrace(param);
+    if (StatusCodeEqual(code, "STATUS_CODE_VIRTUAL_FUNCTION")) {
+        return AppMonitor::GetBatteryInfo(param);
+    }
+    return code;
+}
+StatusCode TestMissionStateTest::SetDateTime(AppSetDateTime &param)
+{
+    LogInfo("TestMissionStateTest::SetDateTime\n");
+    LogInfo("mYear = %u\n", param.mYear);
+    LogInfo("mMonth = %02u\n", param.mMonth);
+    LogInfo("mDay = %02u\n", param.mDay);
+    LogInfo("mHour = %02u\n", param.mHour);
+    LogInfo("mMinute = %02u\n", param.mMinute);
+    LogInfo("mSecond = %02u\n", param.mSecond);
+    StatusCode code = SetDateTimeTrace(param);
+    if (StatusCodeEqual(code, "STATUS_CODE_VIRTUAL_FUNCTION")) {
+        return AppMonitor::SetDateTime(param);
+    }
+    return code;
+}
+StatusCode TestMissionStateTest::SetTimeZone(const unsigned int &zone)
+{
+    LogInfo("TestMissionStateTest::SetTimeZone = %u\n", zone);
+    StatusCode code = SetTimeZoneTrace(zone);
+    if (StatusCodeEqual(code, "STATUS_CODE_VIRTUAL_FUNCTION")) {
+        return AppMonitor::SetTimeZone(zone);
+    }
+    return code;
+}
+StatusCode TestMissionStateTest::UploadFile(AppUploadFile &param)
+{
+    LogInfo("TestMissionStateTest::UploadFile\n");
+    StatusCode code = UploadFileTrace(param);
+    if (StatusCodeEqual(code, "STATUS_CODE_VIRTUAL_FUNCTION")) {
+        return AppMonitor::UploadFile(param);
+    }
+    return code;
+}

test/application/MissionManager/tool/src/TestMissionStateMock.h

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2023 Fancy Code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef TEST_MISSION_STATE_MOCK_H
+#define TEST_MISSION_STATE_MOCK_H
+#include "AppMonitorMock.h"
+#include "MissionManagerTestTool.h"
+#include "TestMissionState.h"
+class TestMissionStateTest : public TestMissionState, virtual public AppMonitorTrace
+{
+public:
+    TestMissionStateTest() = default;
+    virtual ~TestMissionStateTest() = default;
+    StatusCode GetProductInfo(AppGetProductInfo &param) override;
+    StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override;
+    StatusCode GetMediaInfo(AppGetMeidaInfo &param) override;
+    StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override;
+    StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override;
+    StatusCode SetDateTime(AppSetDateTime &param) override;
+    StatusCode SetTimeZone(const unsigned int &zone) override;
+    StatusCode UploadFile(AppUploadFile &param) override;
+    // const StatusCode SetAppMonitor(std::shared_ptr<VAppMonitor> &monitor) override;
+
+protected:
+    // virtual const StatusCode SetAppMonitorTrace(std::shared_ptr<VAppMonitor> &monitor);
+};
+class TestMissionStateMock : public AppMonitorMock, public TestMissionStateTest
+{
+public:
+    TestMissionStateMock() = default;
+    virtual ~TestMissionStateMock() = default;
+    // MOCK_METHOD1(SetAppMonitorTrace, const StatusCode(std::shared_ptr<VAppMonitor> &));
+};
+#endif

test/middleware/AppManager/tool/src/AppManagerTestTool.cpp

@@ -36,84 +36,82 @@ void AppManagerTestTool::UnInit(void)
 }
 void AppManagerTestTool::MockGetProductInfo(void)
 {
-    //
+    std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
+    if (mock) {
+        EXPECT_CALL(*mock.get(), GetProductInfoTrace(_))
+            .Times(ONLY_BE_CALLED_ONCE)
+            .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
+    }
     ServersMock::GetInstance()->MockGetProductInfo();
 }
 void AppManagerTestTool::MockGetDeviceAttr(void)
 {
     std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
-    if (!mock) {
-        LogError("vMock error.\n");
-        return;
+    if (mock) {
+        EXPECT_CALL(*mock.get(), GetDeviceAttrTrace(_))
+            .Times(ONLY_BE_CALLED_ONCE)
+            .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     }
-    EXPECT_CALL(*mock.get(), GetDeviceAttrTrace(_))
-        .Times(ONLY_BE_CALLED_ONCE)
-        .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     ServersMock::GetInstance()->MockGetDeviceAttr();
 }
 void AppManagerTestTool::MockGetMediaInfo(void)
 {
     std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
-    if (!mock) {
-        LogError("vMock error.\n");
-        return;
+    if (mock) {
+        EXPECT_CALL(*mock.get(), GetMediaInfoTrace(_))
+            .Times(ONLY_BE_CALLED_ONCE)
+            .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     }
-    EXPECT_CALL(*mock.get(), GetMediaInfoTrace(_))
-        .Times(ONLY_BE_CALLED_ONCE)
-        .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     ServersMock::GetInstance()->MockGetMediaInfo();
 }
 void AppManagerTestTool::MockGetSdCardInfo(void)
 {
     std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
-    if (!mock) {
-        LogError("vMock error.\n");
-        return;
+    if (mock) {
+        EXPECT_CALL(*mock.get(), GetSdCardInfoTrace(_))
+            .Times(ONLY_BE_CALLED_ONCE)
+            .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     }
-    EXPECT_CALL(*mock.get(), GetSdCardInfoTrace(_))
-        .Times(ONLY_BE_CALLED_ONCE)
-        .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     ServersMock::GetInstance()->MockGetSdCardInfo();
 }
 void AppManagerTestTool::MockGetBatteryInfo(void)
 {
     std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
-    if (!mock) {
-        LogError("vMock error.\n");
-        return;
+    if (mock) {
+        EXPECT_CALL(*mock.get(), GetBatteryInfoTrace(_))
+            .Times(ONLY_BE_CALLED_ONCE)
+            .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     }
-    EXPECT_CALL(*mock.get(), GetBatteryInfoTrace(_))
-        .Times(ONLY_BE_CALLED_ONCE)
-        .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     ServersMock::GetInstance()->MockGetBatteryInfo();
 }
 void AppManagerTestTool::MockSetDateTime(void)
 {
     std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
-    if (!mock) {
-        LogError("vMock error.\n");
-        return;
+    if (mock) {
+        EXPECT_CALL(*mock.get(), SetDateTimeTrace(_))
+            .Times(ONLY_BE_CALLED_ONCE)
+            .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     }
-    EXPECT_CALL(*mock.get(), SetDateTimeTrace(_))
-        .Times(ONLY_BE_CALLED_ONCE)
-        .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     ServersMock::GetInstance()->MockSetDateTime();
 }
 void AppManagerTestTool::MockSetTimeZone(void)
 {
     std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
-    if (!mock) {
-        LogError("vMock error.\n");
-        return;
+    if (mock) {
+        EXPECT_CALL(*mock.get(), SetTimeZoneTrace(_))
+            .Times(ONLY_BE_CALLED_ONCE)
+            .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     }
-    EXPECT_CALL(*mock.get(), SetDateTimeTrace(_))
-        .Times(ONLY_BE_CALLED_ONCE)
-        .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     ServersMock::GetInstance()->MockSetTimeZone();
 }
 void AppManagerTestTool::MockUploadFiles(void)
 {
-    //
+    std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(mAppMonitorMock);
+    if (mock) {
+        EXPECT_CALL(*mock.get(), UploadFileTrace(_))
+            .Times(ONLY_BE_CALLED_ONCE)
+            .WillOnce(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
+    }
     ServersMock::GetInstance()->MockUploadFiles();
 }
 void AppManagerTestTool::AppManagerMockInit(std::shared_ptr<IAppManager> &vMock)
@@ -125,7 +123,8 @@ 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 = std::dynamic_pointer_cast<AppMonitorMock>(monitor);
+        mAppMonitorMock = monitor;
         AppManagerTestTool::AppMonitorInit(mAppMonitorMock);
     };
     EXPECT_CALL(*mock.get(), SetAppMonitorTrace(_))
@@ -134,27 +133,32 @@ void AppManagerTestTool::AppManagerMockInit(std::shared_ptr<IAppManager> &vMock)
 }
 std::shared_ptr<VAppMonitor> AppManagerTestTool::MakeMonitorMock(void)
 {
-    auto monitor = std::make_shared<AppMonitorMock>();
-    EXPECT_CALL(*monitor.get(), GetProductInfoTrace(_))
-        .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
-    EXPECT_CALL(*monitor.get(), GetDeviceAttrTrace(_))
-        .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
-    EXPECT_CALL(*monitor.get(), GetMediaInfoTrace(_))
-        .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
-    EXPECT_CALL(*monitor.get(), GetSdCardInfoTrace(_))
-        .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
-    EXPECT_CALL(*monitor.get(), GetBatteryInfoTrace(_))
-        .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
-    EXPECT_CALL(*monitor.get(), SetDateTimeTrace(_))
-        .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
-    EXPECT_CALL(*monitor.get(), UploadFileTrace(_))
-        .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
+    class Monitor : public AppMonitorMock, public AppMonitorTest
+    {
+    public:
+        Monitor() = default;
+        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)
 {
     std::shared_ptr<AppMonitorMock> mock = std::dynamic_pointer_cast<AppMonitorMock>(vMock);
     if (mock) {
+        EXPECT_CALL(*mock.get(), GetProductInfoTrace(_))
+            .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
+        EXPECT_CALL(*mock.get(), GetDeviceAttrTrace(_))
+            .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
+        EXPECT_CALL(*mock.get(), GetMediaInfoTrace(_))
+            .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
+        EXPECT_CALL(*mock.get(), GetSdCardInfoTrace(_))
+            .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
+        EXPECT_CALL(*mock.get(), GetBatteryInfoTrace(_))
+            .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
+        EXPECT_CALL(*mock.get(), SetDateTimeTrace(_))
+            .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
         EXPECT_CALL(*mock.get(), UploadFileTrace(_))
             .WillRepeatedly(DoAll(Return(CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION))));
     }

test/middleware/AppManager/tool/src/AppMonitorMock.cpp

@@ -23,9 +23,9 @@ StatusCode AppMonitorTest::GetProductInfo(AppGetProductInfo &param)
     }
     return code;
 }
-StatusCode AppMonitorTest::GetProductInfoTrace(AppGetProductInfo &param)
+StatusCode AppMonitorTrace::GetProductInfoTrace(AppGetProductInfo &param)
 {
-    LogInfo("AppMonitorTest::GetProductInfoTrace\n");
+    LogInfo("AppMonitorTrace::GetProductInfoTrace\n");
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }
 StatusCode AppMonitorTest::GetDeviceAttr(AppGetDeviceAttr &param)
@@ -37,9 +37,9 @@ StatusCode AppMonitorTest::GetDeviceAttr(AppGetDeviceAttr &param)
     }
     return code;
 }
-StatusCode AppMonitorTest::GetDeviceAttrTrace(AppGetDeviceAttr &param)
+StatusCode AppMonitorTrace::GetDeviceAttrTrace(AppGetDeviceAttr &param)
 {
-    LogInfo("AppMonitorTest::GetDeviceAttrTrace\n");
+    LogInfo("AppMonitorTrace::GetDeviceAttrTrace\n");
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }
 StatusCode AppMonitorTest::GetMediaInfo(AppGetMeidaInfo &param)
@@ -51,9 +51,9 @@ StatusCode AppMonitorTest::GetMediaInfo(AppGetMeidaInfo &param)
     }
     return code;
 }
-StatusCode AppMonitorTest::GetMediaInfoTrace(AppGetMeidaInfo &param)
+StatusCode AppMonitorTrace::GetMediaInfoTrace(AppGetMeidaInfo &param)
 {
-    LogInfo("AppMonitorTest::GetMediaInfoTrace\n");
+    LogInfo("AppMonitorTrace::GetMediaInfoTrace\n");
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }
 StatusCode AppMonitorTest::GetSdCardInfo(AppGetSdCardInfo &param)
@@ -65,9 +65,9 @@ StatusCode AppMonitorTest::GetSdCardInfo(AppGetSdCardInfo &param)
     }
     return code;
 }
-StatusCode AppMonitorTest::GetSdCardInfoTrace(AppGetSdCardInfo &param)
+StatusCode AppMonitorTrace::GetSdCardInfoTrace(AppGetSdCardInfo &param)
 {
-    LogInfo("AppMonitorTest::GetSdCardInfoTrace\n");
+    LogInfo("AppMonitorTrace::GetSdCardInfoTrace\n");
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }
 StatusCode AppMonitorTest::GetBatteryInfo(AppGetBatteryInfo &param)
@@ -79,9 +79,9 @@ StatusCode AppMonitorTest::GetBatteryInfo(AppGetBatteryInfo &param)
     }
     return code;
 }
-StatusCode AppMonitorTest::GetBatteryInfoTrace(AppGetBatteryInfo &param)
+StatusCode AppMonitorTrace::GetBatteryInfoTrace(AppGetBatteryInfo &param)
 {
-    LogInfo("AppMonitorTest::GetBatteryInfoTrace\n");
+    LogInfo("AppMonitorTrace::GetBatteryInfoTrace\n");
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }
 StatusCode AppMonitorTest::SetDateTime(AppSetDateTime &param)
@@ -99,9 +99,9 @@ StatusCode AppMonitorTest::SetDateTime(AppSetDateTime &param)
     }
     return code;
 }
-StatusCode AppMonitorTest::SetDateTimeTrace(AppSetDateTime &param)
+StatusCode AppMonitorTrace::SetDateTimeTrace(AppSetDateTime &param)
 {
-    LogInfo("AppMonitorTest::SetDateTimeTrace\n");
+    LogInfo("AppMonitorTrace::SetDateTimeTrace\n");
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }
 StatusCode AppMonitorTest::SetTimeZone(const unsigned int &zone)
@@ -113,9 +113,9 @@ StatusCode AppMonitorTest::SetTimeZone(const unsigned int &zone)
     }
     return code;
 }
-StatusCode AppMonitorTest::SetTimeZoneTrace(const unsigned int &zone)
+StatusCode AppMonitorTrace::SetTimeZoneTrace(const unsigned int &zone)
 {
-    LogInfo("AppMonitorTest::SetTimeZoneTrace\n");
+    LogInfo("AppMonitorTrace::SetTimeZoneTrace\n");
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }
 StatusCode AppMonitorTest::UploadFile(AppUploadFile &param)
@@ -127,8 +127,8 @@ StatusCode AppMonitorTest::UploadFile(AppUploadFile &param)
     }
     return code;
 }
-StatusCode AppMonitorTest::UploadFileTrace(AppUploadFile &param)
+StatusCode AppMonitorTrace::UploadFileTrace(AppUploadFile &param)
 {
-    LogInfo("AppMonitorTest::UploadFileTrace\n");
+    LogInfo("AppMonitorTrace::UploadFileTrace\n");
     return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
 }

test/middleware/AppManager/tool/src/AppMonitorMock.h

@@ -16,7 +16,23 @@
 #define APP_MONITOR_MOCK_H
 #include "GtestUsing.h"
 #include "IAppManager.h"
-class AppMonitorTest : public VAppMonitor
+class AppMonitorTrace
+{
+public:
+    AppMonitorTrace() = default;
+    virtual ~AppMonitorTrace() = default;
+
+protected:
+    virtual StatusCode GetProductInfoTrace(AppGetProductInfo &param);
+    virtual StatusCode GetDeviceAttrTrace(AppGetDeviceAttr &param);
+    virtual StatusCode GetMediaInfoTrace(AppGetMeidaInfo &param);
+    virtual StatusCode GetSdCardInfoTrace(AppGetSdCardInfo &param);
+    virtual StatusCode GetBatteryInfoTrace(AppGetBatteryInfo &param);
+    virtual StatusCode SetDateTimeTrace(AppSetDateTime &param);
+    virtual StatusCode SetTimeZoneTrace(const unsigned int &zone);
+    virtual StatusCode UploadFileTrace(AppUploadFile &param);
+};
+class AppMonitorTest : public VAppMonitor, virtual public AppMonitorTrace
 {
 public:
     AppMonitorTest() = default;
@@ -29,18 +45,8 @@ public:
     StatusCode SetDateTime(AppSetDateTime &param) override;
     StatusCode SetTimeZone(const unsigned int &zone) override;
     StatusCode UploadFile(AppUploadFile &param) override;
-
-protected:
-    virtual StatusCode GetProductInfoTrace(AppGetProductInfo &param);
-    virtual StatusCode GetDeviceAttrTrace(AppGetDeviceAttr &param);
-    virtual StatusCode GetMediaInfoTrace(AppGetMeidaInfo &param);
-    virtual StatusCode GetSdCardInfoTrace(AppGetSdCardInfo &param);
-    virtual StatusCode GetBatteryInfoTrace(AppGetBatteryInfo &param);
-    virtual StatusCode SetDateTimeTrace(AppSetDateTime &param);
-    virtual StatusCode SetTimeZoneTrace(const unsigned int &zone);
-    virtual StatusCode UploadFileTrace(AppUploadFile &param);
 };
-class AppMonitorMock : public AppMonitorTest
+class AppMonitorMock : virtual public AppMonitorTrace
 {
 public:
     AppMonitorMock() = default;
@@ -51,6 +57,7 @@ public:
     MOCK_METHOD1(GetSdCardInfoTrace, StatusCode(AppGetSdCardInfo &));
     MOCK_METHOD1(GetBatteryInfoTrace, StatusCode(AppGetBatteryInfo &));
     MOCK_METHOD1(SetDateTimeTrace, StatusCode(AppSetDateTime &));
+    MOCK_METHOD1(SetTimeZoneTrace, StatusCode(const unsigned int &));
     MOCK_METHOD1(UploadFileTrace, StatusCode(AppUploadFile &));
 };
 #endif