test: check all the conditionals

diff --git a/test/config/account.c b/test/config/account.c
index d74227ca3c2c0563a0da9f5a9ba6a6ff0ab2d936..c562458d76245f77c88c276f879f140341edf3eb 100644 (file)
--- a/test/config/account.c
+++ b/test/config/account.c
@@ -57,8 +57,7 @@ static struct ConfigDef Vars[] = {
  * @param var_names List of config items (NULL terminated)
  * @retval ptr New Account object
  */
-struct Account *ac_create(const struct ConfigSet *cs, const char *name,
-                          const char *var_names[])
+struct Account *ac_create(const struct ConfigSet *cs, const char *name, const char *var_names[])
 {
   if (!cs || !name || !var_names)
     return NULL; /* LCOV_EXCL_LINE */
@@ -193,7 +192,7 @@ void config_account(void)
   struct ConfigSet *cs = cs_create(30);
 
   number_init(cs);
-  if (!cs_register_variables(cs, Vars, 0))
+  if (!TEST_CHECK(cs_register_variables(cs, Vars, 0)))
     return;
 
   set_list(cs);
@@ -206,7 +205,7 @@ void config_account(void)
   };
 
   struct Account *ac = ac_create(cs, account, BrokenVarStr);
-  if (!ac)
+  if (TEST_CHECK(!ac))
   {
     TEST_MSG("Expected error:\n");
   }
@@ -223,7 +222,7 @@ void config_account(void)
 
   TEST_MSG("Expect error for next test\n");
   ac = ac_create(cs, account, AccountVarStr2);
-  if (ac)
+  if (!TEST_CHECK(!ac))
   {
     ac_free(cs, &ac);
     TEST_MSG("This test should have failed\n");
@@ -236,20 +235,20 @@ void config_account(void)
   };
 
   ac = ac_create(cs, account, AccountVarStr);
-  if (!ac)
+  if (!TEST_CHECK(ac != NULL))
     return;
 
   size_t index = 0;
   mutt_buffer_reset(&err);
   int rc = ac_set_value(ac, index, 33, &err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err.data);
   }
 
   mutt_buffer_reset(&err);
   rc = ac_set_value(ac, 99, 42, &err);
-  if (CSR_RESULT(rc) == CSR_ERR_UNKNOWN)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_ERR_UNKNOWN))
   {
     TEST_MSG("Expected error: %s\n", err.data);
   }
@@ -261,7 +260,7 @@ void config_account(void)
 
   mutt_buffer_reset(&err);
   rc = ac_get_value(ac, index, &err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err.data);
   }
@@ -273,7 +272,7 @@ void config_account(void)
   index++;
   mutt_buffer_reset(&err);
   rc = ac_get_value(ac, index, &err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err.data);
   }
@@ -284,7 +283,7 @@ void config_account(void)
 
   mutt_buffer_reset(&err);
   rc = ac_get_value(ac, 99, &err);
-  if (CSR_RESULT(rc) == CSR_ERR_UNKNOWN)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_ERR_UNKNOWN))
   {
     TEST_MSG("Expected error\n");
   }
@@ -297,7 +296,7 @@ void config_account(void)
   const char *name = "fruit:Apple";
   mutt_buffer_reset(&err);
   int result = cs_str_string_get(cs, name, &err);
-  if (CSR_RESULT(result) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(result) == CSR_SUCCESS))
   {
     TEST_MSG("%s = '%s'\n", name, err.data);
   }
@@ -309,7 +308,7 @@ void config_account(void)
 
   mutt_buffer_reset(&err);
   result = cs_str_native_set(cs, name, 42, &err);
-  if (CSR_RESULT(result) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(result) == CSR_SUCCESS))
   {
     TEST_MSG("Set %s\n", name);
   }
@@ -320,12 +319,12 @@ void config_account(void)
   }
 
   struct HashElem *he = cs_get_elem(cs, name);
-  if (!he)
+  if (!TEST_CHECK(he != NULL))
     return;
 
   mutt_buffer_reset(&err);
   result = cs_str_initial_set(cs, name, "42", &err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error\n");
   }
@@ -337,7 +336,7 @@ void config_account(void)
 
   mutt_buffer_reset(&err);
   result = cs_str_initial_get(cs, name, &err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error\n");
   }
@@ -349,12 +348,12 @@ void config_account(void)
 
   name = "Apple";
   he = cs_get_elem(cs, name);
-  if (!he)
+  if (!TEST_CHECK(he != NULL))
     return;
 
   mutt_buffer_reset(&err);
   result = cs_he_native_set(cs, he, 42, &err);
-  if (CSR_RESULT(result) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(result) == CSR_SUCCESS))
   {
     TEST_MSG("Set %s\n", name);
   }
@@ -367,4 +366,5 @@ void config_account(void)
   ac_free(cs, &ac);
   cs_free(&cs);
   FREE(&err.data);
+  log_line(__func__);
 }

diff --git a/test/config/address.c b/test/config/address.c
index 22c6c814394dd788f70a104a6d6ac0bbd2d9eddd..195ff0c16f62f075f896844e84a062fbfd74f95d 100644 (file)
--- a/test/config/address.c
+++ b/test/config/address.c
@@ -87,8 +87,13 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   const char *apple_orig = "apple@example.com";
   const char *banana_orig = "banana@example.com";
 
-  if ((mutt_str_strcmp(VarApple->mailbox, apple_orig) != 0) ||
-      (mutt_str_strcmp(VarBanana->mailbox, banana_orig) != 0))
+  if (!TEST_CHECK(mutt_str_strcmp(VarApple->mailbox, apple_orig) == 0))
+  {
+    TEST_MSG("Error: initial values were wrong\n");
+    return false;
+  }
+
+  if (!TEST_CHECK(mutt_str_strcmp(VarBanana->mailbox, banana_orig) == 0))
   {
     TEST_MSG("Error: initial values were wrong\n");
     return false;
@@ -107,14 +112,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, apple_orig) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, apple_orig) == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -125,14 +130,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, banana_orig) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, banana_orig) == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -143,7 +148,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "john@doe.com", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -152,7 +157,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "jane@doe.com", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -161,7 +166,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -172,6 +177,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is '%s'\n", NONULL(value.data));
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -188,14 +194,14 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
     }
 
     addr = VarDamson ? VarDamson->mailbox : NULL;
-    if (mutt_str_strcmp(addr, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(addr, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -208,14 +214,14 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
     }
 
     addr = VarElderberry ? VarElderberry->mailbox : NULL;
-    if (mutt_str_strcmp(addr, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(addr, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -223,6 +229,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(addr), NONULL(valid[i]));
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -234,7 +241,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -245,7 +252,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   name = "Guava";
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -255,12 +262,12 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   name = "Hawthorn";
   rc = cs_str_string_set(cs, name, "hawthorn", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -268,6 +275,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   addr = VarHawthorn ? VarHawthorn->mailbox : NULL;
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(addr), err->data);
 
+  log_line(__func__);
   return true;
 }
 
@@ -282,14 +290,14 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_native_set(cs, name, (intptr_t) a, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     goto tbns_out;
   }
 
   addr = VarIlama ? VarIlama->mailbox : NULL;
-  if (mutt_str_strcmp(addr, a->mailbox) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(addr, a->mailbox) == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     goto tbns_out;
@@ -299,13 +307,13 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Jackfruit";
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 0, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     goto tbns_out;
   }
 
-  if (VarJackfruit != NULL)
+  if (!TEST_CHECK(VarJackfruit == NULL))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     goto tbns_out;
@@ -313,6 +321,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   addr = VarJackfruit ? VarJackfruit->mailbox : NULL;
   TEST_MSG("%s = '%s', set by NULL\n", name, NONULL(addr));
 
+  log_line(__func__);
   result = true;
 tbns_out:
   address_free(&a);
@@ -324,14 +333,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   log_line(__func__);
   char *name = "Kumquat";
 
-  if (cs_str_string_set(cs, name, "kumquat@example.com", err) == INT_MIN)
+  if (!TEST_CHECK(cs_str_string_set(cs, name, "kumquat@example.com", err) != INT_MIN))
     return false;
 
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
   struct Address *a = (struct Address *) value;
 
-  if (VarKumquat != a)
+  if (!TEST_CHECK(VarKumquat == a))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -340,6 +349,7 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   char *addr2 = a ? a->mailbox : NULL;
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(addr1), NONULL(addr2));
 
+  log_line(__func__);
   return true;
 }
 
@@ -354,20 +364,20 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   char *addr = VarLemon ? VarLemon->mailbox : NULL;
   TEST_MSG("Initial: %s = '%s'\n", name, NONULL(addr));
   int rc = cs_str_string_set(cs, name, "hello@example.com", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   addr = VarLemon ? VarLemon->mailbox : NULL;
   TEST_MSG("Set: %s = '%s'\n", name, NONULL(addr));
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
   addr = VarLemon ? VarLemon->mailbox : NULL;
-  if (mutt_str_strcmp(addr, "lemon@example.com") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(addr, "lemon@example.com") == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -381,13 +391,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Initial: %s = '%s'\n", name, VarMango->mailbox);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "john@example.com", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarMango->mailbox);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -397,7 +407,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (mutt_str_strcmp(VarMango->mailbox, "john@example.com") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarMango->mailbox, "john@example.com") == 0))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -405,6 +415,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = '%s'\n", name, VarMango->mailbox);
 
+  log_line(__func__);
   return true;
 }
 
@@ -419,7 +430,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Nectarine";
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "hello@example.com", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -433,7 +444,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP a, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -448,7 +459,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Olive";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello@example.com", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -462,7 +473,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP a, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -477,7 +488,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Papaya";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello@example.com", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -491,7 +502,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP a, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -506,6 +517,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   result = true;
 tv_out:
   address_free(&a);
+  log_line(__func__);
   return result;
 }
 
@@ -543,7 +555,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set parent
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "hello@example.com", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -553,7 +565,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "world@example.com", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -563,7 +575,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -573,13 +585,14 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -588,8 +601,6 @@ ti_out:
 
 void config_address(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -608,14 +619,14 @@ void config_address(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/bool.c b/test/config/bool.c
index 78c591c4d3bdcdd8c5cc73e82bcad31fe4e00677..8d166e27fe1c7598cf702e7f1c8172ec7d2ec3c9 100644 (file)
--- a/test/config/bool.c
+++ b/test/config/bool.c
@@ -80,10 +80,16 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %d\n", VarApple);
   TEST_MSG("Banana = %d\n", VarBanana);
 
-  if ((VarApple != false) || (VarBanana != true))
+  if (!TEST_CHECK(VarApple == false))
   {
-    TEST_MSG("Error: initial values were wrong\n");
-    return false;
+    TEST_MSG("Expected: %d\n", false);
+    TEST_MSG("Actual  : %d\n", VarApple);
+  }
+
+  if (!TEST_CHECK(VarBanana == true))
+  {
+    TEST_MSG("Expected: %d\n", true);
+    TEST_MSG("Actual  : %d\n", VarBanana);
   }
 
   cs_str_string_set(cs, "Apple", "true", err);
@@ -98,14 +104,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "no") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "no") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -123,7 +129,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "yes") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "yes") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -134,7 +140,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "yes", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -143,7 +149,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -154,6 +160,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is '%s'\n", NONULL(value.data));
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -174,9 +181,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     VarDamson = ((i + 1) % 2);
 
