test: tidy code

- clang-format
- remove notes

diff --git a/test/buffer/mutt_buffer_concat_path.c b/test/buffer/mutt_buffer_concat_path.c
index 74aa8429f27c5fce07f71fc885bc391a787b6089..ce2040d9250ace8588e4d29463507b258af75738 100644 (file)
--- a/test/buffer/mutt_buffer_concat_path.c
+++ b/test/buffer/mutt_buffer_concat_path.c
@@ -56,7 +56,8 @@ void test_mutt_buffer_concat_path(void)
   {
     for (size_t i = 0; i < mutt_array_size(concat_test); i++)
     {
-      TEST_CASE_("DIR: '%s'  FILE: '%s'", NONULL(concat_test[i][0]), NONULL(concat_test[i][1]));
+      TEST_CASE_("DIR: '%s'  FILE: '%s'", NONULL(concat_test[i][0]),
+                 NONULL(concat_test[i][1]));
       {
         struct Buffer *buf = mutt_buffer_new();
         mutt_buffer_concat_path(buf, concat_test[i][0], concat_test[i][1]);
@@ -91,4 +92,3 @@ void test_mutt_buffer_concat_path(void)
     }
   }
 }
-

diff --git a/test/buffer/mutt_buffer_increase_size.c b/test/buffer/mutt_buffer_increase_size.c
index 8bea753814f3954facbe21ab83069463ad12fff8..45435d1ac0f496eaca4f7fe9bfd141cb0133edc0 100644 (file)
--- a/test/buffer/mutt_buffer_increase_size.c
+++ b/test/buffer/mutt_buffer_increase_size.c
@@ -53,8 +53,5 @@ void test_mutt_buffer_increase_size(void)
       TEST_CHECK(buf->dsize == MAX(orig_size, sizes[i]));
       mutt_buffer_free(&buf);
     }
-
   }
-
-
 }

diff --git a/test/config/common.c b/test/config/common.c
index de07ad01118cb90ec214afb708243654cb68069c..f7e8dcc574919b15c5ae9b0230d87664c463a582 100644 (file)
--- a/test/config/common.c
+++ b/test/config/common.c
@@ -103,7 +103,8 @@ int log_observer(struct NotifyCallback *nc)
   else
     cs_he_initial_get(ec->cs, ec->he, &result);
 
-  TEST_MSG("Event: %s has been %s to '%s'\n", ec->name, events[nc->event_type - 1], result.data);
+  TEST_MSG("Event: %s has been %s to '%s'\n", ec->name,
+           events[nc->event_type - 1], result.data);
 
   FREE(&result.data);
   return true;

diff --git a/test/config/dump.c b/test/config/dump.c
index 039b857b7854b700ad22c8cf73b162500fea451e..c297211add492cab948e2527dc17bc95810d96f5 100644 (file)
--- a/test/config/dump.c
+++ b/test/config/dump.c
@@ -370,8 +370,10 @@ bool test_dump_config(void)
 
     TEST_CHECK(dump_config(cs, CS_DUMP_STYLE_MUTT, CS_DUMP_NO_FLAGS, fp));
     TEST_CHECK(dump_config(cs, CS_DUMP_STYLE_NEO, CS_DUMP_NO_FLAGS, fp));
-    TEST_CHECK(dump_config(cs, CS_DUMP_STYLE_NEO, CS_DUMP_ONLY_CHANGED | CS_DUMP_HIDE_SENSITIVE, fp));
-    TEST_CHECK(dump_config(cs, CS_DUMP_STYLE_NEO, CS_DUMP_HIDE_VALUE | CS_DUMP_SHOW_DEFAULTS, fp));
+    TEST_CHECK(dump_config(cs, CS_DUMP_STYLE_NEO,
+                           CS_DUMP_ONLY_CHANGED | CS_DUMP_HIDE_SENSITIVE, fp));
+    TEST_CHECK(dump_config(cs, CS_DUMP_STYLE_NEO,
+                           CS_DUMP_HIDE_VALUE | CS_DUMP_SHOW_DEFAULTS, fp));
 
     struct ConfigSet *cs_bad = cs_new(30);
     TEST_CHECK(dump_config(cs_bad, CS_DUMP_STYLE_NEO, CS_DUMP_NO_FLAGS, fp));

