From 9c851492d35ac20fc8f2150fc978d8faa0080f99 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Tue, 18 Jun 2024 20:29:09 +0800 Subject: [PATCH] Imporve:include cleaner. --- test/hal/tool/src/CameraHalMock.cpp | 4 +++- test/hal/tool/src/HalCppMock.cpp | 6 ++++++ test/hal/tool/src/HalMakePtrTest.cpp | 8 ++++++++ test/hal/tool/src/HalTestTool.cpp | 12 +++++++++++- test/hal/tool/src/KeyControlMock.cpp | 9 +++++++++ test/hal/tool/src/LedControlMock.cpp | 7 +++++++ test/hal/tool/src/SdCardHalMock.cpp | 8 +++++++- test/hal/tool/src/WifiHalMock.cpp | 4 ++-- 8 files changed, 53 insertions(+), 5 deletions(-) diff --git a/test/hal/tool/src/CameraHalMock.cpp b/test/hal/tool/src/CameraHalMock.cpp index 2531b059..bb868ea3 100644 --- a/test/hal/tool/src/CameraHalMock.cpp +++ b/test/hal/tool/src/CameraHalMock.cpp @@ -13,8 +13,10 @@ * limitations under the License. */ #include "CameraHalMock.h" -#include "HalCppMock.h" +#include "IHalCpp.h" #include "ILog.h" +#include "StatusCode.h" +#include CameraHalTest::CameraHalTest(const CameraType &cameraType) : mCameraType(cameraType) { } diff --git a/test/hal/tool/src/HalCppMock.cpp b/test/hal/tool/src/HalCppMock.cpp index 0c172081..a6f6ba78 100644 --- a/test/hal/tool/src/HalCppMock.cpp +++ b/test/hal/tool/src/HalCppMock.cpp @@ -13,7 +13,13 @@ * limitations under the License. */ #include "HalCppMock.h" +#include "HalCpp.h" +#include "IHalCpp.h" #include "ILog.h" +#include "StatusCode.h" +#include +#include +#include StatusCode HalCppTest::GetAllLeds(std::map> &allLeds) { LogInfo("HalCppTest::GetAllLeds\n"); diff --git a/test/hal/tool/src/HalMakePtrTest.cpp b/test/hal/tool/src/HalMakePtrTest.cpp index 2e6454a2..2ec6d8dd 100644 --- a/test/hal/tool/src/HalMakePtrTest.cpp +++ b/test/hal/tool/src/HalMakePtrTest.cpp @@ -13,7 +13,15 @@ * limitations under the License. */ #include "HalMakePtrTest.h" +#include "HalCppMock.h" +#include "HalMakePtr.h" +#include "IHalCpp.h" #include "ILog.h" +#include "KeyControl.h" +#include "SdCardHalMock.h" +#include "StatusCode.h" +#include +#include void OverrideHalMakePtrObject(std::shared_ptr &halMock, std::shared_ptr &sdCardHalMock) { std::shared_ptr impl = std::make_shared(); diff --git a/test/hal/tool/src/HalTestTool.cpp b/test/hal/tool/src/HalTestTool.cpp index 0db7f517..28929c08 100644 --- a/test/hal/tool/src/HalTestTool.cpp +++ b/test/hal/tool/src/HalTestTool.cpp @@ -14,15 +14,25 @@ */ #include "HalTestTool.h" #include "CameraHalMock.h" +#include "GtestUsing.h" #include "HalCppMock.h" +#include "HalMakePtr.h" #include "HalMakePtrTest.h" +#include "IHalCpp.h" #include "ILog.h" #include "KeyControl.h" #include "KeyControlMock.h" +#include "LedControl.h" #include "LedControlMock.h" +#include "LinuxApiMock.h" #include "SdCardHalMock.h" +#include "StatusCode.h" #include "WifiHalMock.h" -#include +#include +#include +#include +#include +#include void HalTestTool::Init(void) { mHalMock = std::make_shared(); diff --git a/test/hal/tool/src/KeyControlMock.cpp b/test/hal/tool/src/KeyControlMock.cpp index 6bb42aa8..787b6410 100644 --- a/test/hal/tool/src/KeyControlMock.cpp +++ b/test/hal/tool/src/KeyControlMock.cpp @@ -13,7 +13,16 @@ * limitations under the License. */ #include "KeyControlMock.h" +#include "GtestUsing.h" +#include "IHalCpp.h" #include "ILog.h" +#include "KeyControl.h" +#include "StatusCode.h" +#include +#include +#include +#include +#include unsigned int KeyControlTest::GetStatusCheckPeriodMs(void) { return PERIPHERAL_CHECK_PERIOD_MS; diff --git a/test/hal/tool/src/LedControlMock.cpp b/test/hal/tool/src/LedControlMock.cpp index 87fb0de4..0079f58a 100644 --- a/test/hal/tool/src/LedControlMock.cpp +++ b/test/hal/tool/src/LedControlMock.cpp @@ -13,7 +13,14 @@ * limitations under the License. */ #include "LedControlMock.h" +#include "GtestUsing.h" +#include "IHalCpp.h" #include "ILog.h" +#include "LedControl.h" +#include "StatusCode.h" +#include +#include +#include LedControlTest::LedControlTest(const std::string &ledName) : mLedName(ledName) { } diff --git a/test/hal/tool/src/SdCardHalMock.cpp b/test/hal/tool/src/SdCardHalMock.cpp index d332901c..847957d0 100644 --- a/test/hal/tool/src/SdCardHalMock.cpp +++ b/test/hal/tool/src/SdCardHalMock.cpp @@ -13,7 +13,13 @@ * limitations under the License. */ #include "SdCardHalMock.h" -#include "ILog.h" +#include "GtestUsing.h" +// #include "ILog.h" +#include "LinuxApiMock.h" +#include +#include +#include +#include extern const char *SD_CARD_DEVICE; constexpr int FSTAT_SUCCESS = 0; constexpr int FILE_EXIST = 0; diff --git a/test/hal/tool/src/WifiHalMock.cpp b/test/hal/tool/src/WifiHalMock.cpp index ff1a404c..e7fa4281 100644 --- a/test/hal/tool/src/WifiHalMock.cpp +++ b/test/hal/tool/src/WifiHalMock.cpp @@ -12,5 +12,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "HalCppMock.h" -#include "ILog.h" \ No newline at end of file +// #include "HalCppMock.h" +// #include "ILog.h" \ No newline at end of file