tests: cleanup of code

tests/automated/main.c

@@ -29,8 +29,9 @@ static int add_tests(CU_pSuite pSuite, const test_t *tests)
 int main()
 {
     CU_pSuite pSuite = NULL;
-    if (CUE_SUCCESS != CU_initialize_registry())
+    if (CUE_SUCCESS != CU_initialize_registry()) {
         return CU_get_error();
+    }
     pSuite = CU_add_suite("Nanocbor decode", NULL, NULL);
     if (NULL == pSuite) {
         CU_cleanup_registry();

tests/automated/test_decoder.c

@@ -6,6 +6,8 @@
 #include "test.h"
 #include <CUnit/CUnit.h>
 
+/* NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers) */
+
 static void test_decode_indefinite(void)
 {
     /* Test vector, 3 integers in an indefinite array */
@@ -172,7 +174,7 @@ static void test_decode_none(void)
 {
     nanocbor_value_t val;
     nanocbor_value_t cont;
-    uint64_t tmp;
+    uint64_t tmp = 0;
     nanocbor_decoder_init(&val, NULL, 0);
 
     CU_ASSERT_EQUAL(nanocbor_get_type(&val), NANOCBOR_ERR_END);
@@ -207,12 +209,12 @@ static void test_decode_basic(void)
     CU_ASSERT_EQUAL(5, intval);
 
     const uint8_t decimal_frac[] = { 0xC4, 0x82, 0x21, 0x19, 0x6a, 0xb3 };
-    int32_t m;
-    int32_t e;
+    int32_t mantissa = 0;
+    int32_t exponent = 0;
     nanocbor_decoder_init(&decoder, decimal_frac, sizeof(decimal_frac));
-    CU_ASSERT_EQUAL(nanocbor_get_decimal_frac(&decoder, &e, &m), 0);
-    CU_ASSERT_EQUAL(e, -2);
-    CU_ASSERT_EQUAL(m, 27315);
+    CU_ASSERT_EQUAL(nanocbor_get_decimal_frac(&decoder, &exponent, &mantissa), 0);
+    CU_ASSERT_EQUAL(exponent, -2);
+    CU_ASSERT_EQUAL(mantissa, 27315);
 }
 
 const test_t tests_decoder[] = {
@@ -245,3 +247,5 @@ const test_t tests_decoder[] = {
         .n = NULL,
     },
 };
+
+/* NOLINTEND(cppcoreguidelines-avoid-magic-numbers) */

tests/automated/test_encoder.c

@@ -8,6 +8,7 @@
 #include <float.h>
 #include <math.h>
 
+
 static void print_bytestr(const uint8_t *bytes, size_t len)
 {
     printf("\n");
@@ -39,6 +40,7 @@ static void test_encode_float_specials(void)
 
 static void test_encode_float_to_half(void)
 {
+// NOLINTBEGIN
     uint8_t buf[64];
     nanocbor_encoder_t enc;
     nanocbor_encoder_init(&enc, buf, sizeof(buf));
@@ -53,6 +55,7 @@ static void test_encode_float_to_half(void)
     CU_ASSERT_EQUAL(nanocbor_fmt_float(&enc, -1.9990234375), 3);
     CU_ASSERT_EQUAL(nanocbor_fmt_float(&enc, -1.99951171875), 5);
     CU_ASSERT_EQUAL(nanocbor_fmt_float(&enc, -2.0009765625), 5);
+// NOLINTEND
 
     nanocbor_fmt_end_indefinite(&enc);
     print_bytestr(buf, nanocbor_encoded_len(&enc));

tests/encode/main.c

@@ -2,9 +2,9 @@
  * SPDX-License-Identifier: CC0-1.0
  */
 
-#include <stdio.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -25,7 +25,7 @@ static void _encode(nanocbor_encoder_t *enc)
     nanocbor_fmt_int(enc, -500);
     nanocbor_put_tstr(enc, "this is a long string");
     nanocbor_fmt_float(enc, 0.34);
-    nanocbor_put_bstr(enc, (uint8_t*)"bytez", sizeof("bytez"));
+    nanocbor_put_bstr(enc, (uint8_t *)"bytez", sizeof("bytez"));
     nanocbor_fmt_null(enc);
     nanocbor_fmt_decimal_frac(enc, -2, 27315);
     nanocbor_fmt_end_indefinite(enc);
@@ -48,7 +48,7 @@ int main(void)
     nanocbor_encoder_init(&enc, buf, required);
     _encode(&enc);
 
-    //printf("Bytes: %u\n", (unsigned)nanocbor_encoded_len(&enc));
+    // printf("Bytes: %u\n", (unsigned)nanocbor_encoded_len(&enc));
     fwrite(buf, 1, nanocbor_encoded_len(&enc), stdout);
 
     return 0;