+    TEST_MSG("Setting %s to %s\n", name, valid[i]);
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -188,11 +196,12 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       return false;
     }
     TEST_MSG("%s = %d, set by '%s'\n", name, VarDamson, valid[i]);
+    short_line();
   }
 
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "yes", err);
-  if (rc & CSR_SUC_NO_CHANGE)
+  if (TEST_CHECK(rc & CSR_SUC_NO_CHANGE))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
   }
@@ -202,11 +211,12 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
+  short_line();
   for (unsigned int i = 0; i < mutt_array_size(invalid); i++)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("Expected error: %s\n", err->data);
     }
@@ -216,8 +226,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       TEST_MSG("This test should have failed\n");
       return false;
     }
+    short_line();
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -230,7 +242,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   VarElderberry = false;
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -240,7 +252,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   VarElderberry = true;
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -251,12 +263,13 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_reset(err);
   TEST_MSG("Expect error for next test\n");
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
-    TEST_MSG("%s\n", err->data);
+    TEST_MSG("Get failed\n");
     // return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -265,18 +278,18 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   log_line(__func__);
   char *name = "Fig";
   bool value = true;
-  int rc;
 
+  TEST_MSG("Setting %s to %d\n", name, value);
   VarFig = false;
   mutt_buffer_reset(err);
-  rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  int rc = cs_str_native_set(cs, name, value, err);
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarFig != value)
+  if (!TEST_CHECK(VarFig == value))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -284,9 +297,11 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("%s = %d, set to '%d'\n", name, VarFig, value);
 
+  short_line();
   mutt_buffer_reset(err);
+  TEST_MSG("Setting %s to %d\n", name, value);
   rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(rc & CSR_SUC_NO_CHANGE) != 0)
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -300,10 +315,12 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   int invalid[] = { -1, 2 };
   for (unsigned int i = 0; i < mutt_array_size(invalid); i++)
   {
+    short_line();
     VarFig = false;
+    TEST_MSG("Setting %s to %d\n", name, invalid[i]);
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("Expected error: %s\n", err->data);
     }
@@ -315,6 +332,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     }
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -326,13 +344,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   VarGuava = true;
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (value == INT_MIN)
+  if (!TEST_CHECK(value != INT_MIN))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = %ld\n", name, value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -344,14 +363,15 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   VarHawthorn = true;
   mutt_buffer_reset(err);
 
+  TEST_MSG("%s = %d\n", name, VarJackfruit);
   int rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarHawthorn == true)
+  if (!TEST_CHECK(VarHawthorn != true))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -359,19 +379,20 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarHawthorn);
 
+  short_line();
   name = "Ilama";
   mutt_buffer_reset(err);
 
   TEST_MSG("Initial: %s = %d\n", name, VarIlama);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "yes", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = %d\n", name, VarIlama);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -381,7 +402,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (!VarIlama)
+  if (!TEST_CHECK(VarIlama))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -389,6 +410,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarIlama);
 
+  log_line(__func__);
   return true;
 }
 
@@ -400,7 +422,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarJackfruit = false;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "yes", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -410,11 +432,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarJackfruit);
+  short_line();
 
   VarJackfruit = false;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 1, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -424,12 +447,13 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("Native: %s = %d\n", name, VarJackfruit);
+  short_line();
 
   name = "Kumquat";
   VarKumquat = false;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "yes", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -439,11 +463,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarKumquat);
+  short_line();
 
   VarKumquat = false;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 1, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -453,12 +478,13 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("Native: %s = %d\n", name, VarKumquat);
+  short_line();
 
   name = "Lemon";
   VarLemon = false;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "yes", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -468,11 +494,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarLemon);
+  short_line();
 
   VarLemon = false;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 1, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -483,6 +510,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %d\n", name, VarLemon);
 
+  log_line(__func__);
   return true;
 }
 
@@ -515,17 +543,18 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   VarMango = false;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "1", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "0", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -535,27 +564,30 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("Value of %s wasn't changed\n", parent);
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -590,31 +622,32 @@ static bool test_toggle(struct ConfigSet *cs, struct Buffer *err)
     VarNectarine = before;
     mutt_buffer_reset(err);
     intptr_t value = cs_he_native_get(cs, he, err);
-    if (value == INT_MIN)
+    if (!TEST_CHECK(value != INT_MIN))
     {
       TEST_MSG("Get failed: %s\n", err->data);
       return false;
     }
 
     bool copy = value;
-    if (copy != before)
+    if (!TEST_CHECK(copy == before))
     {
       TEST_MSG("Initial value is wrong: %s\n", err->data);
       return false;
     }
 
     rc = bool_he_toggle(cs, he, err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("Toggle failed: %s\n", err->data);
       return false;
     }
 
-    if (VarNectarine != after)
+    if (!TEST_CHECK(VarNectarine == after))
     {
       TEST_MSG("Toggle value is wrong: %s\n", err->data);
       return false;
     }
+    short_line();
   }
 
   for (size_t i = 0; i < mutt_array_size(tests); i++)
@@ -626,37 +659,38 @@ static bool test_toggle(struct ConfigSet *cs, struct Buffer *err)
     VarNectarine = before;
     mutt_buffer_reset(err);
     intptr_t value = cs_he_native_get(cs, he, err);
-    if (value == INT_MIN)
+    if (!TEST_CHECK(value != INT_MIN))
     {
       TEST_MSG("Get failed: %s\n", err->data);
       return false;
     }
 
     bool copy = value;
-    if (copy != before)
+    if (!TEST_CHECK(copy == before))
     {
       TEST_MSG("Initial value is wrong: %s\n", err->data);
       return false;
     }
 
     rc = bool_str_toggle(cs, "Nectarine", err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("Toggle failed: %s\n", err->data);
       return false;
     }
 
-    if (VarNectarine != after)
+    if (!TEST_CHECK(VarNectarine == after))
     {
       TEST_MSG("Toggle value is wrong: %s\n", err->data);
       return false;
     }
+    short_line();
   }
 
   VarNectarine = 8;
   mutt_buffer_reset(err);
   rc = bool_he_toggle(cs, he, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -668,14 +702,14 @@ static bool test_toggle(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = bool_he_toggle(cs, he, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
 
   mutt_buffer_reset(err);
   rc = bool_str_toggle(cs, "unknown", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -685,13 +719,12 @@ static bool test_toggle(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
 void config_bool(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -711,15 +744,15 @@ void config_bool(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
-  test_toggle(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
+  TEST_CHECK(test_toggle(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/command.c b/test/config/command.c
index ea28723c576619602b574391107cebb8ff33ec9b..4e480504a6c7161dbd64cfb9205b437df87d8f05 100644 (file)
--- a/test/config/command.c
+++ b/test/config/command.c
@@ -86,8 +86,13 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %s\n", VarApple);
   TEST_MSG("Banana = %s\n", VarBanana);
 
-  if ((mutt_str_strcmp(VarApple, "/apple") != 0) ||
-      (mutt_str_strcmp(VarBanana, "/banana") != 0))
+  if (!TEST_CHECK(mutt_str_strcmp(VarApple, "/apple") == 0))
+  {
+    TEST_MSG("Error: initial values were wrong\n");
+    return false;
+  }
+
+  if (!TEST_CHECK(mutt_str_strcmp(VarBanana, "/banana") == 0))
   {
     TEST_MSG("Error: initial values were wrong\n");
     return false;
@@ -106,14 +111,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "/apple") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "/apple") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -124,14 +129,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "/banana") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "/banana") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -142,7 +147,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "/tmp", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -151,7 +156,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "/usr", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -160,7 +165,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -171,6 +176,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is '%s'\n", NONULL(value.data));
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -186,7 +192,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -198,18 +204,19 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarDamson, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarDamson, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
     }
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarDamson), NONULL(valid[i]));
+    short_line();
   }
 
   name = "Fig";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -222,9 +229,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Elderberry";
   for (unsigned int i = 0; i < mutt_array_size(valid); i++)
   {
+    short_line();
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -236,7 +244,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarElderberry, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarElderberry, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -244,6 +252,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarElderberry), NONULL(valid[i]));
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -254,7 +263,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -264,7 +273,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   name = "Hawthorn";
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -273,18 +282,19 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   name = "Ilama";
   rc = cs_str_string_set(cs, name, "ilama", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(VarIlama), err->data);
 
+  log_line(__func__);
   return true;
 }
 
@@ -300,7 +310,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, (intptr_t) valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -312,18 +322,19 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarJackfruit, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarJackfruit, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
     }
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarJackfruit), NONULL(valid[i]));
+    short_line();
   }
 
   name = "Lemon";
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, (intptr_t) "", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -336,9 +347,10 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Kumquat";
   for (unsigned int i = 0; i < mutt_array_size(valid); i++)
   {
+    short_line();
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, (intptr_t) valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -350,7 +362,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarKumquat, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarKumquat, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -358,6 +370,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarKumquat), NONULL(valid[i]));
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -367,18 +380,19 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Mango";
 
   int rc = cs_str_string_set(cs, name, "mango", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (mutt_str_strcmp(VarMango, (char *) value) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarMango, (char *) value) == 0))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = '%s', '%s'\n", name, VarMango, (char *) value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -391,18 +405,18 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Initial: %s = '%s'\n", name, VarNectarine);
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarNectarine);
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (mutt_str_strcmp(VarNectarine, "/nectarine") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarNectarine, "/nectarine") == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -411,7 +425,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Reset: %s = '%s'\n", name, VarNectarine);
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -423,13 +437,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Initial: %s = '%s'\n", name, VarOlive);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarOlive);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -439,7 +453,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (mutt_str_strcmp(VarOlive, "hello") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarOlive, "hello") == 0))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -447,6 +461,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = '%s'\n", name, VarOlive);
 
+  log_line(__func__);
   return true;
 }
 
@@ -457,7 +472,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Papaya";
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -470,7 +485,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -484,7 +499,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Quince";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -497,7 +512,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -511,7 +526,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Raspberry";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -524,7 +539,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -535,6 +550,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %s\n", name, VarRaspberry);
 
+  log_line(__func__);
   return true;
 }
 
