From a574550a8e1d50dc2b34af6e8a308e4bc5a12f51 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Tue, 13 Feb 2024 01:43:37 -0800 Subject: [PATCH] Improve:test code. --- .../tool/include/McuProtocolTestTool.h | 2 +- .../tool/src/McuProtocolTestTool.cpp | 42 +++++++++---------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/test/utils/McuProtocol/tool/include/McuProtocolTestTool.h b/test/utils/McuProtocol/tool/include/McuProtocolTestTool.h index 5c566be..d672340 100644 --- a/test/utils/McuProtocol/tool/include/McuProtocolTestTool.h +++ b/test/utils/McuProtocol/tool/include/McuProtocolTestTool.h @@ -70,7 +70,7 @@ private: const unsigned int &serialNumber); private: - static void PrintHexadecimalData(const void *buf, const size_t &bufLength, const int event); + static void PrintHexadecimalData(const void *buf, const size_t &bufLength, const char *log); private: // virtual void MonitorWriteProtocolData(const short &head, const unsigned int diff --git a/test/utils/McuProtocol/tool/src/McuProtocolTestTool.cpp b/test/utils/McuProtocol/tool/src/McuProtocolTestTool.cpp index e2a85ea..3f30522 100644 --- a/test/utils/McuProtocol/tool/src/McuProtocolTestTool.cpp +++ b/test/utils/McuProtocol/tool/src/McuProtocolTestTool.cpp @@ -98,7 +98,7 @@ void McuProtocolTestTool::Init(std::shared_ptr &mock, const UartInfo mUartFd = uartFd; static size_t WRITE_COUNT = -1; auto api_write = [=, &mock](int fd, const void *buf, size_t count) { - McuProtocolTestTool::PrintHexadecimalData(buf, count, WRITE_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, count, "app write :"); CheckSerialNumber(buf, count); ChecCRC16Code(buf, count); for (auto iter = mProtocolHandle.begin(); iter != mProtocolHandle.end(); ++iter) { @@ -254,11 +254,11 @@ void McuProtocolTestTool::IpcMissionProtocolInit(std::shared_ptr &moc constexpr int LEFT_DATA_LENGTH = sizeof(REPLY_IPC_MISSION_X) - PROTOCOL_DATA_KEY_HEAD_LENGTH; auto apiReadKeyHead = [=](int fd, void *buf, size_t count) { memcpy(buf, REPLY_IPC_MISSION_X, PROTOCOL_DATA_KEY_HEAD_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, "IpcMissionProtocolInit read:"); }; auto apiReadLeftData = [=](int fd, void *buf, size_t count) { memcpy(buf, REPLY_IPC_MISSION_X + PROTOCOL_DATA_KEY_HEAD_LENGTH, LEFT_DATA_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, "IpcMissionProtocolInit read:"); UnlockProtocolHandle(); }; EXPECT_CALL(*mock.get(), fx_read(uartFd, _, _)) @@ -339,11 +339,11 @@ void McuProtocolTestTool::FeedingCycleProtocolInit(std::shared_ptr &m constexpr int LEFT_DATA_LENGTH = sizeof(REPLY_SET_FEEDING_CYCLE_X) - PROTOCOL_DATA_KEY_HEAD_LENGTH; auto apiReadKeyHead = [=](int fd, void *buf, size_t count) { memcpy(buf, REPLY_SET_FEEDING_CYCLE_X, PROTOCOL_DATA_KEY_HEAD_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, "FeedingCycleProtocolInit read:"); }; auto apiReadLeftData = [=](int fd, void *buf, size_t count) { memcpy(buf, REPLY_SET_FEEDING_CYCLE_X + PROTOCOL_DATA_KEY_HEAD_LENGTH, LEFT_DATA_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, "FeedingCycleProtocolInit read:"); UnlockProtocolHandle(); }; EXPECT_CALL(*mock.get(), fx_read(uartFd, _, _)) @@ -389,11 +389,11 @@ void McuProtocolTestTool::SetDataTimeProtocolInit(std::shared_ptr &mo constexpr int LEFT_DATA_LENGTH = sizeof(REPLY_SET_DATE_TIME_X) - PROTOCOL_DATA_KEY_HEAD_LENGTH; auto apiReadKeyHead = [=](int fd, void *buf, size_t count) { memcpy(buf, REPLY_SET_DATE_TIME_X, PROTOCOL_DATA_KEY_HEAD_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, "SetDataTimeProtocolInit read:"); }; auto apiReadLeftData = [=](int fd, void *buf, size_t count) { memcpy(buf, REPLY_SET_DATE_TIME_X + PROTOCOL_DATA_KEY_HEAD_LENGTH, LEFT_DATA_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, "SetDataTimeProtocolInit read:"); UnlockProtocolHandle(); }; EXPECT_CALL(*mock.get(), fx_read(uartFd, _, _)) @@ -439,11 +439,12 @@ void McuProtocolTestTool::SetPirSensitivityProtocolInit(std::shared_ptr &m constexpr int LEFT_DATA_LENGTH = sizeof(REPLY_ASK_CONTORL_INFRARED_LIGHT_X) - PROTOCOL_DATA_KEY_HEAD_LENGTH; auto apiReadKeyHead = [=](int fd, void *buf, size_t count) { memcpy(buf, REPLY_ASK_CONTORL_INFRARED_LIGHT_X, PROTOCOL_DATA_KEY_HEAD_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, "ContorlInfraredLightInit read:"); }; auto apiReadLeftData = [=](int fd, void *buf, size_t count) { memcpy(buf, REPLY_ASK_CONTORL_INFRARED_LIGHT_X + PROTOCOL_DATA_KEY_HEAD_LENGTH, LEFT_DATA_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, "ContorlInfraredLightInit read:"); UnlockProtocolHandle(); }; EXPECT_CALL(*mock.get(), fx_read(uartFd, _, _)) @@ -540,11 +541,12 @@ void McuProtocolTestTool::GetPhotosensitivityValueInit(std::shared_ptr constexpr int LEFT_DATA_LENGTH = sizeof(OTHER_SIDE_ASK_SEND_IPC_MISSION_X) - PROTOCOL_DATA_KEY_HEAD_LENGTH; auto apiReadKeyHead = [=](int fd, void *buf, size_t count) { memcpy(buf, OTHER_SIDE_ASK_SEND_IPC_MISSION_X, PROTOCOL_DATA_KEY_HEAD_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData( + buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, "OtherSideAskIpcMissionInit read:"); }; auto apiReadLeftData = [=](int fd, void *buf, size_t count) { memcpy(buf, OTHER_SIDE_ASK_SEND_IPC_MISSION_X + PROTOCOL_DATA_KEY_HEAD_LENGTH, LEFT_DATA_LENGTH); - McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, READ_PRINT); + McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, "OtherSideAskIpcMissionInit read:"); UnlockProtocolHandle(); }; EXPECT_CALL(*mock.get(), fx_read(uartFd, _, _)) @@ -631,14 +634,9 @@ void McuProtocolTestTool::OtherSideAskIpcMissionInit(std::shared_ptr sizeof(OTHER_SIDE_ASK_SEND_IPC_MISSION_X)); } } -void McuProtocolTestTool::PrintHexadecimalData(const void *buf, const size_t &bufLength, const int event) +void McuProtocolTestTool::PrintHexadecimalData(const void *buf, const size_t &bufLength, const char *log) { - if (WRITE_PRINT == event) { - printf("TEST write buf = { 0x%02X", *(unsigned char *)buf); - } - if (READ_PRINT == event) { - printf("TEST read buf = { 0x%02X", *(unsigned char *)buf); - } + printf("%s { 0x%02X", log, *(unsigned char *)buf); for (size_t i = 1; i < bufLength; i++) { printf(", 0x%02X", *((unsigned char *)buf + i)); }