From 8ad1a659550db2d5566731e40ba89b1fff3f008e Mon Sep 17 00:00:00 2001 From: hugo303 Date: Tue, 28 Nov 2006 10:47:35 +0000 Subject: [PATCH] * Added tests for new Check fail API. git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@399 64e312b2-a51f-0410-8e61-82d0ca0eb02a --- tests/check_check_master.c | 28 +++++--- tests/check_check_sub.c | 138 +++++++++++++++++++++++++++++++++++-- 2 files changed, 148 insertions(+), 18 deletions(-) diff --git a/tests/check_check_master.c b/tests/check_check_master.c index 045cbfe..f47e13f 100644 --- a/tests/check_check_master.c +++ b/tests/check_check_master.c @@ -41,33 +41,39 @@ 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", 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" }, + { "Simple Tests", 180, CK_FAILURE, "Assertion 'x!=y' failed: x==3, y==3" }, + { "Simple Tests", 188, CK_FAILURE, "Assertion '\"test1\"==s' failed: \"test1\"==\"test1\", s==\"test2\"" }, + { "Simple Tests", 198, CK_FAILURE, "Assertion 't!=s' failed: t==\"test2\", s==\"test2\"" }, { "Signal Tests", -1, CK_ERROR, signal_11_str }, { "Signal Tests", -1, CK_PASS, "Passed" }, - { "Signal Tests", 111, CK_ERROR, signal_11_8_str }, + { "Signal Tests", 228, CK_ERROR, signal_11_8_str }, { "Signal Tests", -1, CK_FAILURE, "Early exit with return value 0" }, { "Signal Tests", -1, CK_FAILURE, "Early exit with return value 1" }, { "Signal Tests", -1, CK_ERROR, signal_8_str }, { "Signal Tests", -1, CK_ERROR, signal_8_str }, #if TIMEOUT_TESTS_ENABLED - { "Environment Timeout Tests", 139, CK_ERROR, "Test timeout expired" }, + { "Environment Timeout Tests", 256, CK_ERROR, "Test timeout expired" }, { "Environment Timeout Tests", -1, CK_PASS, "Passed" }, { "Environment Timeout Tests", -1, CK_PASS, "Passed" }, - { "Environment Timeout Tests", 158, CK_ERROR, "Test timeout expired" }, - { "Timeout Tests", 139, CK_ERROR, "Test timeout expired" }, + { "Environment Timeout Tests", 275, CK_ERROR, "Test timeout expired" }, + { "Timeout Tests", 256, CK_ERROR, "Test timeout expired" }, { "Timeout Tests", -1, CK_PASS, "Passed" }, - { "Timeout Tests", 152, CK_ERROR, "Test timeout expired" }, - { "Timeout Tests", 158, CK_ERROR, "Test timeout expired" }, - { "User Timeout Tests", 139, CK_ERROR, "Test timeout expired" }, + { "Timeout Tests", 269, CK_ERROR, "Test timeout expired" }, + { "Timeout Tests", 275, CK_ERROR, "Test timeout expired" }, + { "User Timeout Tests", 2560, CK_ERROR, "Test timeout expired" }, { "User Timeout Tests", -1, CK_PASS, "Passed" }, { "User Timeout Tests", -1, CK_PASS, "Passed" }, - { "User Timeout Tests", 158, CK_ERROR, "Test timeout expired" }, + { "User Timeout Tests", 275, CK_ERROR, "Test timeout expired" }, /* Timeout tests are run twice , see check_check_sub.c:make_sub_suite() */ - { "Timeout Tests", 139, CK_ERROR, "Test timeout expired" }, + { "Timeout Tests", 256, CK_ERROR, "Test timeout expired" }, { "Timeout Tests", -1, CK_PASS, "Passed" }, - { "Timeout Tests", 152, CK_ERROR, "Test timeout expired" }, - { "Timeout Tests", 158, CK_ERROR, "Test timeout expired" }, + { "Timeout Tests", 269, CK_ERROR, "Test timeout expired" }, + { "Timeout Tests", 275, CK_ERROR, "Test timeout expired" }, #endif { "Limit Tests", -1, CK_ERROR, "Early exit with return value 1" }, diff --git a/tests/check_check_sub.c b/tests/check_check_sub.c index a7d4883..d53aed7 100644 --- a/tests/check_check_sub.c +++ b/tests/check_check_sub.c @@ -15,14 +15,14 @@ START_TEST(test_lno) { - fail("Failure expected"); /*line 18*/ + fail("Failure expected"); /* line 18*/ } END_TEST START_TEST(test_mark_lno) { - mark_point(); /*line 24*/ - exit(EXIT_FAILURE); /*should fail at line 24*/ + mark_point(); /* line 24*/ + exit(EXIT_FAILURE); /* should fail at line 24*/ } END_TEST @@ -108,7 +108,124 @@ START_TEST(test_fail_empty) } END_TEST -START_TEST(test_segv) /* line 111 */ + + + + + + + + + + + + + + + + + + + + +START_TEST(test_ck_assert) +{ + int x = 3; + int y = 3; + ck_assert(1); + ck_assert(x == y); + y++; + ck_assert(x != y); + ck_assert(x == y); /* line 139 */ +} +END_TEST + +START_TEST(test_ck_assert_null) +{ + ck_assert(0); /* line 145 */ +} +END_TEST + + + + + + + + + + + + + + + + +START_TEST(test_int_assert_eq) +{ + int x = 3; + int y = 3; + ck_assert_int_eq(x, y); + y++; + ck_assert_int_eq(x, y); /* line 170 */ +} +END_TEST + +START_TEST(test_int_assert_ne) +{ + int x = 3; + int y = 2; + ck_assert_int_ne(x, y); + y++; + ck_assert_int_ne(x, y); /* line 180 */ +} +END_TEST + +START_TEST(test_str_assert_eq) +{ + const char *s = "test2"; + ck_assert_str_eq("test2", s); + ck_assert_str_eq("test1", s); /* line 188 */ +} +END_TEST + +START_TEST(test_str_assert_ne) +{ + const char *s = "test2"; + const char *t = "test1"; + ck_assert_str_ne(t, s); + t = "test2"; + ck_assert_str_ne(t, s); /* line 198 */ +} +END_TEST + + + + + + + + + + + + + + + + + + + + + + + + + + + +START_TEST(test_segv) /* line 228 */ { raise (SIGSEGV); } @@ -136,7 +253,7 @@ START_TEST(test_mark_point) END_TEST #if TIMEOUT_TESTS_ENABLED -START_TEST(test_eternal) /* line 139 */ +START_TEST(test_eternal) /* line 256 */ { for (;;) ; @@ -149,13 +266,13 @@ START_TEST(test_sleep2) } END_TEST -START_TEST(test_sleep5) /* line 152 */ +START_TEST(test_sleep5) /* line 269 */ { sleep(5); } END_TEST -START_TEST(test_sleep8) /* line 158 */ +START_TEST(test_sleep8) /* line 275 */ { sleep(8); } @@ -369,6 +486,13 @@ 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_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_signal, test_segv); tcase_add_test_raise_signal (tc_signal, test_segv, 11); /* pass */ tcase_add_test_raise_signal (tc_signal, test_segv, 8); /* error */ -- 2.40.0