diff --git a/test/hex_helper.h b/test/hex_helper.h new file mode 100644 index 0000000..0e6c0fb --- /dev/null +++ b/test/hex_helper.h @@ -0,0 +1,29 @@ +#ifndef HEX_HELPER_H +#define HEX_HELPER_H + +#include // for strlen + +uint8_t* hex_string_to_array(const char* str) { + size_t len = strlen(str); + if (len % 2 != 0) { + // Cannot handle odd string length + return nullptr; + } + size_t data_len = len / 2; + + uint8_t* data = new uint8_t[data_len]; + + // Convert each hexadecimal character pair to a byte + for (size_t i = 0; i < data_len; ++i) { + uint8_t high_nibble = str[i * 2] >= 'A' ? (str[i * 2] - 'A' + 10) : (str[i * 2] - '0'); + uint8_t low_nibble = str[i * 2 + 1] >= 'A' ? (str[i * 2 + 1] - 'A' + 10) : (str[i * 2 + 1] - '0'); + + // Combine the nibbles into a byte + data[i] = (high_nibble << 4) | low_nibble; + } + + // Return the pointer to the allocated data array + return data; +} + +#endif // HEX_HELPER_H \ No newline at end of file diff --git a/test/test_crc/test_crc.cpp b/test/test_crc/test_crc.cpp index 998ad44..c875752 100644 --- a/test/test_crc/test_crc.cpp +++ b/test/test_crc/test_crc.cpp @@ -1,5 +1,6 @@ #include #include +#include "../hex_helper.h" #include "PacketCRC.h" void setUp() @@ -21,50 +22,62 @@ void run_calculate_test(const uint8_t *packet_data, const uint16_t expected_chec void test_calculate_withDataLengthOf15() { - const uint8_t packet_data[] = {0xC0, 0x0F, 0x00, 0x05, 0xA1, 0xFF, 0xFF, 0x00, 0x00, 0x86, 0x04, 0xFF, 0x00, 0x00, 0x53, 0x47, 0x1B}; + const uint8_t* packet_data = hex_string_to_array("C00F0005A1FFFF00008604FF000053471B"); const uint16_t expected_checksum = 0x446B; run_calculate_test(packet_data, expected_checksum); + + delete[] packet_data; } void test_calculate_withDataLengthOf17() { - const uint8_t packet_data[] = {0xC0, 0x11, 0x00, 0x05, 0xD7, 0xFF, 0xFF, 0x36, 0x9E, 0x86, 0x06, 0xB3, 0x04, 0x00, 0x36, 0x9E, 0x52, 0x53, 0x00}; + const uint8_t* packet_data = hex_string_to_array("C0110005D7FFFF369E8606B30400369E525300"); const uint16_t expected_checksum = 0xE04C; run_calculate_test(packet_data, expected_checksum); + + delete[] packet_data; } void test_calculate_withDataLengthOf19() { - const uint8_t packet_data[] = {0xC0, 0x13, 0x00, 0x05, 0xDD, 0xFF, 0xFF, 0x00, 0x00, 0x86, 0x05, 0x36, 0x4E, 0xF1, 0x00, 0x00, 0x3F, 0x5A, 0x02, 0x3F, 0x42}; + const uint8_t* packet_data = hex_string_to_array("C0130005DDFFFF00008605364EF100003F5A023F42"); const uint16_t expected_checksum = 0x9BD3; run_calculate_test(packet_data, expected_checksum); + + delete[] packet_data; } void test_calculate_withDataLengthOf20() { - const uint8_t packet_data[] = {0xC0, 0x14, 0x10, 0x05, 0x59, 0xFF, 0xFF, 0x4E, 0xF1, 0x86, 0x05, 0xC2, 0x00, 0x00, 0x4E, 0xF1, 0x21, 0x5A, 0x03, 0x21, 0x42, 0x9C}; + const uint8_t* packet_data = hex_string_to_array("C014100559FFFF4EF18605C200004EF1215A0321429C"); const uint16_t expected_checksum = 0x4A8B; run_calculate_test(packet_data, expected_checksum); + + delete[] packet_data; } void test_calculate_withDataLengthOf21() { - const uint8_t packet_data[] = {0xC0, 0x15, 0x10, 0x05, 0xEA, 0xFF, 0xFF, 0x4E, 0xF1, 0x86, 0x05, 0x24, 0x00, 0x00, 0x4E, 0xF1, 0x21, 0x46, 0x4E, 0x98, 0x07, 0x08, 0x01}; + const uint8_t* packet_data = hex_string_to_array("C0151005EAFFFF4EF186052400004EF121464E98070801"); const uint16_t expected_checksum = 0x9887; run_calculate_test(packet_data, expected_checksum); + + delete[] packet_data; } void test_calculate_withDataLengthOf25() { - const uint8_t packet_data[] = {0xC0, 0x19, 0x00, 0x05, 0x47, 0xFF, 0xFF, 0x00, 0x00, 0x86, 0x05, 0x3D, 0x4E, 0xF1, 0x00, 0x00, 0x3F, 0x5A, 0x02, 0x3F, 0x50, 0x02, 0x3F, 0x4D, 0x02, 0x3F, 0x54}; + const uint8_t* packet_data = hex_string_to_array("C019000547FFFF000086053D4EF100003F5A023F50023F4D023F54"); const uint16_t expected_checksum = 0x8318; run_calculate_test(packet_data, expected_checksum); + + delete[] packet_data; } int runUnityTests(void) diff --git a/test/test_packet_parser/test_packet_parser.cpp b/test/test_packet_parser/test_packet_parser.cpp index c5c3bfb..026d113 100644 --- a/test/test_packet_parser/test_packet_parser.cpp +++ b/test/test_packet_parser/test_packet_parser.cpp @@ -1,5 +1,6 @@ #include #include +#include "../hex_helper.h" #include "PacketParser.h" void setUp() @@ -21,35 +22,41 @@ void run_parse_test(const uint8_t *packet_data, Packet &packet) void test_parse_stop() { - const uint8_t packet_data[] = {0xC0, 0x11, 0x00, 0x05, 0x6C, 0xFF, 0xFF, 0x36, 0x9E, 0x86, 0x06, 0x3C, 0x04, 0x00, 0x36, 0x9E, 0x52, 0x53, 0x00}; + const uint8_t* packet_data = hex_string_to_array("C01100056CFFFF369E86063C0400369E525300"); Packet packet; run_parse_test(packet_data, packet); TEST_ASSERT_TRUE(packet.type == PacketType::STOP); + + delete[] packet_data; } void test_parse_close() { - const uint8_t packet_data[] = {0xC0, 0x11, 0x00, 0x05, 0x6C, 0xFF, 0xFF, 0x36, 0x9E, 0x86, 0x06, 0x3C, 0x04, 0x00, 0x36, 0x9E, 0x52, 0x44, 0x00}; + const uint8_t* packet_data = hex_string_to_array("C01100056CFFFF369E86063C0400369E524400"); Packet packet; run_parse_test(packet_data, packet); TEST_ASSERT_TRUE(packet.type == PacketType::CLOSE); + + delete[] packet_data; } void test_parse_open() { - const uint8_t packet_data[] = {0xC0, 0x11, 0x00, 0x05, 0x6C, 0xFF, 0xFF, 0x36, 0x9E, 0x86, 0x06, 0x3C, 0x04, 0x00, 0x36, 0x9E, 0x52, 0x55, 0x00}; + const uint8_t* packet_data = hex_string_to_array("C01100056CFFFF369E86063C0400369E525500"); Packet packet; run_parse_test(packet_data, packet); TEST_ASSERT_TRUE(packet.type == PacketType::OPEN); + + delete[] packet_data; } int runUnityTests(void)