pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-08 04:28:47 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

merge create_test_packet duplicate usage into a shared function (#7752)

Browse Source
This commit is contained in:
TN 2025-09-04 19:26:04 +08:00 committed by GitHub
parent cc37535b2d
commit 26bcc9627d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
test/test_meshpacket_serializer/ports/test_encrypted.cpp
View File

@ -1,30 +1,7 @@
#include "../test_helpers.h" #include "../test_helpers.h"
// test data initialization // Helper function for all encrypted packet assertions
const int from = 0x11223344; void assert_encrypted_packet(const std::string &json, meshtastic_MeshPacket packet)
const int to = 0x55667788;
const int id = 0x9999;
// Helper function to create a test encrypted packet
meshtastic_MeshPacket create_test_encrypted_packet(uint32_t from, uint32_t to, uint32_t id, const char *data)
{
meshtastic_MeshPacket packet = meshtastic_MeshPacket_init_zero;
packet.from = from;
packet.to = to;
packet.id = id;
packet.which_payload_variant = meshtastic_MeshPacket_encrypted_tag;
if (data) {
packet.encrypted.size = strlen(data);
memcpy(packet.encrypted.bytes, data, packet.encrypted.size);
}
return packet;
}
// Comprehensive helper function for all encrypted packet assertions
void assert_encrypted_packet(const std::string &json, uint32_t expected_from, uint32_t expected_to, uint32_t expected_id,
size_t expected_size)
{ {
// Parse and validate JSON // Parse and validate JSON
TEST_ASSERT_TRUE(json.length() > 0); TEST_ASSERT_TRUE(json.length() > 0);
@ -37,24 +14,24 @@ void assert_encrypted_packet(const std::string &json, uint32_t expected_from, ui
// Assert basic packet fields // Assert basic packet fields
TEST_ASSERT_TRUE(jsonObj.find("from") != jsonObj.end()); TEST_ASSERT_TRUE(jsonObj.find("from") != jsonObj.end());
TEST_ASSERT_EQUAL(expected_from, (uint32_t)jsonObj.at("from")->AsNumber()); TEST_ASSERT_EQUAL(packet.from, (uint32_t)jsonObj.at("from")->AsNumber());
TEST_ASSERT_TRUE(jsonObj.find("to") != jsonObj.end()); TEST_ASSERT_TRUE(jsonObj.find("to") != jsonObj.end());
TEST_ASSERT_EQUAL(expected_to, (uint32_t)jsonObj.at("to")->AsNumber()); TEST_ASSERT_EQUAL(packet.to, (uint32_t)jsonObj.at("to")->AsNumber());
TEST_ASSERT_TRUE(jsonObj.find("id") != jsonObj.end()); TEST_ASSERT_TRUE(jsonObj.find("id") != jsonObj.end());
TEST_ASSERT_EQUAL(expected_id, (uint32_t)jsonObj.at("id")->AsNumber()); TEST_ASSERT_EQUAL(packet.id, (uint32_t)jsonObj.at("id")->AsNumber());
// Assert encrypted data fields // Assert encrypted data fields
TEST_ASSERT_TRUE(jsonObj.find("bytes") != jsonObj.end()); TEST_ASSERT_TRUE(jsonObj.find("bytes") != jsonObj.end());
TEST_ASSERT_TRUE(jsonObj.at("bytes")->IsString()); TEST_ASSERT_TRUE(jsonObj.at("bytes")->IsString());
TEST_ASSERT_TRUE(jsonObj.find("size") != jsonObj.end()); TEST_ASSERT_TRUE(jsonObj.find("size") != jsonObj.end());
TEST_ASSERT_EQUAL(expected_size, (int)jsonObj.at("size")->AsNumber()); TEST_ASSERT_EQUAL(packet.encrypted.size, (int)jsonObj.at("size")->AsNumber());
// Assert hex encoding // Assert hex encoding
std::string encrypted_hex = jsonObj["bytes"]->AsString(); std::string encrypted_hex = jsonObj["bytes"]->AsString();
TEST_ASSERT_EQUAL(expected_size * 2, encrypted_hex.length()); TEST_ASSERT_EQUAL(packet.encrypted.size * 2, encrypted_hex.length());
delete root; delete root;
} }
@ -63,20 +40,20 @@ void assert_encrypted_packet(const std::string &json, uint32_t expected_from, ui
void test_encrypted_packet_serialization() void test_encrypted_packet_serialization()
{ {
const char *data = "encrypted_payload_data"; const char *data = "encrypted_payload_data";
meshtastic_MeshPacket packet =
meshtastic_MeshPacket packet = create_test_encrypted_packet(from, to, id, data); create_test_packet(meshtastic_PortNum_TEXT_MESSAGE_APP, reinterpret_cast<const uint8_t *>(data), strlen(data),
meshtastic_MeshPacket_encrypted_tag);
std::string json = MeshPacketSerializer::JsonSerializeEncrypted(&packet); std::string json = MeshPacketSerializer::JsonSerializeEncrypted(&packet);
assert_encrypted_packet(json, from, to, id, strlen(data)); assert_encrypted_packet(json, packet);
} }
// Test empty encrypted packet // Test empty encrypted packet
void test_empty_encrypted_packet() void test_empty_encrypted_packet()
{ {
const char *data = ""; meshtastic_MeshPacket packet =
create_test_packet(meshtastic_PortNum_TEXT_MESSAGE_APP, nullptr, 0, meshtastic_MeshPacket_encrypted_tag);
meshtastic_MeshPacket packet = create_test_encrypted_packet(from, to, id, data);
std::string json = MeshPacketSerializer::JsonSerializeEncrypted(&packet); std::string json = MeshPacketSerializer::JsonSerializeEncrypted(&packet);
assert_encrypted_packet(json, from, to, id, strlen(data)); assert_encrypted_packet(json, packet);
} }

9
test/test_meshpacket_serializer/test_helpers.h
View File

@ -11,7 +11,8 @@
#include <unity.h> #include <unity.h>
// Helper function to create a test packet with the given port and payload // Helper function to create a test packet with the given port and payload
static meshtastic_MeshPacket create_test_packet(meshtastic_PortNum port, const uint8_t *payload, size_t payload_size) static meshtastic_MeshPacket create_test_packet(meshtastic_PortNum port, const uint8_t *payload, size_t payload_size,
int payload_variant = meshtastic_MeshPacket_decoded_tag)
{ {
meshtastic_MeshPacket packet = meshtastic_MeshPacket_init_zero; meshtastic_MeshPacket packet = meshtastic_MeshPacket_init_zero;
@ -29,8 +30,12 @@ static meshtastic_MeshPacket create_test_packet(meshtastic_PortNum port, const u
packet.delayed = meshtastic_MeshPacket_Delayed_NO_DELAY; packet.delayed = meshtastic_MeshPacket_Delayed_NO_DELAY;
// Set decoded variant // Set decoded variant
packet.which_payload_variant = meshtastic_MeshPacket_decoded_tag; packet.which_payload_variant = payload_variant;
packet.decoded.portnum = port; packet.decoded.portnum = port;
if (payload_variant == meshtastic_MeshPacket_encrypted_tag && payload) {
packet.encrypted.size = payload_size;
memcpy(packet.encrypted.bytes, payload, packet.encrypted.size);
}
memcpy(packet.decoded.payload.bytes, payload, payload_size); memcpy(packet.decoded.payload.bytes, payload, payload_size);
packet.decoded.payload.size = payload_size; packet.decoded.payload.size = payload_size;
packet.decoded.want_response = false; packet.decoded.want_response = false;