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

Run clang-format and enable CI check for it (#755)

Browse Source 
* pre-commit: Update and enable clang-format check

There is newer version from clang-format so use that. We do not yet want
18 as that is little bit too new.

* Format some thing by hand which clang-format "breaks"

Clang-format will format some things little bit off in some cases.
Format some things by hand so we get cleaner end result.

* Run clang-format with

```
pre-commit run --all-files clang-format
```

We have already in previously checked places where clang-format does not
make good format and ignored those (hopefully most of the things).

---------

Co-authored-by: Kari Argillander <kari.argillander@fidelix.com>
This commit is contained in:
Kari Argillander
2024-08-30 19:20:58 +03:00
committed by GitHub
parent 622a9e609e
commit f806c5829b
547 changed files with 18286 additions and 16575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit/bacnet/bacerror/src/fakes/bacdcode.c
+2 -1
View File
@@ -86,7 +86,8 @@ DEFINE_FAKE_VALUE_FUNC(int, bacnet_signed_application_decode, uint8_t *, uint16_
DEFINE_FAKE_VALUE_FUNC(int, bacnet_enumerated_decode, uint8_t *, uint16_t, uint32_t, uint32_t *);
DEFINE_FAKE_VALUE_FUNC(int, bacnet_enumerated_context_decode, uint8_t *, uint16_t, uint8_t, uint32_t *);
#endif
DEFINE_FAKE_VALUE_FUNC(int, decode_enumerated, const uint8_t *, uint32_t, uint32_t *);
DEFINE_FAKE_VALUE_FUNC(
int, decode_enumerated, const uint8_t *, uint32_t, uint32_t *);
#if 0
DEFINE_FAKE_VALUE_FUNC(int, decode_context_enumerated, uint8_t *, uint8_t, uint32_t *);
DEFINE_FAKE_VALUE_FUNC(int, encode_bacnet_enumerated, uint8_t *, uint32_t);
test/unit/bacnet/bacerror/src/main.c
+54 -33
View File
@@ -28,7 +28,7 @@
CONTEXTTYPE *const contexts = CONTAINER_OF( \
FUNCNAME##_fake.return_val_seq, CONTEXTTYPE, RESULTFIELD); \
size_t const seq_idx = (FUNCNAME##_fake.return_val_seq_idx < \
FUNCNAME##_fake.return_val_seq_len) \
FUNCNAME##_fake.return_val_seq_len) \
? FUNCNAME##_fake.return_val_seq_idx++ \
: FUNCNAME##_fake.return_val_seq_idx - 1; \
CONTEXTTYPE *const CONTEXTPTRNAME = &contexts[seq_idx]; \
@@ -54,15 +54,16 @@ struct encode_application_enumerated_custom_fake_context {
/* Written to client by custom fake */
const uint8_t *const encoded_enumerated;
int const encoded_enumerated_len;
const int encoded_enumerated_len;
int result;
};
static int encode_application_enumerated_custom_fake(
uint8_t *apdu, uint32_t enumerated)
static int
encode_application_enumerated_custom_fake(uint8_t *apdu, uint32_t enumerated)
{
RETURN_HANDLED_CONTEXT(encode_application_enumerated,
RETURN_HANDLED_CONTEXT(
encode_application_enumerated,
struct encode_application_enumerated_custom_fake_context,
result, /* return field name in _fake_context struct */
context, /* Name of context ptr variable used below */
@@ -70,7 +71,8 @@ static int encode_application_enumerated_custom_fake(
if (context != NULL) {
if (context->result == 0) {
if (apdu != NULL) {
memcpy(apdu, context->encoded_enumerated,
memcpy(
apdu, context->encoded_enumerated,
context->encoded_enumerated_len);
}
}
@@ -86,8 +88,8 @@ struct decode_tag_number_and_value_custom_fake_context {
uint8_t *const apdu_expected;
/* Written to client by custom fake */
uint8_t const tag_number;
uint32_t const value;
const uint8_t tag_number;
const uint32_t value;
int result;
};
@@ -95,17 +97,20 @@ struct decode_tag_number_and_value_custom_fake_context {
static int decode_tag_number_and_value_custom_fake(
const uint8_t *apdu, uint8_t *tag_number, uint32_t *value)
{
RETURN_HANDLED_CONTEXT(decode_tag_number_and_value,
RETURN_HANDLED_CONTEXT(
decode_tag_number_and_value,
struct decode_tag_number_and_value_custom_fake_context,
result, /* return field name in _fake_context struct */
context, /* Name of context ptr variable used below */
{
if (context != NULL) {
if (context->result > 0) {
if (tag_number != NULL)
if (tag_number != NULL) {
*tag_number = context->tag_number;
if (value != NULL)
}
if (value != NULL) {
*value = context->value;
}
}
return context->result;
@@ -119,7 +124,7 @@ struct decode_enumerated_custom_fake_context {
uint8_t *const apdu_expected;
/* Written to client by custom fake */
uint32_t const value;
const uint32_t value;
int result;
};
@@ -127,15 +132,16 @@ struct decode_enumerated_custom_fake_context {
static int decode_enumerated_custom_fake(
const uint8_t *apdu, uint32_t len_value, uint32_t *value)
{
RETURN_HANDLED_CONTEXT(decode_enumerated,
struct decode_enumerated_custom_fake_context,
RETURN_HANDLED_CONTEXT(
decode_enumerated, struct decode_enumerated_custom_fake_context,
result, /* return field name in _fake_context struct */
context, /* Name of context ptr variable used below */
{
if (context != NULL) {
if (context->result > 0) {
if (value != NULL)
if (value != NULL) {
*value = context->value;
}
}
return context->result;
@@ -276,7 +282,8 @@ static void test_bacerror_encode_apdu(void)
for (int i = 0; i < ARRAY_SIZE(test_cases); ++i) {
const struct test_case *const tc = &test_cases[i];
printk("Checking test_cases[%i]: %s\n", i,
printk(
"Checking test_cases[%i]: %s\n", i,
(tc->description_oneliner != NULL) ? tc->description_oneliner : "");
/*
@@ -296,7 +303,8 @@ static void test_bacerror_encode_apdu(void)
*/
encode_application_enumerated_fake.return_val =
-E2BIG; /* for excessive calls */
SET_RETURN_SEQ(encode_application_enumerated,
SET_RETURN_SEQ(
encode_application_enumerated,
&tc->encode_application_enumerated_custom_fake_contexts[0].result,
tc->encode_application_enumerated_custom_fake_contexts_len);
encode_application_enumerated_fake.custom_fake =
@@ -307,8 +315,9 @@ static void test_bacerror_encode_apdu(void)
/*
* Call code_under_test
*/
int result = bacerror_encode_apdu(tc->apdu, tc->invoke_id, tc->service,
tc->error_class, tc->error_code);
int result = bacerror_encode_apdu(
tc->apdu, tc->invoke_id, tc->service, tc->error_class,
tc->error_code);
/*
* Verify expected behavior of code_under_test:
@@ -332,15 +341,18 @@ static void test_bacerror_encode_apdu(void)
? 0
: tc->encode_application_enumerated_custom_fake_contexts_len - 1;
zassert_equal(encode_application_enumerated_fake.call_count,
zassert_equal(
encode_application_enumerated_fake.call_count,
encode_application_enumerated_fake_call_count_expected, NULL);
for (int j = 0;
j < encode_application_enumerated_fake_call_count_expected; ++j) {
zassert_equal(encode_application_enumerated_fake.arg0_history[j],
zassert_equal(
encode_application_enumerated_fake.arg0_history[j],
tc->encode_application_enumerated_custom_fake_contexts[j]
.apdu_expected,
NULL);
zassert_equal(encode_application_enumerated_fake.arg1_history[j],
zassert_equal(
encode_application_enumerated_fake.arg1_history[j],
tc->encode_application_enumerated_custom_fake_contexts[j]
.value_expected,
NULL);
@@ -469,7 +481,8 @@ static void test_bacerror_decode_error_class_and_code(void)
.expected_call_history =
(void *[]) {
bacnet_enumerated_application_decode, NULL, /* mark end of array */
bacnet_enumerated_application_decode,
NULL, /* mark end of array */
},
.decode_tag_number_and_value_custom_fake_contexts_len = 2,
@@ -983,7 +996,8 @@ static void test_bacerror_decode_error_class_and_code(void)
for (int i = 0; i < ARRAY_SIZE(test_cases); ++i) {
const struct test_case *const tc = &test_cases[i];
printk("Checking test_cases[%i]: %s\n", i,
printk(
"Checking test_cases[%i]: %s\n", i,
(tc->description_oneliner != NULL) ? tc->description_oneliner : "");
/*
@@ -1003,14 +1017,16 @@ static void test_bacerror_decode_error_class_and_code(void)
*/
decode_tag_number_and_value_fake.return_val =
-E2BIG; /* for excessive calls */
SET_RETURN_SEQ(decode_tag_number_and_value,
SET_RETURN_SEQ(
decode_tag_number_and_value,
&tc->decode_tag_number_and_value_custom_fake_contexts[0].result,
tc->decode_tag_number_and_value_custom_fake_contexts_len);
decode_tag_number_and_value_fake.custom_fake =
decode_tag_number_and_value_custom_fake;
decode_enumerated_fake.return_val = -E2BIG; /* for excessive calls */
SET_RETURN_SEQ(decode_enumerated,
SET_RETURN_SEQ(
decode_enumerated,
&tc->decode_enumerated_custom_fake_contexts[0].result,
tc->decode_enumerated_custom_fake_contexts_len);
decode_enumerated_fake.custom_fake = decode_enumerated_custom_fake;
@@ -1064,11 +1080,13 @@ static void test_bacerror_decode_error_class_and_code(void)
? 0
: tc->decode_tag_number_and_value_custom_fake_contexts_len - 1;
zassert_equal(decode_tag_number_and_value_fake.call_count,
zassert_equal(
decode_tag_number_and_value_fake.call_count,
decode_tag_number_and_value_fake_call_count_expected, NULL);
for (int j = 0;
j < decode_tag_number_and_value_fake_call_count_expected; ++j) {
zassert_equal(decode_tag_number_and_value_fake.arg0_history[j],
zassert_equal(
decode_tag_number_and_value_fake.arg0_history[j],
tc->decode_tag_number_and_value_custom_fake_contexts[j]
.apdu_expected,
NULL);
@@ -1083,13 +1101,16 @@ static void test_bacerror_decode_error_class_and_code(void)
? 0
: tc->decode_enumerated_custom_fake_contexts_len - 1;
zassert_equal(decode_enumerated_fake.call_count,
zassert_equal(
decode_enumerated_fake.call_count,
decode_enumerated_fake_call_count_expected, NULL);
for (int j = 0; j < decode_enumerated_fake_call_count_expected; ++j) {
zassert_equal(decode_enumerated_fake.arg0_history[j],
zassert_equal(
decode_enumerated_fake.arg0_history[j],
tc->decode_enumerated_custom_fake_contexts[j].apdu_expected,
NULL);
zassert_equal(decode_enumerated_fake.arg1_history[j],
zassert_equal(
decode_enumerated_fake.arg1_history[j],
tc->decode_tag_number_and_value_custom_fake_contexts[j].value,
NULL);
zassert_not_null(decode_enumerated_fake.arg2_history[j], NULL);
@@ -1131,8 +1152,8 @@ ZTEST_SUITE(bacnet_error, NULL, NULL, NULL, NULL, NULL);
#else
void test_main(void)
{
ztest_test_suite(bacnet_bacerror,
ztest_unit_test(test_bacerror_encode_apdu),
ztest_test_suite(
bacnet_bacerror, ztest_unit_test(test_bacerror_encode_apdu),
ztest_unit_test(test_bacerror_decode_error_class_and_code));
ztest_run_test_suite(bacnet_bacerror);
}