@@ -603,6 +619,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -611,8 +628,6 @@ ti_out:
 
 void config_command(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -631,14 +646,14 @@ void config_command(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/common.c b/test/config/common.c
index d3e4b71bcfa245e6644510a9eead5267d534c136..9131b19e7bad9915caf4b1dfb3dff974c9296842 100644 (file)
--- a/test/config/common.c
+++ b/test/config/common.c
@@ -109,6 +109,7 @@ void set_list(const struct ConfigSet *cs)
 {
   log_line(__func__);
   cs_dump_set(cs);
+  log_line(__func__);
 }
 
 int sort_list_cb(const void *a, const void *b)

diff --git a/test/config/initial.c b/test/config/initial.c
index 9f4701001a6dae4d5e2f391af263e033568ac1d0..dc0949def02712fcecfe19331bcea90211cd534b 100644 (file)
--- a/test/config/initial.c
+++ b/test/config/initial.c
@@ -53,38 +53,39 @@ static bool test_set_initial(struct ConfigSet *cs, struct Buffer *err)
 
   name = "Apple";
   struct HashElem *he_a = cs_get_elem(cs, name);
-  if (!he_a)
+  if (!TEST_CHECK(he_a != NULL))
     return false;
 
   const char *aval = "pie";
   int rc = cs_he_initial_set(cs, he_a, aval, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     TEST_MSG("Expected error: %s\n", err->data);
 
   name = "Banana";
   struct HashElem *he_b = cs_get_elem(cs, name);
-  if (!he_b)
+  if (!TEST_CHECK(he_b != NULL))
     return false;
 
   const char *bval = "split";
   rc = cs_he_initial_set(cs, he_b, bval, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   name = "Cherry";
   struct HashElem *he_c = cs_get_elem(cs, name);
-  if (!he_c)
+  if (!TEST_CHECK(he_c != NULL))
     return false;
 
   const char *cval = "blossom";
   rc = cs_str_initial_set(cs, name, cval, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   TEST_MSG("Apple = %s\n", VarApple);
   TEST_MSG("Banana = %s\n", VarBanana);
   TEST_MSG("Cherry = %s\n", VarCherry);
 
+  log_line(__func__);
   return ((mutt_str_strcmp(VarApple, aval) != 0) &&
           (mutt_str_strcmp(VarBanana, bval) != 0) &&
           (mutt_str_strcmp(VarCherry, cval) != 0));
@@ -110,7 +111,7 @@ void config_initial(void)
 
   set_list(cs);
 
-  if (!test_set_initial(cs, &err))
+  if (!TEST_CHECK(test_set_initial(cs, &err)))
   {
     cs_free(&cs);
     FREE(&err.data);

diff --git a/test/config/long.c b/test/config/long.c
index c7dfc251d12fd2ff2ce286782a80eb622eb1688a..460675bb9d5c605d3ef478d77f93e174f5fc11ed 100644 (file)
--- a/test/config/long.c
+++ b/test/config/long.c
@@ -36,21 +36,21 @@
 #include "config/set.h"
 #include "config/types.h"
 
-static short VarApple;
-static short VarBanana;
-static short VarCherry;
-static short VarDamson;
-static short VarElderberry;
-static short VarFig;
-static short VarGuava;
-static short VarHawthorn;
-static short VarIlama;
-static short VarJackfruit;
-static short VarKumquat;
-static short VarLemon;
-static short VarMango;
-static short VarNectarine;
-static short VarOlive;
+static long VarApple;
+static long VarBanana;
+static long VarCherry;
+static long VarDamson;
+static long VarElderberry;
+static long VarFig;
+static long VarGuava;
+static long VarHawthorn;
+static long VarIlama;
+static long VarJackfruit;
+static long VarKumquat;
+static long VarLemon;
+static long VarMango;
+static long VarNectarine;
+static long VarOlive;
 
 // clang-format off
 static struct ConfigDef Vars[] = {
@@ -79,10 +79,16 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %d\n", VarApple);
   TEST_MSG("Banana = %d\n", VarBanana);
 
-  if ((VarApple != -42) || (VarBanana != 99))
+  if (!TEST_CHECK(VarApple == -42))
   {
-    TEST_MSG("Error: initial values were wrong\n");
-    return false;
+    TEST_MSG("Expected: %d\n", -42);
+    TEST_MSG("Actual  : %d\n", VarApple);
+  }
+
+  if (!TEST_CHECK(VarBanana == 99))
+  {
+    TEST_MSG("Expected: %d\n", 99);
+    TEST_MSG("Actual  : %d\n", VarBanana);
   }
 
   cs_str_string_set(cs, "Apple", "2001", err);
@@ -92,20 +98,19 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_init(&value);
   value.data = mutt_mem_calloc(1, STRING);
   value.dsize = STRING;
-  mutt_buffer_reset(&value);
 
   int rc;
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "-42") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "-42") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -116,14 +121,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "99") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "99") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -134,7 +139,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "123", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -143,7 +148,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -154,6 +159,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is %s\n", value.data);
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -163,7 +169,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
 
   const char *valid[] = { "-123", "0", "-42", "456" };
   int longs[] = { -123, 0, -42, 456 };
-  const char *invalid[] = { "-2147483648", "2147483648", "junk", "", NULL };
+  const char *invalid[] = { "-9223372036854775809", "9223372036854775808", "junk", "", NULL };
 
   char *name = "Damson";
 
@@ -172,9 +178,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     VarDamson = -42;
 
+    TEST_MSG("Setting %s to %s\n", name, valid[i]);
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -186,44 +193,48 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (VarDamson != longs[i])
+    if (!TEST_CHECK(VarDamson == longs[i]))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
     }
     TEST_MSG("%s = %d, set by '%s'\n", name, VarDamson, valid[i]);
+    short_line();
   }
 
-  TEST_MSG("\n");
   for (unsigned int i = 0; i < mutt_array_size(invalid); i++)
   {
+    TEST_MSG("Setting %s to %s\n", name, NONULL(invalid[i]));
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
-      TEST_MSG("Expected error: %s\n", err->data);
+      TEST_MSG("%s = %d, set by '%s'\n", name, VarDamson, NONULL(invalid[i]));
+      TEST_MSG("This test should have failed\n");
+      return false;
     }
     else
     {
-      TEST_MSG("%s = %d, set by '%s'\n", name, VarDamson, invalid[i]);
-      TEST_MSG("This test should have failed\n");
-      // return false;
+      TEST_MSG("Expected error: %s\n", err->data);
     }
+    short_line();
   }
 
   name = "Elderberry";
   mutt_buffer_reset(err);
+  TEST_MSG("Setting %s to %s\n", name, "-42");
   rc = cs_str_string_set(cs, name, "-42", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("This test should have failed\n");
-    // return false;
+    return false;
   }
   else
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -235,7 +246,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   VarFig = 123;
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -245,13 +256,14 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   VarFig = -789;
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = %d, %s\n", name, VarFig, err->data);
 
+  log_line(__func__);
   return true;
 }
 
@@ -259,18 +271,19 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 {
   log_line(__func__);
   char *name = "Guava";
-  short value = 12345;
+  long value = 12345;
 
+  TEST_MSG("Setting %s to %d\n", name, value);
   VarGuava = 0;
   mutt_buffer_reset(err);
   int rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarGuava != value)
+  if (!TEST_CHECK(VarGuava == value))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -278,20 +291,25 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("%s = %d, set to '%d'\n", name, VarGuava, value);
 
+  short_line();
+  TEST_MSG("Setting %s to %d\n", name, value);
   rc = cs_str_native_set(cs, name, value, err);
-  if (rc & CSR_SUC_NO_CHANGE)
+  if (!TEST_CHECK(rc & CSR_SUC_NO_CHANGE) != 0)
   {
-    TEST_MSG("Value of %s wasn't changed\n", name);
+    TEST_MSG("This test should have failed\n");
+    return false;
   }
   else
   {
-    TEST_MSG("This test should have failed\n");
-    return false;
+    TEST_MSG("Value of %s wasn't changed\n", name);
   }
 
   name = "Hawthorn";
-  rc = cs_str_native_set(cs, name, -42, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  value = -42;
+  short_line();
+  TEST_MSG("Setting %s to %d\n", name, value);
+  rc = cs_str_native_set(cs, name, value, err);
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -301,24 +319,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  int invalid[] = { -32769, 32768 };
-  for (unsigned int i = 0; i < mutt_array_size(invalid); i++)
-  {
-    VarGuava = 123;
-    mutt_buffer_reset(err);
-    rc = cs_str_native_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
-    {
-      TEST_MSG("Expected error: %s\n", err->data);
-    }
-    else
-    {
-      TEST_MSG("%s = %d, set by '%d'\n", name, VarGuava, invalid[i]);
-      TEST_MSG("This test should have failed\n");
-      // return false;
-    }
-  }
-
+  log_line(__func__);
   return true;
 }
 
@@ -330,13 +331,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   VarIlama = 3456;
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (value == INT_MIN)
+  if (!TEST_CHECK(value != INT_MIN))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = %ld\n", name, value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -348,14 +350,15 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   VarJackfruit = 345;
   mutt_buffer_reset(err);
 
+  TEST_MSG("%s = %d\n", name, VarJackfruit);
   int rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarJackfruit == 345)
+  if (!TEST_CHECK(VarJackfruit != 345))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -363,19 +366,20 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarJackfruit);
 
+  short_line();
   name = "Kumquat";
   mutt_buffer_reset(err);
 
   TEST_MSG("Initial: %s = %d\n", name, VarKumquat);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "99", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = %d\n", name, VarKumquat);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -385,7 +389,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (VarKumquat != 99)
+  if (!TEST_CHECK(VarKumquat == 99))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -393,6 +397,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarKumquat);
 
+  log_line(__func__);
   return true;
 }
 
@@ -404,7 +409,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarLemon = 123;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "456", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -414,11 +419,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarLemon);
+  short_line();
 
   VarLemon = 456;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 123, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -428,12 +434,13 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("Native: %s = %d\n", name, VarLemon);
+  short_line();
 
   name = "Mango";
   VarMango = 123;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "456", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -443,11 +450,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarMango);
+  short_line();
 
   VarMango = 456;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 123, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -457,12 +465,13 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("Native: %s = %d\n", name, VarMango);
+  short_line();
 
   name = "Nectarine";
   VarNectarine = 123;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "456", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -472,11 +481,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarNectarine);
+  short_line();
 
   VarNectarine = 456;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 123, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -487,6 +497,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %d\n", name, VarNectarine);
 
+  log_line(__func__);
   return true;
 }
 