diff --git a/test/date/mutt_date_local_tz.c b/test/date/mutt_date_local_tz.c
index cae8ee435c14fc47c15ea6878518645753d8317e..43597b55e9783a7c93ca7f9f888fabb05cf95d68 100644 (file)
--- a/test/date/mutt_date_local_tz.c
+++ b/test/date/mutt_date_local_tz.c
@@ -30,7 +30,6 @@ void test_mutt_date_local_tz(void)
 {
   // time_t mutt_date_local_tz(time_t t);
 
-
   TEST_CHECK(mutt_date_local_tz(TIME_T_MIN) == 0);
   TEST_CHECK(mutt_date_local_tz(TIME_T_MAX) == 0);
 

diff --git a/test/date/mutt_date_make_time.c b/test/date/mutt_date_make_time.c
index 034d53584d7de72daf5459c6da8149ac491e0ebf..5fca7ce7170ddf06db447464ab245fec2e9ef502 100644 (file)
--- a/test/date/mutt_date_make_time.c
+++ b/test/date/mutt_date_make_time.c
@@ -59,8 +59,9 @@ void test_mutt_date_make_time(void)
     {
       struct tm *tm = &time_tests[i].tm;
 
-      TEST_CASE_("{%d,%d,%d,%d,%d,%d,%d} = %ld", tm->tm_sec, tm->tm_min, tm->tm_hour,
-                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday, time_tests[i].expected);
+      TEST_CASE_("{%d,%d,%d,%d,%d,%d,%d} = %ld", tm->tm_sec, tm->tm_min,
+                 tm->tm_hour, tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday,
+                 time_tests[i].expected);
 
       time_t result = mutt_date_make_time(&time_tests[i].tm, false);
       TEST_CHECK(result == time_tests[i].expected);

diff --git a/test/list/mutt_list_insert_after.c b/test/list/mutt_list_insert_after.c
index edf26312676d2c79ed06404ecd4aac721e4cf813..f198a1996def5618a45bc3ce12e320c2f2f47391 100644 (file)
--- a/test/list/mutt_list_insert_after.c
+++ b/test/list/mutt_list_insert_after.c
@@ -80,7 +80,8 @@ void test_mutt_list_insert_after(void)
     char *insert = "Zelda";
     struct ListHead start = test_list_create(start_names, false);
     struct ListHead expected = test_list_create(expected_names, false);
-    struct ListNode *after = STAILQ_NEXT(STAILQ_NEXT(STAILQ_FIRST(&start), entries), entries);
+    struct ListNode *after =
+        STAILQ_NEXT(STAILQ_NEXT(STAILQ_FIRST(&start), entries), entries);
     TEST_CHECK(mutt_list_insert_after(&start, after, insert) != NULL);
     TEST_CHECK(mutt_list_compare(&start, &expected) == true);
     mutt_list_clear(&start);

diff --git a/test/list/mutt_list_match.c b/test/list/mutt_list_match.c
index a106565b12ca2166cb38cd4aef8379e522d6342c..a6cd564134ef2b960a2068707ebf6977f090196e 100644 (file)
--- a/test/list/mutt_list_match.c
+++ b/test/list/mutt_list_match.c
@@ -86,5 +86,4 @@ void test_mutt_list_match(void)
     TEST_CHECK(mutt_list_match(search, &lh) == true);
     mutt_list_clear(&lh);
   }
-
 }

diff --git a/test/string/mutt_str_is_ascii.c b/test/string/mutt_str_is_ascii.c
index e78648159ef7cd176236d6e2a1a8ffe0e0f02dd1..3e0eb556d4a906e8b9c559bbee5d782ad81b15bb 100644 (file)
--- a/test/string/mutt_str_is_ascii.c
+++ b/test/string/mutt_str_is_ascii.c
@@ -36,6 +36,7 @@ void test_mutt_str_is_ascii(void)
 {
   // bool mutt_str_is_ascii(const char *p, size_t len);
 
+  // clang-format off
   struct IsAsciiTest ascii_tests[] =
   {
     { NULL,    10, true },
@@ -48,6 +49,7 @@ void test_mutt_str_is_ascii(void)
     { "apple\200", 6,  false },
     { "apple\200", 5,  true },
   };
+  // clang-format on
 
   {
     for (size_t i = 0; i < mutt_array_size(ascii_tests); i++)

diff --git a/test/string/mutt_str_split.c b/test/string/mutt_str_split.c
index 747ed43715c041d02c68d7b24a9c5847f4502d0a..f2fc0f61140f2b4b7c23b6044a1e89b8a693b067 100644 (file)
--- a/test/string/mutt_str_split.c
+++ b/test/string/mutt_str_split.c
@@ -131,6 +131,4 @@ void test_mutt_str_split(void)
     mutt_list_clear(&expectedval5);
     mutt_list_clear(&expectedval6);
   }
-  // move to list?
-
 }

