* Add ck_abort and ck_abort_msg implementation with tests.

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@402 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/src/check.h.in b/src/check.h.in
index 7e9afc458524a33ebbf4b94d1d6f89238e052041..8de6a0a56a4ea438f3976e09eb8e8995c6f7a8de 100644 (file)
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -217,6 +217,8 @@ void CK_EXPORT _fail_unless (int result, const char *file,
                              int line, const char *expr, ...);
 
 /* New check fail API. */
+#define ck_abort() ck_abort_msg(NULL)
+#define ck_abort_msg fail
 #define ck_assert(C) ck_assert_msg(C, NULL)
 #define ck_assert_msg fail_unless
 

diff --git a/tests/check_check_master.c b/tests/check_check_master.c
index 337c448672c9105ddbd882a3a4cdef38c32b205f..458544f2bc3ad82bcd7957caf3982b19d326ec89 100644 (file)
--- a/tests/check_check_master.c
+++ b/tests/check_check_master.c
@@ -41,6 +41,9 @@ static master_test_t master_tests[] = {
   { "Simple Tests",  -1, CK_FAILURE, "5 != 6" },
   { "Simple Tests",  -1, CK_FAILURE, "7 == 7" },
   { "Simple Tests",  -1, CK_FAILURE, "Failed" },
+  { "Simple Tests", 114, CK_FAILURE, "Failed" },
+  { "Simple Tests", 120, CK_FAILURE, "Failure expected" },
+  { "Simple Tests", 127, CK_FAILURE, "Failed" },
   { "Simple Tests", 139, CK_FAILURE, "Assertion 'x == y' failed" },
   { "Simple Tests", 145, CK_FAILURE, "Assertion '0' failed" },
   { "Simple Tests", 170, CK_FAILURE, "Assertion 'x==y' failed: x==3, y==4" },

diff --git a/tests/check_check_sub.c b/tests/check_check_sub.c
index d53aed721c6a3552e9e956e9f7aa6faaeca9af5f..f5fad8cd1ab18d2ee812a61379e1f72fabf6186d 100644 (file)
--- a/tests/check_check_sub.c
+++ b/tests/check_check_sub.c
@@ -108,25 +108,25 @@ START_TEST(test_fail_empty)
 }
 END_TEST
 
+/* FIXME: all these line numbers are kind of hard to maintain */
+START_TEST(test_ck_abort)
+{
+  ck_abort(); /* line 114 */
+}
+END_TEST
 
+START_TEST(test_ck_abort_msg)
+{
+  ck_abort_msg("Failure expected"); /* line 120 */
+}
+END_TEST
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+/* FIXME: perhaps passing NULL to ck_abort_msg should be an error. */
+START_TEST(test_ck_abort_msg_null)
+{
+  ck_abort_msg(NULL); /* line 127 */
+}
+END_TEST
 
 START_TEST(test_ck_assert)
 {
@@ -161,7 +161,7 @@ END_TEST
 
 
 
-START_TEST(test_int_assert_eq)
+START_TEST(test_ck_assert_int_eq)
 {
   int x = 3;
   int y = 3;
@@ -171,7 +171,7 @@ START_TEST(test_int_assert_eq)
 }
 END_TEST
 
-START_TEST(test_int_assert_ne)
+START_TEST(test_ck_assert_int_ne)
 {
   int x = 3;
   int y = 2;
@@ -181,7 +181,7 @@ START_TEST(test_int_assert_ne)
 }
 END_TEST
 
-START_TEST(test_str_assert_eq)
+START_TEST(test_ck_assert_str_eq)
 {
   const char *s = "test2";
   ck_assert_str_eq("test2", s);
@@ -189,7 +189,7 @@ START_TEST(test_str_assert_eq)
 }
 END_TEST
 
-START_TEST(test_str_assert_ne)
+START_TEST(test_ck_assert_str_ne)
 {
   const char *s = "test2";
   const char *t = "test1";
@@ -486,12 +486,15 @@ Suite *make_sub_suite(void)
   tcase_add_test (tc_simple, test_fail_vararg_msg_3);
   tcase_add_test (tc_simple, test_fail_empty);
 
+  tcase_add_test (tc_simple, test_ck_abort);
+  tcase_add_test (tc_simple, test_ck_abort_msg);
+  tcase_add_test (tc_simple, test_ck_abort_msg_null);
   tcase_add_test (tc_simple, test_ck_assert);
   tcase_add_test (tc_simple, test_ck_assert_null);
-  tcase_add_test (tc_simple, test_int_assert_eq);
-  tcase_add_test (tc_simple, test_int_assert_ne);
-  tcase_add_test (tc_simple, test_str_assert_eq);
-  tcase_add_test (tc_simple, test_str_assert_ne);
+  tcase_add_test (tc_simple, test_ck_assert_int_eq);
+  tcase_add_test (tc_simple, test_ck_assert_int_ne);
+  tcase_add_test (tc_simple, test_ck_assert_str_eq);
+  tcase_add_test (tc_simple, test_ck_assert_str_ne);
 
   tcase_add_test (tc_signal, test_segv);
   tcase_add_test_raise_signal (tc_signal, test_segv, 11); /* pass  */