@@ -519,43 +530,47 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   VarOlive = 123;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "456", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "-99", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -564,8 +579,6 @@ ti_out:
 
 void config_long(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -584,14 +597,14 @@ void config_long(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/magic.c b/test/config/magic.c
index 2ab71d34cf70eab9efcf077035fc9f48a30913eb..99657020d74bca3631c835e19061ebe7d0852c21 100644 (file)
--- a/test/config/magic.c
+++ b/test/config/magic.c
@@ -75,10 +75,16 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %d\n", VarApple);
   TEST_MSG("Banana = %d\n", VarBanana);
 
-  if ((VarApple != 1) || (VarBanana != 3))
+  if (!TEST_CHECK(VarApple == 1))
   {
-    TEST_MSG("Error: initial values were wrong\n");
-    return false;
+    TEST_MSG("Expected: %d\n", 1);
+    TEST_MSG("Actual  : %d\n", VarApple);
+  }
+
+  if (!TEST_CHECK(VarBanana == 3))
+  {
+    TEST_MSG("Expected: %d\n", 3);
+    TEST_MSG("Actual  : %d\n", VarBanana);
   }
 
   cs_str_string_set(cs, "Apple", "MMDF", err);
@@ -94,14 +100,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "mbox") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "mbox") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -112,14 +118,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "MH") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "MH") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: %s\n", value.data);
     FREE(&value.data);
@@ -130,7 +136,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "mmdf", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -139,7 +145,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -150,6 +156,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is %s\n", value.data);
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -168,13 +175,13 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
 
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
     }
 
-    if (VarDamson == (((i + 1) % 4) + 1))
+    if (!TEST_CHECK(VarDamson != (((i + 1) % 4) + 1)))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -198,7 +205,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("Expected error: %s\n", err->data);
     }
@@ -210,6 +217,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     }
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -226,7 +234,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
     VarElderberry = valid[i];
     mutt_buffer_reset(err);
     rc = cs_str_string_get(cs, name, err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("Get failed: %s\n", err->data);
       return false;
@@ -238,12 +246,13 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_reset(err);
   TEST_MSG("Expect error for next test\n");
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -256,13 +265,13 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   VarFig = MUTT_MBOX;
   mutt_buffer_reset(err);
   int rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarFig != value)
+  if (!TEST_CHECK(VarFig == value))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -288,7 +297,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     VarFig = MUTT_MBOX;
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("Expected error: %s\n", err->data);
     }
@@ -300,6 +309,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     }
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -311,13 +321,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   VarGuava = MUTT_MAILDIR;
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (value == INT_MIN)
+  if (!TEST_CHECK(value != INT_MIN))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = %ld\n", name, value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -330,13 +341,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_reset(err);
 
   int rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarHawthorn == MUTT_MAILDIR)
+  if (!TEST_CHECK(VarHawthorn != MUTT_MAILDIR))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -346,7 +357,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -358,13 +369,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Initial: %s = %d\n", name, VarIlama);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "maildir", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = %d\n", name, VarIlama);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -374,7 +385,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (VarIlama != MUTT_MAILDIR)
+  if (!TEST_CHECK(VarIlama == MUTT_MAILDIR))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -382,6 +393,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarIlama);
 
+  log_line(__func__);
   return true;
 }
 
@@ -393,7 +405,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarJackfruit = MUTT_MBOX;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "maildir", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -407,7 +419,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarJackfruit = MUTT_MBOX;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, MUTT_MAILDIR, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -422,7 +434,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarKumquat = MUTT_MBOX;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "maildir", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -436,7 +448,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarKumquat = MUTT_MBOX;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, MUTT_MAILDIR, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -451,7 +463,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarLemon = MUTT_MBOX;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "maildir", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -465,7 +477,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarLemon = MUTT_MBOX;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, MUTT_MAILDIR, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -476,6 +488,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %d\n", name, VarLemon);
 
+  log_line(__func__);
   return true;
 }
 
@@ -507,7 +520,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set parent
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "maildir", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -517,7 +530,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "mh", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -527,7 +540,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -537,13 +550,14 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -552,8 +566,6 @@ ti_out:
 
 void config_magic(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -572,14 +584,14 @@ void config_magic(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/mbtable.c b/test/config/mbtable.c
index 83b7e57457f22d74c2b30db0d913222b93900c3a..c33224bb6a3f127d7207616900f0ab9885646328 100644 (file)
--- a/test/config/mbtable.c
+++ b/test/config/mbtable.c
@@ -82,8 +82,13 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %s\n", VarApple->orig_str);
   TEST_MSG("Banana = %s\n", VarBanana->orig_str);
 
-  if ((mutt_str_strcmp(VarApple->orig_str, "apple") != 0) ||
-      (mutt_str_strcmp(VarBanana->orig_str, "banana") != 0))
+  if (!TEST_CHECK(mutt_str_strcmp(VarApple->orig_str, "apple") == 0))
+  {
+    TEST_MSG("Error: initial values were wrong\n");
+    return false;
+  }
+
+  if (!TEST_CHECK(mutt_str_strcmp(VarBanana->orig_str, "banana") == 0))
   {
     TEST_MSG("Error: initial values were wrong\n");
     return false;
@@ -102,14 +107,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "apple") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "apple") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -120,14 +125,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "banana") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "banana") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: %s\n", value.data);
     FREE(&value.data);
@@ -138,7 +143,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "config.*", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -147,7 +152,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "file.*", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -156,7 +161,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -167,6 +172,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is '%s'\n", NONULL(value.data));
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -183,7 +189,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -196,7 +202,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     }
 
     mb = VarDamson ? VarDamson->orig_str : NULL;
-    if (mutt_str_strcmp(mb, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(mb, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -209,7 +215,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -222,7 +228,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     }
 
     const char *orig_str = VarElderberry ? VarElderberry->orig_str : NULL;
-    if (mutt_str_strcmp(orig_str, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(orig_str, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -232,12 +238,13 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "\377", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -249,7 +256,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -260,7 +267,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   name = "Guava";
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -270,12 +277,12 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   name = "Hawthorn";
   rc = cs_str_string_set(cs, name, "hawthorn", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -283,6 +290,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   mb = VarHawthorn ? VarHawthorn->orig_str : NULL;
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(mb), err->data);
 
+  log_line(__func__);
   return true;
 }
 
@@ -297,14 +305,14 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_native_set(cs, name, (intptr_t) t, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     goto tns_out;
   }
 
   mb = VarIlama ? VarIlama->orig_str : NULL;
-  if (mutt_str_strcmp(mb, t->orig_str) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(mb, t->orig_str) == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     goto tns_out;
@@ -314,13 +322,13 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Jackfruit";
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 0, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     goto tns_out;
   }
 
-  if (VarJackfruit != NULL)
+  if (!TEST_CHECK(VarJackfruit == NULL))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     goto tns_out;
@@ -331,6 +339,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   result = true;
 tns_out:
   mbtable_free(&t);
+  log_line(__func__);
   return result;
 }
 
@@ -340,14 +349,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Kumquat";
 
   int rc = cs_str_string_set(cs, name, "kumquat", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
   struct MbTable *t = (struct MbTable *) value;
 
-  if (VarKumquat != t)
+  if (!TEST_CHECK(VarKumquat == t))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -356,6 +365,7 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   char *mb2 = t ? t->orig_str : NULL;
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(mb1), NONULL(mb2));
 
+  log_line(__func__);
   return true;
 }
 
@@ -370,20 +380,20 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   char *mb = VarLemon ? VarLemon->orig_str : NULL;
   TEST_MSG("Initial: %s = '%s'\n", name, NONULL(mb));
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   mb = VarLemon ? VarLemon->orig_str : NULL;
   TEST_MSG("Set: %s = '%s'\n", name, NONULL(mb));
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
   mb = VarLemon ? VarLemon->orig_str : NULL;
-  if (mutt_str_strcmp(mb, "lemon") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(mb, "lemon") == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -397,13 +407,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Initial: %s = '%s'\n", name, VarMango->orig_str);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarMango->orig_str);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -413,7 +423,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (mutt_str_strcmp(VarMango->orig_str, "hello") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarMango->orig_str, "hello") == 0))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -421,6 +431,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = '%s'\n", name, VarMango->orig_str);
 
+  log_line(__func__);
   return true;
 }
 
@@ -435,7 +446,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   char *mb = NULL;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -449,7 +460,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP t, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -464,7 +475,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Olive";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -478,7 +489,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP t, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -493,7 +504,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Papaya";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -507,7 +518,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP t, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -519,6 +530,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   mb = VarPapaya ? VarPapaya->orig_str : NULL;
   TEST_MSG("Native: %s = %s\n", name, NONULL(mb));
 
+  log_line(__func__);
   result = true;
 tv_out:
   mbtable_free(&t);
@@ -559,7 +571,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set parent
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -569,7 +581,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "world", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -579,7 +591,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -589,7 +601,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -599,13 +611,12 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   result = true;
 ti_out:
   ac_free(cs, &ac);
+  log_line(__func__);
   return result;
 }
 
 void config_mbtable(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -624,14 +635,14 @@ void config_mbtable(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/number.c b/test/config/number.c
index 2b0b8f5fb9d8fb405a10270071576d69f4fde568..fdc8e7edc31fd59ec29da8a4075efdd0faa2d6db 100644 (file)
--- a/test/config/number.c
+++ b/test/config/number.c
@@ -31,10 +31,10 @@
 #include "mutt/memory.h"
 #include "mutt/string2.h"
 #include "config/account.h"
+#include "config/common.h"
 #include "config/number.h"
 #include "config/set.h"
 #include "config/types.h"
-#include "config/common.h"
 
 static short VarApple;
 static short VarBanana;
@@ -79,16 +79,16 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %d\n", VarApple);
   TEST_MSG("Banana = %d\n", VarBanana);
 
-  if (VarApple != -42)
+  if (!TEST_CHECK(VarApple == -42))
   {
-    TEST_MSG("Expected: %d\n", VarApple);
-    TEST_MSG("Actual  : %d\n", -42);
+    TEST_MSG("Expected: %d\n", -42);
+    TEST_MSG("Actual  : %d\n", VarApple);
   }
 
-  if (VarBanana != 99)
+  if (!TEST_CHECK(VarBanana == 99))
   {
-    TEST_MSG("Expected: %d\n", VarBanana);
-    TEST_MSG("Actual  : %d\n", 99);
+    TEST_MSG("Expected: %d\n", 99);
+    TEST_MSG("Actual  : %d\n", VarBanana);
   }
 
   cs_str_string_set(cs, "Apple", "2001", err);
@@ -98,20 +98,19 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_init(&value);
   value.data = mutt_mem_calloc(1, STRING);
   value.dsize = STRING;
-  mutt_buffer_reset(&value);
 
   int rc;
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "-42") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "-42") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -122,14 +121,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "99") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "99") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -140,7 +139,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "123", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -149,7 +148,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -160,6 +159,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is %s\n", value.data);
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -177,9 +177,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     VarDamson = -42;
 
+    TEST_MSG("Setting %s to %s\n", name, valid[i]);
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -191,34 +192,38 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (VarDamson != numbers[i])
+    if (!TEST_CHECK(VarDamson == numbers[i]))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
     }
     TEST_MSG("%s = %d, set by '%s'\n", name, VarDamson, valid[i]);