diff --git a/test/string/mutt_str_strcasestr.c b/test/string/mutt_str_strcasestr.c
index d56a96c785abd26323b4ca8d3989d49e29df0f6d..ca521b26d416c111f90f0c2014dd2360bb488042 100644 (file)
--- a/test/string/mutt_str_strcasestr.c
+++ b/test/string/mutt_str_strcasestr.c
@@ -119,9 +119,4 @@ void test_mutt_str_strcasestr(void)
 
     TEST_CHECK_(retval == NULL, "Expected: %s, Actual: %s", NULL, retval);
   }
-  // null
-  // no match
-  // one match: start,middle,end
-  // multi-matches
-
 }

diff --git a/test/string/mutt_str_strdup.c b/test/string/mutt_str_strdup.c
index 0ee4b49284724e99b712d7d6e96b3d682f53e960..facb91ca062e3115be0fd70693afd7fd04ddc6ec 100644 (file)
--- a/test/string/mutt_str_strdup.c
+++ b/test/string/mutt_str_strdup.c
@@ -46,4 +46,3 @@ void test_mutt_str_strdup(void)
     FREE(&result);
   }
 }
-

diff --git a/test/string/mutt_str_strfcpy.c b/test/string/mutt_str_strfcpy.c
index ca8209b54b8746fcc440ce3ba880f1a070d559ce..20f83eec69a97d5e2cad792b79c4443a17374a96 100644 (file)
--- a/test/string/mutt_str_strfcpy.c
+++ b/test/string/mutt_str_strfcpy.c
@@ -76,7 +76,4 @@ void test_mutt_str_strfcpy(void)
       TEST_MSG("Actual  : %zu", len);
     }
   }
-  // buf: null empty normal
-  // str: null empty normal
-
 }

diff --git a/test/string/mutt_str_strnfcpy.c b/test/string/mutt_str_strnfcpy.c
index cd2e69c5bc486ad7cdf9d222bb26be9c480d5e87..a4c35f00b9a7a98605475324371f0da442efa4bf 100644 (file)
--- a/test/string/mutt_str_strnfcpy.c
+++ b/test/string/mutt_str_strnfcpy.c
@@ -101,8 +101,4 @@ void test_mutt_str_strnfcpy(void)
       TEST_MSG("Actual  : %s", big);
     }
   }
-  // buf: null empty normal
-  // str: null empty normal
-  // limit
-
 }

diff --git a/test/string/mutt_str_substr_cpy.c b/test/string/mutt_str_substr_cpy.c
index aa003122ef384477fe9a56a2cf251802fb21901b..1ce549794b090ba9e28184e20570dee6b2efa8b7 100644 (file)
--- a/test/string/mutt_str_substr_cpy.c
+++ b/test/string/mutt_str_substr_cpy.c
@@ -29,7 +29,9 @@ void test_mutt_str_substr_cpy(void)
 {
   // char *mutt_str_substr_cpy(char *dest, const char *begin, const char *end, size_t destlen);
 
+  // clang-format off
   const char *str = "apple banana\0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+  // clang-format on
 
   {
     TEST_CHECK(mutt_str_substr_cpy(NULL, str + 3, str + 7, 32) == NULL);

diff --git a/test/string/mutt_str_substr_dup.c b/test/string/mutt_str_substr_dup.c
index 08d7dd176ec4e4cb433990ef53b87b7500038834..38e33973026b89bbb56c511e6d556cec7e65e816 100644 (file)
--- a/test/string/mutt_str_substr_dup.c
+++ b/test/string/mutt_str_substr_dup.c
@@ -29,7 +29,9 @@ void test_mutt_str_substr_dup(void)
 {
   // char *mutt_str_substr_dup(const char *begin, const char *end);
 
+  // clang-format off
   const char *str = "apple banana\0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+  // clang-format on
 
   {
     TEST_CHECK(mutt_str_substr_dup(NULL, str + 7) == NULL);