From e753351194ef2ff4c6cadafea4339a48a9175e97 Mon Sep 17 00:00:00 2001
From: Sedictious <ele.hatzy@gmail.com>
Date: Fri, 11 Sep 2020 16:20:38 +0300
Subject: [PATCH] Use validateCRC in tests
---
test/MessageParser.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/MessageParser.cpp b/test/MessageParser.cpp
index f74f4451..bdba5b79 100644
--- a/test/MessageParser.cpp
+++ b/test/MessageParser.cpp
@@ -40,9 +40,10 @@ TEST_CASE("TC Message parsing into a string", "[MessageParser]") {
CHECK(createdPacket.size() == 18);
CHECK(memcmp(createdPacket.data(), wantedPacket, 16) == 0);
- uint16_t crcField = CRCHelper::calculateCRC(wantedPacket, 16);
- uint16_t calculatedCRC = (static_cast<uint16_t>(createdPacket.data()[16]) << 0x8U) | (static_cast<uint16_t>(createdPacket.data()[17]) & 0xFF);
- CHECK(calculatedCRC == crcField);
+ createdPacket.data();
+ const uint8_t* packet = reinterpret_cast<uint8_t*>(&createdPacket.data()[0]);
+ uint8_t crc_verification = CRCHelper::validateCRC(packet, 18);
+ CHECK(crc_verification == 0);
#else
CHECK(createdPacket.size() == 16);
// The two parentheses are necessary so that Catch2 doesn't try to parse the strings here
@@ -82,10 +83,9 @@ TEST_CASE("TM Message parsing into a string", "[MessageParser]") {
CHECK(createdPacket.size() == 20);
CHECK(memcmp(createdPacket.data(), wantedPacket, 18) == 0);
- uint16_t crcField = CRCHelper::calculateCRC(wantedPacket, 18);
- uint16_t calculatedCRC = (static_cast<uint16_t>(createdPacket.data()[18]) << 0x8U) | (static_cast<uint16_t>
- (createdPacket.data()[19]) & 0xFFU);
- CHECK(calculatedCRC == crcField);
+ const uint8_t* packet = reinterpret_cast<uint8_t*>(&createdPacket.data()[0]);
+ uint8_t crc_verification = CRCHelper::validateCRC(packet, 20);
+ CHECK(crc_verification == 0);
#else
CHECK(createdPacket.size() == 18);
// The two parentheses are necessary so that Catch2 doesn't try to parse the strings here
--
GitLab