+    short_line();
   }
 
   for (unsigned int i = 0; i < mutt_array_size(invalid); i++)
   {
+    TEST_MSG("Setting %s to %s\n", name, NONULL(invalid[i]));
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
-    {
-      TEST_MSG("Expected error: %s\n", err->data);
-    }
-    else
+    if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("%s = %d, set by '%s'\n", name, VarDamson, invalid[i]);
       TEST_MSG("This test should have failed\n");
       return false;
     }
+    else
+    {
+      TEST_MSG("Expected error: %s\n", err->data);
+    }
+    short_line();
   }
 
   name = "Elderberry";
   mutt_buffer_reset(err);
+  TEST_MSG("Setting %s to %s\n", name, "-42");
   rc = cs_str_string_set(cs, name, "-42", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("This test should have failed\n");
     return false;
@@ -228,6 +233,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("Expected error: %s\n", err->data);
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -239,7 +245,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   VarFig = 123;
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -249,13 +255,14 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   VarFig = -789;
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = %d, %s\n", name, VarFig, err->data);
 
+  log_line(__func__);
   return true;
 }
 
@@ -265,16 +272,17 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Guava";
   short value = 12345;
 
+  TEST_MSG("Setting %s to %d\n", name, value);
   VarGuava = 0;
   mutt_buffer_reset(err);
   int rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarGuava != value)
+  if (!TEST_CHECK(VarGuava == value))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -282,21 +290,25 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("%s = %d, set to '%d'\n", name, VarGuava, value);
 
+  short_line();
+  TEST_MSG("Setting %s to %d\n", name, value);
   rc = cs_str_native_set(cs, name, value, err);
-  if (rc & CSR_SUC_NO_CHANGE)
+  if (!TEST_CHECK(rc & CSR_SUC_NO_CHANGE) != 0)
   {
-    TEST_MSG("Value of %s wasn't changed\n", name);
+    TEST_MSG("This test should have failed\n");
+    return false;
   }
   else
   {
-    TEST_MSG("This test should have failed\n");
-    return false;
+    TEST_MSG("Value of %s wasn't changed\n", name);
   }
 
   name = "Hawthorn";
   value = -42;
+  short_line();
+  TEST_MSG("Setting %s to %d\n", name, value);
   rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -309,10 +321,12 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   int invalid[] = { -32769, 32768 };
   for (unsigned int i = 0; i < mutt_array_size(invalid); i++)
   {
+    short_line();
     VarGuava = 123;
+    TEST_MSG("Setting %s to %d\n", name, invalid[i]);
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("Expected error: %s\n", err->data);
     }
@@ -324,6 +338,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     }
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -335,13 +350,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   VarIlama = 3456;
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (value == INT_MIN)
+  if (!TEST_CHECK(value != INT_MIN))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = %ld\n", name, value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -353,14 +369,15 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   VarJackfruit = 345;
   mutt_buffer_reset(err);
 
+  TEST_MSG("%s = %d\n", name, VarJackfruit);
   int rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarJackfruit == 345)
+  if (!TEST_CHECK(VarJackfruit != 345))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -368,19 +385,20 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarJackfruit);
 
+  short_line();
   name = "Kumquat";
   mutt_buffer_reset(err);
 
   TEST_MSG("Initial: %s = %d\n", name, VarKumquat);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "99", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = %d\n", name, VarKumquat);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -390,7 +408,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (VarKumquat != 99)
+  if (!TEST_CHECK(VarKumquat == 99))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -398,6 +416,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarKumquat);
 
+  log_line(__func__);
   return true;
 }
 
@@ -409,7 +428,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarLemon = 123;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "456", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -419,11 +438,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarLemon);
+  short_line();
 
   VarLemon = 456;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 123, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -433,12 +453,13 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("Native: %s = %d\n", name, VarLemon);
+  short_line();
 
   name = "Mango";
   VarMango = 123;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "456", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -448,11 +469,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarMango);
+  short_line();
 
   VarMango = 456;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 123, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -462,12 +484,13 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("Native: %s = %d\n", name, VarMango);
+  short_line();
 
   name = "Nectarine";
   VarNectarine = 123;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "456", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -477,11 +500,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarNectarine);
+  short_line();
 
   VarNectarine = 456;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 123, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -492,10 +516,11 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %d\n", name, VarNectarine);
 
+  log_line(__func__);
   return true;
 }
 
-void dump_native(struct ConfigSet *cs, const char *parent, const char *child)
+static void dump_native(struct ConfigSet *cs, const char *parent, const char *child)
 {
   intptr_t pval = cs_str_native_get(cs, parent, NULL);
   intptr_t cval = cs_str_native_get(cs, child, NULL);
@@ -524,43 +549,47 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   VarOlive = 123;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "456", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "-99", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -569,8 +598,6 @@ ti_out:
 
 void config_number(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -589,14 +616,14 @@ void config_number(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/path.c b/test/config/path.c
index 445432bd0bbdb6108b0360c63b8a3c9794a36ca1..42403291b29a89a9cb323f962d8bfb46487ca469 100644 (file)
--- a/test/config/path.c
+++ b/test/config/path.c
@@ -86,8 +86,13 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %s\n", VarApple);
   TEST_MSG("Banana = %s\n", VarBanana);
 
-  if ((mutt_str_strcmp(VarApple, "/apple") != 0) ||
-      (mutt_str_strcmp(VarBanana, "/banana") != 0))
+  if (!TEST_CHECK(mutt_str_strcmp(VarApple, "/apple") == 0))
+  {
+    TEST_MSG("Error: initial values were wrong\n");
+    return false;
+  }
+
+  if (!TEST_CHECK(mutt_str_strcmp(VarBanana, "/banana") == 0))
   {
     TEST_MSG("Error: initial values were wrong\n");
     return false;
@@ -106,14 +111,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "/apple") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "/apple") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -124,14 +129,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "/banana") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "/banana") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -142,7 +147,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "/tmp", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -151,7 +156,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "/usr", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -160,7 +165,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -171,6 +176,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is '%s'\n", NONULL(value.data));
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -186,7 +192,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -198,18 +204,19 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarDamson, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarDamson, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
     }
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarDamson), NONULL(valid[i]));
+    short_line();
   }
 
   name = "Fig";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -222,9 +229,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Elderberry";
   for (unsigned int i = 0; i < mutt_array_size(valid); i++)
   {
+    short_line();
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -236,7 +244,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarElderberry, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarElderberry, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -244,6 +252,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarElderberry), NONULL(valid[i]));
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -254,7 +263,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -264,7 +273,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   name = "Hawthorn";
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -273,18 +282,19 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   name = "Ilama";
   rc = cs_str_string_set(cs, name, "ilama", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(VarIlama), err->data);
 
+  log_line(__func__);
   return true;
 }
 
@@ -300,7 +310,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, (intptr_t) valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -312,18 +322,19 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarJackfruit, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarJackfruit, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
     }
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarJackfruit), NONULL(valid[i]));
+    short_line();
   }
 
   name = "Lemon";
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, (intptr_t) "", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -336,9 +347,10 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Kumquat";
   for (unsigned int i = 0; i < mutt_array_size(valid); i++)
   {
+    short_line();
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, (intptr_t) valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -350,7 +362,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarKumquat, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarKumquat, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -358,6 +370,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarKumquat), NONULL(valid[i]));
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -367,18 +380,19 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Mango";
 
   int rc = cs_str_string_set(cs, name, "mango", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (mutt_str_strcmp(VarMango, (char *) value) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarMango, (char *) value) == 0))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = '%s', '%s'\n", name, VarMango, (char *) value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -391,18 +405,18 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Initial: %s = '%s'\n", name, VarNectarine);
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarNectarine);
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (mutt_str_strcmp(VarNectarine, "/nectarine") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarNectarine, "/nectarine") == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -411,7 +425,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Reset: %s = '%s'\n", name, VarNectarine);
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -423,13 +437,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Initial: %s = '%s'\n", name, VarOlive);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarOlive);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -439,7 +453,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (mutt_str_strcmp(VarOlive, "hello") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarOlive, "hello") == 0))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -447,6 +461,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = '%s'\n", name, VarOlive);
 
+  log_line(__func__);
   return true;
 }
 
@@ -457,7 +472,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Papaya";
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -470,7 +485,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -484,7 +499,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Quince";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -497,7 +512,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -511,7 +526,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Raspberry";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -524,7 +539,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -535,6 +550,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %s\n", name, VarRaspberry);
 
+  log_line(__func__);
   return true;
 }
 
@@ -603,6 +619,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -611,8 +628,6 @@ ti_out:
 
 void config_path(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -631,14 +646,14 @@ void config_path(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/quad.c b/test/config/quad.c
index 54c7c1c900e50f343bc182245add5a97ce48554d..8b0b6942ab612b0eb25599bc6be21cf5328daf33 100644 (file)
--- a/test/config/quad.c
+++ b/test/config/quad.c
@@ -80,10 +80,16 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %d\n", VarApple);
   TEST_MSG("Banana = %d\n", VarBanana);
 
-  if ((VarApple != 0) || (VarBanana != 3))
+  if (!TEST_CHECK(VarApple == 0))
   {
-    TEST_MSG("Error: initial values were wrong\n");
-    return false;
+    TEST_MSG("Expected: %d\n", 0);
+    TEST_MSG("Actual  : %d\n", VarApple);
+  }
+
+  if (!TEST_CHECK(VarBanana == 3))
+  {
+    TEST_MSG("Expected: %d\n", 3);
+    TEST_MSG("Actual  : %d\n", VarBanana);
   }
 
   cs_str_string_set(cs, "Apple", "ask-yes", err);
@@ -93,20 +99,19 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_init(&value);
   value.data = mutt_mem_calloc(1, STRING);
   value.dsize = STRING;
-  mutt_buffer_reset(&value);
 
   int rc;
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "no") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "no") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -124,7 +129,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "ask-yes") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "ask-yes") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -135,7 +140,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "ask-yes", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -144,7 +149,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -155,6 +160,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is '%s'\n", NONULL(value.data));
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -173,9 +179,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     VarDamson = ((i + 1) % 4);
 
+    TEST_MSG("Setting %s to %s\n", name, valid[i]);
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -192,7 +199,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     {
       mutt_buffer_reset(err);
       rc = cs_str_string_set(cs, name, valid[i], err);
-      if (CSR_RESULT(rc) != CSR_SUCCESS)
+      if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
       {
         TEST_MSG("%s\n", err->data);
         return false;
@@ -204,13 +211,14 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
         continue;
       }
     }
+    short_line();
   }
 
   for (unsigned int i = 0; i < mutt_array_size(invalid); i++)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("Expected error: %s\n", err->data);
     }
@@ -220,8 +228,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       TEST_MSG("This test should have failed\n");
       return false;
     }
+    short_line();
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -250,12 +260,13 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_reset(err);
   TEST_MSG("Expect error for next test\n");
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -265,16 +276,17 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Fig";
   char value = MUTT_YES;
 
