From dcdf20106e5bc109f0d29b0537fef9878d8a9fbe Mon Sep 17 00:00:00 2001
From: Fancy code <258828110.@qq.com>
Date: Fri, 16 Feb 2024 04:59:18 -0800
Subject: [PATCH] Improve:test code.

---
 .../tool/src/McuManagerMakePtrTest.cpp          | 17 ++++++++++++++++-
 .../McuManager/tool/src/McuManagerMakePtrTest.h |  3 ++-
 .../McuManager/tool/src/McuManagerTestTool.cpp  | 15 ++-------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/test/middleware/McuManager/tool/src/McuManagerMakePtrTest.cpp b/test/middleware/McuManager/tool/src/McuManagerMakePtrTest.cpp
index 83387a2..02e73fa 100644
--- a/test/middleware/McuManager/tool/src/McuManagerMakePtrTest.cpp
+++ b/test/middleware/McuManager/tool/src/McuManagerMakePtrTest.cpp
@@ -15,10 +15,25 @@
 #include "McuManagerMakePtrTest.h"
 #include "ILog.h"
 #include "McuManagerTestTool.h"
-void OverrideMcuManagerMakePtrObject(void)
+void OverrideMcuManagerMakePtrObject(std::shared_ptr<McuManagerImplTest> &mcuManagerMock)
 {
     std::shared_ptr<McuManagerMakePtr> impl = std::make_shared<McuManagerMakePtrTest>();
     McuManagerMakePtr::GetInstance(&impl);
+    std::shared_ptr<McuManagerMakePtr> tmp = McuManagerMakePtr::GetInstance();
+    std::shared_ptr<McuManagerMakePtrTest> test = std::dynamic_pointer_cast<McuManagerMakePtrTest>(tmp);
+    if (test) {
+        test->mMcuManagerMock = mcuManagerMock;
+    }
+}
+void CancelOverrideMcuManagerMakePtrObject(void)
+{
+    std::shared_ptr<McuManagerMakePtr> tmp = McuManagerMakePtr::GetInstance();
+    std::shared_ptr<McuManagerMakePtrTest> test = std::dynamic_pointer_cast<McuManagerMakePtrTest>(tmp);
+    if (test) {
+        test->mMcuManagerMock.reset();
+    }
+    std::shared_ptr<McuManagerMakePtr> impl = std::make_shared<McuManagerMakePtr>();
+    McuManagerMakePtr::GetInstance(&impl);
 }
 McuManagerMakePtrTest::McuManagerMakePtrTest()
 {
diff --git a/test/middleware/McuManager/tool/src/McuManagerMakePtrTest.h b/test/middleware/McuManager/tool/src/McuManagerMakePtrTest.h
index 2abf7a8..611f8c2 100644
--- a/test/middleware/McuManager/tool/src/McuManagerMakePtrTest.h
+++ b/test/middleware/McuManager/tool/src/McuManagerMakePtrTest.h
@@ -16,7 +16,8 @@
 #define MCU_MANAGER_MAKE_PTR_TEST_H
 #include "McuManagerMakePtr.h"
 #include "McuManagerTestTool.h"
-void OverrideMcuManagerMakePtrObject(void);
+void OverrideMcuManagerMakePtrObject(std::shared_ptr<McuManagerImplTest> &mcuManagerMock);
+void CancelOverrideMcuManagerMakePtrObject(void);
 class McuManagerMakePtrTest : public McuManagerMakePtr
 {
 public:
diff --git a/test/middleware/McuManager/tool/src/McuManagerTestTool.cpp b/test/middleware/McuManager/tool/src/McuManagerTestTool.cpp
index 2db7bd8..23dd4d9 100644
--- a/test/middleware/McuManager/tool/src/McuManagerTestTool.cpp
+++ b/test/middleware/McuManager/tool/src/McuManagerTestTool.cpp
@@ -28,25 +28,14 @@ void McuManagerTestTool::Init(std::shared_ptr<LinuxTest> &mock)
 {
     LogInfo("McuManagerTestTool::Init\n");
     mMcuManagerMock = std::make_shared<McuManagerImplTest>();
-    OverrideMcuManagerMakePtrObject();
-    std::shared_ptr<McuManagerMakePtr> tmp = McuManagerMakePtr::GetInstance();
-    std::shared_ptr<McuManagerMakePtrTest> test = std::dynamic_pointer_cast<McuManagerMakePtrTest>(tmp);
-    if (test) {
-        test->mMcuManagerMock = mMcuManagerMock;
-    }
+    OverrideMcuManagerMakePtrObject(mMcuManagerMock);
     UartDeviceTestTool::RegisterUartDevice(mock, gUartDevice);
     McuProtocolTestTool::Init(mock, gUartDevice);
 }
 void McuManagerTestTool::UnInit(void)
 {
     mMcuManagerMock.reset();
-    std::shared_ptr<McuManagerMakePtr> tmp = McuManagerMakePtr::GetInstance();
-    std::shared_ptr<McuManagerMakePtrTest> test = std::dynamic_pointer_cast<McuManagerMakePtrTest>(tmp);
-    if (test) {
-        test->mMcuManagerMock.reset();
-    }
-    std::shared_ptr<McuManagerMakePtr> impl = std::make_shared<McuManagerMakePtr>();
-    McuManagerMakePtr::GetInstance(&impl);
+    CancelOverrideMcuManagerMakePtrObject();
     UartDeviceTestTool::UnregisterUartDevice(gUartDevice);
     McuProtocolTestTool::UnInit();
 }