From 9cfcca3c3cd932179facaa94be0b25b68561aeb6 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 4 Sep 2013 10:59:49 +0200 Subject: [PATCH] t/utils/: Name test-cases after the tested function. This might make it possible to do coverage tests. --- t/utils/dbi_test.c | 32 ++++++++++++++++---------------- t/utils/llist_test.c | 32 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/t/utils/dbi_test.c b/t/utils/dbi_test.c index 2ad1cc2..c355e64 100644 --- a/t/utils/dbi_test.c +++ b/t/utils/dbi_test.c @@ -420,14 +420,14 @@ teardown(void) client = NULL; } /* teardown */ -static unsigned long long test_query_callback_called = 0; +static unsigned long long query_callback_called = 0; static int -test_query_callback(sdb_dbi_client_t *c, +query_callback(sdb_dbi_client_t *c, size_t n, sdb_data_t *data, sdb_object_t *user_data) { size_t i; - ++test_query_callback_called; + ++query_callback_called; fail_unless(c == client, "query callback received unexpected client = %p; " @@ -499,13 +499,13 @@ test_query_callback(sdb_dbi_client_t *c, } } return 0; -} /* test_query_callback */ +} /* query_callback */ /* * tests */ -START_TEST(test_client_connect) +START_TEST(test_sdb_dbi_client_connect) { int check = sdb_dbi_client_connect(client); fail_unless(check == 0, @@ -517,7 +517,7 @@ START_TEST(test_client_connect) } END_TEST -START_TEST(test_client_check_conn) +START_TEST(test_sdb_dbi_client_check_conn) { int check = sdb_dbi_client_check_conn(client); fail_unless(check == 0, @@ -540,11 +540,11 @@ START_TEST(test_client_check_conn) } END_TEST -START_TEST(test_exec_query) +START_TEST(test_sdb_dbi_exec_query) { size_t i; - int check = sdb_dbi_exec_query(client, "mockquery0", test_query_callback, + int check = sdb_dbi_exec_query(client, "mockquery0", query_callback, /* user_data = */ TEST_MAGIC, /* n = */ 0); /* not connected yet */ fail_unless(check < 0, @@ -558,13 +558,13 @@ START_TEST(test_exec_query) unsigned long long expected_callback_calls = 0; dbi_conn_query_called = 0; - test_query_callback_called = 0; + query_callback_called = 0; dbi_result_free_called = 0; /* sdb_dbi_exec_query will only use as many type arguments are needed, * so we can safely pass in the maximum number of arguments required * on each call */ - check = sdb_dbi_exec_query(client, q->name, test_query_callback, + check = sdb_dbi_exec_query(client, q->name, query_callback, /* user_data = */ TEST_MAGIC, /* n = */ (int)q->nfields, SDB_TYPE_INTEGER, SDB_TYPE_DECIMAL, SDB_TYPE_STRING, SDB_TYPE_DATETIME, SDB_TYPE_BINARY); @@ -578,11 +578,11 @@ START_TEST(test_exec_query) if (q->nfields) expected_callback_calls = q->nrows; - fail_unless(test_query_callback_called == expected_callback_calls, + fail_unless(query_callback_called == expected_callback_calls, "sdb_dbi_exec_query() did not call the registered callback " "for each result row; got %i call%s; expected: 0", - test_query_callback_called, - (test_query_callback_called == 1) ? "" : "s"); + query_callback_called, + (query_callback_called == 1) ? "" : "s"); fail_unless(dbi_result_free_called == 1, "sdb_dbi_exec_query() did not free the query result object"); @@ -602,9 +602,9 @@ util_dbi_suite(void) tc = tcase_create("core"); tcase_add_checked_fixture(tc, setup, teardown); - tcase_add_test(tc, test_client_connect); - tcase_add_test(tc, test_client_check_conn); - tcase_add_test(tc, test_exec_query); + tcase_add_test(tc, test_sdb_dbi_client_connect); + tcase_add_test(tc, test_sdb_dbi_client_check_conn); + tcase_add_test(tc, test_sdb_dbi_exec_query); suite_add_tcase(s, tc); return s; diff --git a/t/utils/llist_test.c b/t/utils/llist_test.c index b01dd0e..638d2fb 100644 --- a/t/utils/llist_test.c +++ b/t/utils/llist_test.c @@ -80,7 +80,7 @@ populate(void) } } /* populate */ -START_TEST(test_clone) +START_TEST(test_sdb_llist_clone) { sdb_llist_t *clone; size_t i; @@ -100,7 +100,7 @@ START_TEST(test_clone) } END_TEST -START_TEST(test_destroy) +START_TEST(test_sdb_llist_destroy) { size_t i; populate(); @@ -115,7 +115,7 @@ START_TEST(test_destroy) } END_TEST -START_TEST(test_append) +START_TEST(test_sdb_llist_append) { size_t i; for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { @@ -130,7 +130,7 @@ START_TEST(test_append) } END_TEST -START_TEST(test_insert) +START_TEST(test_sdb_llist_insert) { size_t i; for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { @@ -145,7 +145,7 @@ START_TEST(test_insert) } END_TEST -START_TEST(test_insert_invalid) +START_TEST(test_validate_insert) { size_t i; for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) { @@ -162,7 +162,7 @@ START_TEST(test_insert_invalid) } END_TEST -START_TEST(test_search) +START_TEST(test_sdb_llist_search) { size_t i; populate(); @@ -184,7 +184,7 @@ START_TEST(test_search) } END_TEST -START_TEST(test_shift) +START_TEST(test_sdb_llist_shift) { size_t i; populate(); @@ -204,7 +204,7 @@ START_TEST(test_shift) } END_TEST -START_TEST(test_iter) +START_TEST(test_sdb_llist_iter) { sdb_llist_iter_t *iter; size_t i; @@ -241,14 +241,14 @@ util_llist_suite(void) tc = tcase_create("core"); tcase_add_checked_fixture(tc, setup, teardown); - tcase_add_test(tc, test_clone); - tcase_add_test(tc, test_destroy); - tcase_add_test(tc, test_append); - tcase_add_test(tc, test_insert); - tcase_add_test(tc, test_insert_invalid); - tcase_add_test(tc, test_search); - tcase_add_test(tc, test_shift); - tcase_add_test(tc, test_iter); + tcase_add_test(tc, test_sdb_llist_clone); + tcase_add_test(tc, test_sdb_llist_destroy); + tcase_add_test(tc, test_sdb_llist_append); + tcase_add_test(tc, test_sdb_llist_insert); + tcase_add_test(tc, test_validate_insert); + tcase_add_test(tc, test_sdb_llist_search); + tcase_add_test(tc, test_sdb_llist_shift); + tcase_add_test(tc, test_sdb_llist_iter); suite_add_tcase(s, tc); return s; -- 2.30.2