+  TEST_MSG("Setting %s to %d\n", name, value);
   VarFig = MUTT_NO;
   mutt_buffer_reset(err);
   int rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarFig != value)
+  if (!TEST_CHECK(VarFig == value))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -282,9 +294,11 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("%s = %d, set to '%d'\n", name, VarFig, value);
 
+  short_line();
   mutt_buffer_reset(err);
+  TEST_MSG("Setting %s to %d\n", name, value);
   rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(rc & CSR_SUC_NO_CHANGE) != 0)
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -298,10 +312,12 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   int invalid[] = { -1, 4 };
   for (unsigned int i = 0; i < mutt_array_size(invalid); i++)
   {
+    short_line();
     VarFig = MUTT_NO;
+    TEST_MSG("Setting %s to %d\n", name, invalid[i]);
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("Expected error: %s\n", err->data);
     }
@@ -313,6 +329,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     }
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -324,13 +341,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   VarGuava = MUTT_YES;
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (value == INT_MIN)
+  if (!TEST_CHECK(value != INT_MIN))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = %ld\n", name, value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -342,14 +360,15 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   VarHawthorn = MUTT_YES;
   mutt_buffer_reset(err);
 
+  TEST_MSG("%s = %d\n", name, VarJackfruit);
   int rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarHawthorn == MUTT_YES)
+  if (!TEST_CHECK(VarHawthorn != true))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -357,19 +376,20 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarHawthorn);
 
+  short_line();
   name = "Ilama";
   mutt_buffer_reset(err);
 
   TEST_MSG("Initial: %s = %d\n", name, VarIlama);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "ask-yes", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = %d\n", name, VarIlama);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -379,7 +399,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (VarIlama != MUTT_ASKYES)
+  if (!TEST_CHECK(VarIlama == MUTT_ASKYES))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -387,6 +407,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarIlama);
 
+  log_line(__func__);
   return true;
 }
 
@@ -398,7 +419,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarJackfruit = MUTT_NO;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "yes", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -408,11 +429,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarJackfruit);
+  short_line();
 
   VarJackfruit = MUTT_NO;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 1, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -422,12 +444,13 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("Native: %s = %d\n", name, VarJackfruit);
+  short_line();
 
   name = "Kumquat";
   VarKumquat = MUTT_NO;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "yes", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -437,11 +460,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarKumquat);
+  short_line();
 
   VarKumquat = MUTT_NO;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 1, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -451,12 +475,13 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("Native: %s = %d\n", name, VarKumquat);
+  short_line();
 
   name = "Lemon";
   VarLemon = MUTT_NO;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "yes", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -466,11 +491,12 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
   TEST_MSG("String: %s = %d\n", name, VarLemon);
+  short_line();
 
   VarLemon = MUTT_NO;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 1, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -481,6 +507,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %d\n", name, VarLemon);
 
+  log_line(__func__);
   return true;
 }
 
@@ -512,17 +539,18 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set parent
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "yes", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "no", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -532,27 +560,30 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("Value of %s wasn't changed\n", parent);
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
+  short_line();
 
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -589,27 +620,27 @@ static bool test_toggle(struct ConfigSet *cs, struct Buffer *err)
     VarNectarine = before;
     mutt_buffer_reset(err);
     intptr_t value = cs_he_native_get(cs, he, err);
-    if (value == INT_MIN)
+    if (!TEST_CHECK(value != INT_MIN))
     {
       TEST_MSG("Get failed: %s\n", err->data);
       return false;
     }
 
     char copy = value;
-    if (copy != before)
+    if (!TEST_CHECK(copy == before))
     {
       TEST_MSG("Initial value is wrong: %s\n", err->data);
       return false;
     }
 
     rc = quad_he_toggle(cs, he, err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("Toggle failed: %s\n", err->data);
       return false;
     }
 
