dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected NPDU unit test.

Browse Source
This commit is contained in:
skarg
2007-07-20 19:24:31 +00:00
parent f4f83d2d49
commit d1ba1566e0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/npdu.c
+8 -3
View File
@@ -369,7 +369,6 @@ void testNPDU2(Test * pTest)
BACNET_NETWORK_MESSAGE_TYPE network_message_type = 0; /* optional */ BACNET_NETWORK_MESSAGE_TYPE network_message_type = 0; /* optional */
uint16_t vendor_id = 0; /* optional, if net message type is > 0x80 */ uint16_t vendor_id = 0; /* optional, if net message type is > 0x80 */
/* mac_len = 0 if global address */
dest.mac_len = 6; dest.mac_len = 6;
for (i = 0; i < dest.mac_len; i++) { for (i = 0; i < dest.mac_len; i++) {
dest.mac[i] = i; dest.mac[i] = i;
@@ -399,7 +398,10 @@ void testNPDU2(Test * pTest)
ct_test(pTest, npdu_data.data_expecting_reply == data_expecting_reply); ct_test(pTest, npdu_data.data_expecting_reply == data_expecting_reply);
ct_test(pTest, ct_test(pTest,
npdu_data.network_layer_message == network_layer_message); npdu_data.network_layer_message == network_layer_message);
ct_test(pTest, npdu_data.network_message_type == network_message_type); if (npdu_data.network_layer_message) {
ct_test(pTest,
npdu_data.network_message_type == network_message_type);
}
ct_test(pTest, npdu_data.vendor_id == vendor_id); ct_test(pTest, npdu_data.vendor_id == vendor_id);
ct_test(pTest, npdu_data.priority == priority); ct_test(pTest, npdu_data.priority == priority);
/* DNET,DLEN,DADR */ /* DNET,DLEN,DADR */
@@ -463,7 +465,10 @@ void testNPDU1(Test * pTest)
ct_test(pTest, npdu_data.data_expecting_reply == data_expecting_reply); ct_test(pTest, npdu_data.data_expecting_reply == data_expecting_reply);
ct_test(pTest, ct_test(pTest,
npdu_data.network_layer_message == network_layer_message); npdu_data.network_layer_message == network_layer_message);
ct_test(pTest, npdu_data.network_message_type == network_message_type); if (npdu_data.network_layer_message) {
ct_test(pTest,
npdu_data.network_message_type == network_message_type);
}
ct_test(pTest, npdu_data.vendor_id == vendor_id); ct_test(pTest, npdu_data.vendor_id == vendor_id);
ct_test(pTest, npdu_data.priority == priority); ct_test(pTest, npdu_data.priority == priority);
ct_test(pTest, npdu_dest.mac_len == src.mac_len); ct_test(pTest, npdu_dest.mac_len == src.mac_len);