Added AlignAfterOpenBracket: AlwaysBreak and BinPackArguments: true to clang-format. Updated test/bacnet c/h files with updated format.

This commit is contained in:
Steve Karg
2024-04-24 09:38:12 -05:00
parent 1aaebe9414
commit 70c54817fd
120 changed files with 2182 additions and 1894 deletions
+7 -4
View File
@@ -23,8 +23,11 @@ bool arcnet_init(char *interface_name)
return ztest_get_return_value();
}
int arcnet_send_pdu(BACNET_ADDRESS *dest, BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu, unsigned pdu_len)
int arcnet_send_pdu(
BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
unsigned pdu_len)
{
ztest_check_expected_value(dest);
ztest_check_expected_value(npdu_data);
@@ -32,8 +35,8 @@ int arcnet_send_pdu(BACNET_ADDRESS *dest, BACNET_NPDU_DATA *npdu_data,
return ztest_get_return_value();
}
uint16_t arcnet_receive(BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu,
unsigned timeout)
uint16_t arcnet_receive(
BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu, unsigned timeout)
{
ztest_check_expected_value(src);
ztest_check_expected_value(timeout);
+4 -3
View File
@@ -44,7 +44,8 @@ void bip_get_my_address(BACNET_ADDRESS *my_address)
ztest_copy_return_data(my_address, sizeof(BACNET_ADDRESS));
}
int bip_send_pdu(BACNET_ADDRESS *dest,
int bip_send_pdu(
BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
unsigned pdu_len)
@@ -62,8 +63,8 @@ int bip_send_mpdu(BACNET_IP_ADDRESS *dest, uint8_t *mtu, uint16_t mtu_len)
return ztest_get_return_value();
}
uint16_t bip_receive(BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu,
unsigned timeout)
uint16_t bip_receive(
BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu, unsigned timeout)
{
ztest_check_expected_value(src);
ztest_check_expected_value(timeout);
+2 -1
View File
@@ -32,7 +32,8 @@ void bip6_get_my_address(BACNET_ADDRESS *my_address)
ztest_copy_return_data(my_address, sizeof(BACNET_ADDRESS));
}
int bip6_send_pdu(BACNET_ADDRESS *dest,
int bip6_send_pdu(
BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
unsigned pdu_len)
+9 -7
View File
@@ -16,15 +16,18 @@ bool dlmstp_init(char *ifname)
}
void dlmstp_reset(void)
{
{
}
void dlmstp_cleanup(void)
{
}
int dlmstp_send_pdu(BACNET_ADDRESS *dest, BACNET_NPDU_DATA *npdu_data,
uint8_t * pdu, unsigned pdu_len)
int dlmstp_send_pdu(
BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
unsigned pdu_len)
{
ztest_check_expected_value(dest);
ztest_check_expected_value(npdu_data);
@@ -32,8 +35,8 @@ int dlmstp_send_pdu(BACNET_ADDRESS *dest, BACNET_NPDU_DATA *npdu_data,
return ztest_get_return_value();
}
uint16_t dlmstp_receive(BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu,
unsigned timeout)
uint16_t dlmstp_receive(
BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu, unsigned timeout)
{
ztest_check_expected_value(src);
ztest_check_expected_value(timeout);
@@ -128,8 +131,7 @@ void dlmstp_set_frame_rx_complete_callback(
ztest_check_expected_value(cb_func);
}
void dlmstp_set_frame_rx_start_callback(
dlmstp_hook_frame_rx_start_cb cb_func)
void dlmstp_set_frame_rx_start_callback(dlmstp_hook_frame_rx_start_cb cb_func)
{
ztest_check_expected_value(cb_func);
}
@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) 2020 Legrand North America, LLC.
*
* SPDX-License-Identifier: MIT
@@ -24,8 +24,11 @@ bool ethernet_init(char *interface_name)
return ztest_get_return_value();
}
int ethernet_send_pdu(BACNET_ADDRESS *dest, BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu, unsigned pdu_len)
int ethernet_send_pdu(
BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
unsigned pdu_len)
{
ztest_check_expected_value(dest);
ztest_check_expected_value(npdu_data);
@@ -33,8 +36,8 @@ int ethernet_send_pdu(BACNET_ADDRESS *dest, BACNET_NPDU_DATA *npdu_data,
return ztest_get_return_value();
}
uint16_t ethernet_receive(BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu,
unsigned timeout)
uint16_t ethernet_receive(
BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu, unsigned timeout)
{
ztest_check_expected_value(src);
ztest_check_expected_value(timeout);
@@ -42,7 +45,6 @@ uint16_t ethernet_receive(BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu,
return ztest_get_return_value();
}
void ethernet_set_my_address(BACNET_ADDRESS *my_address)
{
ztest_check_expected_data(my_address, sizeof(BACNET_ADDRESS));
+61 -64
View File
@@ -8,7 +8,7 @@
* @brief test BACnet datalink return codes
*/
#include <stdlib.h> /* For calloc() */
#include <stdlib.h> /* For calloc() */
#include <zephyr/ztest.h>
#include <bacnet/datalink/datalink.h>
#include "bacnet/apdu.h"
@@ -42,15 +42,14 @@ static void test_datalink_arcnet(void)
char *iface2 = "bla-bla-bla2";
uint8_t expected_data[] = { 0x5A, 0xA5, 0xDE, 0xAD };
uint8_t data[] = { 0xFF, 0xFF, 0xFF, 0xFF };
BACNET_ADDRESS addr = {
.mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32 }
};
BACNET_ADDRESS addr2 = {0};
BACNET_NPDU_DATA npdu = {0};
BACNET_ADDRESS addr = { .mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54,
0x32 } };
BACNET_ADDRESS addr2 = { 0 };
BACNET_NPDU_DATA npdu = { 0 };
zassert_equal(z_cleanup_mock(), 0, NULL);
datalink_set("arcnet");
@@ -71,8 +70,9 @@ static void test_datalink_arcnet(void)
ztest_expect_value(arcnet_send_pdu, npdu_data, &npdu);
ztest_expect_data(arcnet_send_pdu, pdu, expected_data);
ztest_returns_value(arcnet_send_pdu, 4);
zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
sizeof(expected_data)), 4, NULL);
zassert_equal(
datalink_send_pdu(&addr, &npdu, expected_data, sizeof(expected_data)),
4, NULL);
zassert_equal(z_cleanup_mock(), 0, NULL);
// receive
@@ -123,15 +123,14 @@ static void test_datalink_bip(void)
char *iface2 = "bla-bla-bla2";
uint8_t expected_data[] = { 0x5A, 0xA5, 0xDE, 0xAD };
uint8_t data[] = { 0xFF, 0xFF, 0xFF, 0xFF };
BACNET_ADDRESS addr = {
.mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32 }
};
BACNET_ADDRESS addr2 = {0};
BACNET_NPDU_DATA npdu = {0};
BACNET_ADDRESS addr = { .mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54,
0x32 } };
BACNET_ADDRESS addr2 = { 0 };
BACNET_NPDU_DATA npdu = { 0 };
zassert_equal(z_cleanup_mock(), 0, NULL);
datalink_set("bip");
@@ -152,8 +151,9 @@ static void test_datalink_bip(void)
ztest_expect_value(bip_send_pdu, npdu_data, &npdu);
ztest_expect_data(bip_send_pdu, pdu, expected_data);
ztest_returns_value(bip_send_pdu, 4);
zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
sizeof(expected_data)), 4, NULL);
zassert_equal(
datalink_send_pdu(&addr, &npdu, expected_data, sizeof(expected_data)),
4, NULL);
zassert_equal(z_cleanup_mock(), 0, NULL);
// receive
@@ -207,15 +207,14 @@ static void test_datalink_bip6(void)
char *iface2 = "bla-bla-bla2";
uint8_t expected_data[] = { 0x5A, 0xA5, 0xDE, 0xAD };
uint8_t data[] = { 0xFF, 0xFF, 0xFF, 0xFF };
BACNET_ADDRESS addr = {
.mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32 }
};
BACNET_ADDRESS addr2 = {0};
BACNET_NPDU_DATA npdu = {0};
BACNET_ADDRESS addr = { .mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54,
0x32 } };
BACNET_ADDRESS addr2 = { 0 };
BACNET_NPDU_DATA npdu = { 0 };
zassert_equal(z_cleanup_mock(), 0, NULL);
datalink_set("bip6");
@@ -236,8 +235,9 @@ static void test_datalink_bip6(void)
ztest_expect_value(bip6_send_pdu, npdu_data, &npdu);
ztest_expect_data(bip6_send_pdu, pdu, expected_data);
ztest_returns_value(bip6_send_pdu, 4);
zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
sizeof(expected_data)), 4, NULL);
zassert_equal(
datalink_send_pdu(&addr, &npdu, expected_data, sizeof(expected_data)),
4, NULL);
zassert_equal(z_cleanup_mock(), 0, NULL);
// receive
@@ -290,15 +290,14 @@ static void test_datalink_dlmstp(void)
char *iface2 = "bla-bla-bla2";
uint8_t expected_data[] = { 0x5A, 0xA5, 0xDE, 0xAD };
uint8_t data[] = { 0xFF, 0xFF, 0xFF, 0xFF };
BACNET_ADDRESS addr = {
.mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32 }
};
BACNET_ADDRESS addr2 = {0};
BACNET_NPDU_DATA npdu = {0};
BACNET_ADDRESS addr = { .mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54,
0x32 } };
BACNET_ADDRESS addr2 = { 0 };
BACNET_NPDU_DATA npdu = { 0 };
zassert_equal(z_cleanup_mock(), 0, NULL);
datalink_set("mstp");
@@ -319,8 +318,9 @@ static void test_datalink_dlmstp(void)
ztest_expect_value(dlmstp_send_pdu, npdu_data, &npdu);
ztest_expect_data(dlmstp_send_pdu, pdu, expected_data);
ztest_returns_value(dlmstp_send_pdu, 4);
zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
sizeof(expected_data)), 4, NULL);
zassert_equal(
datalink_send_pdu(&addr, &npdu, expected_data, sizeof(expected_data)),
4, NULL);
zassert_equal(z_cleanup_mock(), 0, NULL);
// receive
@@ -371,15 +371,14 @@ static void test_datalink_ethernet(void)
char *iface2 = "bla-bla-bla2";
uint8_t expected_data[] = { 0x5A, 0xA5, 0xDE, 0xAD };
uint8_t data[] = { 0xFF, 0xFF, 0xFF, 0xFF };
BACNET_ADDRESS addr = {
.mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32 }
};
BACNET_ADDRESS addr2 = {0};
BACNET_NPDU_DATA npdu = {0};
BACNET_ADDRESS addr = { .mac_len = 6,
.mac = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE },
.net = 54,
.len = 7,
.adr = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54,
0x32 } };
BACNET_ADDRESS addr2 = { 0 };
BACNET_NPDU_DATA npdu = { 0 };
zassert_equal(z_cleanup_mock(), 0, NULL);
datalink_set("ethernet");
@@ -400,8 +399,9 @@ static void test_datalink_ethernet(void)
ztest_expect_value(ethernet_send_pdu, npdu_data, &npdu);
ztest_expect_data(ethernet_send_pdu, pdu, expected_data);
ztest_returns_value(ethernet_send_pdu, 4);
zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
sizeof(expected_data)), 4, NULL);
zassert_equal(
datalink_send_pdu(&addr, &npdu, expected_data, sizeof(expected_data)),
4, NULL);
zassert_equal(z_cleanup_mock(), 0, NULL);
// receive
@@ -442,7 +442,6 @@ static void test_datalink_ethernet(void)
datalink_maintenance_timer(42);
}
/**
* @}
*/
@@ -452,13 +451,11 @@ ZTEST_SUITE(datalink_tests, NULL, NULL, NULL, NULL, NULL);
#else
void test_main(void)
{
ztest_test_suite(datalink_tests,
ztest_unit_test(test_datalink_arcnet),
ztest_unit_test(test_datalink_bip),
ztest_unit_test(test_datalink_bip6),
ztest_unit_test(test_datalink_dlmstp),
ztest_unit_test(test_datalink_ethernet)
);
ztest_test_suite(
datalink_tests, ztest_unit_test(test_datalink_arcnet),
ztest_unit_test(test_datalink_bip), ztest_unit_test(test_datalink_bip6),
ztest_unit_test(test_datalink_dlmstp),
ztest_unit_test(test_datalink_ethernet));
ztest_run_test_suite(datalink_tests);
}