-    if (VarNectarine != after)
+    if (!TEST_CHECK(VarNectarine == after))
     {
       TEST_MSG("Toggle value is wrong: %s\n", err->data);
       return false;
@@ -619,7 +650,7 @@ static bool test_toggle(struct ConfigSet *cs, struct Buffer *err)
   VarNectarine = 8;
   mutt_buffer_reset(err);
   rc = quad_he_toggle(cs, he, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -631,18 +662,17 @@ static bool test_toggle(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = quad_he_toggle(cs, he, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
 
+  log_line(__func__);
   return true;
 }
 
 void config_quad(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -651,8 +681,8 @@ void config_quad(void)
 
   struct ConfigSet *cs = cs_create(30);
 
-  quad_init(cs);
   bool_init(cs);
+  quad_init(cs);
   dont_fail = true;
   if (!cs_register_variables(cs, Vars, 0))
     return;
@@ -662,15 +692,15 @@ void config_quad(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
-  test_toggle(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
+  TEST_CHECK(test_toggle(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/regex.c b/test/config/regex.c
index 2fa36b426fba3504ce9b8fb25fbdbd55df9d3734..80fec2f1687f03fa6d213ec19d64a11c5d1e5fd9 100644 (file)
--- a/test/config/regex.c
+++ b/test/config/regex.c
@@ -87,8 +87,13 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %s\n", VarApple->pattern);
   TEST_MSG("Banana = %s\n", VarBanana->pattern);
 
-  if ((mutt_str_strcmp(VarApple->pattern, "apple.*") != 0) ||
-      (mutt_str_strcmp(VarBanana->pattern, "banana.*") != 0))
+  if (!TEST_CHECK(mutt_str_strcmp(VarApple->pattern, "apple.*") == 0))
+  {
+    TEST_MSG("Error: initial values were wrong\n");
+    return false;
+  }
+
+  if (!TEST_CHECK(mutt_str_strcmp(VarBanana->pattern, "banana.*") == 0))
   {
     TEST_MSG("Error: initial values were wrong\n");
     return false;
@@ -107,14 +112,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "apple.*") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "apple.*") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -125,14 +130,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "banana.*") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "banana.*") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: %s\n", value.data);
     FREE(&value.data);
@@ -143,7 +148,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "up.*", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -152,7 +157,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "down.*", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -161,7 +166,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -172,6 +177,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is '%s'\n", NONULL(value.data));
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -188,7 +194,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -201,7 +207,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     }
 
     regex = VarDamson ? VarDamson->pattern : NULL;
-    if (mutt_str_strcmp(regex, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(regex, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -214,7 +220,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -227,7 +233,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     }
 
     regex = VarElderberry ? VarElderberry->pattern : NULL;
-    if (mutt_str_strcmp(regex, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(regex, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -237,7 +243,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "\\1", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -247,6 +253,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -258,7 +265,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -269,7 +276,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   name = "Guava";
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -279,12 +286,12 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   name = "Hawthorn";
   rc = cs_str_string_set(cs, name, "hawthorn", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -292,6 +299,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   regex = VarHawthorn ? VarHawthorn->pattern : NULL;
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(regex), err->data);
 
+  log_line(__func__);
   return true;
 }
 
@@ -306,14 +314,14 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_native_set(cs, name, (intptr_t) r, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     goto tns_out;
   }
 
   regex = VarIlama ? VarIlama->pattern : NULL;
-  if (mutt_str_strcmp(regex, r->pattern) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(regex, r->pattern) == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     goto tns_out;
@@ -326,7 +334,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, (intptr_t) r, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     goto tns_out;
@@ -336,13 +344,13 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Jackfruit";
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, 0, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     goto tns_out;
   }
 
-  if (VarJackfruit != NULL)
+  if (!TEST_CHECK(VarJackfruit == NULL))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     goto tns_out;
@@ -358,7 +366,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, (intptr_t) r, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -368,6 +376,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     goto tns_out;
   }
 
+  log_line(__func__);
   result = true;
 tns_out:
   regex_free(&r);
@@ -380,14 +389,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Lemon";
 
   int rc = cs_str_string_set(cs, name, "lemon.*", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
   struct Regex *r = (struct Regex *) value;
 
-  if (VarLemon != r)
+  if (!TEST_CHECK(VarLemon == r))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -396,6 +405,7 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   char *regex2 = r ? r->pattern : NULL;
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(regex1), NONULL(regex2));
 
+  log_line(__func__);
   return true;
 }
 
@@ -410,20 +420,20 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   char *regex = VarMango ? VarMango->pattern : NULL;
   TEST_MSG("Initial: %s = '%s'\n", name, NONULL(regex));
   int rc = cs_str_string_set(cs, name, "hello.*", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   regex = VarMango ? VarMango->pattern : NULL;
   TEST_MSG("Set: %s = '%s'\n", name, NONULL(regex));
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
   regex = VarMango ? VarMango->pattern : NULL;
-  if (mutt_str_strcmp(regex, "mango.*") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(regex, "mango.*") == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -432,7 +442,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Reset: %s = '%s'\n", name, NONULL(regex));
 
   rc = cs_str_reset(cs, "Nectarine", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -448,13 +458,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Initial: %s = '%s'\n", name, VarOlive->pattern);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "hel*o", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarOlive->pattern);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -464,7 +474,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (mutt_str_strcmp(VarOlive->pattern, "hel*o") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarOlive->pattern, "hel*o") == 0))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -472,6 +482,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = '%s'\n", name, VarOlive->pattern);
 
+  log_line(__func__);
   return true;
 }
 
@@ -486,7 +497,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Papaya";
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "hello.*", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -500,7 +511,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP r, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -515,7 +526,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Quince";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello.*", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -529,7 +540,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP r, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -544,7 +555,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Raspberry";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello.*", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -558,7 +569,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP r, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -573,6 +584,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   result = true;
 tv_out:
   regex_free(&r);
+  log_line(__func__);
   return result;
 }
 
@@ -610,7 +622,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set parent
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "hello.*", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -620,7 +632,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "world.*", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -630,7 +642,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -640,13 +652,14 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -655,8 +668,6 @@ ti_out:
 
 void config_regex(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -675,14 +686,14 @@ void config_regex(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/set.c b/test/config/set.c
index 0be71989c47d9f57b2cc5932f3ef2897f4648a87..655b3e39b7dae8c1e6b9a2b55f3358b568e9d2a7 100644 (file)
--- a/test/config/set.c
+++ b/test/config/set.c
@@ -46,32 +46,27 @@ static struct ConfigDef Vars[] = {
 };
 // clang-format on
 
-static int dummy_string_set(const struct ConfigSet *cs, void *var, struct ConfigDef *cdef,
-                            const char *value, struct Buffer *err)
+static int dummy_string_set(const struct ConfigSet *cs, void *var, struct ConfigDef *cdef, const char *value, struct Buffer *err)
 {
   return CSR_ERR_CODE;
 }
 
-static int dummy_string_get(const struct ConfigSet *cs, void *var,
-                            const struct ConfigDef *cdef, struct Buffer *result)
+static int dummy_string_get(const struct ConfigSet *cs, void *var, const struct ConfigDef *cdef, struct Buffer *result)
 {
   return CSR_ERR_CODE;
 }
 
-static int dummy_native_set(const struct ConfigSet *cs, void *var,
-                            const struct ConfigDef *cdef, intptr_t value, struct Buffer *err)
+static int dummy_native_set(const struct ConfigSet *cs, void *var, const struct ConfigDef *cdef, intptr_t value, struct Buffer *err)
 {
   return CSR_ERR_CODE;
 }
 
-static intptr_t dummy_native_get(const struct ConfigSet *cs, void *var,
-                                 const struct ConfigDef *cdef, struct Buffer *err)
+static intptr_t dummy_native_get(const struct ConfigSet *cs, void *var, const struct ConfigDef *cdef, struct Buffer *err)
 {
   return INT_MIN;
 }
 
-static int dummy_reset(const struct ConfigSet *cs, void *var,
-                       const struct ConfigDef *cdef, struct Buffer *err)
+static int dummy_reset(const struct ConfigSet *cs, void *var, const struct ConfigDef *cdef, struct Buffer *err)
 {
   return CSR_ERR_CODE;
 }
@@ -91,7 +86,7 @@ void config_set(void)
   mutt_buffer_reset(&err);
 
   struct ConfigSet *cs = cs_create(30);
-  if (!cs)
+  if (!TEST_CHECK(cs != NULL))
     return;
 
   cs_add_listener(cs, log_listener);
@@ -103,7 +98,7 @@ void config_set(void)
     "dummy", NULL, NULL, NULL, NULL, NULL, NULL,
   };
 
-  if (!cs_register_type(cs, DT_STRING, &cst_dummy))
+  if (TEST_CHECK(!cs_register_type(cs, DT_STRING, &cst_dummy)))
   {
     TEST_MSG("Expected error\n");
   }
@@ -118,7 +113,7 @@ void config_set(void)
     dummy_native_get, dummy_reset,      dummy_destroy,
   };
 
-  if (!cs_register_type(cs, 25, &cst_dummy2))
+  if (TEST_CHECK(!cs_register_type(cs, 25, &cst_dummy2)))
   {
     TEST_MSG("Expected error\n");
   }
@@ -131,7 +126,7 @@ void config_set(void)
   bool_init(cs);
   bool_init(cs); /* second one should fail */
 
-  if (!cs_register_variables(cs, Vars, 0))
+  if (TEST_CHECK(!cs_register_variables(cs, Vars, 0)))
   {
     TEST_MSG("Expected error\n");
   }
@@ -143,7 +138,7 @@ void config_set(void)
 
   const char *name = "Unknown";
   int result = cs_str_string_set(cs, name, "hello", &err);
-  if (CSR_RESULT(result) == CSR_ERR_UNKNOWN)
+  if (TEST_CHECK(CSR_RESULT(result) == CSR_ERR_UNKNOWN))
   {
     TEST_MSG("Expected error: Unknown var '%s'\n", name);
   }
@@ -154,7 +149,7 @@ void config_set(void)
   }
 
   result = cs_str_string_get(cs, name, &err);
-  if (CSR_RESULT(result) == CSR_ERR_UNKNOWN)
+  if (TEST_CHECK(CSR_RESULT(result) == CSR_ERR_UNKNOWN))
   {
     TEST_MSG("Expected error: Unknown var '%s'\n", name);
   }
@@ -165,7 +160,7 @@ void config_set(void)
   }
 
   result = cs_str_native_set(cs, name, IP "hello", &err);
-  if (CSR_RESULT(result) == CSR_ERR_UNKNOWN)
+  if (TEST_CHECK(CSR_RESULT(result) == CSR_ERR_UNKNOWN))
   {
     TEST_MSG("Expected error: Unknown var '%s'\n", name);
   }
@@ -176,7 +171,7 @@ void config_set(void)
   }
 
   intptr_t native = cs_str_native_get(cs, name, &err);
-  if (native == INT_MIN)
+  if (TEST_CHECK(native == INT_MIN))
   {
     TEST_MSG("Expected error: Unknown var '%s'\n", name);
   }
@@ -187,15 +182,16 @@ void config_set(void)
   }
 
   struct HashElem *he = cs_get_elem(cs, "Banana");
-  if (!he)
+  if (!TEST_CHECK(he != NULL))
     return;
 
   set_list(cs);
 
   const struct ConfigSetType *cst = cs_get_type_def(cs, 15);
-  if (cst)
+  if (!TEST_CHECK(!cst))
     return;
 
   cs_free(&cs);
   FREE(&err.data);
+  log_line(__func__);
 }

diff --git a/test/config/sort.c b/test/config/sort.c
index 468858e9f1cf544e9f448652cd9593d6e3fadcf5..ba0844b33358a1e92129f95440750ca8d4a7e945 100644 (file)
--- a/test/config/sort.c
+++ b/test/config/sort.c
@@ -104,10 +104,16 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %d\n", VarApple);
   TEST_MSG("Banana = %d\n", VarBanana);
 
-  if ((VarApple != 1) || (VarBanana != 2))
+  if (!TEST_CHECK(VarApple == 1))
   {
-    TEST_MSG("Error: initial values were wrong\n");
-    return false;
+    TEST_MSG("Expected: %d\n", 1);
+    TEST_MSG("Actual  : %d\n", VarApple);
+  }
+
+  if (!TEST_CHECK(VarBanana == 2))
+  {
+    TEST_MSG("Expected: %d\n", 2);
+    TEST_MSG("Actual  : %d\n", VarBanana);
   }
 
   cs_str_string_set(cs, "Apple", "threads", err);
@@ -123,14 +129,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "date") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "date") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -141,14 +147,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "size") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "size") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -159,7 +165,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "size", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -168,7 +174,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -179,6 +185,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is %s\n", value.data);
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -199,7 +206,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     {
       mutt_buffer_reset(err);
       rc = cs_str_string_set(cs, name_list[i], map[j].name, err);
-      if (CSR_RESULT(rc) != CSR_SUCCESS)
+      if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
       {
         TEST_MSG("%s\n", err->data);
         return false;
@@ -211,7 +218,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
         continue;
       }
 
-      if (*var != map[j].value)
+      if (!TEST_CHECK(*var == map[j].value))
       {
         TEST_MSG("Value of %s wasn't changed\n", map[j].name);
         return false;
@@ -227,7 +234,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     {
       mutt_buffer_reset(err);
       rc = cs_str_string_set(cs, name_list[i], invalid[j], err);
-      if (CSR_RESULT(rc) != CSR_SUCCESS)
+      if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
       {
         TEST_MSG("Expected error: %s\n", err->data);
       }
@@ -243,13 +250,13 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   const char *name = "Damson";
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "last-date-sent", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarDamson != (SORT_DATE | SORT_LAST))
+  if (!TEST_CHECK(VarDamson == (SORT_DATE | SORT_LAST)))
   {
     TEST_MSG("Expected %d, got %d\n", (SORT_DATE | SORT_LAST), VarDamson);
     return false;
@@ -257,18 +264,19 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "reverse-score", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarDamson != (SORT_SCORE | SORT_REVERSE))
+  if (!TEST_CHECK(VarDamson == (SORT_SCORE | SORT_REVERSE)))
   {
     TEST_MSG("Expected %d, got %d\n", (SORT_DATE | SORT_LAST), VarDamson);
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -280,7 +288,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   VarJackfruit = SORT_SUBJECT;
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -290,7 +298,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   VarJackfruit = SORT_THREADS;
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -301,7 +309,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_reset(err);
   TEST_MSG("Expect error for next test\n");
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -311,12 +319,13 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   name = "Raspberry";
   TEST_MSG("Expect error for next test\n");
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -337,7 +346,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     {
       mutt_buffer_reset(err);
       rc = cs_str_native_set(cs, name_list[i], map[j].value, err);
-      if (CSR_RESULT(rc) != CSR_SUCCESS)
+      if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
       {
         TEST_MSG("%s\n", err->data);
         return false;
@@ -349,7 +358,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
         continue;
       }
 
-      if (*var != map[j].value)
+      if (!TEST_CHECK(*var == map[j].value))
       {
         TEST_MSG("Value of %s wasn't changed\n", map[j].name);
         return false;
@@ -363,13 +372,13 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   VarKumquat = -1;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarKumquat != value)
+  if (!TEST_CHECK(VarKumquat == value))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -383,7 +392,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     VarKumquat = -1;
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, invalid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
     {
       TEST_MSG("Expected error: %s\n", err->data);
     }
@@ -398,13 +407,13 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Damson";
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, (SORT_DATE | SORT_LAST), err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarDamson != (SORT_DATE | SORT_LAST))
+  if (!TEST_CHECK(VarDamson == (SORT_DATE | SORT_LAST)))
   {
     TEST_MSG("Expected %d, got %d\n", (SORT_DATE | SORT_LAST), VarDamson);
     return false;
@@ -412,18 +421,19 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, (SORT_SCORE | SORT_REVERSE), err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (VarDamson != (SORT_SCORE | SORT_REVERSE))
+  if (!TEST_CHECK(VarDamson == (SORT_SCORE | SORT_REVERSE)))
   {
     TEST_MSG("Expected %d, got %d\n", (SORT_DATE | SORT_LAST), VarDamson);
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -435,13 +445,14 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   VarLemon = SORT_THREADS;
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (value != SORT_THREADS)
+  if (!TEST_CHECK(value == SORT_THREADS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = %ld\n", name, value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -454,7 +465,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_reset(err);
 
   int rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -469,7 +480,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Reset: %s = %d\n", name, VarMango);
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -481,13 +492,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Initial: %s = %d\n", name, VarNectarine);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "size", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = %d\n", name, VarNectarine);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -497,7 +508,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (VarNectarine != SORT_SIZE)
+  if (!TEST_CHECK(VarNectarine == SORT_SIZE))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -505,6 +516,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = %d\n", name, VarNectarine);
 
+  log_line(__func__);
   return true;
 }
 
@@ -516,7 +528,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarOlive = SORT_SUBJECT;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "threads", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -530,7 +542,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarOlive = SORT_SUBJECT;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, SORT_THREADS, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -545,7 +557,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarPapaya = SORT_SUBJECT;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "threads", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -559,7 +571,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarPapaya = SORT_SUBJECT;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, SORT_THREADS, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -574,7 +586,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarQuince = SORT_SUBJECT;
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "threads", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -588,7 +600,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   VarQuince = SORT_SUBJECT;
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, SORT_THREADS, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -599,6 +611,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %d\n", name, VarQuince);
 
+  log_line(__func__);
   return true;
 }
 
@@ -631,7 +644,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   VarStrawberry = SORT_SUBJECT;
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, parent, "threads", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -641,7 +654,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // set child
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, child, "score", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -651,7 +664,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset child
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, child, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
@@ -661,13 +674,14 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   // reset parent
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, parent, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Error: %s\n", err->data);
     goto ti_out;
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -684,7 +698,7 @@ static bool test_sort_type(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_reset(err);
   TEST_MSG("Expect error for next test\n");
   int rc = cs_str_string_set(cs, name, value, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("%s = %d, set by '%s'\n", name, VarRaspberry, value);
     TEST_MSG("This test should have failed\n");
@@ -694,20 +708,19 @@ static bool test_sort_type(struct ConfigSet *cs, struct Buffer *err)
   mutt_buffer_reset(err);
   TEST_MSG("Expect error for next test\n");
   rc = cs_str_native_set(cs, name, SORT_THREADS, err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("%s = %d, set by %d\n", name, VarRaspberry, SORT_THREADS);
     TEST_MSG("This test should have failed\n");
     return false;
   }
 
+  log_line(__func__);
   return true;
 }
 
 void config_sort(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -730,15 +743,15 @@ void config_sort(void)
   if (!cs_register_variables(cs, Vars2, 0))
     return;
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
-  test_sort_type(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
+  TEST_CHECK(test_sort_type(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/string.c b/test/config/string.c
index 449e1a322cabf7165932dd0a74558c048692b15f..c975923ab484ad55bc00f5c86b4e1c66452d90de 100644 (file)
--- a/test/config/string.c
+++ b/test/config/string.c
@@ -86,8 +86,13 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Apple = %s\n", VarApple);
   TEST_MSG("Banana = %s\n", VarBanana);
 
-  if ((mutt_str_strcmp(VarApple, "apple") != 0) ||
-      (mutt_str_strcmp(VarBanana, "banana") != 0))
+  if (!TEST_CHECK(mutt_str_strcmp(VarApple, "apple") == 0))
+  {
+    TEST_MSG("Error: initial values were wrong\n");
+    return false;
+  }
+
+  if (!TEST_CHECK(mutt_str_strcmp(VarBanana, "banana") == 0))
   {
     TEST_MSG("Error: initial values were wrong\n");
     return false;
@@ -106,14 +111,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Apple", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "apple") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "apple") == 0))
   {
     TEST_MSG("Apple's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -124,14 +129,14 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Banana", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
     return false;
   }
 
-  if (mutt_str_strcmp(value.data, "banana") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(value.data, "banana") == 0))
   {
     TEST_MSG("Banana's initial value is wrong: '%s'\n", value.data);
     FREE(&value.data);
@@ -142,7 +147,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "train", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -151,7 +156,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_set(cs, "Cherry", "plane", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -160,7 +165,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(&value);
   rc = cs_str_initial_get(cs, "Cherry", &value);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", value.data);
     FREE(&value.data);
@@ -171,6 +176,7 @@ static bool test_initial_values(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Cherry's initial value is '%s'\n", NONULL(value.data));
 
   FREE(&value.data);
+  log_line(__func__);
   return true;
 }
 
@@ -186,7 +192,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -198,18 +204,19 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarDamson, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarDamson, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
     }
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarDamson), NONULL(valid[i]));
+    short_line();
   }
 
   name = "Fig";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -222,9 +229,10 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Elderberry";
   for (unsigned int i = 0; i < mutt_array_size(valid); i++)
   {
+    short_line();
     mutt_buffer_reset(err);
     rc = cs_str_string_set(cs, name, valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -236,7 +244,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarElderberry, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarElderberry, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -244,6 +252,7 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarElderberry), NONULL(valid[i]));
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -254,7 +263,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -264,7 +273,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
   name = "Hawthorn";
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -273,18 +282,19 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   name = "Ilama";
   rc = cs_str_string_set(cs, name, "ilama", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = '%s', '%s'\n", name, NONULL(VarIlama), err->data);
 
+  log_line(__func__);
   return true;
 }
 
@@ -300,7 +310,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   {
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, (intptr_t) valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -312,18 +322,19 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarJackfruit, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarJackfruit, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
     }
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarJackfruit), NONULL(valid[i]));
+    short_line();
   }
 
   name = "Lemon";
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, (intptr_t) "", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -336,9 +347,10 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
   name = "Kumquat";
   for (unsigned int i = 0; i < mutt_array_size(valid); i++)
   {
+    short_line();
     mutt_buffer_reset(err);
     rc = cs_str_native_set(cs, name, (intptr_t) valid[i], err);
-    if (CSR_RESULT(rc) != CSR_SUCCESS)
+    if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     {
       TEST_MSG("%s\n", err->data);
       return false;
@@ -350,7 +362,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
       continue;
     }
 
-    if (mutt_str_strcmp(VarKumquat, valid[i]) != 0)
+    if (!TEST_CHECK(mutt_str_strcmp(VarKumquat, valid[i]) == 0))
     {
       TEST_MSG("Value of %s wasn't changed\n", name);
       return false;
@@ -358,6 +370,7 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
     TEST_MSG("%s = '%s', set by '%s'\n", name, NONULL(VarKumquat), NONULL(valid[i]));
   }
 
+  log_line(__func__);
   return true;
 }
 
@@ -367,18 +380,19 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Mango";
 
   int rc = cs_str_string_set(cs, name, "mango", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (mutt_str_strcmp(VarMango, (char *) value) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarMango, (char *) value) == 0))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
   }
   TEST_MSG("%s = '%s', '%s'\n", name, VarMango, (char *) value);
 
+  log_line(__func__);
   return true;
 }
 
@@ -391,18 +405,18 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Initial: %s = '%s'\n", name, VarNectarine);
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarNectarine);
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (mutt_str_strcmp(VarNectarine, "nectarine") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarNectarine, "nectarine") == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -411,7 +425,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Reset: %s = '%s'\n", name, VarNectarine);
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
@@ -423,13 +437,13 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
   TEST_MSG("Initial: %s = '%s'\n", name, VarOlive);
   dont_fail = true;
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarOlive);
   dont_fail = false;
 
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -439,7 +453,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
     return false;
   }
 
-  if (mutt_str_strcmp(VarOlive, "hello") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarOlive, "hello") == 0))
   {
     TEST_MSG("Value of %s changed\n", name);
     return false;
@@ -447,6 +461,7 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Reset: %s = '%s'\n", name, VarOlive);
 
+  log_line(__func__);
   return true;
 }
 
@@ -457,7 +472,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   char *name = "Papaya";
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -470,7 +485,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -484,7 +499,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Quince";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -497,7 +512,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) == CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
   }
@@ -511,7 +526,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   name = "Raspberry";
   mutt_buffer_reset(err);
   rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -524,7 +539,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   rc = cs_str_native_set(cs, name, IP "world", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (TEST_CHECK(CSR_RESULT(rc) != CSR_SUCCESS))
   {
     TEST_MSG("Expected error: %s\n", err->data);
   }
@@ -535,6 +550,7 @@ static bool test_validator(struct ConfigSet *cs, struct Buffer *err)
   }
   TEST_MSG("Native: %s = %s\n", name, VarRaspberry);
 
+  log_line(__func__);
   return true;
 }
 
@@ -603,6 +619,7 @@ static bool test_inherit(struct ConfigSet *cs, struct Buffer *err)
   }
   dump_native(cs, parent, child);
 
+  log_line(__func__);
   result = true;
 ti_out:
   ac_free(cs, &ac);
@@ -611,8 +628,6 @@ ti_out:
 
 void config_string(void)
 {
-  log_line(__func__);
-
   struct Buffer err;
   mutt_buffer_init(&err);
   err.data = mutt_mem_calloc(1, STRING);
@@ -631,14 +646,14 @@ void config_string(void)
 
   set_list(cs);
 
-  test_initial_values(cs, &err);
-  test_string_set(cs, &err);
-  test_string_get(cs, &err);
-  test_native_set(cs, &err);
-  test_native_get(cs, &err);
-  test_reset(cs, &err);
-  test_validator(cs, &err);
-  test_inherit(cs, &err);
+  TEST_CHECK(test_initial_values(cs, &err));
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
+  TEST_CHECK(test_validator(cs, &err));
+  TEST_CHECK(test_inherit(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);

diff --git a/test/config/synonym.c b/test/config/synonym.c
index 08009e3ea7c42068adf73423791f2f3c7f49a5ef..ea833eddeccf21e952c8e15de626618dfa4e3f3c 100644 (file)
--- a/test/config/synonym.c
+++ b/test/config/synonym.c
@@ -70,13 +70,13 @@ static bool test_string_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_string_set(cs, name, value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (mutt_str_strcmp(VarApple, value) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarApple, value) == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -93,7 +93,7 @@ static bool test_string_get(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_string_get(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -112,13 +112,13 @@ static bool test_native_set(struct ConfigSet *cs, struct Buffer *err)
 
   mutt_buffer_reset(err);
   int rc = cs_str_native_set(cs, name, (intptr_t) value, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (mutt_str_strcmp(VarElderberry, value) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarElderberry, value) == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -134,12 +134,12 @@ static bool test_native_get(struct ConfigSet *cs, struct Buffer *err)
   const char *name = "Hawthorn";
 
   int rc = cs_str_string_set(cs, name, "tree", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
 
   mutt_buffer_reset(err);
   intptr_t value = cs_str_native_get(cs, name, err);
-  if (mutt_str_strcmp(VarGuava, (const char *) value) != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarGuava, (const char *) value) == 0))
   {
     TEST_MSG("Get failed: %s\n", err->data);
     return false;
@@ -158,19 +158,19 @@ static bool test_reset(struct ConfigSet *cs, struct Buffer *err)
 
   TEST_MSG("Initial: %s = '%s'\n", name, NONULL(VarIlama));
   int rc = cs_str_string_set(cs, name, "hello", err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
     return false;
   TEST_MSG("Set: %s = '%s'\n", name, VarIlama);
 
   mutt_buffer_reset(err);
   rc = cs_str_reset(cs, name, err);
-  if (CSR_RESULT(rc) != CSR_SUCCESS)
+  if (!TEST_CHECK(CSR_RESULT(rc) == CSR_SUCCESS))
   {
     TEST_MSG("%s\n", err->data);
     return false;
   }
 
-  if (mutt_str_strcmp(VarIlama, "iguana") != 0)
+  if (!TEST_CHECK(mutt_str_strcmp(VarIlama, "iguana") == 0))
   {
     TEST_MSG("Value of %s wasn't changed\n", name);
     return false;
@@ -211,16 +211,11 @@ void config_synonym(void)
 
   set_list(cs);
 
-  if (!test_string_set(cs, &err))
-    return;
-  if (!test_string_get(cs, &err))
-    return;
-  if (!test_native_set(cs, &err))
-    return;
-  if (!test_native_get(cs, &err))
-    return;
-  if (!test_reset(cs, &err))
-    return;
+  TEST_CHECK(test_string_set(cs, &err));
+  TEST_CHECK(test_string_get(cs, &err));
+  TEST_CHECK(test_native_set(cs, &err));
+  TEST_CHECK(test_native_get(cs, &err));
+  TEST_CHECK(test_reset(cs, &err));
 
   cs_free(&cs);
   FREE(&err.data);